X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3fd9c29882a1562a45d77c6722f5ca9a53e430c1..a8eff06059e7758474a7eca0d800c113eefd876f:/samples/mobile/styles/Makefile.in

diff --git a/samples/mobile/styles/Makefile.in b/samples/mobile/styles/Makefile.in
index d6ca25a119..88ccd5db7d 100644
--- a/samples/mobile/styles/Makefile.in
+++ b/samples/mobile/styles/Makefile.in
@@ -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
 STYLES_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
 	$(__DLLFLAG_p) -I$(srcdir)/../../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -71,6 +71,10 @@ COND_PLATFORM_OS2_1___styles___os2_emxbindcmd = $(NM) styles$(EXEEXT) | if grep
 @COND_PLATFORM_OS2_1@__styles_os2_lib_res = \
 @COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
 @COND_PLATFORM_MACOSX_1@__styles_bundle___depname = styles_bundle
+@COND_TOOLKIT_COCOA@____styles_BUNDLE_TGT_REF_DEP = \
+@COND_TOOLKIT_COCOA@	styles.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@____styles_BUNDLE_TGT_REF_DEP = \
+@COND_TOOLKIT_MAC@	styles.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)
@@ -99,7 +103,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 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 -i $(top_srcdir)/include -o styles$(EXEEXT) \
-	Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r
+	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: ###
@@ -128,7 +132,7 @@ styles$(EXEEXT): $(STYLES_OBJECTS) $(__styles___win32rc)
 	$(__styles___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-styles.app/Contents/PkgInfo: styles$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
+styles.app/Contents/PkgInfo: styles$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
 	mkdir -p styles.app/Contents
 	mkdir -p styles.app/Contents/MacOS
 	mkdir -p styles.app/Contents/Resources
@@ -146,10 +150,10 @@ styles.app/Contents/PkgInfo: styles$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.p
 	ln -f styles$(EXEEXT) styles.app/Contents/MacOS/styles
 	
 	
-	ln -sf $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc styles.app/Contents/Resources/styles.rsrc
-	ln -sf $(top_srcdir)/src/mac/carbon/wxmac.icns styles.app/Contents/Resources/wxmac.icns
+	cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc styles.app/Contents/Resources/styles.rsrc
+	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns styles.app/Contents/Resources/wxmac.icns
 
-@COND_PLATFORM_MACOSX_1@styles_bundle: styles.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@styles_bundle: $(____styles_BUNDLE_TGT_REF_DEP)
 
 data: 
 	@mkdir -p .