diff --git a/samples/makefile.bcc b/samples/makefile.bcc index b9b51034a9..32064c34ca 100644 --- a/samples/makefile.bcc +++ b/samples/makefile.bcc @@ -41,11 +41,50 @@ MAKEARGS = -DCC="$(CC)" -DCXX="$(CXX)" -DCFLAGS="$(CFLAGS)" \ ### Conditionally set variables: ### +!if "$(USE_HTML)" == "1" +__aui___depname = aui +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__except___depname = except +!endif +!if "$(USE_HTML)" == "1" +__help___depname = help +!endif +!if "$(USE_HTML)" == "1" +__htlbox___depname = htlbox +!endif +!if "$(USE_HTML)" == "1" +__html___depname = html +!endif +!if "$(USE_MEDIA)" == "1" +__mediaplayer___depname = mediaplayer +!endif +!if "$(USE_PROPGRID)" == "1" +__propgrid___depname = propgrid +!endif +!if "$(USE_RIBBON)" == "1" +__ribbon___depname = ribbon +!endif +!if "$(USE_HTML)" == "1" && "$(USE_RICHTEXT)" == "1" +__richtext___depname = richtext +!endif +!if "$(USE_MEDIA)" == "1" +__splash___depname = splash +!endif +!if "$(USE_STC)" == "1" +__stc___depname = stc +!endif +!if "$(USE_STC)" == "1" +__webview___depname = webview +!endif +!if "$(USE_HTML)" == "1" && "$(USE_RIBBON)" == "1" +__xrc___depname = xrc +!endif ### Targets: ### -all: access animate artprov aui calendar caret clipboard collpane combo config console dataview dialogs dialup display dll 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 preferences printing propgrid regtest render ribbon richtext sashtest scroll secretstore shaped sockets sound splash splitter statbar stc svg taborder taskbar text thread toolbar treectrl typetest uiaction validate vscroll webview widgets wizard wrapsizer xrc +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___depname) svg taborder taskbar text thread toolbar treectrl typetest uiaction validate vscroll $(__webview___depname) widgets wizard wrapsizer $(__xrc___depname) clean: -if exist .\*.obj del .\*.obj @@ -394,11 +433,13 @@ artprov: call artprov.bat @del artprov.bat +!if "$(USE_HTML)" == "1" aui: @echo cd aui >aui.bat @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>aui.bat call aui.bat @del aui.bat +!endif calendar: @echo cd calendar >calendar.bat @@ -508,11 +549,13 @@ event: call event.bat @del event.bat +!if "$(USE_EXCEPTIONS)" == "1" except: @echo cd except >except.bat @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>except.bat call except.bat @del except.bat +!endif exec: @echo cd exec >exec.bat @@ -532,23 +575,29 @@ grid: call grid.bat @del grid.bat +!if "$(USE_HTML)" == "1" help: @echo cd help >help.bat @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>help.bat call help.bat @del help.bat +!endif +!if "$(USE_HTML)" == "1" htlbox: @echo cd htlbox >htlbox.bat @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>htlbox.bat call htlbox.bat @del htlbox.bat +!endif +!if "$(USE_HTML)" == "1" html: @echo cd html >html.bat @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>html.bat call html.bat @del html.bat +!endif image: @echo cd image >image.bat @@ -598,11 +647,13 @@ mdi: call mdi.bat @del mdi.bat +!if "$(USE_MEDIA)" == "1" mediaplayer: @echo cd mediaplayer >mediaplayer.bat @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>mediaplayer.bat call mediaplayer.bat @del mediaplayer.bat +!endif menu: @echo cd menu >menu.bat @@ -670,11 +721,13 @@ printing: call printing.bat @del printing.bat +!if "$(USE_PROPGRID)" == "1" propgrid: @echo cd propgrid >propgrid.bat @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>propgrid.bat call propgrid.bat @del propgrid.bat +!endif regtest: @echo cd regtest >regtest.bat @@ -688,17 +741,21 @@ 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" && "$(USE_RICHTEXT)" == "1" richtext: @echo cd richtext >richtext.bat @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>richtext.bat call richtext.bat @del richtext.bat +!endif sashtest: @echo cd sashtest >sashtest.bat @@ -736,11 +793,13 @@ sound: call sound.bat @del sound.bat +!if "$(USE_MEDIA)" == "1" splash: @echo cd splash >splash.bat @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>splash.bat call splash.bat @del splash.bat +!endif splitter: @echo cd splitter >splitter.bat @@ -754,11 +813,13 @@ statbar: call statbar.bat @del statbar.bat +!if "$(USE_STC)" == "1" stc: @echo cd stc >stc.bat @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>stc.bat call stc.bat @del stc.bat +!endif svg: @echo cd svg >svg.bat @@ -826,11 +887,13 @@ vscroll: call vscroll.bat @del vscroll.bat +!if "$(USE_STC)" == "1" webview: @echo cd webview >webview.bat @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>webview.bat call webview.bat @del webview.bat +!endif widgets: @echo cd widgets >widgets.bat @@ -850,11 +913,13 @@ wrapsizer: call wrapsizer.bat @del wrapsizer.bat +!if "$(USE_HTML)" == "1" && "$(USE_RIBBON)" == "1" xrc: @echo cd xrc >xrc.bat @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>xrc.bat call xrc.bat @del xrc.bat +!endif memcheck: @echo cd memcheck >memcheck.bat diff --git a/samples/makefile.gcc b/samples/makefile.gcc index 0fece64440..6724cc805a 100644 --- a/samples/makefile.gcc +++ b/samples/makefile.gcc @@ -34,11 +34,54 @@ MAKEARGS = LINK_DLL_FLAGS="$(LINK_DLL_FLAGS)" \ ### Conditionally set variables: ### +ifeq ($(USE_HTML),1) +__aui___depname = aui +endif +ifeq ($(USE_EXCEPTIONS),1) +__except___depname = except +endif +ifeq ($(USE_HTML),1) +__help___depname = help +endif +ifeq ($(USE_HTML),1) +__htlbox___depname = htlbox +endif +ifeq ($(USE_HTML),1) +__html___depname = html +endif +ifeq ($(USE_MEDIA),1) +__mediaplayer___depname = mediaplayer +endif +ifeq ($(USE_PROPGRID),1) +__propgrid___depname = propgrid +endif +ifeq ($(USE_RIBBON),1) +__ribbon___depname = ribbon +endif +ifeq ($(USE_HTML),1) +ifeq ($(USE_RICHTEXT),1) +__richtext___depname = richtext +endif +endif +ifeq ($(USE_MEDIA),1) +__splash___depname = splash +endif +ifeq ($(USE_STC),1) +__stc___depname = stc +endif +ifeq ($(USE_STC),1) +__webview___depname = webview +endif +ifeq ($(USE_HTML),1) +ifeq ($(USE_RIBBON),1) +__xrc___depname = xrc +endif +endif ### Targets: ### -all: access animate artprov aui calendar caret clipboard collpane combo config console dataview dialogs dialup display dll 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 preferences printing propgrid regtest render ribbon richtext sashtest scroll secretstore shaped sockets sound splash splitter statbar stc svg taborder taskbar text thread toolbar treectrl typetest uiaction validate vscroll webview widgets wizard wrapsizer xrc +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___depname) svg taborder taskbar text thread toolbar treectrl typetest uiaction validate vscroll $(__webview___depname) widgets wizard wrapsizer $(__xrc___depname) clean: -if exist .\*.o del .\*.o @@ -134,8 +177,10 @@ animate: artprov: $(MAKE) -C artprov -f makefile.gcc $(MAKEARGS) all +ifeq ($(USE_HTML),1) aui: $(MAKE) -C aui -f makefile.gcc $(MAKEARGS) all +endif calendar: $(MAKE) -C calendar -f makefile.gcc $(MAKEARGS) all @@ -191,8 +236,10 @@ erase: event: $(MAKE) -C event -f makefile.gcc $(MAKEARGS) all +ifeq ($(USE_EXCEPTIONS),1) except: $(MAKE) -C except -f makefile.gcc $(MAKEARGS) all +endif exec: $(MAKE) -C exec -f makefile.gcc $(MAKEARGS) all @@ -203,14 +250,20 @@ font: grid: $(MAKE) -C grid -f makefile.gcc $(MAKEARGS) all +ifeq ($(USE_HTML),1) help: $(MAKE) -C help -f makefile.gcc $(MAKEARGS) all +endif +ifeq ($(USE_HTML),1) htlbox: $(MAKE) -C htlbox -f makefile.gcc $(MAKEARGS) all +endif +ifeq ($(USE_HTML),1) html: $(MAKE) -C html -f makefile.gcc $(MAKEARGS) all +endif image: $(MAKE) -C image -f makefile.gcc $(MAKEARGS) all @@ -236,8 +289,10 @@ listctrl: mdi: $(MAKE) -C mdi -f makefile.gcc $(MAKEARGS) all +ifeq ($(USE_MEDIA),1) mediaplayer: $(MAKE) -C mediaplayer -f makefile.gcc $(MAKEARGS) all +endif menu: $(MAKE) -C menu -f makefile.gcc $(MAKEARGS) all @@ -272,8 +327,10 @@ preferences: printing: $(MAKE) -C printing -f makefile.gcc $(MAKEARGS) all +ifeq ($(USE_PROPGRID),1) propgrid: $(MAKE) -C propgrid -f makefile.gcc $(MAKEARGS) all +endif regtest: $(MAKE) -C regtest -f makefile.gcc $(MAKEARGS) all @@ -281,11 +338,17 @@ 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) +ifeq ($(USE_RICHTEXT),1) richtext: $(MAKE) -C richtext -f makefile.gcc $(MAKEARGS) all +endif +endif sashtest: $(MAKE) -C sashtest -f makefile.gcc $(MAKEARGS) all @@ -305,8 +368,10 @@ sockets: sound: $(MAKE) -C sound -f makefile.gcc $(MAKEARGS) all +ifeq ($(USE_MEDIA),1) splash: $(MAKE) -C splash -f makefile.gcc $(MAKEARGS) all +endif splitter: $(MAKE) -C splitter -f makefile.gcc $(MAKEARGS) all @@ -314,8 +379,10 @@ splitter: statbar: $(MAKE) -C statbar -f makefile.gcc $(MAKEARGS) all +ifeq ($(USE_STC),1) stc: $(MAKE) -C stc -f makefile.gcc $(MAKEARGS) all +endif svg: $(MAKE) -C svg -f makefile.gcc $(MAKEARGS) all @@ -350,8 +417,10 @@ validate: vscroll: $(MAKE) -C vscroll -f makefile.gcc $(MAKEARGS) all +ifeq ($(USE_STC),1) webview: $(MAKE) -C webview -f makefile.gcc $(MAKEARGS) all +endif widgets: $(MAKE) -C widgets -f makefile.gcc $(MAKEARGS) all @@ -362,8 +431,12 @@ wizard: 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 df4fea0351..08bee2e064 100644 --- a/samples/makefile.vc +++ b/samples/makefile.vc @@ -32,11 +32,50 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \ ### Conditionally set variables: ### +!if "$(USE_HTML)" == "1" +__aui___depname = sub_aui +!endif +!if "$(USE_EXCEPTIONS)" == "1" +__except___depname = sub_except +!endif +!if "$(USE_HTML)" == "1" +__help___depname = sub_help +!endif +!if "$(USE_HTML)" == "1" +__htlbox___depname = sub_htlbox +!endif +!if "$(USE_HTML)" == "1" +__html___depname = sub_html +!endif +!if "$(USE_MEDIA)" == "1" +__mediaplayer___depname = sub_mediaplayer +!endif +!if "$(USE_PROPGRID)" == "1" +__propgrid___depname = sub_propgrid +!endif +!if "$(USE_RIBBON)" == "1" +__ribbon___depname = sub_ribbon +!endif +!if "$(USE_HTML)" == "1" && "$(USE_RICHTEXT)" == "1" +__richtext___depname = sub_richtext +!endif +!if "$(USE_MEDIA)" == "1" +__splash___depname = sub_splash +!endif +!if "$(USE_STC)" == "1" +__stc___depname = sub_stc +!endif +!if "$(USE_STC)" == "1" +__webview___depname = sub_webview +!endif +!if "$(USE_HTML)" == "1" && "$(USE_RIBBON)" == "1" +__xrc___depname = sub_xrc +!endif ### 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_dataview sub_dialogs sub_dialup sub_display sub_dll 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_preferences sub_printing sub_propgrid sub_regtest sub_render sub_ribbon sub_richtext sub_sashtest sub_scroll sub_secretstore 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_uiaction sub_validate sub_vscroll sub_webview sub_widgets sub_wizard sub_wrapsizer sub_xrc +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 $(__stc___depname) sub_svg sub_taborder sub_taskbar sub_text sub_thread sub_toolbar sub_treectrl sub_typetest sub_uiaction sub_validate sub_vscroll $(__webview___depname) sub_widgets sub_wizard sub_wrapsizer $(__xrc___depname) clean: -if exist .\*.obj del .\*.obj @@ -307,10 +346,12 @@ sub_artprov: $(MAKE) -f makefile.vc $(MAKEARGS) all cd "$(MAKEDIR)" +!if "$(USE_HTML)" == "1" sub_aui: cd aui $(MAKE) -f makefile.vc $(MAKEARGS) all cd "$(MAKEDIR)" +!endif sub_calendar: cd calendar @@ -402,10 +443,12 @@ sub_event: $(MAKE) -f makefile.vc $(MAKEARGS) all cd "$(MAKEDIR)" +!if "$(USE_EXCEPTIONS)" == "1" sub_except: cd except $(MAKE) -f makefile.vc $(MAKEARGS) all cd "$(MAKEDIR)" +!endif sub_exec: cd exec @@ -422,20 +465,26 @@ sub_grid: $(MAKE) -f makefile.vc $(MAKEARGS) all cd "$(MAKEDIR)" +!if "$(USE_HTML)" == "1" sub_help: cd help $(MAKE) -f makefile.vc $(MAKEARGS) all cd "$(MAKEDIR)" +!endif +!if "$(USE_HTML)" == "1" sub_htlbox: cd htlbox $(MAKE) -f makefile.vc $(MAKEARGS) all cd "$(MAKEDIR)" +!endif +!if "$(USE_HTML)" == "1" sub_html: cd html $(MAKE) -f makefile.vc $(MAKEARGS) all cd "$(MAKEDIR)" +!endif sub_image: cd image @@ -477,10 +526,12 @@ sub_mdi: $(MAKE) -f makefile.vc $(MAKEARGS) all cd "$(MAKEDIR)" +!if "$(USE_MEDIA)" == "1" sub_mediaplayer: cd mediaplayer $(MAKE) -f makefile.vc $(MAKEARGS) all cd "$(MAKEDIR)" +!endif sub_menu: cd menu @@ -537,10 +588,12 @@ sub_printing: $(MAKE) -f makefile.vc $(MAKEARGS) all cd "$(MAKEDIR)" +!if "$(USE_PROPGRID)" == "1" sub_propgrid: cd propgrid $(MAKE) -f makefile.vc $(MAKEARGS) all cd "$(MAKEDIR)" +!endif sub_regtest: cd regtest @@ -552,15 +605,19 @@ 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" && "$(USE_RICHTEXT)" == "1" sub_richtext: cd richtext $(MAKE) -f makefile.vc $(MAKEARGS) all cd "$(MAKEDIR)" +!endif sub_sashtest: cd sashtest @@ -592,10 +649,12 @@ sub_sound: $(MAKE) -f makefile.vc $(MAKEARGS) all cd "$(MAKEDIR)" +!if "$(USE_MEDIA)" == "1" sub_splash: cd splash $(MAKE) -f makefile.vc $(MAKEARGS) all cd "$(MAKEDIR)" +!endif sub_splitter: cd splitter @@ -607,10 +666,12 @@ sub_statbar: $(MAKE) -f makefile.vc $(MAKEARGS) all cd "$(MAKEDIR)" +!if "$(USE_STC)" == "1" sub_stc: cd stc $(MAKE) -f makefile.vc $(MAKEARGS) all cd "$(MAKEDIR)" +!endif sub_svg: cd svg @@ -667,10 +728,12 @@ sub_vscroll: $(MAKE) -f makefile.vc $(MAKEARGS) all cd "$(MAKEDIR)" +!if "$(USE_STC)" == "1" sub_webview: cd webview $(MAKE) -f makefile.vc $(MAKEARGS) all cd "$(MAKEDIR)" +!endif sub_widgets: cd widgets @@ -687,10 +750,12 @@ sub_wrapsizer: $(MAKE) -f makefile.vc $(MAKEARGS) all cd "$(MAKEDIR)" +!if "$(USE_HTML)" == "1" && "$(USE_RIBBON)" == "1" sub_xrc: cd xrc $(MAKE) -f makefile.vc $(MAKEARGS) all cd "$(MAKEDIR)" +!endif sub_flash: cd flash diff --git a/samples/samples.bkl b/samples/samples.bkl index d6b6909a1a..b87921a8eb 100644 --- a/samples/samples.bkl +++ b/samples/samples.bkl @@ -15,7 +15,7 @@ - + @@ -34,13 +34,13 @@ - + - - - + + + @@ -49,7 +49,7 @@ - + @@ -61,21 +61,21 @@ - + - - + + - + - + @@ -87,11 +87,11 @@ - + - +