X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b17c1746930b29c13d5bfff0009721cbcefa53f1..e0269b2e2a237e211b2dae7efa2731151f239560:/samples/htlbox/Makefile.in?ds=sidebyside diff --git a/samples/htlbox/Makefile.in b/samples/htlbox/Makefile.in index 3bbe241cf4..7a37ac56d3 100644 --- a/samples/htlbox/Makefile.in +++ b/samples/htlbox/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! # ========================================================================= @@ -97,12 +97,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 htlbox$(EXEEXT) Carbon.r \ + $(srcdir)/../../samples -i $(top_srcdir)/include -o htlbox$(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) @@ -159,7 +159,7 @@ htlbox_htlbox.o: $(srcdir)/htlbox.cpp $(CXXC) -c -o $@ $(HTLBOX_CXXFLAGS) $< htlbox_htlbox_rc.o: $(srcdir)/htlbox.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: