extra word removed (patch 813536)

[wxWidgets.git] / demos / bombs / Makefile.in

diff --git a/demos/bombs/Makefile.in b/demos/bombs/Makefile.in
index 293f67f1ec6d7cd0986e843a552d97b9776d3b54..d0cb288fadcd6eeadea5170e4693cf4f172768e1 100644 (file)
--- a/demos/bombs/Makefile.in
+++ b/demos/bombs/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@
@@ -42,7 +43,7 @@ BOMBS_OBJECTS =  \
        bombs_game.o \
        $(__bombs___win32rc)
 LIBDIRNAME = $(top_builddir)lib
-WX_VERSION = 2.5.0
+WX_VERSION = 2.5.1
 
 ### Conditionally set variables: ###
 
@@ -78,7 +79,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 bombs$(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)
@@ -94,6 +95,9 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 @COND_PLATFORM_MAC_1@__bombs___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
 @COND_PLATFORM_MAC_1@__bombs___mac_setfilecmd = \
 @COND_PLATFORM_MAC_1@  $(SETFILE) -a C bombs$(EXEEXT)
+COND_PLATFORM_OS2_1___bombs___os2_emxbindcmd = $(NM) bombs$(EXEEXT) | if grep -q \
+       pmwin.763 ; then emxbind -ep bombs$(EXEEXT) ; fi
+@COND_PLATFORM_OS2_1@__bombs___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___bombs___os2_emxbindcmd)
 @COND_PLATFORM_WIN32_1@__bombs___win32rc = bombs_bombs_rc.o
 @COND_PLATFORM_MACOSX_1@__bombs_bundle___depname = bombs_bundle
 
@@ -102,12 +106,13 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 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)
+       $(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)
+       $(__bombs___os2_emxbindcmd)
        $(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
+bombs.app/Contents/PkgInfo: bombs$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
        mkdir -p bombs.app/Contents
        mkdir -p bombs.app/Contents/MacOS
        mkdir -p bombs.app/Contents/Resources
@@ -125,7 +130,7 @@ bombs.app/Contents: bombs$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRN
        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 $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.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
@@ -135,9 +140,9 @@ 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 --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
 
-@COND_PLATFORM_MACOSX_1@bombs_bundle: bombs.app/Contents
+@COND_PLATFORM_MACOSX_1@bombs_bundle: bombs.app/Contents/PkgInfo
 
 bombs_game.o: $(srcdir)/game.cpp
        $(CXXC) -c -o $@ $(BOMBS_CXXFLAGS) $<