X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e1a098d1ec2463d86e1a3a708d90e864ed17cdbb..1169a91932273bc84c23ed9dbd0a2da064d59d66:/samples/multimon/Makefile.in diff --git a/samples/multimon/Makefile.in b/samples/multimon/Makefile.in index 934bf59d62..79ed5e03d6 100644 --- a/samples/multimon/Makefile.in +++ b/samples/multimon/Makefile.in @@ -36,9 +36,8 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -MULTIMON_TEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) +MULTIMON_TEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) MULTIMON_TEST_OBJECTS = \ $(__multimon_test___win32rc) \ $(__multimon_test_os2_lib_res) \ @@ -77,9 +76,9 @@ 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 multimon_test$(EXEEXT) \ - Carbon.r $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../samples -o multimon_test$(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 = \ @COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX) @@ -158,7 +157,7 @@ multimon_test_multimon_test.o: $(srcdir)/multimon_test.cpp $(CXXC) -c -o $@ $(MULTIMON_TEST_CXXFLAGS) $< multimon_test_sample_rc.o: $(srcdir)/../../samples/sample.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 uninstall: