X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b17c1746930b29c13d5bfff0009721cbcefa53f1..8334c5b95809cae275ece6678c62f5715e7990cb:/samples/png/Makefile.in

diff --git a/samples/png/Makefile.in b/samples/png/Makefile.in
index fde44733e9..d07fff4bfb 100644
--- a/samples/png/Makefile.in
+++ b/samples/png/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.1.2 (http://bakefile.sourceforge.net)
+#     Bakefile 0.1.4 (http://bakefile.sourceforge.net)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -35,7 +35,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 ### Variables: ###
 
 DESTDIR = 
-WX_VERSION = 2.5.1
+WX_VERSION = 2.5.2
 LIBDIRNAME = $(top_builddir)lib
 PNG_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
 	$(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -69,6 +69,8 @@ COND_PLATFORM_OS2_1___png___os2_emxbindcmd = $(NM) png$(EXEEXT) | if grep -q \
 @COND_PLATFORM_OS2_1@__png_os2_lib_res = \
 @COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
 @COND_PLATFORM_MACOSX_1@__png_bundle___depname = png_bundle
+@COND_TOOLKIT_COCOA@____png_BUNDLE_TGT_REF_DEP = png.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@____png_BUNDLE_TGT_REF_DEP = png.app/Contents/PkgInfo
 COND_MONOLITHIC_0___WXLIB_CORE_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
@@ -92,13 +94,13 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 @COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \
 @COND_WXUSE_ODBC_BUILTIN@	-lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX)
 @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = \
-@COND_WXUSE_REGEX_BUILTIN@	-lwxregex$(WXDEBUGFLAG)$(HOST_SUFFIX)
+@COND_WXUSE_REGEX_BUILTIN@	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(HOST_SUFFIX)
 @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
 @COND_WXUSE_EXPAT_BUILTIN@	-lwxexpat$(WXDEBUGFLAG)$(HOST_SUFFIX)
 COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
 	__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
-	$(srcdir)/../../samples -o png$(EXEEXT) Carbon.r \
-	$(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r
+	$(srcdir)/../../samples -i $(top_srcdir)/include -o png$(EXEEXT) Carbon.r \
+	$(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.r sample.r
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 
 ### Targets: ###
@@ -127,7 +129,7 @@ png$(EXEEXT): $(PNG_OBJECTS) $(__png___win32rc)
 	$(__png___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-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
+png.app/Contents/PkgInfo: png$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
 	mkdir -p png.app/Contents
 	mkdir -p png.app/Contents/MacOS
 	mkdir -p png.app/Contents/Resources
@@ -136,7 +138,7 @@ png.app/Contents/PkgInfo: png$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIB
 	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
 	-e "s/EXECUTABLE/png/" \
 	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/Info.plist.in >png.app/Contents/Info.plist
+	$(top_srcdir)/src/mac/carbon/Info.plist.in >png.app/Contents/Info.plist
 	
 	
 	echo -n "APPL????" >png.app/Contents/PkgInfo
@@ -145,16 +147,16 @@ png.app/Contents/PkgInfo: png$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIB
 	ln -f png$(EXEEXT) png.app/Contents/MacOS/png
 	
 	
-	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
+	cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc png.app/Contents/Resources/png.rsrc
+	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns png.app/Contents/Resources/wxmac.icns
 
-@COND_PLATFORM_MACOSX_1@png_bundle: png.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@png_bundle: $(____png_BUNDLE_TGT_REF_DEP)
 
 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 $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples
+	$(RESCOMP) -i$< -o$@  --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples --include-dir $(top_srcdir)/include
 
 
 # Include dependency info, if present: