Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove the TOOLKIT test from msvc-headers-setuo-h definition.

Browse Source 
This is unnecessary now that TOOLKIT is back to being a constant again and
results in errors if GTK TOOLKIT is enabled.

Closes #14965.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74438 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2013-07-07 12:58:45 +00:00
parent 1b7751aaa9
commit 0053219faf
1 changed files with 4 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
build/bakefiles/common.bkl
View File

@@ -436,21 +436,10 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(SETUPHDIR)\wx\setup.h
</set> </set>
</if> </if>
<if cond="FORMAT!='msevc4prj'"> <if cond="FORMAT!='msevc4prj'">
<!-- Unfortunately we have to include wx/univ/setup.h in both <msvc-headers-setup-h>
cases because WXUNIV==1 is not a weak condition, but at msw/setup.h
least don't include wxGTK setup.h when building wxMSW. --> univ/setup.h
<if cond="TOOLKIT=='MSW'"> </msvc-headers-setup-h>
<msvc-headers-setup-h>
msw/setup.h
univ/setup.h
</msvc-headers-setup-h>
</if>
<if cond="TOOLKIT=='GTK'">
<msvc-headers-setup-h>
gtk/setup.h
univ/setup.h
</msvc-headers-setup-h>
</if>
<set var="_custom_build_include_wx_msw_setup_h"> <set var="_custom_build_include_wx_msw_setup_h">
<if cond="WXUNIV=='0' and TOOLKIT=='MSW'"> <if cond="WXUNIV=='0' and TOOLKIT=='MSW'">
$(msvc_copy_setup_h_script % 'msw\setup.h') $(msvc_copy_setup_h_script % 'msw\setup.h')