diff --git a/samples/makefile.bcc b/samples/makefile.bcc
index fa22b8b132..ead4ca30a8 100644
--- a/samples/makefile.bcc
+++ b/samples/makefile.bcc
@@ -56,9 +56,15 @@ __htlbox___depname = htlbox
 !if "$(USE_HTML)" == "1"
 __html___depname = html
 !endif
+!if "$(USE_MEDIA)" == "1"
+__mediaplayer___depname = mediaplayer
+!endif
 !if "$(USE_HTML)" == "1"
 __richtext___depname = richtext
 !endif
+!if "$(USE_MEDIA)" == "1"
+__splash___depname = splash
+!endif
 !if "$(USE_HTML)" == "1"
 __xrc___depname = xrc
 !endif
@@ -66,7 +72,7 @@ __xrc___depname = xrc
 
 ### 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 .\*.obj del .\*.obj
@@ -629,11 +635,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
@@ -769,11 +777,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
diff --git a/samples/makefile.gcc b/samples/makefile.gcc
index 40777802c0..6fb28842cd 100644
--- a/samples/makefile.gcc
+++ b/samples/makefile.gcc
@@ -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
diff --git a/samples/makefile.vc b/samples/makefile.vc
index 04e260f8ad..a6dda6d16d 100644
--- a/samples/makefile.vc
+++ b/samples/makefile.vc
@@ -47,9 +47,15 @@ __htlbox___depname = sub_htlbox
 !if "$(USE_HTML)" == "1"
 __html___depname = sub_html
 !endif
+!if "$(USE_MEDIA)" == "1"
+__mediaplayer___depname = sub_mediaplayer
+!endif
 !if "$(USE_HTML)" == "1"
 __richtext___depname = sub_richtext
 !endif
+!if "$(USE_MEDIA)" == "1"
+__splash___depname = sub_splash
+!endif
 !if "$(USE_HTML)" == "1"
 __xrc___depname = sub_xrc
 !endif
@@ -57,7 +63,7 @@ __xrc___depname = sub_xrc
 
 ### 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 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 $(__richtext___depname) 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 $(__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 sub_propgrid 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)
 
 clean: 
 	-if exist .\*.obj del .\*.obj
@@ -508,10 +514,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
@@ -625,10 +633,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
diff --git a/samples/samples.bkl b/samples/samples.bkl
index 94a0e423b6..19aaa24ba9 100644
--- a/samples/samples.bkl
+++ b/samples/samples.bkl
@@ -49,7 +49,7 @@
     <subproject id="layout" template="sub"/>
     <subproject id="listctrl" 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="minimal" template="sub"/>
     <subproject id="nativdlg" template="sub"/>
@@ -72,7 +72,7 @@
     <subproject id="shaped" template="sub"/>
     <subproject id="sockets" 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="statbar" template="sub"/>
     <subproject id="stc" template="sub"/>