remove also wxT(); it's confusing, too; do load wxstd.mo catalog after calling wxLoca...

[wxWidgets.git] / utils / makefile.gcc

diff --git a/utils/makefile.gcc b/utils/makefile.gcc
index 3bb3a17662ed88af21bb7476ec7b7f5699e607ae..4c92913846cb7c58a059dabc302a97ca56243ccd 100644 (file)
--- a/utils/makefile.gcc
+++ b/utils/makefile.gcc
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.1.1 (http://bakefile.sourceforge.net)
+#     Bakefile 0.2.5 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -12,15 +12,22 @@ include ../build/msw/config.gcc
 
 ### Variables: ###
 
-MAKEARGS = CPPFLAGS="$(CPPFLAGS)" DEBUG_FLAG="$(DEBUG_FLAG)" \
-       LDFLAGS="$(LDFLAGS)" CC="$(CC)" USE_GUI="$(USE_GUI)" \
-       MONOLITHIC="$(MONOLITHIC)" CXXFLAGS="$(CXXFLAGS)" \
-       GCC_VERSION="$(GCC_VERSION)" USE_HTML="$(USE_HTML)" BUILD="$(BUILD)" \
-       DEBUG_INFO="$(DEBUG_INFO)" USE_EXCEPTIONS="$(USE_EXCEPTIONS)" \
-       VENDOR="$(VENDOR)" UNICODE="$(UNICODE)" OFFICIAL_BUILD="$(OFFICIAL_BUILD)" \
-       MSLU="$(MSLU)" WXUNIV="$(WXUNIV)" RUNTIME_LIBS="$(RUNTIME_LIBS)" \
-       CXX="$(CXX)" CFG="$(CFG)" CFLAGS="$(CFLAGS)" SHARED="$(SHARED)" \
-       USE_ODBC="$(USE_ODBC)" USE_OPENGL="$(USE_OPENGL)"
+MAKEARGS = LINK_DLL_FLAGS="$(LINK_DLL_FLAGS)" \
+       LINK_MODULE_FLAGS="$(LINK_MODULE_FLAGS)" CC="$(CC)" CXX="$(CXX)" \
+       CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" \
+       LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" WXUNIV="$(WXUNIV)" \
+       UNICODE="$(UNICODE)" MSLU="$(MSLU)" BUILD="$(BUILD)" \
+       DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" \
+       MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" \
+       USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" \
+       USE_PROPGRID="$(USE_PROPGRID)" USE_RICHTEXT="$(USE_RICHTEXT)" \
+       USE_STC="$(USE_STC)" USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" \
+       USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" \
+       USE_THREADS="$(USE_THREADS)" USE_GDIPLUS="$(USE_GDIPLUS)" \
+       OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" \
+       WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" \
+       CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" \
+       RUNTIME_LIBS="$(RUNTIME_LIBS)" GCC_VERSION="$(GCC_VERSION)"
 
 ### Conditionally set variables: ###
 
@@ -28,15 +35,40 @@ MAKEARGS = CPPFLAGS="$(CPPFLAGS)" DEBUG_FLAG="$(DEBUG_FLAG)" \
 
 ### Targets: ###
 
-all: tex2rtf helpgen
+all: emulator helpview hhp2cached ifacecheck screenshotgen wxrc
 
 clean: 
        -if exist .\*.o del .\*.o
+       -if exist .\*.d del .\*.d
+       $(MAKE) -C emulator\src -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C helpview\src -f makefile.gcc $(MAKEARGS) 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
 
-helpgen: 
-       $(MAKE) -C HelpGen -f makefile.gcc $(MAKEARGS) all
+emulator: 
+       $(MAKE) -C emulator\src -f makefile.gcc $(MAKEARGS) all
 
-tex2rtf: 
-       $(MAKE) -C tex2rtf\src -f makefile.gcc $(MAKEARGS) all
+helpview: 
+       $(MAKE) -C helpview\src -f makefile.gcc $(MAKEARGS) all
 
-.PHONY: all clean helpgen tex2rtf
+hhp2cached: 
+       $(MAKE) -C hhp2cached -f makefile.gcc $(MAKEARGS) all
+
+ifacecheck: 
+       $(MAKE) -C ifacecheck\src -f makefile.gcc $(MAKEARGS) all
+
+screenshotgen: 
+       $(MAKE) -C screenshotgen\src -f makefile.gcc $(MAKEARGS) all
+
+wxrc: 
+       $(MAKE) -C wxrc -f makefile.gcc $(MAKEARGS) all
+
+.PHONY: all clean emulator helpview hhp2cached ifacecheck screenshotgen wxrc
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include ./*.d