Fixed Unicode compilo

[wxWidgets.git] / utils / makefile.vc

diff --git a/utils/makefile.vc b/utils/makefile.vc
index 08ad8f4da0665c81629f711831e6accbe3d0d39e..bf71de13297ff661e61dd903faae7228f5b0c318 100644 (file)
--- a/utils/makefile.vc
+++ b/utils/makefile.vc
@@ -12,6 +12,14 @@
 
 ### Variables: ###
 
+MAKEARGS = CPPFLAGS="$(CPPFLAGS)" DEBUG_FLAG="$(DEBUG_FLAG)" \
+       LDFLAGS="$(LDFLAGS)" DEBUG_RUNTIME_LIBS="$(DEBUG_RUNTIME_LIBS)" CC="$(CC)" \
+       USE_GUI="$(USE_GUI)" MONOLITHIC="$(MONOLITHIC)" CXXFLAGS="$(CXXFLAGS)" \
+       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)"
 
 ### Conditionally set variables: ###
 
@@ -19,18 +27,33 @@
 
 ### Targets: ###
 
-all: sub_tex2rtf sub_helpgen
+all: sub_configtool sub_emulator sub_helpview sub_tex2rtf sub_helpgen
 
 clean: 
        -if exist .\*.obj del .\*.obj
        -if exist .\*.res del .\*.res
 
+sub_configtool: 
+       cd configtool\src
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd $(MAKEDIR)
+
+sub_emulator: 
+       cd emulator\src
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd $(MAKEDIR)
+
 sub_helpgen: 
        cd HelpGen
-       $(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd $(MAKEDIR)
+
+sub_helpview: 
+       cd helpview\src
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
        cd $(MAKEDIR)
 
 sub_tex2rtf: 
        cd tex2rtf\src
-       $(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
        cd $(MAKEDIR)