X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c3255f5fbab93ad229178ec1610a180afa35133a..4fa87bd948a00e9cc2a31a577663c344632f521c:/samples/toolbar/Makefile.in

diff --git a/samples/toolbar/Makefile.in b/samples/toolbar/Makefile.in
index 77b3c82682..cf7211d949 100644
--- a/samples/toolbar/Makefile.in
+++ b/samples/toolbar/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!
 # =========================================================================
 
@@ -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
 TOOLBAR_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
 	$(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
@@ -70,6 +70,10 @@ COND_PLATFORM_OS2_1___toolbar___os2_emxbindcmd = $(NM) toolbar$(EXEEXT) | if \
 @COND_PLATFORM_OS2_1@__toolbar_os2_lib_res = \
 @COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
 @COND_PLATFORM_MACOSX_1@__toolbar_bundle___depname = toolbar_bundle
+@COND_TOOLKIT_COCOA@____toolbar_BUNDLE_TGT_REF_DEP = \
+@COND_TOOLKIT_COCOA@	toolbar.app/Contents/PkgInfo
+@COND_TOOLKIT_MAC@____toolbar_BUNDLE_TGT_REF_DEP = \
+@COND_TOOLKIT_MAC@	toolbar.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)
@@ -93,13 +97,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 -i $(top_srcdir)/include -o toolbar$(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: ###
@@ -128,7 +132,7 @@ toolbar$(EXEEXT): $(TOOLBAR_OBJECTS) $(__toolbar___win32rc)
 	$(__toolbar___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-toolbar.app/Contents/PkgInfo: toolbar$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
+toolbar.app/Contents/PkgInfo: toolbar$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
 	mkdir -p toolbar.app/Contents
 	mkdir -p toolbar.app/Contents/MacOS
 	mkdir -p toolbar.app/Contents/Resources
@@ -137,7 +141,7 @@ toolbar.app/Contents/PkgInfo: toolbar$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.
 	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
 	-e "s/EXECUTABLE/toolbar/" \
 	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/Info.plist.in >toolbar.app/Contents/Info.plist
+	$(top_srcdir)/src/mac/carbon/Info.plist.in >toolbar.app/Contents/Info.plist
 	
 	
 	echo -n "APPL????" >toolbar.app/Contents/PkgInfo
@@ -146,10 +150,10 @@ toolbar.app/Contents/PkgInfo: toolbar$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.
 	ln -f toolbar$(EXEEXT) toolbar.app/Contents/MacOS/toolbar
 	
 	
-	ln -sf $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc toolbar.app/Contents/Resources/toolbar.rsrc
-	ln -sf $(top_srcdir)/src/mac/wxmac.icns toolbar.app/Contents/Resources/wxmac.icns
+	cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc toolbar.app/Contents/Resources/toolbar.rsrc
+	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns toolbar.app/Contents/Resources/wxmac.icns
 
-@COND_PLATFORM_MACOSX_1@toolbar_bundle: toolbar.app/Contents/PkgInfo
+@COND_PLATFORM_MACOSX_1@toolbar_bundle: $(____toolbar_BUNDLE_TGT_REF_DEP)
 
 toolbar_toolbar.o: $(srcdir)/toolbar.cpp
 	$(CXXC) -c -o $@ $(TOOLBAR_CXXFLAGS) $<