From 0e0d3ae110601e631aa4b153a06c5544aa63057d Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 3 Nov 2008 22:58:45 +0000 Subject: [PATCH] added wxrc to the makefiles git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56672 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- utils/Makefile.in | 25 ++++++++++++++++++++----- utils/makefile.bcc | 12 +++++++++++- utils/makefile.gcc | 8 ++++++-- utils/makefile.vc | 10 +++++++++- utils/makefile.wat | 10 +++++++++- utils/utils.bkl | 5 +++++ 6 files changed, 60 insertions(+), 10 deletions(-) diff --git a/utils/Makefile.in b/utils/Makefile.in index b95bed8405..c97ad8a274 100644 --- a/utils/Makefile.in +++ b/utils/Makefile.in @@ -21,13 +21,13 @@ DESTDIR = ### Targets: ### -all: emulator helpview hhp2cached ifacecheck screenshotgen +all: emulator helpview hhp2cached ifacecheck screenshotgen wxrc -install: install_ifacecheck install_screenshotgen +install: install_ifacecheck install_screenshotgen install_wxrc -uninstall: uninstall_ifacecheck uninstall_screenshotgen +uninstall: uninstall_ifacecheck uninstall_screenshotgen uninstall_wxrc -install-strip: install install-strip_ifacecheck install-strip_screenshotgen +install-strip: install install-strip_ifacecheck install-strip_screenshotgen install-strip_wxrc clean: rm -rf ./.deps ./.pch @@ -37,6 +37,7 @@ clean: -(cd hhp2cached && $(MAKE) clean) -(cd ifacecheck/src && $(MAKE) clean) -(cd screenshotgen/src && $(MAKE) clean) + -(cd wxrc && $(MAKE) clean) distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile @@ -45,6 +46,7 @@ distclean: clean -(cd hhp2cached && $(MAKE) distclean) -(cd ifacecheck/src && $(MAKE) distclean) -(cd screenshotgen/src && $(MAKE) distclean) + -(cd wxrc && $(MAKE) distclean) emulator: (cd emulator/src && $(MAKE) all) @@ -79,6 +81,18 @@ uninstall_screenshotgen: install-strip_screenshotgen: (cd screenshotgen/src && $(MAKE) install-strip) +wxrc: + (cd wxrc && $(MAKE) all) + +install_wxrc: + (cd wxrc && $(MAKE) install) + +uninstall_wxrc: + (cd wxrc && $(MAKE) uninstall) + +install-strip_wxrc: + (cd wxrc && $(MAKE) install-strip) + # Include dependency info, if present: @IF_GNU_MAKE@-include ./.deps/*.d @@ -86,4 +100,5 @@ install-strip_screenshotgen: .PHONY: all install uninstall clean distclean emulator helpview hhp2cached \ ifacecheck install_ifacecheck uninstall_ifacecheck install-strip_ifacecheck \ screenshotgen install_screenshotgen uninstall_screenshotgen \ - install-strip_screenshotgen + install-strip_screenshotgen wxrc install_wxrc uninstall_wxrc \ + install-strip_wxrc diff --git a/utils/makefile.bcc b/utils/makefile.bcc index 72c5a93a16..5a56ccdeee 100644 --- a/utils/makefile.bcc +++ b/utils/makefile.bcc @@ -44,7 +44,7 @@ MAKEARGS = -DCC="$(CC)" -DCXX="$(CXX)" -DCFLAGS="$(CFLAGS)" \ ### Targets: ### -all: emulator helpview hhp2cached ifacecheck screenshotgen +all: emulator helpview hhp2cached ifacecheck screenshotgen wxrc clean: -if exist .\*.obj del .\*.obj @@ -70,6 +70,10 @@ clean: @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>screenshotgen.bat call screenshotgen.bat @del screenshotgen.bat + @echo cd wxrc >wxrc.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>wxrc.bat + call wxrc.bat + @del wxrc.bat emulator: @echo cd emulator\src >emulator.bat @@ -101,3 +105,9 @@ screenshotgen: call screenshotgen.bat @del screenshotgen.bat +wxrc: + @echo cd wxrc >wxrc.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>wxrc.bat + call wxrc.bat + @del wxrc.bat + diff --git a/utils/makefile.gcc b/utils/makefile.gcc index e65c1587e3..4c92913846 100644 --- a/utils/makefile.gcc +++ b/utils/makefile.gcc @@ -35,7 +35,7 @@ MAKEARGS = LINK_DLL_FLAGS="$(LINK_DLL_FLAGS)" \ ### Targets: ### -all: emulator helpview hhp2cached ifacecheck screenshotgen +all: emulator helpview hhp2cached ifacecheck screenshotgen wxrc clean: -if exist .\*.o del .\*.o @@ -45,6 +45,7 @@ clean: $(MAKE) -C hhp2cached -f makefile.gcc $(MAKEARGS) clean $(MAKE) -C ifacecheck\src -f makefile.gcc $(MAKEARGS) clean $(MAKE) -C screenshotgen\src -f makefile.gcc $(MAKEARGS) clean + $(MAKE) -C wxrc -f makefile.gcc $(MAKEARGS) clean emulator: $(MAKE) -C emulator\src -f makefile.gcc $(MAKEARGS) all @@ -61,7 +62,10 @@ ifacecheck: screenshotgen: $(MAKE) -C screenshotgen\src -f makefile.gcc $(MAKEARGS) all -.PHONY: all clean emulator helpview hhp2cached ifacecheck screenshotgen +wxrc: + $(MAKE) -C wxrc -f makefile.gcc $(MAKEARGS) all + +.PHONY: all clean emulator helpview hhp2cached ifacecheck screenshotgen wxrc SHELL := $(COMSPEC) diff --git a/utils/makefile.vc b/utils/makefile.vc index 70629b55df..b8aa88ece1 100644 --- a/utils/makefile.vc +++ b/utils/makefile.vc @@ -34,7 +34,7 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \ ### Targets: ### -all: sub_emulator sub_helpview sub_hhp2cached sub_ifacecheck sub_screenshotgen +all: sub_emulator sub_helpview sub_hhp2cached sub_ifacecheck sub_screenshotgen sub_wxrc clean: -if exist .\*.obj del .\*.obj @@ -55,6 +55,9 @@ clean: cd screenshotgen\src $(MAKE) -f makefile.vc $(MAKEARGS) clean cd "$(MAKEDIR)" + cd wxrc + $(MAKE) -f makefile.vc $(MAKEARGS) clean + cd "$(MAKEDIR)" sub_emulator: cd emulator\src @@ -81,3 +84,8 @@ sub_screenshotgen: $(MAKE) -f makefile.vc $(MAKEARGS) all cd "$(MAKEDIR)" +sub_wxrc: + cd wxrc + $(MAKE) -f makefile.vc $(MAKEARGS) all + cd "$(MAKEDIR)" + diff --git a/utils/makefile.wat b/utils/makefile.wat index 60b08ddebc..8166f02fa2 100644 --- a/utils/makefile.wat +++ b/utils/makefile.wat @@ -48,7 +48,7 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" & ### Targets: ### -all : .SYMBOLIC emulator helpview hhp2cached ifacecheck screenshotgen +all : .SYMBOLIC emulator helpview hhp2cached ifacecheck screenshotgen wxrc clean : .SYMBOLIC -if exist .\*.obj del .\*.obj @@ -71,6 +71,9 @@ clean : .SYMBOLIC cd screenshotgen\src wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean cd $(WATCOM_CWD) + cd wxrc + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean + cd $(WATCOM_CWD) emulator : .SYMBOLIC cd emulator\src @@ -97,3 +100,8 @@ screenshotgen : .SYMBOLIC wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all cd $(WATCOM_CWD) +wxrc : .SYMBOLIC + cd wxrc + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all + cd $(WATCOM_CWD) + diff --git a/utils/utils.bkl b/utils/utils.bkl index ec11f79ac0..8ca2cb7297 100644 --- a/utils/utils.bkl +++ b/utils/utils.bkl @@ -32,4 +32,9 @@ yes + + wxrc + yes + +