X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1c3a6972f471bd792eb8d812049c68bccd56a2a9..118f4724b64394abb6501836d63bf273557a2f5f:/demos/life/Makefile.in

diff --git a/demos/life/Makefile.in b/demos/life/Makefile.in
index 3036768071..33fe272ca9 100644
--- a/demos/life/Makefile.in
+++ b/demos/life/Makefile.in
@@ -19,6 +19,7 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
 HOST_SUFFIX = @HOST_SUFFIX@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@
+NM = @NM@
 RESCOMP = @RESCOMP@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
 SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
@@ -33,17 +34,19 @@ top_srcdir = @top_srcdir@
 
 ### Variables: ###
 
+DESTDIR = 
 LIBDIRNAME = $(top_builddir)lib
-LIFE_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+LIFE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 	-I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \
-	-I$(srcdir)/../../samples $(CXXFLAGS)
+	-I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
 LIFE_OBJECTS =  \
+	$(__life_os2_lib_res) \
 	life_life.o \
 	life_dialogs.o \
 	life_game.o \
 	life_reader.o \
 	$(__life___win32rc)
-WX_VERSION = 2.5.0
+WX_VERSION = 2.5.1
 
 ### Conditionally set variables: ###
 
@@ -79,7 +82,7 @@ WX_VERSION = 2.5.0
 COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
 	__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \
 	$(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o life$(EXEEXT) Carbon.r \
-	$(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r
+	$(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.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)
@@ -95,8 +98,13 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 @COND_PLATFORM_MAC_1@__life___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
 @COND_PLATFORM_MAC_1@__life___mac_setfilecmd = \
 @COND_PLATFORM_MAC_1@	$(SETFILE) -a C life$(EXEEXT)
+COND_PLATFORM_OS2_1___life___os2_emxbindcmd = $(NM) life$(EXEEXT) | if grep -q \
+	pmwin.763 ; then emxbind -ep life$(EXEEXT) ; fi
+@COND_PLATFORM_OS2_1@__life___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___life___os2_emxbindcmd)
 @COND_PLATFORM_WIN32_1@__life___win32rc = life_life_rc.o
 @COND_PLATFORM_MACOSX_1@__life_bundle___depname = life_bundle
+@COND_PLATFORM_OS2_1@__life_os2_lib_res = \
+@COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
 
 ### Targets: ###
 
@@ -110,7 +118,7 @@ clean:
 
 data: 
 	@mkdir -p .
-	@for f in samples.inc breeder.lif; do \
+	@for f in breeder.lif; do \
 	if test \( ! -s ./$$f \) -o \( $(srcdir)/$$f -nt ./$$f  \) ; then \
 	cp -pRf $(srcdir)/$$f . ; \
 	fi; \
@@ -124,12 +132,13 @@ install: all
 install-strip: install
 
 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)
+	$(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)
+	$(__life___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-life.app/Contents/PkgInfo: life$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns
+life.app/Contents/PkgInfo: life$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
 	mkdir -p life.app/Contents
 	mkdir -p life.app/Contents/MacOS
 	mkdir -p life.app/Contents/Resources
@@ -147,8 +156,8 @@ life.app/Contents/PkgInfo: life$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(L
 	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
+	ln -sf $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc life.app/Contents/Resources/life.rsrc
+	ln -sf $(top_srcdir)/src/mac/wxmac.icns life.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@life_bundle: life.app/Contents/PkgInfo
 
@@ -162,7 +171,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 --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples
+	$(RESCOMP) -i$< -o$@  --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples
 
 life_reader.o: $(srcdir)/reader.cpp
 	$(CXXC) -c -o $@ $(LIFE_CXXFLAGS) $<