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

fix for library order when using wx-dependent libraries (part of patch 1303724)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35675 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2005-09-25 11:21:48 +00:00
parent 61a15bac86
commit 9864ef3b5c
1 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,7 +7,7 @@ See wx.bkl for platform-independent notes.
Usage: Usage:
Options WX_CPPFLAGS, WX_CFLAGS, WX_CXXFLAGS, WX_LIBS are defined. Options WX_CPPFLAGS, WX_CFLAGS, WX_CXXFLAGS, WX_LIBS are defined.
Format-specific notes: Format-specific notes:
@@ -23,7 +23,7 @@ Format-specific notes:
<!-- ============================================================== --> <!-- ============================================================== -->
<!-- Autoconf --> <!-- Autoconf -->
<!-- ============================================================== --> <!-- ============================================================== -->
<if cond="FORMAT=='autoconf'"> <if cond="FORMAT=='autoconf'">
<!-- Autoconf backend is simplicity itself thanks to wx-config... --> <!-- Autoconf backend is simplicity itself thanks to wx-config... -->
<option name="WX_CFLAGS"/> <option name="WX_CFLAGS"/>
@@ -31,7 +31,7 @@ Format-specific notes:
<option name="WX_CPPFLAGS"/> <option name="WX_CPPFLAGS"/>
<option name="WX_LIBS"/> <option name="WX_LIBS"/>
</if> </if>
<!-- ============================================================== --> <!-- ============================================================== -->
<!-- GNU makefiles for Unix --> <!-- GNU makefiles for Unix -->
<!-- ============================================================== --> <!-- ============================================================== -->
@@ -62,27 +62,38 @@ Format-specific notes:
prevents bakefile from detecting it: --> prevents bakefile from detecting it: -->
<set var="FORMAT_OUTPUT_VARIABLES" append="1">WX_CONFIG</set> <set var="FORMAT_OUTPUT_VARIABLES" append="1">WX_CONFIG</set>
</if> </if>
<!-- ============================================================== --> <!-- ============================================================== -->
<!-- Common code --> <!-- Common code -->
<!-- ============================================================== --> <!-- ============================================================== -->
<if cond="FORMAT not in ['gnu','autoconf']"> <if cond="FORMAT not in ['gnu','autoconf']">
<error> <error>
Don't include presets/wx_unix.bkl directly, use presets/wx.bkl. Don't include presets/wx_unix.bkl directly, use presets/wx.bkl.
</error> </error>
</if> </if>
<template id="wx-lib"> <template id="wx-lib">
<cxxflags>$(WX_CXXFLAGS)</cxxflags> <cxxflags>$(WX_CXXFLAGS)</cxxflags>
<cflags>$(WX_CFLAGS)</cflags> <cflags>$(WX_CFLAGS)</cflags>
</template> </template>
<template id="wx" template="wx-lib"> <template id="wx" template="wx-lib">
<ldlibs>$(WX_LIBS)</ldlibs> <!--
Don't include the $(WX_LIBS) variable in linker options here since
it would make impossible for the user to obtain the right library
order when he needs to specify, *before* WX_LIBS, its own libraries
that depend on wxWidgets libraries; to avoid this, we include
$(WX_LIBS) as soon as we found the <wx-lib>base</wx-lib> tag which
the user should always put *after* all other wx-dependent libraries
-->
</template> </template>
<!-- not used together with wx-config: --> <!-- not used together with wx-config: -->
<define-tag name="wx-lib" rules="exe,dll,module"/> <define-tag name="wx-lib" rules="exe,dll,module">
<if cond="value=='base'">
<ldlibs>$(WX_LIBS)</ldlibs>
</if>
</define-tag>
</makefile> </makefile>