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

Fix media samples being compiled when USE_MEDIA=0

Browse Source
This commit is contained in:
Raul Tambre
2017-02-05 13:42:54 +02:00
parent 5d3ef67019
commit 3ad61b9005
4 changed files with 35 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
samples/makefile.gcc
View File

@@ -49,9 +49,15 @@ endif
ifeq ($(USE_HTML),1)
__html___depname = html
endif
ifeq ($(USE_MEDIA),1)
__mediaplayer___depname = mediaplayer
endif
ifeq ($(USE_HTML),1)
__richtext___depname = richtext
endif
ifeq ($(USE_MEDIA),1)
__splash___depname = splash
endif
ifeq ($(USE_HTML),1)
__xrc___depname = xrc
endif
@@ -59,7 +65,7 @@ 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 menu minimal nativdlg notebook oleauto opengl ownerdrw popup power preferences printing propgrid regtest render ribbon $(__richtext___depname) 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___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 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)
clean:
-if exist .\*.o del .\*.o
@@ -267,8 +273,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
@@ -338,8 +346,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