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

allow wxpresets to be used with xcode2 format (even if it's not fully functional yet)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@49937 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Francesco Montorsi 2007-11-13 21:09:33 +00:00
parent dd72206610
commit 001c002122
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
build/bakefiles/wxpresets/presets/wx.bkl
View File

@ -270,7 +270,8 @@
<!-- this is just a wrapper that includes the real implementation: -->
<!-- REAL IMPLEMENTATION -->
<!-- -->
<set var="__wx_included_impl">0</set>
@ -284,6 +285,13 @@
<set var="__wx_included_impl">1</set>
</if>
<if cond="FORMAT=='xcode2'">
<!-- xCode2 is an IDE and thus reuses almost nothing from unix part of wxpresets;
better use the win32 part! -->
<include file="wx_win32.bkl"/>
<set var="__wx_included_impl">1</set>
</if>
<if cond="__wx_included_impl=='0'">
<error>This format is not (yet) supported by wx preset.</error>
</if>
@ -395,7 +403,7 @@
<command cond="TOOLSET in ['win32','os2','dos']">
if not exist $(nativePaths(_DIRNAME)) mkdir $(nativePaths(_DIRNAME))
</command>
</modify-target>
</modify-target>
<!-- the following code is mostly equivalent to a:
<dependency-of>$(id)</dependency-of>

10
build/bakefiles/wxpresets/presets/wx_win32.bkl
View File

@ -225,8 +225,10 @@
<define>$(WXDEBUG_DEFINE)</define>
<define>__WXMSW__</define>
<include>$(WX_DIR)$(WXLIBINCLUDE)</include>
<include>$(WX_DIR)/include</include>
<if cond="FORMAT!='xcode2'">
<include>$(WX_DIR)$(WXLIBINCLUDE)</include>
<include>$(WX_DIR)/include</include>
</if>
</template>
@ -277,7 +279,9 @@
<!-- template for wx executables/dlls: -->
<template id="wx" template="wx-lib">
<lib-path>$(WX_DIR)$(WXLIBPATH)</lib-path>
<if cond="FORMAT!='xcode2'">
<lib-path>$(WX_DIR)$(WXLIBPATH)</lib-path>
</if>
<!-- wx libs must come before 3rd party and sys libs, this is
the place where the hack explained above is carried on: -->