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

fixed wrong order of libraries in the output

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33330 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2005-04-04 20:25:38 +00:00
parent 8d3261f9d9
commit bb51876f6c
1 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -178,6 +178,8 @@ FIXME: this template has (at least) the following bugs:
<define-tag name="__wx-libs-point" rules="exe,dll,module"/> <define-tag name="__wx-libs-point" rules="exe,dll,module"/>
<tag-info name="wx-lib" <tag-info name="wx-lib"
position="before:__wx-libs-point"/> position="before:__wx-libs-point"/>
<tag-info name="__wx-syslibs"
position="after:__wx-libs-point"/>
<!-- template for static wx libraries: --> <!-- template for static wx libraries: -->
@@ -196,15 +198,11 @@ FIXME: this template has (at least) the following bugs:
<include>$(WX_DIR)/include</include> <include>$(WX_DIR)/include</include>
</template> </template>
<!-- template for wx executables/dlls: --> <!-- this ugly tag contains all sys-lib tags used by "wx" template,
<template id="wx" template="wx-lib"> in order to make sure they are not reorder when wx-lib is moved
<lib-path>$(WX_DIR)$(WXLIBPATH)</lib-path> after __wx-libs-point: -->
<define-tag name="__wx-syslibs" rules="exe,dll,module">
<!-- wx libs must come before 3rd party and sys libs, this is
the place where the hack explained above is carried on: -->
<__wx-libs-point/>
<!-- wx 3rd party libs, always use them: --> <!-- wx 3rd party libs, always use them: -->
<sys-lib>wxtiff$(WX3RDPARTLIBPOSTFIX)</sys-lib> <sys-lib>wxtiff$(WX3RDPARTLIBPOSTFIX)</sys-lib>
<sys-lib>wxjpeg$(WX3RDPARTLIBPOSTFIX)</sys-lib> <sys-lib>wxjpeg$(WX3RDPARTLIBPOSTFIX)</sys-lib>
@@ -245,6 +243,16 @@ FIXME: this template has (at least) the following bugs:
<if cond="FORMAT=='msvc' or FORMAT=='msvc6prj' or FORMAT=='borland'"> <if cond="FORMAT=='msvc' or FORMAT=='msvc6prj' or FORMAT=='borland'">
<sys-lib>oleacc</sys-lib> <sys-lib>oleacc</sys-lib>
</if> </if>
</define-tag>
<!-- template for wx executables/dlls: -->
<template id="wx" template="wx-lib">
<lib-path>$(WX_DIR)$(WXLIBPATH)</lib-path>
<!-- wx libs must come before 3rd party and sys libs, this is
the place where the hack explained above is carried on: -->
<__wx-libs-point/>
<__wx-syslibs/>
</template> </template>
</makefile> </makefile>