X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ec08d395bd37d7446787f5539b40a8ed5283654c..e6c3f9eb6af1c2d787697d362192b8ca1407f261:/samples/png/Makefile.in

diff --git a/samples/png/Makefile.in b/samples/png/Makefile.in
index c4a9088c1c..4d6d0452d8 100644
--- a/samples/png/Makefile.in
+++ b/samples/png/Makefile.in
@@ -34,11 +34,12 @@ top_srcdir = @top_srcdir@
 
 ### Variables: ###
 
+DESTDIR = 
 LIBDIRNAME = $(top_builddir)lib
-PNG_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
-	-I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \
-	-I$(srcdir)/../../samples $(CXXFLAGS)
+PNG_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(top_srcdir)/include \
+	-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
 PNG_OBJECTS =  \
+	$(__png_os2_lib_res) \
 	png_pngdemo.o \
 	$(__png___win32rc)
 WX_VERSION = 2.5.1
@@ -97,6 +98,8 @@ COND_PLATFORM_OS2_1___png___os2_emxbindcmd = $(NM) png$(EXEEXT) | if grep -q \
 @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
+@COND_PLATFORM_OS2_1@__png_os2_lib_res = \
+@COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
 
 ### Targets: ###
 
@@ -140,8 +143,8 @@ 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).1.rsrc png.app/Contents/Resources/png.rsrc
-	ln -f $(top_srcdir)/src/mac/wxmac.icns png.app/Contents/Resources/wxmac.icns
+	ln -sf $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc png.app/Contents/Resources/png.rsrc
+	ln -sf $(top_srcdir)/src/mac/wxmac.icns png.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@png_bundle: png.app/Contents/PkgInfo