Merge in from trunk r68684 - r69046

[wxWidgets.git] / samples / makefile.vc

diff --git a/samples/makefile.vc b/samples/makefile.vc
index 66849a9eb4d33101220cc0ba65b8cbdc0124c941..297f24f011acad5a5379cfeebf3ecce291dda05c 100644 (file)
--- a/samples/makefile.vc
+++ b/samples/makefile.vc
@@ -1,6 +1,6 @@
 # =========================================================================\r
 #     This makefile was generated by\r
-#     Bakefile 0.2.8 (http://www.bakefile.org)\r
+#     Bakefile 0.2.9 (http://www.bakefile.org)\r
 #     Do not modify, all changes will be overwritten!\r
 # =========================================================================\r
 \r
@@ -18,15 +18,14 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
        TARGET_CPU="$(TARGET_CPU)" DEBUG_INFO="$(DEBUG_INFO)" \\r
        DEBUG_FLAG="$(DEBUG_FLAG)" DEBUG_RUNTIME_LIBS="$(DEBUG_RUNTIME_LIBS)" \\r
        MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" \\r
-       USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" \\r
-       USE_RIBBON="$(USE_RIBBON)" USE_PROPGRID="$(USE_PROPGRID)" \\r
-       USE_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" \\r
-       USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" \\r
+       USE_WEB="$(USE_WEB)" USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" \\r
+       USE_AUI="$(USE_AUI)" USE_RIBBON="$(USE_RIBBON)" \\r
+       USE_PROPGRID="$(USE_PROPGRID)" USE_RICHTEXT="$(USE_RICHTEXT)" \\r
+       USE_STC="$(USE_STC)" USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" \\r
        USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" \\r
        USE_THREADS="$(USE_THREADS)" USE_CAIRO="$(USE_CAIRO)" \\r
-       USE_GDIPLUS="$(USE_GDIPLUS)" OFFICIAL_BUILD="$(OFFICIAL_BUILD)" \\r
-       VENDOR="$(VENDOR)" WX_FLAVOUR="$(WX_FLAVOUR)" \\r
-       WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" \\r
+       OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" \\r
+       WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" \\r
        CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" \\r
        RUNTIME_LIBS="$(RUNTIME_LIBS)"\r
 \r
@@ -36,7 +35,7 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
 \r
 ### Targets: ###\r
 \r
-all: sub_access sub_animate sub_artprov sub_aui sub_calendar sub_caret sub_clipboard sub_collpane sub_combo sub_config sub_console sub_controls sub_dataview sub_dialogs sub_dialup sub_display sub_dll sub_dnd sub_docview sub_dragimag sub_drawing sub_erase sub_event sub_except sub_exec sub_font sub_grid sub_help sub_htlbox sub_html sub_image sub_internat sub_ipc sub_joytest sub_keyboard sub_layout sub_listctrl sub_mdi sub_mediaplayer sub_menu sub_minimal sub_nativdlg sub_notebook sub_oleauto sub_opengl sub_ownerdrw sub_popup sub_power sub_printing sub_propgrid sub_regtest sub_render sub_ribbon sub_richtext sub_sashtest sub_scroll sub_shaped sub_sockets sub_sound sub_splash sub_splitter sub_statbar sub_stc sub_svg sub_taborder sub_taskbar sub_text sub_thread sub_toolbar sub_treectrl sub_typetest sub_validate sub_vscroll sub_widgets sub_wizard sub_wrapsizer sub_xrc\r
+all: sub_access sub_animate sub_artprov sub_aui sub_calendar sub_caret sub_clipboard sub_collpane sub_combo sub_config sub_console sub_controls sub_dataview sub_dialogs sub_dialup sub_display sub_dll sub_dnd sub_docview sub_dragimag sub_drawing sub_erase sub_event sub_except sub_exec sub_font sub_grid sub_help sub_htlbox sub_html sub_image sub_internat sub_ipc sub_joytest sub_keyboard sub_layout sub_listctrl sub_mdi sub_mediaplayer sub_menu sub_minimal sub_nativdlg sub_notebook sub_oleauto sub_opengl sub_ownerdrw sub_popup sub_power sub_printing sub_propgrid sub_regtest sub_render sub_ribbon sub_richtext sub_sashtest sub_scroll sub_shaped sub_sockets sub_sound sub_splash sub_splitter sub_statbar sub_stc sub_svg sub_taborder sub_taskbar sub_text sub_thread sub_toolbar sub_treectrl sub_typetest sub_uiaction sub_validate sub_vscroll sub_web sub_widgets sub_wizard sub_wrapsizer sub_xrc\r
 \r
 clean: \r
        -if exist .\*.obj del .\*.obj\r
@@ -255,12 +254,18 @@ clean:
        cd typetest\r
        $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
        cd "$(MAKEDIR)"\r
+       cd uiaction\r
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
+       cd "$(MAKEDIR)"\r
        cd validate\r
        $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
        cd "$(MAKEDIR)"\r
        cd vscroll\r
        $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
        cd "$(MAKEDIR)"\r
+       cd web\r
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
+       cd "$(MAKEDIR)"\r
        cd widgets\r
        $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
        cd "$(MAKEDIR)"\r
@@ -638,6 +643,11 @@ sub_typetest:
        $(MAKE) -f makefile.vc $(MAKEARGS) all\r
        cd "$(MAKEDIR)"\r
 \r
+sub_uiaction: \r
+       cd uiaction\r
+       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
+       cd "$(MAKEDIR)"\r
+\r
 sub_validate: \r
        cd validate\r
        $(MAKE) -f makefile.vc $(MAKEARGS) all\r
@@ -648,6 +658,11 @@ sub_vscroll:
        $(MAKE) -f makefile.vc $(MAKEARGS) all\r
        cd "$(MAKEDIR)"\r
 \r
+sub_web: \r
+       cd web\r
+       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
+       cd "$(MAKEDIR)"\r
+\r
 sub_widgets: \r
        cd widgets\r
        $(MAKE) -f makefile.vc $(MAKEARGS) all\r