wxX11 compilation fix.

[wxWidgets.git] / contrib / samples / animate / Makefile.in

diff --git a/contrib/samples/animate/Makefile.in b/contrib/samples/animate/Makefile.in
index ea081e1af2be8e43576ad4eeb1cd3d6779d6a1bc..4a6959bda3f23701f213661ec539819167c81b1c 100644 (file)
--- a/contrib/samples/animate/Makefile.in
+++ b/contrib/samples/animate/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@
@@ -40,7 +41,7 @@ ANITEST_OBJECTS =  \
        anitest_anitest.o \
        $(__anitest___win32rc)
 LIBDIRNAME = $(top_builddir)lib
-WX_VERSION = 2.5.0
+WX_VERSION = 2.5.1
 
 ### Conditionally set variables: ###
 
@@ -76,7 +77,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 -i $(srcdir)/../../include -o \
-       anitest$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r \
+       anitest$(EXEEXT) Carbon.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 = \
@@ -93,6 +94,9 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 @COND_PLATFORM_MAC_1@__anitest___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
 @COND_PLATFORM_MAC_1@__anitest___mac_setfilecmd = \
 @COND_PLATFORM_MAC_1@  $(SETFILE) -a C anitest$(EXEEXT)
+COND_PLATFORM_OS2_1___anitest___os2_emxbindcmd = $(NM) anitest$(EXEEXT) | if \
+       grep -q pmwin.763 ; then emxbind -ep anitest$(EXEEXT) ; fi
+@COND_PLATFORM_OS2_1@__anitest___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___anitest___os2_emxbindcmd)
 @COND_PLATFORM_WIN32_1@__anitest___win32rc = anitest_anitest_rc.o
 @COND_PLATFORM_MACOSX_1@__anitest_bundle___depname = anitest_bundle
 
@@ -101,12 +105,13 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 all: anitest$(EXEEXT) $(__anitest_bundle___depname) data
 
 anitest$(EXEEXT): $(ANITEST_OBJECTS) $(__anitest___win32rc)
-       $(CXX) -o $@ $(ANITEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate-2.5$(HOST_SUFFIX) $(__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 $@ $(ANITEST_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate-2.5$(HOST_SUFFIX)  $(__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)
        $(__anitest___mac_rezcmd)
        $(__anitest___mac_setfilecmd)
+       $(__anitest___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
-anitest.app/Contents: anitest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns
+anitest.app/Contents/PkgInfo: anitest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
        mkdir -p anitest.app/Contents
        mkdir -p anitest.app/Contents/MacOS
        mkdir -p anitest.app/Contents/Resources
@@ -124,16 +129,16 @@ anitest.app/Contents: anitest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIB
        ln -f anitest$(EXEEXT) anitest.app/Contents/MacOS/anitest
        
        
-       ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc anitest.app/Contents/Resources/anitest.rsrc
+       ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc anitest.app/Contents/Resources/anitest.rsrc
        ln -f $(top_srcdir)/src/mac/wxmac.icns anitest.app/Contents/Resources/wxmac.icns
 
 anitest_anitest.o: $(srcdir)/anitest.cpp
        $(CXXC) -c -o $@ $(ANITEST_CXXFLAGS) $<
 
 anitest_anitest_rc.o: $(srcdir)/anitest.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 --include-dir $(srcdir)/../../include
+       $(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 --include-dir $(srcdir)/../../include
 
-@COND_PLATFORM_MACOSX_1@anitest_bundle: anitest.app/Contents
+@COND_PLATFORM_MACOSX_1@anitest_bundle: anitest.app/Contents/PkgInfo
 
 clean: 
        rm -rf ./.deps ./.pch