Fix STC samples being compiled when USE_STC=0

samples/makefile.bcc

@@ -71,6 +71,12 @@ __richtext___depname = richtext
 !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
@@ -78,7 +84,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___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)
+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
@@ -807,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
@@ -879,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

samples/makefile.gcc

@@ -66,6 +66,12 @@ 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
@@ -75,7 +81,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___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)
+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
@@ -373,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
@@ -409,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

samples/makefile.vc

@@ -62,6 +62,12 @@ __richtext___depname = sub_richtext
 !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
@@ -69,7 +75,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 $(__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)
+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
@@ -660,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
@@ -720,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

samples/samples.bkl

@@ -75,7 +75,7 @@
     <subproject id="splash" template="sub" cond="USE_MEDIA=='1'"/>
     <subproject id="splitter" 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="taborder" template="sub"/>
     <subproject id="taskbar" template="sub"/>
@@ -87,7 +87,7 @@
     <subproject id="uiaction" template="sub"/>
     <subproject id="validate" 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="wizard" template="sub"/>
     <subproject id="wrapsizer" template="sub"/>