makefiles update with OSX fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22793 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -21,6 +21,7 @@ LDFLAGS = @LDFLAGS@
|
||||
LDFLAGS_GUI = @LDFLAGS_GUI@
|
||||
RESCOMP = @RESCOMP@
|
||||
SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
|
||||
SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
|
||||
SETFILE = @SETFILE@
|
||||
TOOLCHAIN_NAME = @TOOLCHAIN_NAME@
|
||||
TOOLKIT = @TOOLKIT@
|
||||
@@ -35,7 +36,7 @@ top_srcdir = @top_srcdir@
|
||||
DOCVIEW_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
|
||||
-I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
|
||||
$(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
|
||||
-I$(srcdir) $(__DLLFLAG_p) -I../../samples $(CXXFLAGS)
|
||||
-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXFLAGS)
|
||||
DOCVIEW_OBJECTS = \
|
||||
docview_docview.o \
|
||||
docview_doc.o \
|
||||
@@ -48,8 +49,7 @@ LIBDIRNAME = $(top_builddir)lib
|
||||
@COND_DEPS_TRACKING_0@CXXC = $(CXX)
|
||||
@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
|
||||
@COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r \
|
||||
@COND_TOOLKIT_MAC@ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r \
|
||||
@COND_TOOLKIT_MAC@ ../../samples/sample.r
|
||||
@COND_TOOLKIT_MAC@ $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r
|
||||
@COND_USE_GUI_0@PORTNAME = base
|
||||
@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
|
||||
@COND_TOOLKIT_MAC@WXBASEPORT = _carbon
|
||||
@@ -120,30 +120,55 @@ COND_PLATFORM_MAC_1___docview___mac_rezcmd = $(RESCOMP) -d __DARWIN__ -t APPL -d
|
||||
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \
|
||||
$(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \
|
||||
$(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \
|
||||
$(__DLLFLAG_p_1) -i ../../samples -o docview$(EXEEXT) $(MACOSX_RESOURCES) \
|
||||
chart.r doc.r docview.r mondrian.r
|
||||
$(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o docview$(EXEEXT) \
|
||||
$(MACOSX_RESOURCES) chart.r doc.r docview.r mondrian.r
|
||||
@COND_PLATFORM_MAC_1@__docview___mac_rezcmd = $(COND_PLATFORM_MAC_1___docview___mac_rezcmd)
|
||||
@COND_PLATFORM_MAC_1@__docview___mac_setfilecmd = \
|
||||
@COND_PLATFORM_MAC_1@ $(SETFILE) -a C docview$(EXEEXT)
|
||||
@COND_PLATFORM_WIN32_1@__docview___win32rc = docview_docview_rc.o
|
||||
@COND_PLATFORM_MACOSX_1@__docview_bundle___depname = docview_bundle
|
||||
|
||||
### Targets: ###
|
||||
|
||||
all: docview$(EXEEXT)
|
||||
all: docview$(EXEEXT) $(__docview_bundle___depname)
|
||||
|
||||
clean:
|
||||
rm -rf ./.deps
|
||||
rm -rf ./.deps ./.pch
|
||||
rm -f ./*.o
|
||||
rm -f docview$(EXEEXT)
|
||||
rm -rf docview.app
|
||||
|
||||
distclean: clean
|
||||
rm -f configure config.cache config.log config.status
|
||||
rm -f bk-deps shared-ld-sh
|
||||
rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
|
||||
|
||||
docview$(EXEEXT): $(DOCVIEW_OBJECTS) $(__docview___win32rc)
|
||||
$(CXX) -o $@ $(DOCVIEW_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
|
||||
$(__docview___mac_rezcmd)
|
||||
$(__docview___mac_setfilecmd)
|
||||
$(SAMPLES_RPATH_POSTLINK)
|
||||
|
||||
docview.app/Contents: docview$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns
|
||||
mkdir -p docview.app/Contents
|
||||
mkdir -p docview.app/Contents/MacOS
|
||||
mkdir -p docview.app/Contents/Resources
|
||||
|
||||
|
||||
sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
|
||||
-e "s/EXECUTABLE/docview/" \
|
||||
-e "s/VERSION/2.5.0/" \
|
||||
$(top_srcdir)/src/mac/Info.plist.in >docview.app/Contents/Info.plist
|
||||
|
||||
|
||||
echo -n "APPL????" >docview.app/Contents/PkgInfo
|
||||
|
||||
|
||||
ln -f docview$(EXEEXT) docview.app/Contents/MacOS/docview
|
||||
|
||||
|
||||
ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc docview.app/Contents/Resources/docview.rsrc
|
||||
ln -f $(top_srcdir)/src/mac/wxmac.icns docview.app/Contents/Resources/wxmac.icns
|
||||
|
||||
@COND_PLATFORM_MACOSX_1@docview_bundle: docview.app/Contents
|
||||
|
||||
docview_doc.o: $(srcdir)/doc.cpp
|
||||
$(CXXC) -c -o $@ $(DOCVIEW_CXXFLAGS) $<
|
||||
@@ -152,7 +177,7 @@ docview_docview.o: $(srcdir)/docview.cpp
|
||||
$(CXXC) -c -o $@ $(DOCVIEW_CXXFLAGS) $<
|
||||
|
||||
docview_docview_rc.o: $(srcdir)/docview.rc
|
||||
$(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir ../../samples
|
||||
$(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples
|
||||
|
||||
docview_view.o: $(srcdir)/view.cpp
|
||||
$(CXXC) -c -o $@ $(DOCVIEW_CXXFLAGS) $<
|
||||
@@ -167,4 +192,4 @@ uninstall:
|
||||
# Include dependency info, if present:
|
||||
@IF_GNU_MAKE@-include .deps/*.d
|
||||
|
||||
.PHONY: all clean distclean install uninstall
|
||||
.PHONY: all clean distclean docview_bundle install uninstall
|
||||
|
Reference in New Issue
Block a user