various changes to get up to date with CVS

[wxWidgets.git] / samples / makefile.vc

diff --git a/samples/makefile.vc b/samples/makefile.vc
index 33e2391f4b42e673fb0e72a70a88fc0415628de9..318a2fc6ff041ee1dc9865d8cb6678344d4efbe8 100644 (file)
--- a/samples/makefile.vc
+++ b/samples/makefile.vc
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.1.5 (http://bakefile.sourceforge.net)
+#     Bakefile 0.2.0 (http://bakefile.sourceforge.net)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -13,13 +13,16 @@
 ### Variables: ###
 
 MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
-       CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" SHARED="$(SHARED)" \
+       CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" \
        WXUNIV="$(WXUNIV)" UNICODE="$(UNICODE)" MSLU="$(MSLU)" BUILD="$(BUILD)" \
-       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_EXCEPTIONS="$(USE_EXCEPTIONS)" OFFICIAL_BUILD="$(OFFICIAL_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)" \
@@ -31,7 +34,7 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
 
 ### Targets: ###
 
-all: sub_access sub_artprov sub_calendar sub_caret sub_checklst sub_config sub_console sub_controls sub_db sub_dialogs sub_dialup sub_display sub_dnd sub_docview sub_docvwmdi sub_dragimag sub_drawing sub_dynamic sub_erase sub_event sub_exec sub_except sub_font sub_grid sub_help sub_htlbox sub_html sub_image sub_internat sub_ipc sub_joytest sub_keyboard sub_layout sub_listbox sub_listctrl sub_mdi sub_mediaplayer sub_memcheck sub_menu sub_mfc sub_minifram sub_minimal sub_mobile sub_multimon sub_nativdlg sub_notebook sub_oleauto sub_opengl sub_ownerdrw sub_png sub_popup sub_printing sub_propsize sub_regtest sub_render sub_richedit sub_rotate sub_sashtest sub_scroll sub_scrollsub sub_shaped sub_sockets sub_sound sub_splash sub_splitter sub_statbar sub_taskbar sub_text sub_thread sub_toolbar sub_treectrl sub_typetest sub_validate sub_vscroll sub_widgets sub_wizard
+all: sub_access sub_artprov sub_calendar sub_caret sub_checklst sub_config sub_combo sub_console sub_controls sub_db sub_dialogs sub_dialup sub_display sub_dnd sub_docview sub_docvwmdi sub_dragimag sub_drawing sub_dynamic sub_erase sub_event sub_exec sub_except sub_font sub_grid sub_help sub_htlbox sub_html sub_image sub_internat sub_ipc sub_joytest sub_keyboard sub_layout sub_listbox sub_listctrl sub_mdi sub_mediaplayer sub_memcheck sub_menu sub_minifram sub_minimal sub_mobile sub_multimon sub_nativdlg sub_notebook sub_oleauto sub_opengl sub_ownerdrw sub_png sub_popup sub_printing sub_propsize sub_regtest sub_render sub_rotate sub_sashtest sub_scroll sub_scrollsub sub_shaped sub_sockets sub_sound sub_splash sub_splitter sub_statbar sub_taskbar sub_text sub_thread sub_toolbar sub_treectrl sub_typetest sub_validate sub_vscroll sub_widgets sub_wizard sub_mfc
 
 clean: 
        -if exist .\*.obj del .\*.obj
@@ -55,6 +58,9 @@ clean:
        cd config
        $(MAKE) -f makefile.vc $(MAKEARGS) clean
        cd $(MAKEDIR)
+       cd combo
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd $(MAKEDIR)
        cd console
        $(MAKE) -f makefile.vc $(MAKEARGS) clean
        cd $(MAKEDIR)
@@ -154,9 +160,6 @@ clean:
        cd menu
        $(MAKE) -f makefile.vc $(MAKEARGS) clean
        cd $(MAKEDIR)
-       cd mfc
-       $(MAKE) -f makefile.vc $(MAKEARGS) clean
-       cd $(MAKEDIR)
        cd minifram
        $(MAKE) -f makefile.vc $(MAKEARGS) clean
        cd $(MAKEDIR)
@@ -202,9 +205,6 @@ clean:
        cd render
        $(MAKE) -f makefile.vc $(MAKEARGS) clean
        cd $(MAKEDIR)
-       cd richedit
-       $(MAKE) -f makefile.vc $(MAKEARGS) clean
-       cd $(MAKEDIR)
        cd rotate
        $(MAKE) -f makefile.vc $(MAKEARGS) clean
        cd $(MAKEDIR)
@@ -265,6 +265,9 @@ clean:
        cd wizard
        $(MAKE) -f makefile.vc $(MAKEARGS) clean
        cd $(MAKEDIR)
+       cd mfc
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd $(MAKEDIR)
 
 sub_access: 
        cd access
@@ -296,6 +299,11 @@ sub_config:
        $(MAKE) -f makefile.vc $(MAKEARGS) all
        cd $(MAKEDIR)
 
+sub_combo: 
+       cd combo
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd $(MAKEDIR)
+
 sub_console: 
        cd console
        $(MAKE) -f makefile.vc $(MAKEARGS) all
@@ -461,11 +469,6 @@ sub_menu:
        $(MAKE) -f makefile.vc $(MAKEARGS) all
        cd $(MAKEDIR)
 
-sub_mfc: 
-       cd mfc
-       $(MAKE) -f makefile.vc $(MAKEARGS) all
-       cd $(MAKEDIR)
-
 sub_minifram: 
        cd minifram
        $(MAKE) -f makefile.vc $(MAKEARGS) all
@@ -541,11 +544,6 @@ sub_render:
        $(MAKE) -f makefile.vc $(MAKEARGS) all
        cd $(MAKEDIR)
 
-sub_richedit: 
-       cd richedit
-       $(MAKE) -f makefile.vc $(MAKEARGS) all
-       cd $(MAKEDIR)
-
 sub_rotate: 
        cd rotate
        $(MAKE) -f makefile.vc $(MAKEARGS) all
@@ -646,3 +644,8 @@ sub_wizard:
        $(MAKE) -f makefile.vc $(MAKEARGS) all
        cd $(MAKEDIR)
 
+sub_mfc: 
+       cd mfc
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd $(MAKEDIR)
+