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

allow specifying non default libraries for gnu output format (patch 1469464)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38756 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2006-04-16 15:42:00 +00:00
parent 4bfec1790f
commit c81032a760
3 changed files with 29 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,7 +12,17 @@
<!-- this variable identifies the version of the wx presets.
this is changed only when major changes to wxpresets take place. -->
<set var="WX_PRESETS_VERSION">2</set>
<set var="WX_PRESETS_VERSION">3</set>
<!-- list of known libraries used by wx-lib tag defined in wx_unix.bkl and wx_win32.bkl -->
<set var="LIB_LIST">base core net xml odbc xrc html adv media gl dbgrid qa</set>
<!-- NOTE: refer to the NET contrib using NETUTILS instead of NET
(which is already in LIB_LIST) -->
<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>
<!-- this is just a wrapper that includes the real implementation: -->

24
build/bakefiles/wxpresets/presets/wx_unix.bkl
View File

@ -55,10 +55,6 @@ Format-specific notes:
<default-value>`$(DOLLAR)(WX_CONFIG) --cppflags`</default-value>
<description>C preprocessor flags to use with wxWidgets code</description>
</option>
<option name="WX_LIBS">
<default-value>`$(DOLLAR)(WX_CONFIG) --libs`</default-value>
<description>wxWidgets libraries to link against</description>
</option>
<option name="WX_RESCOMP">
<default-value>`$(DOLLAR)(WX_CONFIG) --rescomp`</default-value>
<description>wxWidgets resource compiler and flags</description>
@ -113,11 +109,27 @@ Format-specific notes:
-->
</template>
<!-- not used together with wx-config: -->
<!-- VERY IMPORTANT: <wx-lib>base</wx-lib> must be the last wx-lib tag
in all your bakefiles !!
-->
<define-tag name="wx-lib" rules="exe,dll,module">
<if cond="value=='base'">
<if cond="FORMAT=='autoconf' and value=='base'">
<!-- all wx-dependent libraries should have been already listed
thus we can now add WX_LIBS to the linker line -->
<ldlibs>$(WX_LIBS)</ldlibs>
</if>
<if cond="FORMAT=='gnu' and value=='base'">
<!-- all wx libraries should have been already specified, thus
$(__liblist) should contain the full list... -->
<set var="__liblist" append="1">base</set>
<ldlibs>`$(WX_CONFIG) --libs $(','.join(__liblist.split()))`</ldlibs>
</if>
<if cond="FORMAT=='gnu' and value!='base'">
<set var="__liblist" append="1">$(value)</set>
</if>
<if cond="value not in ALLLIB_LIST.split()">
<error>Unknown wxWidgets library given in the wx-lib tag</error>
</if>
</define-tag>
</makefile>

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

@ -292,15 +292,6 @@ FIXME: this template has (at least) the following bugs:
<!-- libraries required by the platform, the libraries -->
<!-- we want for our stuff, and the wxWindows libs. -->
<!-- list of known libraries used by wx-lib tag below -->
<set var="LIB_LIST">base core net xml odbc xrc html adv media gl dbgrid qa</set>
<!-- NOTE: refer to the NET contrib using NETUTILS instead of NET
(which is already in LIB_LIST) -->
<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>
<!-- this tag is used to include wx libraries: -->
<define-tag name="wx-lib" rules="exe,dll,module">
<if cond="value=='base'"><sys-lib>$(WXLIB_BASE_NAME)</sys-lib></if>