compilation fix after wxGUIAppTraits::GetToolkitVersion() introduction

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

diff --git a/samples/html/makefile.vc b/samples/html/makefile.vc
index 079e974c4b0e9dad3d48839214b8b50762702575..f5c2f3fb95221e49a0f80b4dd1a3e7a974e46b47 100644 (file)
--- a/samples/html/makefile.vc
+++ b/samples/html/makefile.vc
@@ -1,10 +1,10 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.1.1 (http://bakefile.sourceforge.net)
+#     Bakefile 0.2.0 (http://bakefile.sourceforge.net)
 #     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!
@@ -12,6 +12,21 @@
 
 ### Variables: ###
 
+MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
+       CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" \
+       WXUNIV="$(WXUNIV)" UNICODE="$(UNICODE)" MSLU="$(MSLU)" BUILD="$(BUILD)" \
+       TARGET_CPU="$(TARGET_CPU)" DEBUG_INFO="$(DEBUG_INFO)" \
+       DEBUG_FLAG="$(DEBUG_FLAG)" DEBUG_RUNTIME_LIBS="$(DEBUG_RUNTIME_LIBS)" \
+       MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" \
+       USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" \
+       USE_RICHTEXT="$(USE_RICHTEXT)" USE_OPENGL="$(USE_OPENGL)" \
+       USE_ODBC="$(USE_ODBC)" USE_QA="$(USE_QA)" \
+       USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" \
+       USE_THREADS="$(USE_THREADS)" 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)"
 
 ### Conditionally set variables: ###
 
@@ -19,48 +34,74 @@
 
 ### Targets: ###
 
-all: about help helpview printing test virtual widget zip
-
-about: 
-       cd about
-       $(MAKE) /$(MAKEFLAGS) all
-       cd $(MAKEDIR)
+all: sub_about sub_help sub_helpview sub_printing sub_test sub_virtual sub_widget sub_zip
 
 clean: 
        -if exist .\*.obj del .\*.obj
        -if exist .\*.res del .\*.res
+       -if exist .\*.pch del .\*.pch
+       cd about
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd $(MAKEDIR)
+       cd help
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd $(MAKEDIR)
+       cd helpview
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd $(MAKEDIR)
+       cd printing
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd $(MAKEDIR)
+       cd test
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd $(MAKEDIR)
+       cd virtual
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd $(MAKEDIR)
+       cd widget
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd $(MAKEDIR)
+       cd zip
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd $(MAKEDIR)
 
-help: 
+sub_about: 
+       cd about
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd $(MAKEDIR)
+
+sub_help: 
        cd help
-       $(MAKE) /$(MAKEFLAGS) all
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
        cd $(MAKEDIR)
 
-helpview: 
+sub_helpview: 
        cd helpview
-       $(MAKE) /$(MAKEFLAGS) all
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
        cd $(MAKEDIR)
 
-printing: 
+sub_printing: 
        cd printing
-       $(MAKE) /$(MAKEFLAGS) all
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
        cd $(MAKEDIR)
 
-test: 
+sub_test: 
        cd test
-       $(MAKE) /$(MAKEFLAGS) all
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
        cd $(MAKEDIR)
 
-virtual: 
+sub_virtual: 
        cd virtual
-       $(MAKE) /$(MAKEFLAGS) all
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
        cd $(MAKEDIR)
 
-widget: 
+sub_widget: 
        cd widget
-       $(MAKE) /$(MAKEFLAGS) all
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
        cd $(MAKEDIR)
 
-zip: 
+sub_zip: 
        cd zip
-       $(MAKE) /$(MAKEFLAGS) all
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
        cd $(MAKEDIR)
+