Use wxScopedCharBuffer in To8BitData() in ANSI build too.

[wxWidgets.git] / samples / makefile.vc

diff --git a/samples/makefile.vc b/samples/makefile.vc
index 080efad979005771cc5f4f5a3931088ea8522c3b..3a688feb2af76c4005fa0e1f1a926d9f0d96a53a 100644 (file)
--- a/samples/makefile.vc
+++ b/samples/makefile.vc
@@ -24,9 +24,8 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
        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_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_widgets sub_wizard sub_wrapsizer sub_xrc\r
 \r
 clean: \r
        -if exist .\*.obj del .\*.obj\r
@@ -90,6 +89,9 @@ clean:
        cd display\r
        $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
        cd "$(MAKEDIR)"\r
+       cd dll\r
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
+       cd "$(MAKEDIR)"\r
        cd dnd\r
        $(MAKE) -f makefile.vc $(MAKEARGS) clean\r
        cd "$(MAKEDIR)"\r
@@ -252,6 +254,9 @@ 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
@@ -360,6 +365,11 @@ sub_display:
        $(MAKE) -f makefile.vc $(MAKEARGS) all\r
        cd "$(MAKEDIR)"\r
 \r
+sub_dll: \r
+       cd dll\r
+       $(MAKE) -f makefile.vc $(MAKEARGS) all\r
+       cd "$(MAKEDIR)"\r
+\r
 sub_dnd: \r
        cd dnd\r
        $(MAKE) -f makefile.vc $(MAKEARGS) all\r
@@ -630,6 +640,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