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 f468f516d21ccfa0e34b5e7ed6628afe50c5c6f6..f5c2f3fb95221e49a0f80b4dd1a3e7a974e46b47 100644 (file)
--- a/samples/html/makefile.vc
+++ b/samples/html/makefile.vc
@@ -1,6 +1,6 @@
 # =========================================================================
 #     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!
 # =========================================================================
 
@@ -12,14 +12,21 @@
 
 ### 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)"
+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: ###
 
@@ -29,15 +36,40 @@ MAKEARGS = CPPFLAGS="$(CPPFLAGS)" DEBUG_FLAG="$(DEBUG_FLAG)" \
 
 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)
+
 sub_about: 
        cd about
        $(MAKE) -f makefile.vc $(MAKEARGS) all
        cd $(MAKEDIR)
 
-clean: 
-       -if exist .\*.obj del .\*.obj
-       -if exist .\*.res del .\*.res
-
 sub_help: 
        cd help
        $(MAKE) -f makefile.vc $(MAKEARGS) all
@@ -72,3 +104,4 @@ sub_zip:
        cd zip
        $(MAKE) -f makefile.vc $(MAKEARGS) all
        cd $(MAKEDIR)
+