Allow more than one line in a wxStaticText on iOS.

[wxWidgets.git] / samples / makefile.vc

diff --git a/samples/makefile.vc b/samples/makefile.vc
index 297f24f011acad5a5379cfeebf3ecce291dda05c..341ad98e220a3ffa8a64adecef34bee941376454 100644 (file)
--- a/samples/makefile.vc
+++ b/samples/makefile.vc
@@ -14,11 +14,12 @@
 \r
 MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \\r
        CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" \\r
-       WXUNIV="$(WXUNIV)" UNICODE="$(UNICODE)" MSLU="$(MSLU)" BUILD="$(BUILD)" \\r
+       TOOLKIT_VERSION="$(TOOLKIT_VERSION)" WXUNIV="$(WXUNIV)" \\r
+       UNICODE="$(UNICODE)" MSLU="$(MSLU)" BUILD="$(BUILD)" \\r
        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_WEB="$(USE_WEB)" USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" \\r
+       USE_WEBVIEW="$(USE_WEBVIEW)" 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
@@ -35,7 +36,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_uiaction sub_validate sub_vscroll sub_web 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_preferences 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_webview sub_widgets sub_wizard sub_wrapsizer sub_xrc\r
 \r
 clean: \r
        -if exist .\*.obj del .\*.obj\r
@@ -185,6 +186,9 @@ clean:
        cd power\r
        $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
        cd "$(MAKEDIR)"\r
+       cd preferences\r
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
+       cd "$(MAKEDIR)"\r
        cd printing\r
        $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
        cd "$(MAKEDIR)"\r
@@ -263,7 +267,7 @@ clean:
        cd vscroll\r
        $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
        cd "$(MAKEDIR)"\r
-       cd web\r
+       cd webview\r
        $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
        cd "$(MAKEDIR)"\r
        cd widgets\r
@@ -528,6 +532,11 @@ sub_power:
        $(MAKE) -f makefile.vc $(MAKEARGS) all\r
        cd "$(MAKEDIR)"\r
 \r
+sub_preferences: \r
+       cd preferences\r
+       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
+       cd "$(MAKEDIR)"\r
+\r
 sub_printing: \r
        cd printing\r
        $(MAKE) -f makefile.vc $(MAKEARGS) all\r
@@ -658,8 +667,8 @@ sub_vscroll:
        $(MAKE) -f makefile.vc $(MAKEARGS) all\r
        cd "$(MAKEDIR)"\r
 \r
-sub_web: \r
-       cd web\r
+sub_webview: \r
+       cd webview\r
        $(MAKE) -f makefile.vc $(MAKEARGS) all\r
        cd "$(MAKEDIR)"\r
 \r