compilation fix for unicode

[wxWidgets.git] / utils / makefile.gcc

diff --git a/utils/makefile.gcc b/utils/makefile.gcc
index b46310741e494be1f958c8c347dd410826639a78..c0be03e8fae12b84295173e3da1d1496fb89599c 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.1.3 (http://bakefile.sourceforge.net)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -12,15 +12,15 @@ include ../build/msw/config.gcc
 
 ### Variables: ###
 
-MAKEARGS = CPPFLAGS="$(CPPFLAGS)" MONOLITHIC="$(MONOLITHIC)" \
-       CXXFLAGS="$(CXXFLAGS)" VENDOR="$(VENDOR)" GCC_VERSION="$(GCC_VERSION)" \
-       RUNTIME_LIBS="$(RUNTIME_LIBS)" LDFLAGS="$(LDFLAGS)" \
-       USE_OPENGL="$(USE_OPENGL)" DEBUG_FLAG="$(DEBUG_FLAG)" UNICODE="$(UNICODE)" \
-       CC="$(CC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" BUILD="$(BUILD)" \
-       DEBUG_INFO="$(DEBUG_INFO)" USE_EXCEPTIONS="$(USE_EXCEPTIONS)" \
-       OFFICIAL_BUILD="$(OFFICIAL_BUILD)" MSLU="$(MSLU)" WXUNIV="$(WXUNIV)" \
-       CXX="$(CXX)" CFG="$(CFG)" CFLAGS="$(CFLAGS)" SHARED="$(SHARED)" \
-       USE_ODBC="$(USE_ODBC)"
+MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
+       CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" 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_OPENGL="$(USE_OPENGL)" USE_ODBC="$(USE_ODBC)" \
+       USE_EXCEPTIONS="$(USE_EXCEPTIONS)" OFFICIAL_BUILD="$(OFFICIAL_BUILD)" \
+       VENDOR="$(VENDOR)" CFG="$(CFG)" RUNTIME_LIBS="$(RUNTIME_LIBS)" \
+       GCC_VERSION="$(GCC_VERSION)"
 
 ### Conditionally set variables: ###
 
@@ -32,6 +32,11 @@ all: configtool emulator helpview tex2rtf helpgen
 
 clean: 
        -if exist .\*.o del .\*.o
+       $(MAKE) -C configtool\src -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C emulator\src -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C helpview\src -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C tex2rtf\src -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C HelpGen -f makefile.gcc $(MAKEARGS) clean
 
 configtool: 
        $(MAKE) -C configtool\src -f makefile.gcc $(MAKEARGS) all
@@ -39,13 +44,13 @@ configtool:
 emulator: 
        $(MAKE) -C emulator\src -f makefile.gcc $(MAKEARGS) all
 
-helpgen: 
-       $(MAKE) -C HelpGen -f makefile.gcc $(MAKEARGS) all
-
 helpview: 
        $(MAKE) -C helpview\src -f makefile.gcc $(MAKEARGS) all
 
 tex2rtf: 
        $(MAKE) -C tex2rtf\src -f makefile.gcc $(MAKEARGS) all
 
-.PHONY: all clean configtool emulator helpgen helpview tex2rtf
+helpgen: 
+       $(MAKE) -C HelpGen -f makefile.gcc $(MAKEARGS) all
+
+.PHONY: all clean configtool emulator helpview tex2rtf helpgen