diff --git a/samples/makefile.bcc b/samples/makefile.bcc index 7769688541..cfa4b5ec8b 100644 --- a/samples/makefile.bcc +++ b/samples/makefile.bcc @@ -62,20 +62,23 @@ __mediaplayer___depname = mediaplayer !if "$(USE_PROPGRID)" == "1" __propgrid___depname = propgrid !endif +!if "$(USE_RIBBON)" == "1" +__ribbon___depname = ribbon +!endif !if "$(USE_HTML)" == "1" __richtext___depname = richtext !endif !if "$(USE_MEDIA)" == "1" __splash___depname = splash !endif -!if "$(USE_HTML)" == "1" +!if "$(USE_HTML)" == "1" && "$(USE_RIBBON)" == "1" __xrc___depname = xrc !endif ### Targets: ### -all: access animate artprov $(__aui___depname) calendar caret clipboard collpane combo config console dataview dialogs dialup display dll dnd docview dragimag drawing erase event $(__except___depname) exec font grid $(__help___depname) $(__htlbox___depname) $(__html___depname) image internat ipc joytest keyboard layout listctrl mdi $(__mediaplayer___depname) menu minimal nativdlg notebook oleauto opengl ownerdrw popup power preferences printing $(__propgrid___depname) regtest render ribbon $(__richtext___depname) sashtest scroll secretstore shaped sockets sound $(__splash___depname) splitter statbar stc svg taborder taskbar text thread toolbar treectrl typetest uiaction validate vscroll webview widgets wizard wrapsizer $(__xrc___depname) +all: access animate artprov $(__aui___depname) calendar caret clipboard collpane combo config console dataview dialogs dialup display dll dnd docview dragimag drawing erase event $(__except___depname) exec font grid $(__help___depname) $(__htlbox___depname) $(__html___depname) image internat ipc joytest keyboard layout listctrl mdi $(__mediaplayer___depname) menu minimal nativdlg notebook oleauto opengl ownerdrw popup power preferences printing $(__propgrid___depname) regtest render $(__ribbon___depname) $(__richtext___depname) sashtest scroll secretstore shaped sockets sound $(__splash___depname) splitter statbar stc svg taborder taskbar text thread toolbar treectrl typetest uiaction validate vscroll webview widgets wizard wrapsizer $(__xrc___depname) clean: -if exist .\*.obj del .\*.obj @@ -732,11 +735,13 @@ render: call render.bat @del render.bat +!if "$(USE_RIBBON)" == "1" ribbon: @echo cd ribbon >ribbon.bat @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>ribbon.bat call ribbon.bat @del ribbon.bat +!endif !if "$(USE_HTML)" == "1" richtext: @@ -898,7 +903,7 @@ wrapsizer: call wrapsizer.bat @del wrapsizer.bat -!if "$(USE_HTML)" == "1" +!if "$(USE_HTML)" == "1" && "$(USE_RIBBON)" == "1" xrc: @echo cd xrc >xrc.bat @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>xrc.bat diff --git a/samples/makefile.gcc b/samples/makefile.gcc index bacbe5b3b9..61dca8f853 100644 --- a/samples/makefile.gcc +++ b/samples/makefile.gcc @@ -55,6 +55,9 @@ endif ifeq ($(USE_PROPGRID),1) __propgrid___depname = propgrid endif +ifeq ($(USE_RIBBON),1) +__ribbon___depname = ribbon +endif ifeq ($(USE_HTML),1) __richtext___depname = richtext endif @@ -62,13 +65,15 @@ ifeq ($(USE_MEDIA),1) __splash___depname = splash endif ifeq ($(USE_HTML),1) +ifeq ($(USE_RIBBON),1) __xrc___depname = xrc endif +endif ### Targets: ### -all: access animate artprov $(__aui___depname) calendar caret clipboard collpane combo config console dataview dialogs dialup display dll dnd docview dragimag drawing erase event $(__except___depname) exec font grid $(__help___depname) $(__htlbox___depname) $(__html___depname) image internat ipc joytest keyboard layout listctrl mdi $(__mediaplayer___depname) menu minimal nativdlg notebook oleauto opengl ownerdrw popup power preferences printing $(__propgrid___depname) regtest render ribbon $(__richtext___depname) sashtest scroll secretstore shaped sockets sound $(__splash___depname) splitter statbar stc svg taborder taskbar text thread toolbar treectrl typetest uiaction validate vscroll webview widgets wizard wrapsizer $(__xrc___depname) +all: access animate artprov $(__aui___depname) calendar caret clipboard collpane combo config console dataview dialogs dialup display dll dnd docview dragimag drawing erase event $(__except___depname) exec font grid $(__help___depname) $(__htlbox___depname) $(__html___depname) image internat ipc joytest keyboard layout listctrl mdi $(__mediaplayer___depname) menu minimal nativdlg notebook oleauto opengl ownerdrw popup power preferences printing $(__propgrid___depname) regtest render $(__ribbon___depname) $(__richtext___depname) sashtest scroll secretstore shaped sockets sound $(__splash___depname) splitter statbar stc svg taborder taskbar text thread toolbar treectrl typetest uiaction validate vscroll webview widgets wizard wrapsizer $(__xrc___depname) clean: -if exist .\*.o del .\*.o @@ -325,8 +330,10 @@ regtest: render: $(MAKE) -C render -f makefile.gcc $(MAKEARGS) all +ifeq ($(USE_RIBBON),1) ribbon: $(MAKE) -C ribbon -f makefile.gcc $(MAKEARGS) all +endif ifeq ($(USE_HTML),1) richtext: @@ -411,9 +418,11 @@ wrapsizer: $(MAKE) -C wrapsizer -f makefile.gcc $(MAKEARGS) all ifeq ($(USE_HTML),1) +ifeq ($(USE_RIBBON),1) xrc: $(MAKE) -C xrc -f makefile.gcc $(MAKEARGS) all endif +endif memcheck: $(MAKE) -C memcheck -f makefile.gcc $(MAKEARGS) all diff --git a/samples/makefile.vc b/samples/makefile.vc index 4ab6935ece..ec579b6054 100644 --- a/samples/makefile.vc +++ b/samples/makefile.vc @@ -53,20 +53,23 @@ __mediaplayer___depname = sub_mediaplayer !if "$(USE_PROPGRID)" == "1" __propgrid___depname = sub_propgrid !endif +!if "$(USE_RIBBON)" == "1" +__ribbon___depname = sub_ribbon +!endif !if "$(USE_HTML)" == "1" __richtext___depname = sub_richtext !endif !if "$(USE_MEDIA)" == "1" __splash___depname = sub_splash !endif -!if "$(USE_HTML)" == "1" +!if "$(USE_HTML)" == "1" && "$(USE_RIBBON)" == "1" __xrc___depname = sub_xrc !endif ### Targets: ### -all: sub_access sub_animate sub_artprov $(__aui___depname) sub_calendar sub_caret sub_clipboard sub_collpane sub_combo sub_config sub_console sub_dataview sub_dialogs sub_dialup sub_display sub_dll sub_dnd sub_docview sub_dragimag sub_drawing sub_erase sub_event $(__except___depname) sub_exec sub_font sub_grid $(__help___depname) $(__htlbox___depname) $(__html___depname) sub_image sub_internat sub_ipc sub_joytest sub_keyboard sub_layout sub_listctrl sub_mdi $(__mediaplayer___depname) sub_menu sub_minimal sub_nativdlg sub_notebook sub_oleauto sub_opengl sub_ownerdrw sub_popup sub_power sub_preferences sub_printing $(__propgrid___depname) sub_regtest sub_render sub_ribbon $(__richtext___depname) sub_sashtest sub_scroll sub_secretstore sub_shaped sub_sockets sub_sound $(__splash___depname) 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_webview sub_widgets sub_wizard sub_wrapsizer $(__xrc___depname) +all: sub_access sub_animate sub_artprov $(__aui___depname) sub_calendar sub_caret sub_clipboard sub_collpane sub_combo sub_config sub_console sub_dataview sub_dialogs sub_dialup sub_display sub_dll sub_dnd sub_docview sub_dragimag sub_drawing sub_erase sub_event $(__except___depname) sub_exec sub_font sub_grid $(__help___depname) $(__htlbox___depname) $(__html___depname) sub_image sub_internat sub_ipc sub_joytest sub_keyboard sub_layout sub_listctrl sub_mdi $(__mediaplayer___depname) sub_menu sub_minimal sub_nativdlg sub_notebook sub_oleauto sub_opengl sub_ownerdrw sub_popup sub_power sub_preferences sub_printing $(__propgrid___depname) sub_regtest sub_render $(__ribbon___depname) $(__richtext___depname) sub_sashtest sub_scroll sub_secretstore sub_shaped sub_sockets sub_sound $(__splash___depname) 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_webview sub_widgets sub_wizard sub_wrapsizer $(__xrc___depname) clean: -if exist .\*.obj del .\*.obj @@ -596,10 +599,12 @@ sub_render: $(MAKE) -f makefile.vc $(MAKEARGS) all cd "$(MAKEDIR)" +!if "$(USE_RIBBON)" == "1" sub_ribbon: cd ribbon $(MAKE) -f makefile.vc $(MAKEARGS) all cd "$(MAKEDIR)" +!endif !if "$(USE_HTML)" == "1" sub_richtext: @@ -735,7 +740,7 @@ sub_wrapsizer: $(MAKE) -f makefile.vc $(MAKEARGS) all cd "$(MAKEDIR)" -!if "$(USE_HTML)" == "1" +!if "$(USE_HTML)" == "1" && "$(USE_RIBBON)" == "1" sub_xrc: cd xrc $(MAKE) -f makefile.vc $(MAKEARGS) all diff --git a/samples/samples.bkl b/samples/samples.bkl index 48c347ddba..a2b44759b5 100644 --- a/samples/samples.bkl +++ b/samples/samples.bkl @@ -64,7 +64,7 @@ - + @@ -91,7 +91,7 @@ - +