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

Use PLATFORM checks in bakefiles instead of TOOLKIT checks.

Browse Source 
No real changes as the output is currently the same for all supported
PLATFORM/TOOLKIT combinations anyhow but prefer checking for PLATFORM to
prepare for the support of GTK toolkit under MSW platform.

Closes #14379.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71700 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2012-06-08 18:44:10 +00:00
parent cf737db657
commit 5c3f21c6a3
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build/bakefiles/build_cfg.bkl
View File

@ -8,8 +8,7 @@
the library.
-->
<if cond="FORMAT not in ['autoconf','msvc6prj','msevc4prj','msvs2003prj','msvs2005prj','msvs2008prj'] and
TOOLKIT in ['PM','MSW','MOTIF']">
<if cond="FORMAT not in ['autoconf','msvc6prj','msevc4prj','msvs2003prj','msvs2005prj','msvs2008prj']">
<set var="BUILD_CFG_FILE" make_var="1">
$(SETUPHDIR)$(DIRSEP)build.cfg

4
build/bakefiles/common.bkl
View File

@ -424,7 +424,7 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
univ/setup.h
</msvc-headers-setup-h>
<set var="_custom_build_include_wx_msw_setup_h">
<if cond="WXUNIV=='0'">
<if cond="WXUNIV=='0' and TOOLKIT=='MSW'">
$(msvc_copy_setup_h_script % 'msw\setup.h')
</if>
</set>
@ -614,7 +614,7 @@ $(TAB)$(VC_COMPILER) /EP /nologo "$(DOLLAR)(InputPath)" > "$(SETUPHDIR)\wx\msw\r
<define>WXBUILDING</define>
<if cond="WX_DISABLE_PRECOMP_HEADERS=='0'">
<if cond="FORMAT!='autoconf' and TOOLKIT in ['MSW','PM','WINCE']">
<if cond="FORMAT!='autoconf'">
<sources>$(WXTOPDIR)src/common/dummy.cpp</sources>
<precomp-headers-gen>
$(WXTOPDIR)src/common/dummy.cpp

8
build/bakefiles/wx.bkl
View File

@ -40,7 +40,7 @@
<subproject id="samples">
<installable>no</installable>
<dir cond="FORMAT=='autoconf'">samples</dir>
<dir cond="FORMAT!='autoconf' and TOOLKIT in ['PM','MSW','MOTIF']">../../samples</dir>
<dir cond="FORMAT!='autoconf'">../../samples</dir>
</subproject>
<if cond="FORMAT=='autoconf'">
@ -194,8 +194,8 @@
<set var="SETUP_H_SUBDIR">
<if cond="WXUNIV=='1'">univ</if>
<if cond="WXUNIV=='0' and TOOLKIT!='PM'">$(TOOLKIT_LOWERCASE)</if>
<if cond="WXUNIV=='0' and TOOLKIT=='PM'">os2</if>
<if cond="WXUNIV=='0' and PLATFORM_OS2!='1'">$(TOOLKIT_LOWERCASE)</if>
<if cond="WXUNIV=='0' and PLATFORM_OS2=='1'">os2</if>
</set>
<copy-file-to-file-if-not-exist id="master_setup.h">
@ -212,7 +212,7 @@
<!-- create rcdefs.h on Windows: -->
<if cond="FORMAT in ['borland','mingw','msvc','watcom'] and TOOLKIT == 'MSW'">
<if cond="FORMAT in ['borland','mingw','msvc','watcom']">
<mkdir id="libdir_setup_wx_msw">
<depends>libdir_setup_wx</depends>