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:
Václav Slavík
2003-08-13 12:38:44 +00:00
parent 8bcf2d204f
commit ab892b9519
114 changed files with 4010 additions and 1077 deletions

View File

@@ -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@
BOMBS_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)
BOMBS_OBJECTS = \
bombs_bombs.o \
bombs_bombs1.o \
@@ -106,8 +107,8 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(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 bombs$(EXEEXT) Carbon.r \
$(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../samples/sample.r
$(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o bombs$(EXEEXT) Carbon.r \
$(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r
@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
@COND_MONOLITHIC_0@__WXLIB_BASE_p = \
@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
@@ -124,15 +125,38 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@COND_PLATFORM_MAC_1@__bombs___mac_setfilecmd = \
@COND_PLATFORM_MAC_1@ $(SETFILE) -a C bombs$(EXEEXT)
@COND_PLATFORM_WIN32_1@__bombs___win32rc = bombs_bombs_rc.o
@COND_PLATFORM_MACOSX_1@__bombs_bundle___depname = bombs_bundle
### Targets: ###
all: bombs$(EXEEXT)
all: bombs$(EXEEXT) $(__bombs_bundle___depname)
bombs$(EXEEXT): $(BOMBS_OBJECTS) $(__bombs___win32rc)
$(CXX) -o $@ $(BOMBS_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)
$(__bombs___mac_rezcmd)
$(__bombs___mac_setfilecmd)
$(SAMPLES_RPATH_POSTLINK)
bombs.app/Contents: bombs$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns
mkdir -p bombs.app/Contents
mkdir -p bombs.app/Contents/MacOS
mkdir -p bombs.app/Contents/Resources
sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-e "s/EXECUTABLE/bombs/" \
-e "s/VERSION/2.5.0/" \
$(top_srcdir)/src/mac/Info.plist.in >bombs.app/Contents/Info.plist
echo -n "APPL????" >bombs.app/Contents/PkgInfo
ln -f bombs$(EXEEXT) bombs.app/Contents/MacOS/bombs
ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc bombs.app/Contents/Resources/bombs.rsrc
ln -f $(top_srcdir)/src/mac/wxmac.icns bombs.app/Contents/Resources/wxmac.icns
bombs_bombs.o: $(srcdir)/bombs.cpp
$(CXXC) -c -o $@ $(BOMBS_CXXFLAGS) $<
@@ -141,19 +165,21 @@ bombs_bombs1.o: $(srcdir)/bombs1.cpp
$(CXXC) -c -o $@ $(BOMBS_CXXFLAGS) $<
bombs_bombs_rc.o: $(srcdir)/bombs.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
@COND_PLATFORM_MACOSX_1@bombs_bundle: bombs.app/Contents
bombs_game.o: $(srcdir)/game.cpp
$(CXXC) -c -o $@ $(BOMBS_CXXFLAGS) $<
clean:
rm -rf ./.deps
rm -rf ./.deps ./.pch
rm -f ./*.o
rm -f bombs$(EXEEXT)
rm -rf bombs.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
install: all
@@ -165,4 +191,4 @@ uninstall:
# Include dependency info, if present:
@IF_GNU_MAKE@-include .deps/*.d
.PHONY: all clean distclean install uninstall
.PHONY: all bombs_bundle clean distclean install uninstall

View File

@@ -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@
DBBROWSE_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)
DBBROWSE_OBJECTS = \
dbbrowse_dbbrowse.o \
dbbrowse_doc.o \
@@ -111,8 +112,8 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(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 dbbrowse$(EXEEXT) Carbon.r \
$(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../samples/sample.r
$(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o dbbrowse$(EXEEXT) Carbon.r \
$(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r
@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
COND_MONOLITHIC_0___WXLIB_ADV_p = \
-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX)
@@ -141,29 +142,55 @@ COND_MONOLITHIC_0___WXLIB_ODBC_p = \
@COND_PLATFORM_MAC_1@__dbbrowse___mac_setfilecmd = \
@COND_PLATFORM_MAC_1@ $(SETFILE) -a C dbbrowse$(EXEEXT)
@COND_PLATFORM_WIN32_1@__dbbrowse___win32rc = dbbrowse_dbbrowse_rc.o
@COND_PLATFORM_MACOSX_1@__dbbrowse_bundle___depname = dbbrowse_bundle
### Targets: ###
all: dbbrowse$(EXEEXT)
all: dbbrowse$(EXEEXT) $(__dbbrowse_bundle___depname)
clean:
rm -rf ./.deps
rm -rf ./.deps ./.pch
rm -f ./*.o
rm -f dbbrowse$(EXEEXT)
rm -rf dbbrowse.app
dbbrowse$(EXEEXT): $(DBBROWSE_OBJECTS) $(__dbbrowse___win32rc)
$(CXX) -o $@ $(DBBROWSE_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_DBGRID_p) $(__WXLIB_ADV_p) $(__WXLIB_ODBC_p) $(__WXLIB_HTML_p) $(__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)
$(__dbbrowse___mac_rezcmd)
$(__dbbrowse___mac_setfilecmd)
$(SAMPLES_RPATH_POSTLINK)
dbbrowse.app/Contents: dbbrowse$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns
mkdir -p dbbrowse.app/Contents
mkdir -p dbbrowse.app/Contents/MacOS
mkdir -p dbbrowse.app/Contents/Resources
sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-e "s/EXECUTABLE/dbbrowse/" \
-e "s/VERSION/2.5.0/" \
$(top_srcdir)/src/mac/Info.plist.in >dbbrowse.app/Contents/Info.plist
echo -n "APPL????" >dbbrowse.app/Contents/PkgInfo
ln -f dbbrowse$(EXEEXT) dbbrowse.app/Contents/MacOS/dbbrowse
ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc dbbrowse.app/Contents/Resources/dbbrowse.rsrc
ln -f $(top_srcdir)/src/mac/wxmac.icns dbbrowse.app/Contents/Resources/wxmac.icns
dbbrowse_browsedb.o: $(srcdir)/browsedb.cpp
$(CXXC) -c -o $@ $(DBBROWSE_CXXFLAGS) $<
@COND_PLATFORM_MACOSX_1@dbbrowse_bundle: dbbrowse.app/Contents
dbbrowse_dbbrowse.o: $(srcdir)/dbbrowse.cpp
$(CXXC) -c -o $@ $(DBBROWSE_CXXFLAGS) $<
dbbrowse_dbbrowse_rc.o: $(srcdir)/dbbrowse.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
dbbrowse_dbgrid.o: $(srcdir)/dbgrid.cpp
$(CXXC) -c -o $@ $(DBBROWSE_CXXFLAGS) $<
@@ -184,8 +211,7 @@ dbbrowse_tabpgwin.o: $(srcdir)/tabpgwin.cpp
$(CXXC) -c -o $@ $(DBBROWSE_CXXFLAGS) $<
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
install: all
@@ -197,4 +223,4 @@ uninstall:
# Include dependency info, if present:
@IF_GNU_MAKE@-include .deps/*.d
.PHONY: all clean distclean install uninstall
.PHONY: all clean dbbrowse_bundle distclean install uninstall

View File

@@ -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@
FORTY_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)
FORTY_OBJECTS = \
forty_forty.o \
forty_canvas.o \
@@ -111,8 +112,8 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(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 forty$(EXEEXT) Carbon.r \
$(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../samples/sample.r
$(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o forty$(EXEEXT) Carbon.r \
$(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r
@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
@COND_MONOLITHIC_0@__WXLIB_BASE_p = \
@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
@@ -132,24 +133,49 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@COND_PLATFORM_MAC_1@__forty___mac_setfilecmd = \
@COND_PLATFORM_MAC_1@ $(SETFILE) -a C forty$(EXEEXT)
@COND_PLATFORM_WIN32_1@__forty___win32rc = forty_forty_rc.o
@COND_PLATFORM_MACOSX_1@__forty_bundle___depname = forty_bundle
### Targets: ###
all: forty$(EXEEXT)
all: forty$(EXEEXT) $(__forty_bundle___depname)
clean:
rm -rf ./.deps
rm -rf ./.deps ./.pch
rm -f ./*.o
rm -f forty$(EXEEXT)
rm -rf forty.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
forty$(EXEEXT): $(FORTY_OBJECTS) $(__forty___win32rc)
$(CXX) -o $@ $(FORTY_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_HTML_p) $(__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)
$(__forty___mac_rezcmd)
$(__forty___mac_setfilecmd)
$(SAMPLES_RPATH_POSTLINK)
forty.app/Contents: forty$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns
mkdir -p forty.app/Contents
mkdir -p forty.app/Contents/MacOS
mkdir -p forty.app/Contents/Resources
sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-e "s/EXECUTABLE/forty/" \
-e "s/VERSION/2.5.0/" \
$(top_srcdir)/src/mac/Info.plist.in >forty.app/Contents/Info.plist
echo -n "APPL????" >forty.app/Contents/PkgInfo
ln -f forty$(EXEEXT) forty.app/Contents/MacOS/forty
ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc forty.app/Contents/Resources/forty.rsrc
ln -f $(top_srcdir)/src/mac/wxmac.icns forty.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@forty_bundle: forty.app/Contents
forty_canvas.o: $(srcdir)/canvas.cpp
$(CXXC) -c -o $@ $(FORTY_CXXFLAGS) $<
@@ -161,7 +187,7 @@ forty_forty.o: $(srcdir)/forty.cpp
$(CXXC) -c -o $@ $(FORTY_CXXFLAGS) $<
forty_forty_rc.o: $(srcdir)/forty.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
forty_game.o: $(srcdir)/game.cpp
$(CXXC) -c -o $@ $(FORTY_CXXFLAGS) $<
@@ -188,4 +214,4 @@ uninstall:
# Include dependency info, if present:
@IF_GNU_MAKE@-include .deps/*.d
.PHONY: all clean distclean install uninstall
.PHONY: all clean distclean forty_bundle install uninstall

View File

@@ -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@
FRACTAL_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)
FRACTAL_OBJECTS = \
fractal_fractal.o \
$(__fractal___win32rc)
@@ -104,8 +105,8 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(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 fractal$(EXEEXT) Carbon.r \
$(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../samples/sample.r
$(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o fractal$(EXEEXT) Carbon.r \
$(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r
@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
@COND_MONOLITHIC_0@__WXLIB_BASE_p = \
@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
@@ -122,30 +123,55 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@COND_PLATFORM_MAC_1@__fractal___mac_setfilecmd = \
@COND_PLATFORM_MAC_1@ $(SETFILE) -a C fractal$(EXEEXT)
@COND_PLATFORM_WIN32_1@__fractal___win32rc = fractal_fractal_rc.o
@COND_PLATFORM_MACOSX_1@__fractal_bundle___depname = fractal_bundle
### Targets: ###
all: fractal$(EXEEXT)
all: fractal$(EXEEXT) $(__fractal_bundle___depname)
clean:
rm -rf ./.deps
rm -rf ./.deps ./.pch
rm -f ./*.o
rm -f fractal$(EXEEXT)
rm -rf fractal.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
fractal$(EXEEXT): $(FRACTAL_OBJECTS) $(__fractal___win32rc)
$(CXX) -o $@ $(FRACTAL_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)
$(__fractal___mac_rezcmd)
$(__fractal___mac_setfilecmd)
$(SAMPLES_RPATH_POSTLINK)
fractal.app/Contents: fractal$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns
mkdir -p fractal.app/Contents
mkdir -p fractal.app/Contents/MacOS
mkdir -p fractal.app/Contents/Resources
sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-e "s/EXECUTABLE/fractal/" \
-e "s/VERSION/2.5.0/" \
$(top_srcdir)/src/mac/Info.plist.in >fractal.app/Contents/Info.plist
echo -n "APPL????" >fractal.app/Contents/PkgInfo
ln -f fractal$(EXEEXT) fractal.app/Contents/MacOS/fractal
ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc fractal.app/Contents/Resources/fractal.rsrc
ln -f $(top_srcdir)/src/mac/wxmac.icns fractal.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@fractal_bundle: fractal.app/Contents
fractal_fractal.o: $(srcdir)/fractal.cpp
$(CXXC) -c -o $@ $(FRACTAL_CXXFLAGS) $<
fractal_fractal_rc.o: $(srcdir)/fractal.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
install: all
@@ -157,4 +183,4 @@ uninstall:
# Include dependency info, if present:
@IF_GNU_MAKE@-include .deps/*.d
.PHONY: all clean distclean install uninstall
.PHONY: all clean distclean fractal_bundle install uninstall

View File

@@ -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@
@@ -36,7 +37,7 @@ LIBDIRNAME = $(top_builddir)lib
LIFE_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)
LIFE_OBJECTS = \
life_life.o \
life_dialogs.o \
@@ -107,8 +108,8 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(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 life$(EXEEXT) Carbon.r \
$(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../samples/sample.r
$(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o life$(EXEEXT) Carbon.r \
$(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r
@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
@COND_MONOLITHIC_0@__WXLIB_BASE_p = \
@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
@@ -125,15 +126,17 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@COND_PLATFORM_MAC_1@__life___mac_setfilecmd = \
@COND_PLATFORM_MAC_1@ $(SETFILE) -a C life$(EXEEXT)
@COND_PLATFORM_WIN32_1@__life___win32rc = life_life_rc.o
@COND_PLATFORM_MACOSX_1@__life_bundle___depname = life_bundle
### Targets: ###
all: life$(EXEEXT) data
all: life$(EXEEXT) $(__life_bundle___depname) data
clean:
rm -rf ./.deps
rm -rf ./.deps ./.pch
rm -f ./*.o
rm -f life$(EXEEXT)
rm -rf life.app
data:
@mkdir -p .
@@ -144,8 +147,7 @@ data:
done
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
install: all
@@ -155,6 +157,30 @@ life$(EXEEXT): $(LIFE_OBJECTS) $(__life___win32rc)
$(CXX) -o $@ $(LIFE_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)
$(__life___mac_rezcmd)
$(__life___mac_setfilecmd)
$(SAMPLES_RPATH_POSTLINK)
life.app/Contents: life$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns
mkdir -p life.app/Contents
mkdir -p life.app/Contents/MacOS
mkdir -p life.app/Contents/Resources
sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-e "s/EXECUTABLE/life/" \
-e "s/VERSION/2.5.0/" \
$(top_srcdir)/src/mac/Info.plist.in >life.app/Contents/Info.plist
echo -n "APPL????" >life.app/Contents/PkgInfo
ln -f life$(EXEEXT) life.app/Contents/MacOS/life
ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc life.app/Contents/Resources/life.rsrc
ln -f $(top_srcdir)/src/mac/wxmac.icns life.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@life_bundle: life.app/Contents
life_dialogs.o: $(srcdir)/dialogs.cpp
$(CXXC) -c -o $@ $(LIFE_CXXFLAGS) $<
@@ -166,7 +192,7 @@ life_life.o: $(srcdir)/life.cpp
$(CXXC) -c -o $@ $(LIFE_CXXFLAGS) $<
life_life_rc.o: $(srcdir)/life.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
life_reader.o: $(srcdir)/reader.cpp
$(CXXC) -c -o $@ $(LIFE_CXXFLAGS) $<
@@ -177,4 +203,4 @@ uninstall:
# Include dependency info, if present:
@IF_GNU_MAKE@-include .deps/*.d
.PHONY: all clean data distclean install uninstall
.PHONY: all clean data distclean install life_bundle uninstall

View File

@@ -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@
@@ -36,7 +37,7 @@ LIBDIRNAME = $(top_builddir)lib
WXPOEM_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)
WXPOEM_OBJECTS = \
wxpoem_wxpoem.o \
$(__wxpoem___win32rc)
@@ -104,8 +105,8 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(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 wxpoem$(EXEEXT) Carbon.r \
$(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r ../../samples/sample.r
$(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o wxpoem$(EXEEXT) Carbon.r \
$(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r
@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
@COND_MONOLITHIC_0@__WXLIB_BASE_p = \
@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
@@ -125,15 +126,17 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@COND_PLATFORM_MAC_1@__wxpoem___mac_setfilecmd = \
@COND_PLATFORM_MAC_1@ $(SETFILE) -a C wxpoem$(EXEEXT)
@COND_PLATFORM_WIN32_1@__wxpoem___win32rc = wxpoem_wxpoem_rc.o
@COND_PLATFORM_MACOSX_1@__wxpoem_bundle___depname = wxpoem_bundle
### Targets: ###
all: wxpoem$(EXEEXT) data
all: wxpoem$(EXEEXT) $(__wxpoem_bundle___depname) data
clean:
rm -rf ./.deps
rm -rf ./.deps ./.pch
rm -f ./*.o
rm -f wxpoem$(EXEEXT)
rm -rf wxpoem.app
data:
@mkdir -p .
@@ -144,8 +147,7 @@ data:
done
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
install: all
@@ -157,15 +159,39 @@ wxpoem$(EXEEXT): $(WXPOEM_OBJECTS) $(__wxpoem___win32rc)
$(CXX) -o $@ $(WXPOEM_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_HTML_p) $(__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)
$(__wxpoem___mac_rezcmd)
$(__wxpoem___mac_setfilecmd)
$(SAMPLES_RPATH_POSTLINK)
wxpoem.app/Contents: wxpoem$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns
mkdir -p wxpoem.app/Contents
mkdir -p wxpoem.app/Contents/MacOS
mkdir -p wxpoem.app/Contents/Resources
sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
-e "s/EXECUTABLE/wxpoem/" \
-e "s/VERSION/2.5.0/" \
$(top_srcdir)/src/mac/Info.plist.in >wxpoem.app/Contents/Info.plist
echo -n "APPL????" >wxpoem.app/Contents/PkgInfo
ln -f wxpoem$(EXEEXT) wxpoem.app/Contents/MacOS/wxpoem
ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc wxpoem.app/Contents/Resources/wxpoem.rsrc
ln -f $(top_srcdir)/src/mac/wxmac.icns wxpoem.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@wxpoem_bundle: wxpoem.app/Contents
wxpoem_wxpoem.o: $(srcdir)/wxpoem.cpp
$(CXXC) -c -o $@ $(WXPOEM_CXXFLAGS) $<
wxpoem_wxpoem_rc.o: $(srcdir)/wxpoem.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
# Include dependency info, if present:
@IF_GNU_MAKE@-include .deps/*.d
.PHONY: all clean data distclean install uninstall
.PHONY: all clean data distclean install uninstall wxpoem_bundle