From: Vadim Zeitlin Date: Thu, 18 Sep 2008 16:44:48 +0000 (+0000) Subject: rebaked after propgrid sample addition X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/c70d645d7f85d410fa8e25c3921f5f1c775c332c?ds=inline rebaked after propgrid sample addition git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55699 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/samples/makefile.bcc b/samples/makefile.bcc index e370a54852..cb8ad7eef5 100644 --- a/samples/makefile.bcc +++ b/samples/makefile.bcc @@ -28,8 +28,9 @@ MAKEARGS = -DCC="$(CC)" -DCXX="$(CXX)" -DCFLAGS="$(CFLAGS)" \ -DDEBUG_INFO="$(DEBUG_INFO)" -DDEBUG_FLAG="$(DEBUG_FLAG)" \ -DMONOLITHIC="$(MONOLITHIC)" -DUSE_GUI="$(USE_GUI)" \ -DUSE_HTML="$(USE_HTML)" -DUSE_MEDIA="$(USE_MEDIA)" -DUSE_XRC="$(USE_XRC)" \ - -DUSE_AUI="$(USE_AUI)" -DUSE_RICHTEXT="$(USE_RICHTEXT)" \ - -DUSE_STC="$(USE_STC)" -DUSE_OPENGL="$(USE_OPENGL)" -DUSE_QA="$(USE_QA)" \ + -DUSE_AUI="$(USE_AUI)" -DUSE_PROPGRID="$(USE_PROPGRID)" \ + -DUSE_RICHTEXT="$(USE_RICHTEXT)" -DUSE_STC="$(USE_STC)" \ + -DUSE_OPENGL="$(USE_OPENGL)" -DUSE_QA="$(USE_QA)" \ -DUSE_EXCEPTIONS="$(USE_EXCEPTIONS)" -DUSE_RTTI="$(USE_RTTI)" \ -DUSE_THREADS="$(USE_THREADS)" -DUSE_GDIPLUS="$(USE_GDIPLUS)" \ -DOFFICIAL_BUILD="$(OFFICIAL_BUILD)" -DVENDOR="$(VENDOR)" \ @@ -43,7 +44,7 @@ MAKEARGS = -DCC="$(CC)" -DCXX="$(CXX)" -DCFLAGS="$(CFLAGS)" \ ### Targets: ### -all: access animate artprov aui calendar caret collpane config combo console controls dataview dialogs dialup display dnd docview docvwmdi dragimag drawing erase event exec except font grid help htlbox html image internat ipc joytest keyboard layout listctrl mdi mediaplayer memcheck menu minimal mobile nativdlg notebook oleauto opengl ownerdrw popup printing regtest render richtext sashtest scroll scrollsub shaped sockets sound splash splitter statbar stc taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard wrapsizer mfc +all: access animate artprov aui calendar caret collpane config combo console controls dataview dialogs dialup display dnd docview docvwmdi dragimag drawing erase event exec except font grid help htlbox html image internat ipc joytest keyboard layout listctrl mdi mediaplayer memcheck menu minimal mobile nativdlg notebook oleauto opengl ownerdrw popup printing propgrid regtest render richtext sashtest scroll scrollsub shaped sockets sound splash splitter statbar stc taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard wrapsizer mfc clean: -if exist .\*.obj del .\*.obj @@ -245,6 +246,10 @@ clean: @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>printing.bat call printing.bat @del printing.bat + @echo cd propgrid >propgrid.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>propgrid.bat + call propgrid.bat + @del propgrid.bat @echo cd regtest >regtest.bat @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>regtest.bat call regtest.bat @@ -640,6 +645,12 @@ printing: call printing.bat @del printing.bat +propgrid: + @echo cd propgrid >propgrid.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>propgrid.bat + call propgrid.bat + @del propgrid.bat + regtest: @echo cd regtest >regtest.bat @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>regtest.bat diff --git a/samples/makefile.gcc b/samples/makefile.gcc index 63b9041aea..edf6a69bf6 100644 --- a/samples/makefile.gcc +++ b/samples/makefile.gcc @@ -20,8 +20,8 @@ MAKEARGS = LINK_DLL_FLAGS="$(LINK_DLL_FLAGS)" \ DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" \ MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" \ USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" \ - USE_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" \ - USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" \ + USE_PROPGRID="$(USE_PROPGRID)" USE_RICHTEXT="$(USE_RICHTEXT)" \ + USE_STC="$(USE_STC)" USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" \ USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" \ USE_THREADS="$(USE_THREADS)" USE_GDIPLUS="$(USE_GDIPLUS)" \ OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" \ @@ -35,7 +35,7 @@ MAKEARGS = LINK_DLL_FLAGS="$(LINK_DLL_FLAGS)" \ ### Targets: ### -all: access animate artprov aui calendar caret collpane config combo console controls dataview dialogs dialup display dnd docview docvwmdi dragimag drawing erase event exec except font grid help htlbox html image internat ipc joytest keyboard layout listctrl mdi mediaplayer memcheck menu minimal mobile nativdlg notebook oleauto opengl ownerdrw popup printing regtest render richtext sashtest scroll scrollsub shaped sockets sound splash splitter statbar stc taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard wrapsizer mfc +all: access animate artprov aui calendar caret collpane config combo console controls dataview dialogs dialup display dnd docview docvwmdi dragimag drawing erase event exec except font grid help htlbox html image internat ipc joytest keyboard layout listctrl mdi mediaplayer memcheck menu minimal mobile nativdlg notebook oleauto opengl ownerdrw popup printing propgrid regtest render richtext sashtest scroll scrollsub shaped sockets sound splash splitter statbar stc taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard wrapsizer mfc clean: -if exist .\*.o del .\*.o @@ -89,6 +89,7 @@ clean: $(MAKE) -C ownerdrw -f makefile.gcc $(MAKEARGS) clean $(MAKE) -C popup -f makefile.gcc $(MAKEARGS) clean $(MAKE) -C printing -f makefile.gcc $(MAKEARGS) clean + $(MAKE) -C propgrid -f makefile.gcc $(MAKEARGS) clean $(MAKE) -C regtest -f makefile.gcc $(MAKEARGS) clean $(MAKE) -C render -f makefile.gcc $(MAKEARGS) clean $(MAKE) -C richtext -f makefile.gcc $(MAKEARGS) clean @@ -262,6 +263,9 @@ popup: printing: $(MAKE) -C printing -f makefile.gcc $(MAKEARGS) all +propgrid: + $(MAKE) -C propgrid -f makefile.gcc $(MAKEARGS) all + regtest: $(MAKE) -C regtest -f makefile.gcc $(MAKEARGS) all @@ -337,13 +341,7 @@ wrapsizer: mfc: $(MAKE) -C mfc -f makefile.gcc $(MAKEARGS) all -.PHONY: all clean access animate artprov aui calendar caret collpane config combo \ - console controls dataview dialogs dialup display dnd docview docvwmdi dragimag \ - drawing erase event exec except font grid help htlbox html image internat ipc joytest \ - keyboard layout listctrl mdi mediaplayer memcheck menu minimal mobile nativdlg \ - notebook oleauto opengl ownerdrw popup printing regtest render richtext sashtest \ - scroll scrollsub shaped sockets sound splash splitter statbar stc taskbar text \ - thread toolbar treectrl typetest validate vscroll widgets wizard wrapsizer mfc +.PHONY: all clean access animate artprov aui calendar caret collpane config combo console controls dataview dialogs dialup display dnd docview docvwmdi dragimag drawing erase event exec except font grid help htlbox html image internat ipc joytest keyboard layout listctrl mdi mediaplayer memcheck menu minimal mobile nativdlg notebook oleauto opengl ownerdrw popup printing propgrid regtest render richtext sashtest scroll scrollsub shaped sockets sound splash splitter statbar stc taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard wrapsizer mfc SHELL := $(COMSPEC) diff --git a/samples/makefile.vc b/samples/makefile.vc index 86fd867e87..11c3c513ab 100644 --- a/samples/makefile.vc +++ b/samples/makefile.vc @@ -19,8 +19,8 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \ DEBUG_FLAG="$(DEBUG_FLAG)" DEBUG_RUNTIME_LIBS="$(DEBUG_RUNTIME_LIBS)" \ MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" \ USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" \ - USE_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" \ - USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" \ + USE_PROPGRID="$(USE_PROPGRID)" USE_RICHTEXT="$(USE_RICHTEXT)" \ + USE_STC="$(USE_STC)" USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" \ USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" \ USE_THREADS="$(USE_THREADS)" USE_GDIPLUS="$(USE_GDIPLUS)" \ OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" \ @@ -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_collpane sub_config sub_combo sub_console sub_controls sub_dataview sub_dialogs sub_dialup sub_display sub_dnd sub_docview sub_docvwmdi sub_dragimag sub_drawing 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_listctrl sub_mdi sub_mediaplayer sub_memcheck sub_menu sub_minimal sub_mobile sub_nativdlg sub_notebook sub_oleauto sub_opengl sub_ownerdrw sub_popup sub_printing sub_regtest sub_render sub_richtext sub_sashtest sub_scroll sub_scrollsub sub_shaped sub_sockets sub_sound sub_splash sub_splitter sub_statbar sub_stc sub_taskbar sub_text sub_thread sub_toolbar sub_treectrl sub_typetest sub_validate sub_vscroll sub_widgets sub_wizard sub_wrapsizer sub_mfc +all: sub_access sub_animate sub_artprov sub_aui sub_calendar sub_caret sub_collpane sub_config sub_combo sub_console sub_controls sub_dataview sub_dialogs sub_dialup sub_display sub_dnd sub_docview sub_docvwmdi sub_dragimag sub_drawing 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_listctrl sub_mdi sub_mediaplayer sub_memcheck sub_menu sub_minimal sub_mobile sub_nativdlg sub_notebook sub_oleauto sub_opengl sub_ownerdrw sub_popup sub_printing sub_propgrid sub_regtest sub_render sub_richtext sub_sashtest sub_scroll sub_scrollsub sub_shaped sub_sockets sub_sound sub_splash sub_splitter sub_statbar sub_stc sub_taskbar sub_text sub_thread sub_toolbar sub_treectrl sub_typetest sub_validate sub_vscroll sub_widgets sub_wizard sub_wrapsizer sub_mfc clean: -if exist .\*.obj del .\*.obj @@ -187,6 +187,9 @@ clean: cd printing $(MAKE) -f makefile.vc $(MAKEARGS) clean cd "$(MAKEDIR)" + cd propgrid + $(MAKE) -f makefile.vc $(MAKEARGS) clean + cd "$(MAKEDIR)" cd regtest $(MAKE) -f makefile.vc $(MAKEARGS) clean cd "$(MAKEDIR)" @@ -508,6 +511,11 @@ sub_printing: $(MAKE) -f makefile.vc $(MAKEARGS) all cd "$(MAKEDIR)" +sub_propgrid: + cd propgrid + $(MAKE) -f makefile.vc $(MAKEARGS) all + cd "$(MAKEDIR)" + sub_regtest: cd regtest $(MAKE) -f makefile.vc $(MAKEARGS) all diff --git a/samples/makefile.wat b/samples/makefile.wat index 1fc44d3977..66c2faa0a0 100644 --- a/samples/makefile.wat +++ b/samples/makefile.wat @@ -36,8 +36,8 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" & DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" & MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" & USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" & - USE_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" & - USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" & + USE_PROPGRID="$(USE_PROPGRID)" USE_RICHTEXT="$(USE_RICHTEXT)" & + USE_STC="$(USE_STC)" USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" & USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" & USE_THREADS="$(USE_THREADS)" USE_GDIPLUS="$(USE_GDIPLUS)" & OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" & @@ -48,7 +48,7 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" & ### Targets: ### -all : .SYMBOLIC access animate artprov aui calendar caret collpane config combo console controls dataview dialogs dialup display dnd docview docvwmdi dragimag drawing erase event exec except font grid help htlbox html image internat ipc joytest keyboard layout listctrl mdi mediaplayer memcheck menu minimal mobile nativdlg notebook oleauto opengl ownerdrw popup printing regtest render richtext sashtest scroll scrollsub shaped sockets sound splash splitter statbar stc taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard wrapsizer mfc +all : .SYMBOLIC access animate artprov aui calendar caret collpane config combo console controls dataview dialogs dialup display dnd docview docvwmdi dragimag drawing erase event exec except font grid help htlbox html image internat ipc joytest keyboard layout listctrl mdi mediaplayer memcheck menu minimal mobile nativdlg notebook oleauto opengl ownerdrw popup printing propgrid regtest render richtext sashtest scroll scrollsub shaped sockets sound splash splitter statbar stc taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard wrapsizer mfc clean : .SYMBOLIC -if exist .\*.obj del .\*.obj @@ -203,6 +203,9 @@ clean : .SYMBOLIC cd printing wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean cd $(WATCOM_CWD) + cd propgrid + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean + cd $(WATCOM_CWD) cd regtest wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean cd $(WATCOM_CWD) @@ -524,6 +527,11 @@ printing : .SYMBOLIC wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all cd $(WATCOM_CWD) +propgrid : .SYMBOLIC + cd propgrid + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all + cd $(WATCOM_CWD) + regtest : .SYMBOLIC cd regtest wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all