X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4bc89de684848e796d151a10074218d2b88206d0..c10ae510189067379125802d4f7dcf2fed4d5b39:/contrib/utils/wxrcedit/Makefile.in diff --git a/contrib/utils/wxrcedit/Makefile.in b/contrib/utils/wxrcedit/Makefile.in index c0febf3050..69ed41de3d 100644 --- a/contrib/utils/wxrcedit/Makefile.in +++ b/contrib/utils/wxrcedit/Makefile.in @@ -40,9 +40,9 @@ top_srcdir = @top_srcdir@ DESTDIR = LIBDIRNAME = $(top_builddir)lib -WXRCEDIT_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ - -I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \ - -I$(srcdir)/../../../samples -I$(srcdir)/../../include $(CXXFLAGS) +WXRCEDIT_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \ + $(__DLLFLAG_p) -I$(srcdir)/../../../samples -I$(srcdir)/../../include \ + $(CPPFLAGS) $(CXXFLAGS) WXRCEDIT_OBJECTS = \ $(__wxrcedit_os2_lib_res) \ wxrcedit_edapp.o \ @@ -90,10 +90,9 @@ WXRCEDIT_OBJECTS = \ @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 -i $(srcdir)/../../include -o \ - wxrcedit$(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 -i $(srcdir)/../../include -o wxrcedit$(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_ADV_p = \ -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX) @@ -184,7 +183,7 @@ wxrcedit_splittree.o: $(srcdir)/splittree.cpp $(CXXC) -c -o $@ $(WXRCEDIT_CXXFLAGS) $< wxrcedit_wxrcedit_rc.o: $(srcdir)/wxrcedit.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 --include-dir $(srcdir)/../../include + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../../samples --include-dir $(srcdir)/../../include wxrcedit_xmlhelpr.o: $(srcdir)/xmlhelpr.cpp $(CXXC) -c -o $@ $(WXRCEDIT_CXXFLAGS) $<