X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/078c7a596db67f39e2502861d4b7c666d0f4236b..b3fcfa4d89d44425ed28050462c6064100fe7b05:/samples/wizard/Makefile.in

diff --git a/samples/wizard/Makefile.in b/samples/wizard/Makefile.in
index 36a943e437..9db12c1d6c 100644
--- a/samples/wizard/Makefile.in
+++ b/samples/wizard/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.1.2 (http://bakefile.sourceforge.net)
+#     Bakefile 0.1.3 (http://bakefile.sourceforge.net)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -98,12 +98,12 @@ 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 wizard$(EXEEXT) Carbon.r \
+	$(srcdir)/../../samples -i $(top_srcdir)/include -o wizard$(EXEEXT) Carbon.r \
 	$(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 
@@ -133,7 +133,7 @@ wizard$(EXEEXT): $(WIZARD_OBJECTS) $(__wizard___win32rc)
 	$(__wizard___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-wizard.app/Contents/PkgInfo: wizard$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
+wizard.app/Contents/PkgInfo: wizard$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
 	mkdir -p wizard.app/Contents
 	mkdir -p wizard.app/Contents/MacOS
 	mkdir -p wizard.app/Contents/Resources
@@ -142,7 +142,7 @@ wizard.app/Contents/PkgInfo: wizard$(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/wizard/" \
 	-e "s/VERSION/$(WX_VERSION)/" \
-	$(top_srcdir)/src/mac/Info.plist.in >wizard.app/Contents/Info.plist
+	$(top_srcdir)/src/mac/carbon/Info.plist.in >wizard.app/Contents/Info.plist
 	
 	
 	echo -n "APPL????" >wizard.app/Contents/PkgInfo
@@ -160,7 +160,7 @@ wizard_wizard.o: $(srcdir)/wizard.cpp
 	$(CXXC) -c -o $@ $(WIZARD_CXXFLAGS) $<
 
 wizard_wizard_rc.o: $(srcdir)/wizard.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: