Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't build samples not supported in current wxMSW build

Browse Source 
Fix certain samples being compiled when they shouldn't because the
corresponding feature was disabled when building the library.
This commit is contained in:
VZ
2017-02-27 23:17:37 +01:00
committed by GitHub
parent ab5312c8d2 779276d854
commit aaa31b121c
4 changed files with 219 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
samples/makefile.bcc
View File

@@ -41,11 +41,50 @@ MAKEARGS = -DCC="$(CC)" -DCXX="$(CXX)" -DCFLAGS="$(CFLAGS)" \
### Conditionally set variables: ### ### 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: ### ### 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: clean:
-if exist .\*.obj del .\*.obj -if exist .\*.obj del .\*.obj
@@ -394,11 +433,13 @@ artprov:
call artprov.bat call artprov.bat
@del artprov.bat @del artprov.bat
!if "$(USE_HTML)" == "1"
aui: aui:
@echo cd aui >aui.bat @echo cd aui >aui.bat
@echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>aui.bat @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>aui.bat
call aui.bat call aui.bat
@del aui.bat @del aui.bat
!endif
calendar: calendar:
@echo cd calendar >calendar.bat @echo cd calendar >calendar.bat
@@ -508,11 +549,13 @@ event:
call event.bat call event.bat
@del event.bat @del event.bat
!if "$(USE_EXCEPTIONS)" == "1"
except: except:
@echo cd except >except.bat @echo cd except >except.bat
@echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>except.bat @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>except.bat
call except.bat call except.bat
@del except.bat @del except.bat
!endif
exec: exec:
@echo cd exec >exec.bat @echo cd exec >exec.bat
@@ -532,23 +575,29 @@ grid:
call grid.bat call grid.bat
@del grid.bat @del grid.bat
!if "$(USE_HTML)" == "1"
help: help:
@echo cd help >help.bat @echo cd help >help.bat
@echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>help.bat @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>help.bat
call help.bat call help.bat
@del help.bat @del help.bat
!endif
!if "$(USE_HTML)" == "1"
htlbox: htlbox:
@echo cd htlbox >htlbox.bat @echo cd htlbox >htlbox.bat
@echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>htlbox.bat @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>htlbox.bat
call htlbox.bat call htlbox.bat
@del htlbox.bat @del htlbox.bat
!endif
!if "$(USE_HTML)" == "1"
html: html:
@echo cd html >html.bat @echo cd html >html.bat
@echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>html.bat @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>html.bat
call html.bat call html.bat
@del html.bat @del html.bat
!endif
image: image:
@echo cd image >image.bat @echo cd image >image.bat
@@ -598,11 +647,13 @@ mdi:
call mdi.bat call mdi.bat
@del mdi.bat @del mdi.bat
!if "$(USE_MEDIA)" == "1"
mediaplayer: mediaplayer:
@echo cd mediaplayer >mediaplayer.bat @echo cd mediaplayer >mediaplayer.bat
@echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>mediaplayer.bat @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>mediaplayer.bat
call mediaplayer.bat call mediaplayer.bat
@del mediaplayer.bat @del mediaplayer.bat
!endif
menu: menu:
@echo cd menu >menu.bat @echo cd menu >menu.bat
@@ -670,11 +721,13 @@ printing:
call printing.bat call printing.bat
@del printing.bat @del printing.bat
!if "$(USE_PROPGRID)" == "1"
propgrid: propgrid:
@echo cd propgrid >propgrid.bat @echo cd propgrid >propgrid.bat
@echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>propgrid.bat @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>propgrid.bat
call propgrid.bat call propgrid.bat
@del propgrid.bat @del propgrid.bat
!endif
regtest: regtest:
@echo cd regtest >regtest.bat @echo cd regtest >regtest.bat
@@ -688,17 +741,21 @@ render:
call render.bat call render.bat
@del render.bat @del render.bat
!if "$(USE_RIBBON)" == "1"
ribbon: ribbon:
@echo cd ribbon >ribbon.bat @echo cd ribbon >ribbon.bat
@echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>ribbon.bat @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>ribbon.bat
call ribbon.bat call ribbon.bat
@del ribbon.bat @del ribbon.bat
!endif
!if "$(USE_HTML)" == "1" && "$(USE_RICHTEXT)" == "1"
richtext: richtext:
@echo cd richtext >richtext.bat @echo cd richtext >richtext.bat
@echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>richtext.bat @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>richtext.bat
call richtext.bat call richtext.bat
@del richtext.bat @del richtext.bat
!endif
sashtest: sashtest:
@echo cd sashtest >sashtest.bat @echo cd sashtest >sashtest.bat
@@ -736,11 +793,13 @@ sound:
call sound.bat call sound.bat
@del sound.bat @del sound.bat
!if "$(USE_MEDIA)" == "1"
splash: splash:
@echo cd splash >splash.bat @echo cd splash >splash.bat
@echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>splash.bat @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>splash.bat
call splash.bat call splash.bat
@del splash.bat @del splash.bat
!endif
splitter: splitter:
@echo cd splitter >splitter.bat @echo cd splitter >splitter.bat
@@ -754,11 +813,13 @@ statbar:
call statbar.bat call statbar.bat
@del statbar.bat @del statbar.bat
!if "$(USE_STC)" == "1"
stc: stc:
@echo cd stc >stc.bat @echo cd stc >stc.bat
@echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>stc.bat @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>stc.bat
call stc.bat call stc.bat
@del stc.bat @del stc.bat
!endif
svg: svg:
@echo cd svg >svg.bat @echo cd svg >svg.bat
@@ -826,11 +887,13 @@ vscroll:
call vscroll.bat call vscroll.bat
@del vscroll.bat @del vscroll.bat
!if "$(USE_STC)" == "1"
webview: webview:
@echo cd webview >webview.bat @echo cd webview >webview.bat
@echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>webview.bat @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>webview.bat
call webview.bat call webview.bat
@del webview.bat @del webview.bat
!endif
widgets: widgets:
@echo cd widgets >widgets.bat @echo cd widgets >widgets.bat
@@ -850,11 +913,13 @@ wrapsizer:
call wrapsizer.bat call wrapsizer.bat
@del wrapsizer.bat @del wrapsizer.bat
!if "$(USE_HTML)" == "1" && "$(USE_RIBBON)" == "1"
xrc: xrc:
@echo cd xrc >xrc.bat @echo cd xrc >xrc.bat
@echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>xrc.bat @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>xrc.bat
call xrc.bat call xrc.bat
@del xrc.bat @del xrc.bat
!endif
memcheck: memcheck:
@echo cd memcheck >memcheck.bat @echo cd memcheck >memcheck.bat

75
samples/makefile.gcc
View File

@@ -34,11 +34,54 @@ MAKEARGS = LINK_DLL_FLAGS="$(LINK_DLL_FLAGS)" \
### Conditionally set variables: ### ### 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: ### ### 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: clean:
-if exist .\*.o del .\*.o -if exist .\*.o del .\*.o
@@ -134,8 +177,10 @@ animate:
artprov: artprov:
$(MAKE) -C artprov -f makefile.gcc $(MAKEARGS) all $(MAKE) -C artprov -f makefile.gcc $(MAKEARGS) all
ifeq ($(USE_HTML),1)
aui: aui:
$(MAKE) -C aui -f makefile.gcc $(MAKEARGS) all $(MAKE) -C aui -f makefile.gcc $(MAKEARGS) all
endif
calendar: calendar:
$(MAKE) -C calendar -f makefile.gcc $(MAKEARGS) all $(MAKE) -C calendar -f makefile.gcc $(MAKEARGS) all
@@ -191,8 +236,10 @@ erase:
event: event:
$(MAKE) -C event -f makefile.gcc $(MAKEARGS) all $(MAKE) -C event -f makefile.gcc $(MAKEARGS) all
ifeq ($(USE_EXCEPTIONS),1)
except: except:
$(MAKE) -C except -f makefile.gcc $(MAKEARGS) all $(MAKE) -C except -f makefile.gcc $(MAKEARGS) all
endif
exec: exec:
$(MAKE) -C exec -f makefile.gcc $(MAKEARGS) all $(MAKE) -C exec -f makefile.gcc $(MAKEARGS) all
@@ -203,14 +250,20 @@ font:
grid: grid:
$(MAKE) -C grid -f makefile.gcc $(MAKEARGS) all $(MAKE) -C grid -f makefile.gcc $(MAKEARGS) all
ifeq ($(USE_HTML),1)
help: help:
$(MAKE) -C help -f makefile.gcc $(MAKEARGS) all $(MAKE) -C help -f makefile.gcc $(MAKEARGS) all
endif
ifeq ($(USE_HTML),1)
htlbox: htlbox:
$(MAKE) -C htlbox -f makefile.gcc $(MAKEARGS) all $(MAKE) -C htlbox -f makefile.gcc $(MAKEARGS) all
endif
ifeq ($(USE_HTML),1)
html: html:
$(MAKE) -C html -f makefile.gcc $(MAKEARGS) all $(MAKE) -C html -f makefile.gcc $(MAKEARGS) all
endif
image: image:
$(MAKE) -C image -f makefile.gcc $(MAKEARGS) all $(MAKE) -C image -f makefile.gcc $(MAKEARGS) all
@@ -236,8 +289,10 @@ listctrl:
mdi: mdi:
$(MAKE) -C mdi -f makefile.gcc $(MAKEARGS) all $(MAKE) -C mdi -f makefile.gcc $(MAKEARGS) all
ifeq ($(USE_MEDIA),1)
mediaplayer: mediaplayer:
$(MAKE) -C mediaplayer -f makefile.gcc $(MAKEARGS) all $(MAKE) -C mediaplayer -f makefile.gcc $(MAKEARGS) all
endif
menu: menu:
$(MAKE) -C menu -f makefile.gcc $(MAKEARGS) all $(MAKE) -C menu -f makefile.gcc $(MAKEARGS) all
@@ -272,8 +327,10 @@ preferences:
printing: printing:
$(MAKE) -C printing -f makefile.gcc $(MAKEARGS) all $(MAKE) -C printing -f makefile.gcc $(MAKEARGS) all
ifeq ($(USE_PROPGRID),1)
propgrid: propgrid:
$(MAKE) -C propgrid -f makefile.gcc $(MAKEARGS) all $(MAKE) -C propgrid -f makefile.gcc $(MAKEARGS) all
endif
regtest: regtest:
$(MAKE) -C regtest -f makefile.gcc $(MAKEARGS) all $(MAKE) -C regtest -f makefile.gcc $(MAKEARGS) all
@@ -281,11 +338,17 @@ regtest:
render: render:
$(MAKE) -C render -f makefile.gcc $(MAKEARGS) all $(MAKE) -C render -f makefile.gcc $(MAKEARGS) all
ifeq ($(USE_RIBBON),1)
ribbon: ribbon:
$(MAKE) -C ribbon -f makefile.gcc $(MAKEARGS) all $(MAKE) -C ribbon -f makefile.gcc $(MAKEARGS) all
endif
ifeq ($(USE_HTML),1)
ifeq ($(USE_RICHTEXT),1)
richtext: richtext:
$(MAKE) -C richtext -f makefile.gcc $(MAKEARGS) all $(MAKE) -C richtext -f makefile.gcc $(MAKEARGS) all
endif
endif
sashtest: sashtest:
$(MAKE) -C sashtest -f makefile.gcc $(MAKEARGS) all $(MAKE) -C sashtest -f makefile.gcc $(MAKEARGS) all
@@ -305,8 +368,10 @@ sockets:
sound: sound:
$(MAKE) -C sound -f makefile.gcc $(MAKEARGS) all $(MAKE) -C sound -f makefile.gcc $(MAKEARGS) all
ifeq ($(USE_MEDIA),1)
splash: splash:
$(MAKE) -C splash -f makefile.gcc $(MAKEARGS) all $(MAKE) -C splash -f makefile.gcc $(MAKEARGS) all
endif
splitter: splitter:
$(MAKE) -C splitter -f makefile.gcc $(MAKEARGS) all $(MAKE) -C splitter -f makefile.gcc $(MAKEARGS) all
@@ -314,8 +379,10 @@ splitter:
statbar: statbar:
$(MAKE) -C statbar -f makefile.gcc $(MAKEARGS) all $(MAKE) -C statbar -f makefile.gcc $(MAKEARGS) all
ifeq ($(USE_STC),1)
stc: stc:
$(MAKE) -C stc -f makefile.gcc $(MAKEARGS) all $(MAKE) -C stc -f makefile.gcc $(MAKEARGS) all
endif
svg: svg:
$(MAKE) -C svg -f makefile.gcc $(MAKEARGS) all $(MAKE) -C svg -f makefile.gcc $(MAKEARGS) all
@@ -350,8 +417,10 @@ validate:
vscroll: vscroll:
$(MAKE) -C vscroll -f makefile.gcc $(MAKEARGS) all $(MAKE) -C vscroll -f makefile.gcc $(MAKEARGS) all
ifeq ($(USE_STC),1)
webview: webview:
$(MAKE) -C webview -f makefile.gcc $(MAKEARGS) all $(MAKE) -C webview -f makefile.gcc $(MAKEARGS) all
endif
widgets: widgets:
$(MAKE) -C widgets -f makefile.gcc $(MAKEARGS) all $(MAKE) -C widgets -f makefile.gcc $(MAKEARGS) all
@@ -362,8 +431,12 @@ wizard:
wrapsizer: wrapsizer:
$(MAKE) -C wrapsizer -f makefile.gcc $(MAKEARGS) all $(MAKE) -C wrapsizer -f makefile.gcc $(MAKEARGS) all
ifeq ($(USE_HTML),1)
ifeq ($(USE_RIBBON),1)
xrc: xrc:
$(MAKE) -C xrc -f makefile.gcc $(MAKEARGS) all $(MAKE) -C xrc -f makefile.gcc $(MAKEARGS) all
endif
endif
memcheck: memcheck:
$(MAKE) -C memcheck -f makefile.gcc $(MAKEARGS) all $(MAKE) -C memcheck -f makefile.gcc $(MAKEARGS) all

67
samples/makefile.vc
View File

@@ -32,11 +32,50 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
### Conditionally set variables: ### ### 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: ### ### 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: clean:
-if exist .\*.obj del .\*.obj -if exist .\*.obj del .\*.obj
@@ -307,10 +346,12 @@ sub_artprov:
$(MAKE) -f makefile.vc $(MAKEARGS) all $(MAKE) -f makefile.vc $(MAKEARGS) all
cd "$(MAKEDIR)" cd "$(MAKEDIR)"
!if "$(USE_HTML)" == "1"
sub_aui: sub_aui:
cd aui cd aui
$(MAKE) -f makefile.vc $(MAKEARGS) all $(MAKE) -f makefile.vc $(MAKEARGS) all
cd "$(MAKEDIR)" cd "$(MAKEDIR)"
!endif
sub_calendar: sub_calendar:
cd calendar cd calendar
@@ -402,10 +443,12 @@ sub_event:
$(MAKE) -f makefile.vc $(MAKEARGS) all $(MAKE) -f makefile.vc $(MAKEARGS) all
cd "$(MAKEDIR)" cd "$(MAKEDIR)"
!if "$(USE_EXCEPTIONS)" == "1"
sub_except: sub_except:
cd except cd except
$(MAKE) -f makefile.vc $(MAKEARGS) all $(MAKE) -f makefile.vc $(MAKEARGS) all
cd "$(MAKEDIR)" cd "$(MAKEDIR)"
!endif
sub_exec: sub_exec:
cd exec cd exec
@@ -422,20 +465,26 @@ sub_grid:
$(MAKE) -f makefile.vc $(MAKEARGS) all $(MAKE) -f makefile.vc $(MAKEARGS) all
cd "$(MAKEDIR)" cd "$(MAKEDIR)"
!if "$(USE_HTML)" == "1"
sub_help: sub_help:
cd help cd help
$(MAKE) -f makefile.vc $(MAKEARGS) all $(MAKE) -f makefile.vc $(MAKEARGS) all
cd "$(MAKEDIR)" cd "$(MAKEDIR)"
!endif
!if "$(USE_HTML)" == "1"
sub_htlbox: sub_htlbox:
cd htlbox cd htlbox
$(MAKE) -f makefile.vc $(MAKEARGS) all $(MAKE) -f makefile.vc $(MAKEARGS) all
cd "$(MAKEDIR)" cd "$(MAKEDIR)"
!endif
!if "$(USE_HTML)" == "1"
sub_html: sub_html:
cd html cd html
$(MAKE) -f makefile.vc $(MAKEARGS) all $(MAKE) -f makefile.vc $(MAKEARGS) all
cd "$(MAKEDIR)" cd "$(MAKEDIR)"
!endif
sub_image: sub_image:
cd image cd image
@@ -477,10 +526,12 @@ sub_mdi:
$(MAKE) -f makefile.vc $(MAKEARGS) all $(MAKE) -f makefile.vc $(MAKEARGS) all
cd "$(MAKEDIR)" cd "$(MAKEDIR)"
!if "$(USE_MEDIA)" == "1"
sub_mediaplayer: sub_mediaplayer:
cd mediaplayer cd mediaplayer
$(MAKE) -f makefile.vc $(MAKEARGS) all $(MAKE) -f makefile.vc $(MAKEARGS) all
cd "$(MAKEDIR)" cd "$(MAKEDIR)"
!endif
sub_menu: sub_menu:
cd menu cd menu
@@ -537,10 +588,12 @@ sub_printing:
$(MAKE) -f makefile.vc $(MAKEARGS) all $(MAKE) -f makefile.vc $(MAKEARGS) all
cd "$(MAKEDIR)" cd "$(MAKEDIR)"
!if "$(USE_PROPGRID)" == "1"
sub_propgrid: sub_propgrid:
cd propgrid cd propgrid
$(MAKE) -f makefile.vc $(MAKEARGS) all $(MAKE) -f makefile.vc $(MAKEARGS) all
cd "$(MAKEDIR)" cd "$(MAKEDIR)"
!endif
sub_regtest: sub_regtest:
cd regtest cd regtest
@@ -552,15 +605,19 @@ sub_render:
$(MAKE) -f makefile.vc $(MAKEARGS) all $(MAKE) -f makefile.vc $(MAKEARGS) all
cd "$(MAKEDIR)" cd "$(MAKEDIR)"
!if "$(USE_RIBBON)" == "1"
sub_ribbon: sub_ribbon:
cd ribbon cd ribbon
$(MAKE) -f makefile.vc $(MAKEARGS) all $(MAKE) -f makefile.vc $(MAKEARGS) all
cd "$(MAKEDIR)" cd "$(MAKEDIR)"
!endif
!if "$(USE_HTML)" == "1" && "$(USE_RICHTEXT)" == "1"
sub_richtext: sub_richtext:
cd richtext cd richtext
$(MAKE) -f makefile.vc $(MAKEARGS) all $(MAKE) -f makefile.vc $(MAKEARGS) all
cd "$(MAKEDIR)" cd "$(MAKEDIR)"
!endif
sub_sashtest: sub_sashtest:
cd sashtest cd sashtest
@@ -592,10 +649,12 @@ sub_sound:
$(MAKE) -f makefile.vc $(MAKEARGS) all $(MAKE) -f makefile.vc $(MAKEARGS) all
cd "$(MAKEDIR)" cd "$(MAKEDIR)"
!if "$(USE_MEDIA)" == "1"
sub_splash: sub_splash:
cd splash cd splash
$(MAKE) -f makefile.vc $(MAKEARGS) all $(MAKE) -f makefile.vc $(MAKEARGS) all
cd "$(MAKEDIR)" cd "$(MAKEDIR)"
!endif
sub_splitter: sub_splitter:
cd splitter cd splitter
@@ -607,10 +666,12 @@ sub_statbar:
$(MAKE) -f makefile.vc $(MAKEARGS) all $(MAKE) -f makefile.vc $(MAKEARGS) all
cd "$(MAKEDIR)" cd "$(MAKEDIR)"
!if "$(USE_STC)" == "1"
sub_stc: sub_stc:
cd stc cd stc
$(MAKE) -f makefile.vc $(MAKEARGS) all $(MAKE) -f makefile.vc $(MAKEARGS) all
cd "$(MAKEDIR)" cd "$(MAKEDIR)"
!endif
sub_svg: sub_svg:
cd svg cd svg
@@ -667,10 +728,12 @@ sub_vscroll:
$(MAKE) -f makefile.vc $(MAKEARGS) all $(MAKE) -f makefile.vc $(MAKEARGS) all
cd "$(MAKEDIR)" cd "$(MAKEDIR)"
!if "$(USE_STC)" == "1"
sub_webview: sub_webview:
cd webview cd webview
$(MAKE) -f makefile.vc $(MAKEARGS) all $(MAKE) -f makefile.vc $(MAKEARGS) all
cd "$(MAKEDIR)" cd "$(MAKEDIR)"
!endif
sub_widgets: sub_widgets:
cd widgets cd widgets
@@ -687,10 +750,12 @@ sub_wrapsizer:
$(MAKE) -f makefile.vc $(MAKEARGS) all $(MAKE) -f makefile.vc $(MAKEARGS) all
cd "$(MAKEDIR)" cd "$(MAKEDIR)"
!if "$(USE_HTML)" == "1" && "$(USE_RIBBON)" == "1"
sub_xrc: sub_xrc:
cd xrc cd xrc
$(MAKE) -f makefile.vc $(MAKEARGS) all $(MAKE) -f makefile.vc $(MAKEARGS) all
cd "$(MAKEDIR)" cd "$(MAKEDIR)"
!endif
sub_flash: sub_flash:
cd flash cd flash

