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

define WX_DIR as WXWIN env var for Unix and not only Win32

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38757 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-04-16 15:47:11 +00:00
parent c81032a760
commit dd5cb4b197
2 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,6 +22,26 @@
<set var="CONTRIBLIB_LIST">animate applet deprecated fl foldbar gizmos mmedia netutils ogl plot stc svg</set> <set var="CONTRIBLIB_LIST">animate applet deprecated fl foldbar gizmos mmedia netutils ogl plot stc svg</set>
<set var="ALLLIB_LIST">$(LIB_LIST) $(CONTRIBLIB_LIST)</set> <set var="ALLLIB_LIST">$(LIB_LIST) $(CONTRIBLIB_LIST)</set>
<!-- this is a temporary variable until there is non general -->
<!-- function in bakefiles for returning native markup for -->
<!-- reading envrionment variables -->
<set var="ENV_VAR">
<if cond="FORMAT=='watcom'">%</if>
<if cond="FORMAT!='watcom'"></if>
</set>
<!-- The directory where wxWidgets is installed: -->
<if cond="not isdefined('WX_DIR')">
<set var="WX_DIR_DEFAULT" overwrite="0">$(DOLLAR)($(ENV_VAR)WXWIN)</set>
<option name="WX_DIR" category="path">
<default-value>$(WX_DIR_DEFAULT)</default-value>
<description>
The directory where wxWidgets library is installed
</description>
</option>
</if>
<!-- this is just a wrapper that includes the real implementation: --> <!-- this is just a wrapper that includes the real implementation: -->

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

@@ -42,15 +42,6 @@ FIXME: this template has (at least) the following bugs:
<!-- is not constant, i.e. if it cannot be determined --> <!-- is not constant, i.e. if it cannot be determined -->
<!-- by bakefile itself. --> <!-- by bakefile itself. -->
<!-- this is a temporary variable until there is non general -->
<!-- function in bakefiles for returning native markup for -->
<!-- reading envrionment variables -->
<set var="ENV_VAR">
<if cond="FORMAT=='watcom'">%</if>
<if cond="FORMAT!='watcom'"></if>
</set>
<!-- Presets for limited dmars make.exe format: --> <!-- Presets for limited dmars make.exe format: -->
<if cond="FORMAT=='dmars'"> <if cond="FORMAT=='dmars'">
<set var="WX_UNICODE">0</set> <set var="WX_UNICODE">0</set>
@@ -59,17 +50,6 @@ FIXME: this template has (at least) the following bugs:
</if> </if>
<!-- The directory where wxWidgets is installed: -->
<if cond="not isdefined('WX_DIR')">
<set var="WX_DIR_DEFAULT" overwrite="0">$(DOLLAR)($(ENV_VAR)WXWIN)</set>
<option name="WX_DIR" category="path">
<default-value>$(WX_DIR_DEFAULT)</default-value>
<description>
The directory where wxWidgets library is installed
</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. -->