X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f820e98de02ee9c5d34f28372a2324d9b2909f6c..32592f4a80846246cdb6ea3463c80cc1a55dfef1:/samples/makefile.vc

diff --git a/samples/makefile.vc b/samples/makefile.vc
index 9c8dace661..2d4e3d3fec 100644
--- a/samples/makefile.vc
+++ b/samples/makefile.vc
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.1.1 (http://bakefile.sourceforge.net)
+#     Bakefile 0.2.0 (http://bakefile.sourceforge.net)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -12,6 +12,19 @@
 
 ### Variables: ###
 
+MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
+	CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" \
+	WXUNIV="$(WXUNIV)" UNICODE="$(UNICODE)" MSLU="$(MSLU)" BUILD="$(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_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)" \
+	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)" \
+	RUNTIME_LIBS="$(RUNTIME_LIBS)"
 
 ### Conditionally set variables: ###
 
@@ -19,378 +32,610 @@
 
 ### 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_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_memcheck sub_menu sub_mfc sub_minifram sub_minimal sub_mobile sub_multimon sub_nativdlg sub_newgrid sub_notebook sub_oleauto sub_opengl sub_ownerdrw sub_png sub_printing sub_propsize sub_regtest sub_render sub_richedit sub_rotate sub_sashtest sub_scroll sub_scrollsub sub_shaped sub_sockets sub_splitter sub_statbar sub_tab sub_taskbar sub_text sub_thread sub_toolbar sub_treectrl sub_typetest sub_validate sub_vscroll sub_widgets sub_wizard sub_wxtest
+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_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
+	-if exist .\*.res del .\*.res
+	-if exist .\*.pch del .\*.pch
+	cd access
+	$(MAKE) -f makefile.vc $(MAKEARGS) clean
+	cd $(MAKEDIR)
+	cd artprov
+	$(MAKE) -f makefile.vc $(MAKEARGS) clean
+	cd $(MAKEDIR)
+	cd calendar
+	$(MAKE) -f makefile.vc $(MAKEARGS) clean
+	cd $(MAKEDIR)
+	cd caret
+	$(MAKE) -f makefile.vc $(MAKEARGS) clean
+	cd $(MAKEDIR)
+	cd checklst
+	$(MAKE) -f makefile.vc $(MAKEARGS) clean
+	cd $(MAKEDIR)
+	cd config
+	$(MAKE) -f makefile.vc $(MAKEARGS) clean
+	cd $(MAKEDIR)
+	cd console
+	$(MAKE) -f makefile.vc $(MAKEARGS) clean
+	cd $(MAKEDIR)
+	cd controls
+	$(MAKE) -f makefile.vc $(MAKEARGS) clean
+	cd $(MAKEDIR)
+	cd db
+	$(MAKE) -f makefile.vc $(MAKEARGS) clean
+	cd $(MAKEDIR)
+	cd dialogs
+	$(MAKE) -f makefile.vc $(MAKEARGS) clean
+	cd $(MAKEDIR)
+	cd dialup
+	$(MAKE) -f makefile.vc $(MAKEARGS) clean
+	cd $(MAKEDIR)
+	cd display
+	$(MAKE) -f makefile.vc $(MAKEARGS) clean
+	cd $(MAKEDIR)
+	cd dnd
+	$(MAKE) -f makefile.vc $(MAKEARGS) clean
+	cd $(MAKEDIR)
+	cd docview
+	$(MAKE) -f makefile.vc $(MAKEARGS) clean
+	cd $(MAKEDIR)
+	cd docvwmdi
+	$(MAKE) -f makefile.vc $(MAKEARGS) clean
+	cd $(MAKEDIR)
+	cd dragimag
+	$(MAKE) -f makefile.vc $(MAKEARGS) clean
+	cd $(MAKEDIR)
+	cd drawing
+	$(MAKE) -f makefile.vc $(MAKEARGS) clean
+	cd $(MAKEDIR)
+	cd dynamic
+	$(MAKE) -f makefile.vc $(MAKEARGS) clean
+	cd $(MAKEDIR)
+	cd erase
+	$(MAKE) -f makefile.vc $(MAKEARGS) clean
+	cd $(MAKEDIR)
+	cd event
+	$(MAKE) -f makefile.vc $(MAKEARGS) clean
+	cd $(MAKEDIR)
+	cd exec
+	$(MAKE) -f makefile.vc $(MAKEARGS) clean
+	cd $(MAKEDIR)
+	cd except
+	$(MAKE) -f makefile.vc $(MAKEARGS) clean
+	cd $(MAKEDIR)
+	cd font
+	$(MAKE) -f makefile.vc $(MAKEARGS) clean
+	cd $(MAKEDIR)
+	cd grid
+	$(MAKE) -f makefile.vc $(MAKEARGS) clean
+	cd $(MAKEDIR)
+	cd help
+	$(MAKE) -f makefile.vc $(MAKEARGS) clean
+	cd $(MAKEDIR)
+	cd htlbox
+	$(MAKE) -f makefile.vc $(MAKEARGS) clean
+	cd $(MAKEDIR)
+	cd html
+	$(MAKE) -f makefile.vc $(MAKEARGS) clean
+	cd $(MAKEDIR)
+	cd image
+	$(MAKE) -f makefile.vc $(MAKEARGS) clean
+	cd $(MAKEDIR)
+	cd internat
+	$(MAKE) -f makefile.vc $(MAKEARGS) clean
+	cd $(MAKEDIR)
+	cd ipc
+	$(MAKE) -f makefile.vc $(MAKEARGS) clean
+	cd $(MAKEDIR)
+	cd joytest
+	$(MAKE) -f makefile.vc $(MAKEARGS) clean
+	cd $(MAKEDIR)
+	cd keyboard
+	$(MAKE) -f makefile.vc $(MAKEARGS) clean
+	cd $(MAKEDIR)
+	cd layout
+	$(MAKE) -f makefile.vc $(MAKEARGS) clean
+	cd $(MAKEDIR)
+	cd listbox
+	$(MAKE) -f makefile.vc $(MAKEARGS) clean
+	cd $(MAKEDIR)
+	cd listctrl
+	$(MAKE) -f makefile.vc $(MAKEARGS) clean
+	cd $(MAKEDIR)
+	cd mdi
+	$(MAKE) -f makefile.vc $(MAKEARGS) clean
+	cd $(MAKEDIR)
+	cd mediaplayer
+	$(MAKE) -f makefile.vc $(MAKEARGS) clean
+	cd $(MAKEDIR)
+	cd memcheck
+	$(MAKE) -f makefile.vc $(MAKEARGS) clean
+	cd $(MAKEDIR)
+	cd menu
+	$(MAKE) -f makefile.vc $(MAKEARGS) clean
+	cd $(MAKEDIR)
+	cd minifram
+	$(MAKE) -f makefile.vc $(MAKEARGS) clean
+	cd $(MAKEDIR)
+	cd minimal
+	$(MAKE) -f makefile.vc $(MAKEARGS) clean
+	cd $(MAKEDIR)
+	cd mobile
+	$(MAKE) -f makefile.vc $(MAKEARGS) clean
+	cd $(MAKEDIR)
+	cd multimon
+	$(MAKE) -f makefile.vc $(MAKEARGS) clean
+	cd $(MAKEDIR)
+	cd nativdlg
+	$(MAKE) -f makefile.vc $(MAKEARGS) clean
+	cd $(MAKEDIR)
+	cd notebook
+	$(MAKE) -f makefile.vc $(MAKEARGS) clean
+	cd $(MAKEDIR)
+	cd oleauto
+	$(MAKE) -f makefile.vc $(MAKEARGS) clean
+	cd $(MAKEDIR)
+	cd opengl
+	$(MAKE) -f makefile.vc $(MAKEARGS) clean
+	cd $(MAKEDIR)
+	cd ownerdrw
+	$(MAKE) -f makefile.vc $(MAKEARGS) clean
+	cd $(MAKEDIR)
+	cd png
+	$(MAKE) -f makefile.vc $(MAKEARGS) clean
+	cd $(MAKEDIR)
+	cd popup
+	$(MAKE) -f makefile.vc $(MAKEARGS) clean
+	cd $(MAKEDIR)
+	cd printing
+	$(MAKE) -f makefile.vc $(MAKEARGS) clean
+	cd $(MAKEDIR)
+	cd propsize
+	$(MAKE) -f makefile.vc $(MAKEARGS) clean
+	cd $(MAKEDIR)
+	cd regtest
+	$(MAKE) -f makefile.vc $(MAKEARGS) clean
+	cd $(MAKEDIR)
+	cd render
+	$(MAKE) -f makefile.vc $(MAKEARGS) clean
+	cd $(MAKEDIR)
+	cd rotate
+	$(MAKE) -f makefile.vc $(MAKEARGS) clean
+	cd $(MAKEDIR)
+	cd sashtest
+	$(MAKE) -f makefile.vc $(MAKEARGS) clean
+	cd $(MAKEDIR)
+	cd scroll
+	$(MAKE) -f makefile.vc $(MAKEARGS) clean
+	cd $(MAKEDIR)
+	cd scrollsub
+	$(MAKE) -f makefile.vc $(MAKEARGS) clean
+	cd $(MAKEDIR)
+	cd shaped
+	$(MAKE) -f makefile.vc $(MAKEARGS) clean
+	cd $(MAKEDIR)
+	cd sockets
+	$(MAKE) -f makefile.vc $(MAKEARGS) clean
+	cd $(MAKEDIR)
+	cd sound
+	$(MAKE) -f makefile.vc $(MAKEARGS) clean
+	cd $(MAKEDIR)
+	cd splash
+	$(MAKE) -f makefile.vc $(MAKEARGS) clean
+	cd $(MAKEDIR)
+	cd splitter
+	$(MAKE) -f makefile.vc $(MAKEARGS) clean
+	cd $(MAKEDIR)
+	cd statbar
+	$(MAKE) -f makefile.vc $(MAKEARGS) clean
+	cd $(MAKEDIR)
+	cd taskbar
+	$(MAKE) -f makefile.vc $(MAKEARGS) clean
+	cd $(MAKEDIR)
+	cd text
+	$(MAKE) -f makefile.vc $(MAKEARGS) clean
+	cd $(MAKEDIR)
+	cd thread
+	$(MAKE) -f makefile.vc $(MAKEARGS) clean
+	cd $(MAKEDIR)
+	cd toolbar
+	$(MAKE) -f makefile.vc $(MAKEARGS) clean
+	cd $(MAKEDIR)
+	cd treectrl
+	$(MAKE) -f makefile.vc $(MAKEARGS) clean
+	cd $(MAKEDIR)
+	cd typetest
+	$(MAKE) -f makefile.vc $(MAKEARGS) clean
+	cd $(MAKEDIR)
+	cd validate
+	$(MAKE) -f makefile.vc $(MAKEARGS) clean
+	cd $(MAKEDIR)
+	cd vscroll
+	$(MAKE) -f makefile.vc $(MAKEARGS) clean
+	cd $(MAKEDIR)
+	cd widgets
+	$(MAKE) -f makefile.vc $(MAKEARGS) clean
+	cd $(MAKEDIR)
+	cd wizard
+	$(MAKE) -f makefile.vc $(MAKEARGS) clean
+	cd $(MAKEDIR)
+	cd mfc
+	$(MAKE) -f makefile.vc $(MAKEARGS) clean
+	cd $(MAKEDIR)
 
 sub_access: 
 	cd access
-	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	$(MAKE) -f makefile.vc $(MAKEARGS) all
 	cd $(MAKEDIR)
 
 sub_artprov: 
 	cd artprov
-	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	$(MAKE) -f makefile.vc $(MAKEARGS) all
 	cd $(MAKEDIR)
 
 sub_calendar: 
 	cd calendar
-	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	$(MAKE) -f makefile.vc $(MAKEARGS) all
 	cd $(MAKEDIR)
 
 sub_caret: 
 	cd caret
-	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	$(MAKE) -f makefile.vc $(MAKEARGS) all
 	cd $(MAKEDIR)
 
 sub_checklst: 
 	cd checklst
-	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	$(MAKE) -f makefile.vc $(MAKEARGS) all
 	cd $(MAKEDIR)
 
-clean: 
-	-if exist .\*.obj del .\*.obj
-	-if exist .\*.res del .\*.res
-
 sub_config: 
 	cd config
-	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	$(MAKE) -f makefile.vc $(MAKEARGS) all
 	cd $(MAKEDIR)
 
 sub_console: 
 	cd console
-	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	$(MAKE) -f makefile.vc $(MAKEARGS) all
 	cd $(MAKEDIR)
 
 sub_controls: 
 	cd controls
-	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	$(MAKE) -f makefile.vc $(MAKEARGS) all
 	cd $(MAKEDIR)
 
 sub_db: 
 	cd db
-	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	$(MAKE) -f makefile.vc $(MAKEARGS) all
 	cd $(MAKEDIR)
 
 sub_dialogs: 
 	cd dialogs
-	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	$(MAKE) -f makefile.vc $(MAKEARGS) all
 	cd $(MAKEDIR)
 
 sub_dialup: 
 	cd dialup
-	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	$(MAKE) -f makefile.vc $(MAKEARGS) all
 	cd $(MAKEDIR)
 
 sub_display: 
 	cd display
-	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	$(MAKE) -f makefile.vc $(MAKEARGS) all
 	cd $(MAKEDIR)
 
 sub_dnd: 
 	cd dnd
-	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	$(MAKE) -f makefile.vc $(MAKEARGS) all
 	cd $(MAKEDIR)
 
 sub_docview: 
 	cd docview
-	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	$(MAKE) -f makefile.vc $(MAKEARGS) all
 	cd $(MAKEDIR)
 
 sub_docvwmdi: 
 	cd docvwmdi
-	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	$(MAKE) -f makefile.vc $(MAKEARGS) all
 	cd $(MAKEDIR)
 
 sub_dragimag: 
 	cd dragimag
-	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	$(MAKE) -f makefile.vc $(MAKEARGS) all
 	cd $(MAKEDIR)
 
 sub_drawing: 
 	cd drawing
-	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	$(MAKE) -f makefile.vc $(MAKEARGS) all
 	cd $(MAKEDIR)
 
 sub_dynamic: 
 	cd dynamic
-	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	$(MAKE) -f makefile.vc $(MAKEARGS) all
 	cd $(MAKEDIR)
 
 sub_erase: 
 	cd erase
-	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	$(MAKE) -f makefile.vc $(MAKEARGS) all
 	cd $(MAKEDIR)
 
 sub_event: 
 	cd event
-	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	$(MAKE) -f makefile.vc $(MAKEARGS) all
 	cd $(MAKEDIR)
 
 sub_exec: 
 	cd exec
-	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	$(MAKE) -f makefile.vc $(MAKEARGS) all
+	cd $(MAKEDIR)
+
+sub_except: 
+	cd except
+	$(MAKE) -f makefile.vc $(MAKEARGS) all
 	cd $(MAKEDIR)
 
 sub_font: 
 	cd font
-	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	$(MAKE) -f makefile.vc $(MAKEARGS) all
 	cd $(MAKEDIR)
 
 sub_grid: 
 	cd grid
-	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	$(MAKE) -f makefile.vc $(MAKEARGS) all
 	cd $(MAKEDIR)
 
 sub_help: 
 	cd help
-	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	$(MAKE) -f makefile.vc $(MAKEARGS) all
 	cd $(MAKEDIR)
 
 sub_htlbox: 
 	cd htlbox
-	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	$(MAKE) -f makefile.vc $(MAKEARGS) all
 	cd $(MAKEDIR)
 
 sub_html: 
 	cd html
-	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	$(MAKE) -f makefile.vc $(MAKEARGS) all
 	cd $(MAKEDIR)
 
 sub_image: 
 	cd image
-	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	$(MAKE) -f makefile.vc $(MAKEARGS) all
 	cd $(MAKEDIR)
 
 sub_internat: 
 	cd internat
-	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	$(MAKE) -f makefile.vc $(MAKEARGS) all
 	cd $(MAKEDIR)
 
 sub_ipc: 
 	cd ipc
-	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	$(MAKE) -f makefile.vc $(MAKEARGS) all
 	cd $(MAKEDIR)
 
 sub_joytest: 
 	cd joytest
-	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	$(MAKE) -f makefile.vc $(MAKEARGS) all
 	cd $(MAKEDIR)
 
 sub_keyboard: 
 	cd keyboard
-	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	$(MAKE) -f makefile.vc $(MAKEARGS) all
 	cd $(MAKEDIR)
 
 sub_layout: 
 	cd layout
-	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	$(MAKE) -f makefile.vc $(MAKEARGS) all
 	cd $(MAKEDIR)
 
 sub_listbox: 
 	cd listbox
-	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	$(MAKE) -f makefile.vc $(MAKEARGS) all
 	cd $(MAKEDIR)
 
 sub_listctrl: 
 	cd listctrl
-	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	$(MAKE) -f makefile.vc $(MAKEARGS) all
 	cd $(MAKEDIR)
 
 sub_mdi: 
 	cd mdi
-	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	$(MAKE) -f makefile.vc $(MAKEARGS) all
+	cd $(MAKEDIR)
+
+sub_mediaplayer: 
+	cd mediaplayer
+	$(MAKE) -f makefile.vc $(MAKEARGS) all
 	cd $(MAKEDIR)
 
 sub_memcheck: 
 	cd memcheck
-	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	$(MAKE) -f makefile.vc $(MAKEARGS) all
 	cd $(MAKEDIR)
 
 sub_menu: 
 	cd menu
-	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
-	cd $(MAKEDIR)
-
-sub_mfc: 
-	cd mfc
-	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	$(MAKE) -f makefile.vc $(MAKEARGS) all
 	cd $(MAKEDIR)
 
 sub_minifram: 
 	cd minifram
-	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	$(MAKE) -f makefile.vc $(MAKEARGS) all
 	cd $(MAKEDIR)
 
 sub_minimal: 
 	cd minimal
-	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	$(MAKE) -f makefile.vc $(MAKEARGS) all
 	cd $(MAKEDIR)
 
 sub_mobile: 
 	cd mobile
-	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	$(MAKE) -f makefile.vc $(MAKEARGS) all
 	cd $(MAKEDIR)
 
 sub_multimon: 
 	cd multimon
-	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	$(MAKE) -f makefile.vc $(MAKEARGS) all
 	cd $(MAKEDIR)
 
 sub_nativdlg: 
 	cd nativdlg
-	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
-	cd $(MAKEDIR)
-
-sub_newgrid: 
-	cd newgrid
-	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	$(MAKE) -f makefile.vc $(MAKEARGS) all
 	cd $(MAKEDIR)
 
 sub_notebook: 
 	cd notebook
-	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	$(MAKE) -f makefile.vc $(MAKEARGS) all
 	cd $(MAKEDIR)
 
 sub_oleauto: 
 	cd oleauto
-	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	$(MAKE) -f makefile.vc $(MAKEARGS) all
 	cd $(MAKEDIR)
 
 sub_opengl: 
 	cd opengl
-	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	$(MAKE) -f makefile.vc $(MAKEARGS) all
 	cd $(MAKEDIR)
 
 sub_ownerdrw: 
 	cd ownerdrw
-	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	$(MAKE) -f makefile.vc $(MAKEARGS) all
 	cd $(MAKEDIR)
 
 sub_png: 
 	cd png
-	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	$(MAKE) -f makefile.vc $(MAKEARGS) all
+	cd $(MAKEDIR)
+
+sub_popup: 
+	cd popup
+	$(MAKE) -f makefile.vc $(MAKEARGS) all
 	cd $(MAKEDIR)
 
 sub_printing: 
 	cd printing
-	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	$(MAKE) -f makefile.vc $(MAKEARGS) all
 	cd $(MAKEDIR)
 
 sub_propsize: 
 	cd propsize
-	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	$(MAKE) -f makefile.vc $(MAKEARGS) all
 	cd $(MAKEDIR)
 
 sub_regtest: 
 	cd regtest
-	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	$(MAKE) -f makefile.vc $(MAKEARGS) all
 	cd $(MAKEDIR)
 
 sub_render: 
 	cd render
-	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
-	cd $(MAKEDIR)
-
-sub_richedit: 
-	cd richedit
-	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	$(MAKE) -f makefile.vc $(MAKEARGS) all
 	cd $(MAKEDIR)
 
 sub_rotate: 
 	cd rotate
-	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	$(MAKE) -f makefile.vc $(MAKEARGS) all
 	cd $(MAKEDIR)
 
 sub_sashtest: 
 	cd sashtest
-	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	$(MAKE) -f makefile.vc $(MAKEARGS) all
 	cd $(MAKEDIR)
 
 sub_scroll: 
 	cd scroll
-	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	$(MAKE) -f makefile.vc $(MAKEARGS) all
 	cd $(MAKEDIR)
 
 sub_scrollsub: 
 	cd scrollsub
-	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	$(MAKE) -f makefile.vc $(MAKEARGS) all
 	cd $(MAKEDIR)
 
 sub_shaped: 
 	cd shaped
-	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	$(MAKE) -f makefile.vc $(MAKEARGS) all
 	cd $(MAKEDIR)
 
 sub_sockets: 
 	cd sockets
-	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	$(MAKE) -f makefile.vc $(MAKEARGS) all
+	cd $(MAKEDIR)
+
+sub_sound: 
+	cd sound
+	$(MAKE) -f makefile.vc $(MAKEARGS) all
+	cd $(MAKEDIR)
+
+sub_splash: 
+	cd splash
+	$(MAKE) -f makefile.vc $(MAKEARGS) all
 	cd $(MAKEDIR)
 
 sub_splitter: 
 	cd splitter
-	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	$(MAKE) -f makefile.vc $(MAKEARGS) all
 	cd $(MAKEDIR)
 
 sub_statbar: 
 	cd statbar
-	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
-	cd $(MAKEDIR)
-
-sub_tab: 
-	cd tab
-	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	$(MAKE) -f makefile.vc $(MAKEARGS) all
 	cd $(MAKEDIR)
 
 sub_taskbar: 
 	cd taskbar
-	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	$(MAKE) -f makefile.vc $(MAKEARGS) all
 	cd $(MAKEDIR)
 
 sub_text: 
 	cd text
-	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	$(MAKE) -f makefile.vc $(MAKEARGS) all
 	cd $(MAKEDIR)
 
 sub_thread: 
 	cd thread
-	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	$(MAKE) -f makefile.vc $(MAKEARGS) all
 	cd $(MAKEDIR)
 
 sub_toolbar: 
 	cd toolbar
-	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	$(MAKE) -f makefile.vc $(MAKEARGS) all
 	cd $(MAKEDIR)
 
 sub_treectrl: 
 	cd treectrl
-	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	$(MAKE) -f makefile.vc $(MAKEARGS) all
 	cd $(MAKEDIR)
 
 sub_typetest: 
 	cd typetest
-	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	$(MAKE) -f makefile.vc $(MAKEARGS) all
 	cd $(MAKEDIR)
 
 sub_validate: 
 	cd validate
-	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	$(MAKE) -f makefile.vc $(MAKEARGS) all
 	cd $(MAKEDIR)
 
 sub_vscroll: 
 	cd vscroll
-	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	$(MAKE) -f makefile.vc $(MAKEARGS) all
 	cd $(MAKEDIR)
 
 sub_widgets: 
 	cd widgets
-	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	$(MAKE) -f makefile.vc $(MAKEARGS) all
 	cd $(MAKEDIR)
 
 sub_wizard: 
 	cd wizard
-	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+	$(MAKE) -f makefile.vc $(MAKEARGS) all
 	cd $(MAKEDIR)
 
-sub_wxtest: 
-	cd wxtest
-	$(MAKE) /$(MAKEFLAGS) -f makefile.vc all
+sub_mfc: 
+	cd mfc
+	$(MAKE) -f makefile.vc $(MAKEARGS) all
 	cd $(MAKEDIR)
+