X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b17c1746930b29c13d5bfff0009721cbcefa53f1..0b9d77cef71f01559e2c81353efe623d25db63ad:/contrib/samples/gizmos/multicell/Makefile.in?ds=inline diff --git a/contrib/samples/gizmos/multicell/Makefile.in b/contrib/samples/gizmos/multicell/Makefile.in index 0e6d711744..6746374db5 100644 --- a/contrib/samples/gizmos/multicell/Makefile.in +++ b/contrib/samples/gizmos/multicell/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! # ========================================================================= @@ -94,13 +94,14 @@ 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 $(srcdir)/../../../include -o \ - mtest$(EXEEXT) Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r + $(srcdir)/../../../../samples -i $(top_srcdir)/include -i \ + $(srcdir)/../../../include -o mtest$(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) ### Targets: ### @@ -153,7 +154,7 @@ mtest.app/Contents/PkgInfo: mtest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $ @COND_PLATFORM_MACOSX_1@mtest_bundle: mtest.app/Contents/PkgInfo mtest_sample_rc.o: $(srcdir)/../../../../samples/sample.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 mtest_mtest.o: $(srcdir)/mtest.cpp $(CXXC) -c -o $@ $(MTEST_CXXFLAGS) $<