26
samples/samples.bkl
View File

@@ -15,7 +15,7 @@
<subproject id="access" template="sub"/> <subproject id="access" template="sub"/>
<subproject id="animate" template="sub"/> <subproject id="animate" template="sub"/>
<subproject id="artprov" template="sub"/> <subproject id="artprov" template="sub"/>
<subproject id="aui" template="sub"/> <subproject id="aui" template="sub" cond="USE_HTML=='1'"/>
<subproject id="calendar" template="sub"/> <subproject id="calendar" template="sub"/>
<subproject id="caret" template="sub"/> <subproject id="caret" template="sub"/>
<subproject id="clipboard" template="sub"/> <subproject id="clipboard" template="sub"/>
@@ -34,13 +34,13 @@
<subproject id="drawing" template="sub"/> <subproject id="drawing" template="sub"/>
<subproject id="erase" template="sub"/> <subproject id="erase" template="sub"/>
<subproject id="event" template="sub"/> <subproject id="event" template="sub"/>
<subproject id="except" template="sub"/> <subproject id="except" template="sub" cond="USE_EXCEPTIONS=='1'"/>
<subproject id="exec" template="sub"/> <subproject id="exec" template="sub"/>
<subproject id="font" template="sub"/> <subproject id="font" template="sub"/>
<subproject id="grid" template="sub"/> <subproject id="grid" template="sub"/>
<subproject id="help" template="sub"/> <subproject id="help" template="sub" cond="USE_HTML=='1'"/>
<subproject id="htlbox" template="sub"/> <subproject id="htlbox" template="sub" cond="USE_HTML=='1'"/>
<subproject id="html" template="sub"/> <subproject id="html" template="sub" cond="USE_HTML=='1'"/>
<subproject id="image" template="sub"/> <subproject id="image" template="sub"/>
<subproject id="internat" template="sub"/> <subproject id="internat" template="sub"/>
<subproject id="ipc" template="sub"/> <subproject id="ipc" template="sub"/>
@@ -49,7 +49,7 @@
<subproject id="layout" template="sub"/> <subproject id="layout" template="sub"/>
<subproject id="listctrl" template="sub"/> <subproject id="listctrl" template="sub"/>
<subproject id="mdi" template="sub"/> <subproject id="mdi" template="sub"/>
<subproject id="mediaplayer" template="sub"/> <subproject id="mediaplayer" template="sub" cond="USE_MEDIA=='1'"/>
<subproject id="menu" template="sub"/> <subproject id="menu" template="sub"/>
<subproject id="minimal" template="sub"/> <subproject id="minimal" template="sub"/>
<subproject id="nativdlg" template="sub"/> <subproject id="nativdlg" template="sub"/>
@@ -61,21 +61,21 @@
<subproject id="power" template="sub"/> <subproject id="power" template="sub"/>
<subproject id="preferences" template="sub"/> <subproject id="preferences" template="sub"/>
<subproject id="printing" template="sub"/> <subproject id="printing" template="sub"/>
<subproject id="propgrid" template="sub"/> <subproject id="propgrid" template="sub" cond="USE_PROPGRID=='1'"/>
<subproject id="regtest" template="sub"/> <subproject id="regtest" template="sub"/>
<subproject id="render" template="sub"/> <subproject id="render" template="sub"/>
<subproject id="ribbon" template="sub"/> <subproject id="ribbon" template="sub" cond="USE_RIBBON=='1'"/>
<subproject id="richtext" template="sub"/> <subproject id="richtext" template="sub" cond="USE_HTML=='1' and USE_RICHTEXT=='1'"/>
<subproject id="sashtest" template="sub"/> <subproject id="sashtest" template="sub"/>
<subproject id="scroll" template="sub"/> <subproject id="scroll" template="sub"/>
<subproject id="secretstore" template="sub"/> <subproject id="secretstore" template="sub"/>
<subproject id="shaped" template="sub"/> <subproject id="shaped" template="sub"/>
<subproject id="sockets" template="sub"/> <subproject id="sockets" template="sub"/>
<subproject id="sound" template="sub"/> <subproject id="sound" template="sub"/>
<subproject id="splash" template="sub"/> <subproject id="splash" template="sub" cond="USE_MEDIA=='1'"/>
<subproject id="splitter" template="sub"/> <subproject id="splitter" template="sub"/>
<subproject id="statbar" template="sub"/> <subproject id="statbar" template="sub"/>
<subproject id="stc" template="sub"/> <subproject id="stc" template="sub" cond="USE_STC=='1'"/>
<subproject id="svg" template="sub"/> <subproject id="svg" template="sub"/>
<subproject id="taborder" template="sub"/> <subproject id="taborder" template="sub"/>
<subproject id="taskbar" template="sub"/> <subproject id="taskbar" template="sub"/>
@@ -87,11 +87,11 @@
<subproject id="uiaction" template="sub"/> <subproject id="uiaction" template="sub"/>
<subproject id="validate" template="sub"/> <subproject id="validate" template="sub"/>
<subproject id="vscroll" template="sub"/> <subproject id="vscroll" template="sub"/>
<subproject id="webview" template="sub"/> <subproject id="webview" template="sub" cond="USE_STC=='1'"/>
<subproject id="widgets" template="sub"/> <subproject id="widgets" template="sub"/>
<subproject id="wizard" template="sub"/> <subproject id="wizard" template="sub"/>
<subproject id="wrapsizer" template="sub"/> <subproject id="wrapsizer" template="sub"/>
<subproject id="xrc" template="sub"/> <subproject id="xrc" template="sub" cond="USE_HTML=='1' and USE_RIBBON=='1'"/>
<!-- <!--
These samples don't always build (they need non-default wxWidgets These samples don't always build (they need non-default wxWidgets