X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e1a098d1ec2463d86e1a3a708d90e864ed17cdbb..0d8b87ac8ae0ababd4c0d725142532f6d592fdb2:/samples/wxtest/Makefile.in diff --git a/samples/wxtest/Makefile.in b/samples/wxtest/Makefile.in index a35a8c265c..a3a85d2e75 100644 --- a/samples/wxtest/Makefile.in +++ b/samples/wxtest/Makefile.in @@ -36,9 +36,8 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -WXTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) +WXTEST_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS) WXTEST_OBJECTS = \ $(__wxtest___win32rc) \ $(__wxtest_os2_lib_res) \ @@ -78,8 +77,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 wxtest$(EXEEXT) Carbon.r \ + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \ + $(srcdir)/../../samples -o wxtest$(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 = \ @@ -154,7 +153,7 @@ wxtest.app/Contents/PkgInfo: wxtest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in @COND_PLATFORM_MACOSX_1@wxtest_bundle: wxtest.app/Contents/PkgInfo wxtest_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 wxtest_test.o: $(srcdir)/test.cpp $(CXXC) -c -o $@ $(WXTEST_CXXFLAGS) $<