From d9e90d79125480006b220be188aabdb2e14094dc Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 16 Sep 2009 23:18:55 +0000 Subject: [PATCH] Add ribbon sample to the list of samples to build. Add the file to samples/samples.bkl and regenerate the makefiles and also add it manually to samples.dsw. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61948 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- samples/makefile.bcc | 12 +++++++++++- samples/makefile.gcc | 14 +++++++++----- samples/makefile.vc | 10 +++++++++- samples/makefile.wat | 10 +++++++++- samples/samples.bkl | 1 + samples/samples.dsw | 12 ++++++++++++ 6 files changed, 51 insertions(+), 8 deletions(-) diff --git a/samples/makefile.bcc b/samples/makefile.bcc index 149eae0..e699972 100644 --- a/samples/makefile.bcc +++ b/samples/makefile.bcc @@ -44,7 +44,7 @@ MAKEARGS = -DCC="$(CC)" -DCXX="$(CXX)" -DCFLAGS="$(CFLAGS)" \ ### Targets: ### -all: access animate artprov aui calendar caret clipboard collpane combo config console controls dataview dialogs dialup display dnd docview dragimag drawing erase event except exec font grid help htlbox html image internat ipc joytest keyboard layout listctrl mdi mediaplayer menu minimal nativdlg notebook oleauto opengl ownerdrw popup power printing propgrid regtest render richtext sashtest scroll shaped sockets sound splash splitter statbar stc svg taborder taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard wrapsizer xrc +all: access animate artprov aui calendar caret clipboard collpane combo config console controls dataview dialogs dialup display dnd docview dragimag drawing erase event except exec font grid help htlbox html image internat ipc joytest keyboard layout listctrl mdi mediaplayer menu minimal nativdlg notebook oleauto opengl ownerdrw popup power printing propgrid regtest render ribbon richtext sashtest scroll shaped sockets sound splash splitter statbar stc svg taborder taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard wrapsizer xrc clean: -if exist .\*.obj del .\*.obj @@ -254,6 +254,10 @@ clean: @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>render.bat call render.bat @del render.bat + @echo cd ribbon >ribbon.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>ribbon.bat + call ribbon.bat + @del ribbon.bat @echo cd richtext >richtext.bat @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>richtext.bat call richtext.bat @@ -661,6 +665,12 @@ render: call render.bat @del render.bat +ribbon: + @echo cd ribbon >ribbon.bat + @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>ribbon.bat + call ribbon.bat + @del ribbon.bat + richtext: @echo cd richtext >richtext.bat @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>richtext.bat diff --git a/samples/makefile.gcc b/samples/makefile.gcc index 2766f36..f23543c 100644 --- a/samples/makefile.gcc +++ b/samples/makefile.gcc @@ -36,7 +36,7 @@ MAKEARGS = LINK_DLL_FLAGS="$(LINK_DLL_FLAGS)" \ ### Targets: ### -all: access animate artprov aui calendar caret clipboard collpane combo config console controls dataview dialogs dialup display dnd docview dragimag drawing erase event except exec font grid help htlbox html image internat ipc joytest keyboard layout listctrl mdi mediaplayer menu minimal nativdlg notebook oleauto opengl ownerdrw popup power printing propgrid regtest render richtext sashtest scroll shaped sockets sound splash splitter statbar stc svg taborder taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard wrapsizer xrc +all: access animate artprov aui calendar caret clipboard collpane combo config console controls dataview dialogs dialup display dnd docview dragimag drawing erase event except exec font grid help htlbox html image internat ipc joytest keyboard layout listctrl mdi mediaplayer menu minimal nativdlg notebook oleauto opengl ownerdrw popup power printing propgrid regtest render ribbon richtext sashtest scroll shaped sockets sound splash splitter statbar stc svg taborder taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard wrapsizer xrc clean: -if exist .\*.o del .\*.o @@ -92,6 +92,7 @@ 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 ribbon -f makefile.gcc $(MAKEARGS) clean $(MAKE) -C richtext -f makefile.gcc $(MAKEARGS) clean $(MAKE) -C sashtest -f makefile.gcc $(MAKEARGS) clean $(MAKE) -C scroll -f makefile.gcc $(MAKEARGS) clean @@ -271,6 +272,9 @@ regtest: render: $(MAKE) -C render -f makefile.gcc $(MAKEARGS) all +ribbon: + $(MAKE) -C ribbon -f makefile.gcc $(MAKEARGS) all + richtext: $(MAKE) -C richtext -f makefile.gcc $(MAKEARGS) all @@ -350,10 +354,10 @@ memcheck: config console controls dataview dialogs dialup display dnd docview dragimag \ drawing erase event except exec font grid help htlbox html image internat ipc joytest \ keyboard layout listctrl mdi mediaplayer menu minimal nativdlg notebook oleauto \ - opengl ownerdrw popup power printing propgrid regtest render richtext sashtest \ - scroll shaped sockets sound splash splitter statbar stc svg taborder taskbar text \ - thread toolbar treectrl typetest validate vscroll widgets wizard wrapsizer xrc \ - memcheck + opengl ownerdrw popup power printing propgrid regtest render ribbon richtext \ + sashtest scroll shaped sockets sound splash splitter statbar stc svg taborder \ + taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard \ + wrapsizer xrc memcheck SHELL := $(COMSPEC) diff --git a/samples/makefile.vc b/samples/makefile.vc index 5626428..13093d2 100644 --- a/samples/makefile.vc +++ b/samples/makefile.vc @@ -35,7 +35,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_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_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 +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 clean: -if exist .\*.obj del .\*.obj @@ -194,6 +194,9 @@ clean: cd render $(MAKE) -f makefile.vc $(MAKEARGS) clean cd "$(MAKEDIR)" + cd ribbon + $(MAKE) -f makefile.vc $(MAKEARGS) clean + cd "$(MAKEDIR)" cd richtext $(MAKE) -f makefile.vc $(MAKEARGS) clean cd "$(MAKEDIR)" @@ -531,6 +534,11 @@ sub_render: $(MAKE) -f makefile.vc $(MAKEARGS) all cd "$(MAKEDIR)" +sub_ribbon: + cd ribbon + $(MAKE) -f makefile.vc $(MAKEARGS) all + cd "$(MAKEDIR)" + sub_richtext: cd richtext $(MAKE) -f makefile.vc $(MAKEARGS) all diff --git a/samples/makefile.wat b/samples/makefile.wat index 20fcc8e..66b40a3 100644 --- a/samples/makefile.wat +++ b/samples/makefile.wat @@ -53,7 +53,7 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" & ### Targets: ### -all : .SYMBOLIC access animate artprov aui calendar caret clipboard collpane combo config console controls dataview dialogs dialup display dnd docview dragimag drawing erase event except exec font grid help htlbox html image internat ipc joytest keyboard layout listctrl mdi mediaplayer menu minimal nativdlg notebook oleauto opengl ownerdrw popup power printing propgrid regtest render richtext sashtest scroll shaped sockets sound splash splitter statbar stc svg taborder taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard wrapsizer xrc +all : .SYMBOLIC access animate artprov aui calendar caret clipboard collpane combo config console controls dataview dialogs dialup display dnd docview dragimag drawing erase event except exec font grid help htlbox html image internat ipc joytest keyboard layout listctrl mdi mediaplayer menu minimal nativdlg notebook oleauto opengl ownerdrw popup power printing propgrid regtest render ribbon richtext sashtest scroll shaped sockets sound splash splitter statbar stc svg taborder taskbar text thread toolbar treectrl typetest validate vscroll widgets wizard wrapsizer xrc clean : .SYMBOLIC -if exist .\*.obj del .\*.obj @@ -214,6 +214,9 @@ clean : .SYMBOLIC cd render wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean cd $(WATCOM_CWD) + cd ribbon + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean + cd $(WATCOM_CWD) cd richtext wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean cd $(WATCOM_CWD) @@ -545,6 +548,11 @@ render : .SYMBOLIC wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all cd $(WATCOM_CWD) +ribbon : .SYMBOLIC + cd ribbon + wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all + cd $(WATCOM_CWD) + richtext : .SYMBOLIC cd richtext wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all diff --git a/samples/samples.bkl b/samples/samples.bkl index a8c41e5..82cd147 100644 --- a/samples/samples.bkl +++ b/samples/samples.bkl @@ -64,6 +64,7 @@ + diff --git a/samples/samples.dsw b/samples/samples.dsw index b64347d..b628717 100644 --- a/samples/samples.dsw +++ b/samples/samples.dsw @@ -639,6 +639,18 @@ Package=<4> ############################################################################### +Project: "ribbon"=.\ribbon\ribbon.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + Project: "richtext"=.\richtext\richtext.dsp - Package Owner=<4> Package=<5> -- 2.7.4