X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e1a098d1ec2463d86e1a3a708d90e864ed17cdbb..6f401080887e8a60e83ee972c871a478d0889c3e:/samples/caret/Makefile.in diff --git a/samples/caret/Makefile.in b/samples/caret/Makefile.in index 5bdf6e9fce..bd6e79d130 100644 --- a/samples/caret/Makefile.in +++ b/samples/caret/Makefile.in @@ -34,9 +34,8 @@ top_srcdir = @top_srcdir@ ### Variables: ### -CARET_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) +CARET_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) CARET_OBJECTS = \ $(__caret_os2_lib_res) \ caret_caret.o \ @@ -77,8 +76,8 @@ WX_VERSION = 2.5.1 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \ @COND_WXUSE_ZLIB_BUILTIN@ -lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX) COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ - __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \ - $(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o caret$(EXEEXT) Carbon.r \ + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../samples -o caret$(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) @COND_MONOLITHIC_0@__WXLIB_BASE_p = \ @@ -141,7 +140,7 @@ caret_caret.o: $(srcdir)/caret.cpp $(CXXC) -c -o $@ $(CARET_CXXFLAGS) $< caret_caret_rc.o: $(srcdir)/caret.rc - $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(top_srcdir)/include --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 clean: rm -rf ./.deps ./.pch