AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix the richtext sample being compiled when USE_RICHTEXT=0

Browse Source
This commit is contained in:
Raul Tambre 2017-02-05 13:52:18 +02:00
parent 314d3adbee
commit 801b0b1c30
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
samples/makefile.bcc
View File

@ -65,7 +65,7 @@ __propgrid___depname = propgrid
!if "$(USE_RIBBON)" == "1" !if "$(USE_RIBBON)" == "1"
__ribbon___depname = ribbon __ribbon___depname = ribbon
!endif !endif
!if "$(USE_HTML)" == "1" !if "$(USE_HTML)" == "1" && "$(USE_RICHTEXT)" == "1"
__richtext___depname = richtext __richtext___depname = richtext
!endif !endif
!if "$(USE_MEDIA)" == "1" !if "$(USE_MEDIA)" == "1"
@ -743,7 +743,7 @@ ribbon:
@del ribbon.bat @del ribbon.bat
!endif !endif
!if "$(USE_HTML)" == "1" !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

4
samples/makefile.gcc
View File

@ -59,8 +59,10 @@ ifeq ($(USE_RIBBON),1)
__ribbon___depname = ribbon __ribbon___depname = ribbon
endif endif
ifeq ($(USE_HTML),1) ifeq ($(USE_HTML),1)
ifeq ($(USE_RICHTEXT),1)
__richtext___depname = richtext __richtext___depname = richtext
endif endif
endif
ifeq ($(USE_MEDIA),1) ifeq ($(USE_MEDIA),1)
__splash___depname = splash __splash___depname = splash
endif endif
@ -336,9 +338,11 @@ ribbon:
endif endif
ifeq ($(USE_HTML),1) 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
endif
sashtest: sashtest:
$(MAKE) -C sashtest -f makefile.gcc $(MAKEARGS) all $(MAKE) -C sashtest -f makefile.gcc $(MAKEARGS) all

4
samples/makefile.vc
View File

@ -56,7 +56,7 @@ __propgrid___depname = sub_propgrid
!if "$(USE_RIBBON)" == "1" !if "$(USE_RIBBON)" == "1"
__ribbon___depname = sub_ribbon __ribbon___depname = sub_ribbon
!endif !endif
!if "$(USE_HTML)" == "1" !if "$(USE_HTML)" == "1" && "$(USE_RICHTEXT)" == "1"
__richtext___depname = sub_richtext __richtext___depname = sub_richtext
!endif !endif
!if "$(USE_MEDIA)" == "1" !if "$(USE_MEDIA)" == "1"
@ -606,7 +606,7 @@ sub_ribbon:
cd "$(MAKEDIR)" cd "$(MAKEDIR)"
!endif !endif
!if "$(USE_HTML)" == "1" !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

2
samples/samples.bkl
View File

@ -65,7 +65,7 @@
<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" cond="USE_RIBBON=='1'"/> <subproject id="ribbon" template="sub" cond="USE_RIBBON=='1'"/>
<subproject id="richtext" template="sub" cond="USE_HTML=='1'"/> <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"/>