X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c3255f5fbab93ad229178ec1610a180afa35133a..ae662096c3e8548c37e5c8a8a9cb43d62bb543a4:/samples/layout/Makefile.in

diff --git a/samples/layout/Makefile.in b/samples/layout/Makefile.in
index a23bfa7f9d..fdc64c30e7 100644
--- a/samples/layout/Makefile.in
+++ b/samples/layout/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!
 # =========================================================================
 
@@ -93,7 +93,7 @@ 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 \
@@ -128,7 +128,7 @@ layout$(EXEEXT): $(LAYOUT_OBJECTS) $(__layout___win32rc)
 	$(__layout___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-layout.app/Contents/PkgInfo: layout$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
+layout.app/Contents/PkgInfo: layout$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
 	mkdir -p layout.app/Contents
 	mkdir -p layout.app/Contents/MacOS
 	mkdir -p layout.app/Contents/Resources
@@ -137,7 +137,7 @@ layout.app/Contents/PkgInfo: layout$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in
 	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
 	-e "s/EXECUTABLE/layout/" \
 	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/Info.plist.in >layout.app/Contents/Info.plist
+	$(top_srcdir)/src/mac/carbon/Info.plist.in >layout.app/Contents/Info.plist
 	
 	
 	echo -n "APPL????" >layout.app/Contents/PkgInfo
@@ -147,7 +147,7 @@ layout.app/Contents/PkgInfo: layout$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in
 	
 	
 	ln -sf $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc layout.app/Contents/Resources/layout.rsrc
-	ln -sf $(top_srcdir)/src/mac/wxmac.icns layout.app/Contents/Resources/wxmac.icns
+	ln -sf $(top_srcdir)/src/mac/carbon/wxmac.icns layout.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@layout_bundle: layout.app/Contents/PkgInfo