wchar_t (4 bytes) / unichar (2 bytes) problems first attempt to fix

[wxWidgets.git] / samples / html / makefile.vc

diff --git a/samples/html/makefile.vc b/samples/html/makefile.vc
index 2c32d11eb7390df36cf7a9eeaccc28fdbbdf125b..209a5940947723ed601e54c5b58ec924cb5e24bb 100644 (file)
--- a/samples/html/makefile.vc
+++ b/samples/html/makefile.vc
@@ -1,10 +1,10 @@
 # =========================================================================
 #     This makefile was generated by
 # =========================================================================
 #     This makefile was generated by

-#     Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net)
+#     Bakefile 0.1.1 (http://bakefile.sourceforge.net)

 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 

-!include <../../build/config.vc>
+!include <../../build/msw/config.vc>

 
 # -------------------------------------------------------------------------
 # Do not modify the rest of this file!
 
 # -------------------------------------------------------------------------
 # Do not modify the rest of this file!


@@ -12,6 +12,15 @@
 
 ### Variables: ###
 
 
 ### Variables: ###
 

+MAKEARGS = CPPFLAGS="$(CPPFLAGS)" MONOLITHIC="$(MONOLITHIC)" \
+       CXXFLAGS="$(CXXFLAGS)" VENDOR="$(VENDOR)" RUNTIME_LIBS="$(RUNTIME_LIBS)" \
+       LDFLAGS="$(LDFLAGS)" USE_OPENGL="$(USE_OPENGL)" DEBUG_FLAG="$(DEBUG_FLAG)" \
+       UNICODE="$(UNICODE)" DEBUG_RUNTIME_LIBS="$(DEBUG_RUNTIME_LIBS)" 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)"

 
 ### Conditionally set variables: ###
 
 
 ### Conditionally set variables: ###
 


@@ -19,48 +28,48 @@
 
 ### Targets: ###
 
 
 ### Targets: ###
 

-all: about help helpview printing test virtual widget zip
+all: sub_about sub_help sub_helpview sub_printing sub_test sub_virtual sub_widget sub_zip

 
 

-about: 
+sub_about: 

        cd about
        cd about

-       $(MAKE) /$(MAKEFLAGS) all
+       $(MAKE) -f makefile.vc $(MAKEARGS) all

        cd $(MAKEDIR)
 
 clean: 
        -if exist .\*.obj del .\*.obj
        -if exist .\*.res del .\*.res
 
        cd $(MAKEDIR)
 
 clean: 
        -if exist .\*.obj del .\*.obj
        -if exist .\*.res del .\*.res
 

-help: 
+sub_help: 

        cd help
        cd help

-       $(MAKE) /$(MAKEFLAGS) all
+       $(MAKE) -f makefile.vc $(MAKEARGS) all

        cd $(MAKEDIR)
 
        cd $(MAKEDIR)
 

-helpview: 
+sub_helpview: 

        cd helpview
        cd helpview

-       $(MAKE) /$(MAKEFLAGS) all
+       $(MAKE) -f makefile.vc $(MAKEARGS) all

        cd $(MAKEDIR)
 
        cd $(MAKEDIR)
 

-printing: 
+sub_printing: 

        cd printing
        cd printing

-       $(MAKE) /$(MAKEFLAGS) all
+       $(MAKE) -f makefile.vc $(MAKEARGS) all

        cd $(MAKEDIR)
 
        cd $(MAKEDIR)
 

-test: 
+sub_test: 

        cd test
        cd test

-       $(MAKE) /$(MAKEFLAGS) all
+       $(MAKE) -f makefile.vc $(MAKEARGS) all

        cd $(MAKEDIR)
 
        cd $(MAKEDIR)
 

-virtual: 
+sub_virtual: 

        cd virtual
        cd virtual

-       $(MAKE) /$(MAKEFLAGS) all
+       $(MAKE) -f makefile.vc $(MAKEARGS) all

        cd $(MAKEDIR)
 
        cd $(MAKEDIR)
 

-widget: 
+sub_widget: 

        cd widget
        cd widget

-       $(MAKE) /$(MAKEFLAGS) all
+       $(MAKE) -f makefile.vc $(MAKEARGS) all

        cd $(MAKEDIR)
 
        cd $(MAKEDIR)
 

-zip: 
+sub_zip: 

        cd zip
        cd zip

-       $(MAKE) /$(MAKEFLAGS) all
+       $(MAKE) -f makefile.vc $(MAKEARGS) all

        cd $(MAKEDIR)
        cd $(MAKEDIR)