class/struct mismatch

[wxWidgets.git] / utils / makefile.vc

diff --git a/utils/makefile.vc b/utils/makefile.vc
index 0f2a51db23a94d65f34e1ef6c7891d6cdc3ddca8..f40e5661f9c92e22054e552dd34c7b90b87fb808 100644 (file)
--- a/utils/makefile.vc
+++ b/utils/makefile.vc
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.1.9 (http://bakefile.sourceforge.net)
+#     Bakefile 0.2.1 (http://bakefile.sourceforge.net)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -18,9 +18,11 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
        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_XRC="$(USE_XRC)" USE_OPENGL="$(USE_OPENGL)" USE_ODBC="$(USE_ODBC)" \
-       USE_QA="$(USE_QA)" USE_EXCEPTIONS="$(USE_EXCEPTIONS)" \
-       USE_RTTI="$(USE_RTTI)" USE_THREADS="$(USE_THREADS)" \
+       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)" USE_GDIPLUS="$(USE_GDIPLUS)" \
        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)" \
@@ -32,15 +34,12 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
 
 ### Targets: ###
 
-all: sub_configtool sub_emulator sub_helpview sub_tex2rtf sub_helpgen
+all: sub_emulator sub_helpview sub_tex2rtf sub_helpgen
 
 clean: 
        -if exist .\*.obj del .\*.obj
        -if exist .\*.res del .\*.res
        -if exist .\*.pch del .\*.pch
-       cd configtool\src
-       $(MAKE) -f makefile.vc $(MAKEARGS) clean
-       cd $(MAKEDIR)
        cd emulator\src
        $(MAKE) -f makefile.vc $(MAKEARGS) clean
        cd $(MAKEDIR)
@@ -54,11 +53,6 @@ clean:
        $(MAKE) -f makefile.vc $(MAKEARGS) clean
        cd $(MAKEDIR)
 
-sub_configtool: 
-       cd configtool\src
-       $(MAKE) -f makefile.vc $(MAKEARGS) all
-       cd $(MAKEDIR)
-
 sub_emulator: 
        cd emulator\src
        $(MAKE) -f makefile.vc $(MAKEARGS) all