Updated changes.txt.

[wxWidgets.git] / samples / png / Makefile.in

diff --git a/samples/png/Makefile.in b/samples/png/Makefile.in
index 2a6ee76a8759636051f10ddcd0611df8d2497350..c4a9088c1c36a765d0c2c95d14d13749ce83c542 100644 (file)
--- a/samples/png/Makefile.in
+++ b/samples/png/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 @@ PNG_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
 PNG_OBJECTS =  \
        png_pngdemo.o \
        $(__png___win32rc)
-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 -o png$(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)
@@ -91,6 +92,9 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__
 @COND_PLATFORM_MAC_1@__png___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
 @COND_PLATFORM_MAC_1@__png___mac_setfilecmd = $(SETFILE) -a C png$(EXEEXT)
+COND_PLATFORM_OS2_1___png___os2_emxbindcmd = $(NM) png$(EXEEXT) | if grep -q \
+       pmwin.763 ; then emxbind -ep png$(EXEEXT) ; fi
+@COND_PLATFORM_OS2_1@__png___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___png___os2_emxbindcmd)
 @COND_PLATFORM_WIN32_1@__png___win32rc = png_pngdemo_rc.o
 @COND_PLATFORM_MACOSX_1@__png_bundle___depname = png_bundle
 
@@ -112,12 +116,13 @@ install: all
 install-strip: install
 
 png$(EXEEXT): $(PNG_OBJECTS) $(__png___win32rc)
-       $(CXX) -o $@ $(PNG_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 $@ $(PNG_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)
        $(__png___mac_rezcmd)
        $(__png___mac_setfilecmd)
+       $(__png___os2_emxbindcmd)
        $(SAMPLES_RPATH_POSTLINK)
 
-png.app/Contents/PkgInfo: png$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns
+png.app/Contents/PkgInfo: png$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
        mkdir -p png.app/Contents
        mkdir -p png.app/Contents/MacOS
        mkdir -p png.app/Contents/Resources
@@ -135,7 +140,7 @@ png.app/Contents/PkgInfo: png$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIB
        ln -f png$(EXEEXT) png.app/Contents/MacOS/png
        
        
-       ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc png.app/Contents/Resources/png.rsrc
+       ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc png.app/Contents/Resources/png.rsrc
        ln -f $(top_srcdir)/src/mac/wxmac.icns png.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@png_bundle: png.app/Contents/PkgInfo
@@ -144,7 +149,7 @@ png_pngdemo.o: $(srcdir)/pngdemo.cpp
        $(CXXC) -c -o $@ $(PNG_CXXFLAGS) $<
 
 png_pngdemo_rc.o: $(srcdir)/pngdemo.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
 
 uninstall: