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

call release builds 'Release'; don't define options if they are already defined by user's bkl code

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34650 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2005-06-14 18:11:15 +00:00
parent bd018e7e31
commit 1ed52f8caa
1 changed files with 54 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -50,57 +50,68 @@ FIXME: this template has (at least) the following bugs:
<if cond="FORMAT!='watcom'"></if> <if cond="FORMAT!='watcom'"></if>
</set> </set>
<!-- The directory where wxWidgets is installed: --> <!-- The directory where wxWidgets is installed: -->
<set var="WX_DIR_DEFAULT" overwrite="0">$(DOLLAR)($(ENV_VAR)WXWIN)</set> <if cond="not isdefined('WX_DIR')">
<option name="WX_DIR" category="path"> <set var="WX_DIR_DEFAULT" overwrite="0">$(DOLLAR)($(ENV_VAR)WXWIN)</set>
<default-value>$(WX_DIR_DEFAULT)</default-value> <option name="WX_DIR" category="path">
<description> <default-value>$(WX_DIR_DEFAULT)</default-value>
The directory where wxWidgets library is installed <description>
</description> The directory where wxWidgets library is installed
</option> </description>
</option>
</if>
<!-- This is a standard option that determines --> <!-- This is a standard option that determines -->
<!-- whether the user wants to build this library as --> <!-- whether the user wants to build this library as -->
<!-- a dll or as a static library. --> <!-- a dll or as a static library. -->
<set var="WX_SHARED_DEFAULT" overwrite="0">0</set> <if cond="not isdefined('WX_SHARED')">
<option name="WX_SHARED"> <set var="WX_SHARED_DEFAULT" overwrite="0">0</set>
<values>0,1</values> <option name="WX_SHARED">
<values-description>,DLL</values-description> <values>0,1</values>
<default-value>$(WX_SHARED_DEFAULT)</default-value> <values-description>,DLL</values-description>
<description> <default-value>$(WX_SHARED_DEFAULT)</default-value>
Use DLL build of wx library to use? <description>
</description> Use DLL build of wx library to use?
</option> </description>
</option>
</if>
<!-- Configuration for building the bakefile with --> <!-- Configuration for building the bakefile with -->
<!-- unicode strings or not (unicode or ansi). --> <!-- unicode strings or not (unicode or ansi). -->
<set var="WX_UNICODE_DEFAULT" overwrite="0">0</set> <if cond="not isdefined('WX_UNICODE')">
<option name="WX_UNICODE"> <set var="WX_UNICODE_DEFAULT" overwrite="0">0</set>
<values>0,1</values> <option name="WX_UNICODE">
<values-description>,Unicode</values-description> <values>0,1</values>
<default-value>$(WX_UNICODE_DEFAULT)</default-value> <values-description>,Unicode</values-description>
<description> <default-value>$(WX_UNICODE_DEFAULT)</default-value>
Compile Unicode build of wxWidgets? <description>
</description> Compile Unicode build of wxWidgets?
</option> </description>
</option>
</if>
<set var="WX_DEBUG_DEFAULT" overwrite="0">1</set> <if cond="not isdefined('WX_DEBUG')">
<option name="WX_DEBUG"> <set var="WX_DEBUG_DEFAULT" overwrite="0">1</set>
<values>0,1</values> <option name="WX_DEBUG">
<values-description>,Debug</values-description> <values>0,1</values>
<default-value>$(WX_DEBUG_DEFAULT)</default-value> <values-description>Release,Debug</values-description>
<description> <default-value>$(WX_DEBUG_DEFAULT)</default-value>
Use debug build of wxWidgets (define __WXDEBUG__)? <description>
</description> Use debug build of wxWidgets (define __WXDEBUG__)?
</option> </description>
</option>
</if>
<set var="WX_VERSION_DEFAULT" overwrite="0">26</set> <if cond="not isdefined('WX_VERSION')">
<option name="WX_VERSION"> <set var="WX_VERSION_DEFAULT" overwrite="0">26</set>
<default-value>$(WX_VERSION_DEFAULT)</default-value> <option name="WX_VERSION">
<description> <default-value>$(WX_VERSION_DEFAULT)</default-value>
Version of the wx library to build against. <description>
</description> Version of the wx library to build against.
</option> </description>
</option>
</if>
<!-- HELPER VARIABLES --> <!-- HELPER VARIABLES -->
<!-- --> <!-- -->
@@ -123,6 +134,7 @@ FIXME: this template has (at least) the following bugs:
<!-- These are handy ways of dealing with the --> <!-- These are handy ways of dealing with the -->
<!-- extensions in the library names of the --> <!-- extensions in the library names of the -->
<!-- wxWindows library. --> <!-- wxWindows library. -->
<error>WX_DEBUG=$(WX_DEBUG).</error>
<set var="WXLIBPOSTFIX"> <set var="WXLIBPOSTFIX">
<if cond="WX_DEBUG=='1' and WX_UNICODE=='1'">ud</if> <if cond="WX_DEBUG=='1' and WX_UNICODE=='1'">ud</if>
<if cond="WX_DEBUG=='1' and WX_UNICODE=='0'">d</if> <if cond="WX_DEBUG=='1' and WX_UNICODE=='0'">d</if>