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

don't build flash and mfc samples with non-MSVC compilers (closes #10622)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59699 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2009-03-21 15:39:15 +00:00
parent ea46839980
commit c00ee75726
4 changed files with 13 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
samples/makefile.bcc
View File

@ -334,14 +334,6 @@ clean:
@echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>wrapsizer.bat @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>wrapsizer.bat
call wrapsizer.bat call wrapsizer.bat
@del wrapsizer.bat @del wrapsizer.bat
@echo cd flash >flash.bat
@echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>flash.bat
call flash.bat
@del flash.bat
@echo cd mfc >mfc.bat
@echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>mfc.bat
call mfc.bat
@del mfc.bat
@echo cd memcheck >memcheck.bat @echo cd memcheck >memcheck.bat
@echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>memcheck.bat @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>memcheck.bat
call memcheck.bat call memcheck.bat
@ -773,18 +765,6 @@ wrapsizer:
call wrapsizer.bat call wrapsizer.bat
@del wrapsizer.bat @del wrapsizer.bat
flash:
@echo cd flash >flash.bat
@echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>flash.bat
call flash.bat
@del flash.bat
mfc:
@echo cd mfc >mfc.bat
@echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>mfc.bat
call mfc.bat
@del mfc.bat
memcheck: memcheck:
@echo cd memcheck >memcheck.bat @echo cd memcheck >memcheck.bat
@echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>memcheck.bat @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>memcheck.bat

10
samples/makefile.gcc
View File

@ -111,8 +111,6 @@ clean:
$(MAKE) -C widgets -f makefile.gcc $(MAKEARGS) clean $(MAKE) -C widgets -f makefile.gcc $(MAKEARGS) clean
$(MAKE) -C wizard -f makefile.gcc $(MAKEARGS) clean $(MAKE) -C wizard -f makefile.gcc $(MAKEARGS) clean
$(MAKE) -C wrapsizer -f makefile.gcc $(MAKEARGS) clean $(MAKE) -C wrapsizer -f makefile.gcc $(MAKEARGS) clean
$(MAKE) -C flash -f makefile.gcc $(MAKEARGS) clean
$(MAKE) -C mfc -f makefile.gcc $(MAKEARGS) clean
$(MAKE) -C memcheck -f makefile.gcc $(MAKEARGS) clean $(MAKE) -C memcheck -f makefile.gcc $(MAKEARGS) clean
access: access:
@ -328,12 +326,6 @@ wizard:
wrapsizer: wrapsizer:
$(MAKE) -C wrapsizer -f makefile.gcc $(MAKEARGS) all $(MAKE) -C wrapsizer -f makefile.gcc $(MAKEARGS) all
flash:
$(MAKE) -C flash -f makefile.gcc $(MAKEARGS) all
mfc:
$(MAKE) -C mfc -f makefile.gcc $(MAKEARGS) all
memcheck: memcheck:
$(MAKE) -C memcheck -f makefile.gcc $(MAKEARGS) all $(MAKE) -C memcheck -f makefile.gcc $(MAKEARGS) all
@ -343,7 +335,7 @@ memcheck:
keyboard layout listctrl mdi mediaplayer menu minimal nativdlg notebook oleauto \ keyboard layout listctrl mdi mediaplayer menu minimal nativdlg notebook oleauto \
opengl ownerdrw popup printing propgrid regtest render richtext sashtest scroll \ opengl ownerdrw popup printing propgrid regtest render richtext sashtest scroll \
shaped sockets sound splash splitter statbar stc taskbar text thread toolbar \ shaped sockets sound splash splitter statbar stc taskbar text thread toolbar \
treectrl typetest validate vscroll widgets wizard wrapsizer flash mfc memcheck treectrl typetest validate vscroll widgets wizard wrapsizer memcheck
SHELL := $(COMSPEC) SHELL := $(COMSPEC)

16
samples/makefile.wat
View File

@ -269,12 +269,6 @@ clean : .SYMBOLIC
cd wrapsizer cd wrapsizer
wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
cd $(WATCOM_CWD) cd $(WATCOM_CWD)
cd flash
wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
cd $(WATCOM_CWD)
cd mfc
wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
cd $(WATCOM_CWD)
cd memcheck cd memcheck
wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
cd $(WATCOM_CWD) cd $(WATCOM_CWD)
@ -634,16 +628,6 @@ wrapsizer : .SYMBOLIC
wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
cd $(WATCOM_CWD) cd $(WATCOM_CWD)
flash : .SYMBOLIC
cd flash
wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
cd $(WATCOM_CWD)
mfc : .SYMBOLIC
cd mfc
wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
cd $(WATCOM_CWD)
memcheck : .SYMBOLIC memcheck : .SYMBOLIC
cd memcheck cd memcheck
wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all

15
samples/samples.bkl
View File

@ -84,9 +84,18 @@
<subproject id="widgets" template="sub"/> <subproject id="widgets" template="sub"/>
<subproject id="wizard" template="sub"/> <subproject id="wizard" template="sub"/>
<subproject id="wrapsizer" template="sub"/> <subproject id="wrapsizer" template="sub"/>
<!-- These samples don't always build so don't build them by default -->
<subproject id="flash" template="optsub"/> <!--
<subproject id="mfc" template="optsub"/> These samples don't always build (they need non-default wxWidgets
configuration or some 3rd party library being installed) so don't build
them by default by using "optsub" template instead of "sub" one and
some of them also requite MSVC compiler so don't use them with the
other ones.
-->
<if cond="FORMAT[:3] == 'msv'">
<subproject id="flash" template="optsub"/>
<subproject id="mfc" template="optsub"/>
</if>
<subproject id="memcheck" template="optsub"/> <subproject id="memcheck" template="optsub"/>
</makefile> </makefile>