X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/134624215427991d99950e2fc1e1555dd6143158..b02a6dc2b6e10302272af502a12b249681df40d6:/contrib/samples/ogl/studio/Makefile.in?ds=sidebyside

diff --git a/contrib/samples/ogl/studio/Makefile.in b/contrib/samples/ogl/studio/Makefile.in
index 0c14496e86..f31224e0bf 100644
--- a/contrib/samples/ogl/studio/Makefile.in
+++ b/contrib/samples/ogl/studio/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.1.3 (http://bakefile.sourceforge.net)
+#     Bakefile 0.1.4 (http://bakefile.sourceforge.net)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -37,7 +37,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 ### Variables: ###
 
 DESTDIR = 
-WX_VERSION = 2.5.1
+WX_VERSION = 2.5.2
 LIBDIRNAME = $(top_builddir)lib
 STUDIO_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
 	$(__DLLFLAG_p) -I$(srcdir)/../../../../samples \
@@ -83,6 +83,10 @@ COND_PLATFORM_OS2_1___studio___os2_emxbindcmd = $(NM) studio$(EXEEXT) | if grep
 @COND_PLATFORM_OS2_1@__studio_os2_lib_res = \
 @COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
 @COND_PLATFORM_MACOSX_1@__studio_bundle___depname = studio_bundle
+@COND_TOOLKIT_COCOA@____studio_BUNDLE_TGT_REF_DEP = \
+@COND_TOOLKIT_COCOA@	studio.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@____studio_BUNDLE_TGT_REF_DEP = \
+@COND_TOOLKIT_MAC@	studio.app/Contents/PkgInfo
 COND_MONOLITHIC_0___WXLIB_ADV_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_ADV_p = $(COND_MONOLITHIC_0___WXLIB_ADV_p)
@@ -119,7 +123,7 @@ 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 -i \
 	$(srcdir)/../../../include -o studio$(EXEEXT) Carbon.r \
-	$(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r
+	$(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.r sample.r
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 
 ### Targets: ###
@@ -148,7 +152,7 @@ studio$(EXEEXT): $(STUDIO_OBJECTS) $(__studio___win32rc)
 	$(__studio___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-studio.app/Contents/PkgInfo: studio$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
+studio.app/Contents/PkgInfo: studio$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
 	mkdir -p studio.app/Contents
 	mkdir -p studio.app/Contents/MacOS
 	mkdir -p studio.app/Contents/Resources
@@ -166,10 +170,10 @@ studio.app/Contents/PkgInfo: studio$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.p
 	ln -f studio$(EXEEXT) studio.app/Contents/MacOS/studio
 	
 	
-	ln -sf $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc studio.app/Contents/Resources/studio.rsrc
-	ln -sf $(top_srcdir)/src/mac/wxmac.icns studio.app/Contents/Resources/wxmac.icns
+	cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc studio.app/Contents/Resources/studio.rsrc
+	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns studio.app/Contents/Resources/wxmac.icns
 
-@COND_PLATFORM_MACOSX_1@studio_bundle: studio.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@studio_bundle: $(____studio_BUNDLE_TGT_REF_DEP)
 
 data: 
 	@mkdir -p .