diff --git a/samples/makefile.bcc b/samples/makefile.bcc index a51f28c96b..128a958b9c 100644 --- a/samples/makefile.bcc +++ b/samples/makefile.bcc @@ -43,7 +43,7 @@ MAKEARGS = -DCC="$(CC)" -DCXX="$(CXX)" -DCFLAGS="$(CFLAGS)" \ ### Targets: ### -all: access animate artprov aui calendar caret checklst collpane config combo console controls dataview db dialogs dialup display dnd docview docvwmdi dragimag drawing dynamic erase event exec except font grid help htlbox html image internat ipc joytest keyboard layout listbox listctrl mdi mediaplayer memcheck menu minifram minimal mobile multimon nativdlg notebook oleauto opengl ownerdrw png popup printing propsize regtest render richtext rotate sashtest scroll scrollsub shaped sockets sound splash splitter statbar taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard mfc +all: access animate artprov aui calendar caret checklst collpane config combo console controls dataview db dialogs dialup display dnd docview docvwmdi dragimag drawing dynamic erase event exec except font grid help htlbox html image internat ipc joytest keyboard layout listbox listctrl mdi mediaplayer menu minifram minimal mobile multimon nativdlg notebook oleauto opengl ownerdrw png popup printing propsize regtest render richtext rotate sashtest scroll scrollsub shaped sockets sound splash splitter statbar taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard clean: -if exist .\*.obj del .\*.obj @@ -217,10 +217,6 @@ clean: @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>mediaplayer.bat call mediaplayer.bat @del mediaplayer.bat - @echo cd memcheck >memcheck.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>memcheck.bat - call memcheck.bat - @del memcheck.bat @echo cd menu >menu.bat @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>menu.bat call menu.bat @@ -373,6 +369,10 @@ clean: @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>mfc.bat call mfc.bat @del mfc.bat + @echo cd memcheck >memcheck.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>memcheck.bat + call memcheck.bat + @del memcheck.bat access: @echo cd access >access.bat @@ -626,12 +626,6 @@ mediaplayer: call mediaplayer.bat @del mediaplayer.bat -memcheck: - @echo cd memcheck >memcheck.bat - @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>memcheck.bat - call memcheck.bat - @del memcheck.bat - menu: @echo cd menu >menu.bat @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>menu.bat @@ -860,3 +854,9 @@ mfc: call mfc.bat @del mfc.bat +memcheck: + @echo cd memcheck >memcheck.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>memcheck.bat + call memcheck.bat + @del memcheck.bat + diff --git a/samples/makefile.gcc b/samples/makefile.gcc index c09b1d3934..0a4ec96dfa 100644 --- a/samples/makefile.gcc +++ b/samples/makefile.gcc @@ -35,7 +35,7 @@ MAKEARGS = LINK_DLL_FLAGS="$(LINK_DLL_FLAGS)" \ ### Targets: ### -all: access animate artprov aui calendar caret checklst collpane config combo console controls dataview db dialogs dialup display dnd docview docvwmdi dragimag drawing dynamic erase event exec except font grid help htlbox html image internat ipc joytest keyboard layout listbox listctrl mdi mediaplayer memcheck menu minifram minimal mobile multimon nativdlg notebook oleauto opengl ownerdrw png popup printing propsize regtest render richtext rotate sashtest scroll scrollsub shaped sockets sound splash splitter statbar taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard mfc +all: access animate artprov aui calendar caret checklst collpane config combo console controls dataview db dialogs dialup display dnd docview docvwmdi dragimag drawing dynamic erase event exec except font grid help htlbox html image internat ipc joytest keyboard layout listbox listctrl mdi mediaplayer menu minifram minimal mobile multimon nativdlg notebook oleauto opengl ownerdrw png popup printing propsize regtest render richtext rotate sashtest scroll scrollsub shaped sockets sound splash splitter statbar taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard clean: -if exist .\*.o del .\*.o @@ -82,7 +82,6 @@ clean: $(MAKE) -C listctrl -f makefile.gcc $(MAKEARGS) clean $(MAKE) -C mdi -f makefile.gcc $(MAKEARGS) clean $(MAKE) -C mediaplayer -f makefile.gcc $(MAKEARGS) clean - $(MAKE) -C memcheck -f makefile.gcc $(MAKEARGS) clean $(MAKE) -C menu -f makefile.gcc $(MAKEARGS) clean $(MAKE) -C minifram -f makefile.gcc $(MAKEARGS) clean $(MAKE) -C minimal -f makefile.gcc $(MAKEARGS) clean @@ -121,6 +120,7 @@ clean: $(MAKE) -C widgets -f makefile.gcc $(MAKEARGS) clean $(MAKE) -C wizard -f makefile.gcc $(MAKEARGS) clean $(MAKE) -C mfc -f makefile.gcc $(MAKEARGS) clean + $(MAKE) -C memcheck -f makefile.gcc $(MAKEARGS) clean access: $(MAKE) -C access -f makefile.gcc $(MAKEARGS) all @@ -248,9 +248,6 @@ mdi: mediaplayer: $(MAKE) -C mediaplayer -f makefile.gcc $(MAKEARGS) all -memcheck: - $(MAKE) -C memcheck -f makefile.gcc $(MAKEARGS) all - menu: $(MAKE) -C menu -f makefile.gcc $(MAKEARGS) all @@ -365,7 +362,10 @@ wizard: mfc: $(MAKE) -C mfc -f makefile.gcc $(MAKEARGS) all -.PHONY: all clean access animate artprov aui calendar caret checklst collpane config combo console controls dataview db dialogs dialup display dnd docview docvwmdi dragimag drawing dynamic erase event exec except font grid help htlbox html image internat ipc joytest keyboard layout listbox listctrl mdi mediaplayer memcheck menu minifram minimal mobile multimon nativdlg notebook oleauto opengl ownerdrw png popup printing propsize regtest render richtext rotate sashtest scroll scrollsub shaped sockets sound splash splitter statbar taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard mfc +memcheck: + $(MAKE) -C memcheck -f makefile.gcc $(MAKEARGS) all + +.PHONY: all clean access animate artprov aui calendar caret checklst collpane config combo console controls dataview db dialogs dialup display dnd docview docvwmdi dragimag drawing dynamic erase event exec except font grid help htlbox html image internat ipc joytest keyboard layout listbox listctrl mdi mediaplayer menu minifram minimal mobile multimon nativdlg notebook oleauto opengl ownerdrw png popup printing propsize regtest render richtext rotate sashtest scroll scrollsub shaped sockets sound splash splitter statbar taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard mfc memcheck SHELL := $(COMSPEC) diff --git a/samples/makefile.vc b/samples/makefile.vc index 6a1a3cb037..49f3df486c 100644 --- a/samples/makefile.vc +++ b/samples/makefile.vc @@ -34,7 +34,7 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \ ### Targets: ### -all: sub_access sub_animate sub_artprov sub_aui sub_calendar sub_caret sub_checklst sub_collpane sub_config sub_combo sub_console sub_controls sub_dataview 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_richtext 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 +all: sub_access sub_animate sub_artprov sub_aui sub_calendar sub_caret sub_checklst sub_collpane sub_config sub_combo sub_console sub_controls sub_dataview 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_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_richtext 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 clean: -if exist .\*.obj del .\*.obj @@ -166,9 +166,6 @@ clean: 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)" @@ -283,6 +280,9 @@ clean: cd mfc $(MAKE) -f makefile.vc $(MAKEARGS) clean cd "$(MAKEDIR)" + cd memcheck + $(MAKE) -f makefile.vc $(MAKEARGS) clean + cd "$(MAKEDIR)" sub_access: cd access @@ -494,11 +494,6 @@ sub_mediaplayer: $(MAKE) -f makefile.vc $(MAKEARGS) all cd "$(MAKEDIR)" -sub_memcheck: - cd memcheck - $(MAKE) -f makefile.vc $(MAKEARGS) all - cd "$(MAKEDIR)" - sub_menu: cd menu $(MAKE) -f makefile.vc $(MAKEARGS) all @@ -689,3 +684,8 @@ sub_mfc: $(MAKE) -f makefile.vc $(MAKEARGS) all cd "$(MAKEDIR)" +sub_memcheck: + cd memcheck + $(MAKE) -f makefile.vc $(MAKEARGS) all + cd "$(MAKEDIR)" + diff --git a/samples/makefile.wat b/samples/makefile.wat index d5fc89c44a..79ccb275a6 100644 --- a/samples/makefile.wat +++ b/samples/makefile.wat @@ -48,7 +48,7 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" & ### Targets: ### -all : .SYMBOLIC access animate artprov aui calendar caret checklst collpane config combo console controls dataview db dialogs dialup display dnd docview docvwmdi dragimag drawing dynamic erase event exec except font grid help htlbox html image internat ipc joytest keyboard layout listbox listctrl mdi mediaplayer memcheck menu minifram minimal mobile multimon nativdlg notebook oleauto opengl ownerdrw png popup printing propsize regtest render richtext rotate sashtest scroll scrollsub shaped sockets sound splash splitter statbar taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard mfc +all : .SYMBOLIC access animate artprov aui calendar caret checklst collpane config combo console controls dataview db dialogs dialup display dnd docview docvwmdi dragimag drawing dynamic erase event exec except font grid help htlbox html image internat ipc joytest keyboard layout listbox listctrl mdi mediaplayer menu minifram minimal mobile multimon nativdlg notebook oleauto opengl ownerdrw png popup printing propsize regtest render richtext rotate sashtest scroll scrollsub shaped sockets sound splash splitter statbar taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard clean : .SYMBOLIC -if exist .\*.obj del .\*.obj @@ -182,9 +182,6 @@ clean : .SYMBOLIC cd mediaplayer wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean cd $(WATCOM_CWD) - cd memcheck - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean - cd $(WATCOM_CWD) cd menu wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean cd $(WATCOM_CWD) @@ -299,6 +296,9 @@ clean : .SYMBOLIC cd mfc wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean cd $(WATCOM_CWD) + cd memcheck + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean + cd $(WATCOM_CWD) access : .SYMBOLIC cd access @@ -510,11 +510,6 @@ mediaplayer : .SYMBOLIC wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all cd $(WATCOM_CWD) -memcheck : .SYMBOLIC - cd memcheck - wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all - cd $(WATCOM_CWD) - menu : .SYMBOLIC cd menu wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all @@ -705,3 +700,8 @@ mfc : .SYMBOLIC wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all cd $(WATCOM_CWD) +memcheck : .SYMBOLIC + cd memcheck + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all + cd $(WATCOM_CWD) + diff --git a/samples/samples.bkl b/samples/samples.bkl index c620fd20e0..ff5daeebca 100644 --- a/samples/samples.bkl +++ b/samples/samples.bkl @@ -4,8 +4,11 @@ -