Fix the propgrid sample being compiled when USE_PROPGRID=0

samples/makefile.bcc

@@ -59,6 +59,9 @@ __html___depname = html
 !if "$(USE_MEDIA)" == "1"
 __mediaplayer___depname = mediaplayer
 !endif
+!if "$(USE_PROPGRID)" == "1"
+__propgrid___depname = propgrid
+!endif
 !if "$(USE_HTML)" == "1"
 __richtext___depname = richtext
 !endif
@@ -72,7 +75,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 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)
+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 $(__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
@@ -709,11 +712,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

samples/makefile.gcc

@@ -52,6 +52,9 @@ endif
 ifeq ($(USE_MEDIA),1)
 __mediaplayer___depname = mediaplayer
 endif
+ifeq ($(USE_PROPGRID),1)
+__propgrid___depname = propgrid
+endif
 ifeq ($(USE_HTML),1)
 __richtext___depname = richtext
 endif
@@ -65,7 +68,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 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)
+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 $(__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
@@ -311,8 +314,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

samples/makefile.vc

@@ -50,6 +50,9 @@ __html___depname = sub_html
 !if "$(USE_MEDIA)" == "1"
 __mediaplayer___depname = sub_mediaplayer
 !endif
+!if "$(USE_PROPGRID)" == "1"
+__propgrid___depname = sub_propgrid
+!endif
 !if "$(USE_HTML)" == "1"
 __richtext___depname = sub_richtext
 !endif
@@ -63,7 +66,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 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)
+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 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
@@ -576,10 +579,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

samples/samples.bkl

@@ -61,7 +61,7 @@
     <subproject id="power" template="sub"/>
     <subproject id="preferences" 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="render" template="sub"/>
     <subproject id="ribbon" template="sub"/>