fix for library order when using wx-dependent libraries (part of patch 1303724)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35675 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -79,10 +79,21 @@ Format-specific notes:
|
|||||||
</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>
|
||||||
|
Reference in New Issue
Block a user