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

fixed wrong order of libraries for contrib samples

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22110 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík 2003-07-19 16:26:36 +00:00
parent d1fafa4ea9
commit e83a52a25a
3 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
build/bakefiles/common.bkl
View File

@ -218,7 +218,7 @@
</template>
<!-- for both GUI and wxBase libs/samples: -->
<template id="wx_append_base">
<template id="wx_append_base_nomono">
<!-- link against builtin 3rd party libs, if needed: -->
<sys-lib>$(LIB_TIFF)</sys-lib>
<sys-lib>$(LIB_JPEG)</sys-lib>
@ -256,10 +256,21 @@
</template>
<!-- for GUI libs/samples: -->
<template id="wx_append" template="wx_append_base">
<template id="wx_append_nomono" template="wx_append_base_nomono">
<ldlibs>$(EXTRALIBS_GUI)</ldlibs>
</template>
<template id="wx_append_base" template_append="wx_append_base_nomono">
<!-- Always link against the wxWin library in monolithic build: -->
<sys-lib>$(WXLIB_MONO)</sys-lib>
</template>
<template id="wx_append" template_append="wx_append_nomono">
<!-- Always link against the wxWin library in monolithic build: -->
<sys-lib>$(WXLIB_MONO)</sys-lib>
</template>
<template id="wx_lib_b" template="wx,anylib">
<set var="WXLIBNAME">$(wxwin.mkLibName(wxid))</set>
<libname>$(WXLIBNAME)</libname>
@ -285,7 +296,8 @@
<template id="wx_lib" template="wx_lib_b"/>
<template id="wx_base_lib" template="wx_lib_b"/>
<template id="wx_dll" template="wx_dll_b" template_append="wx_append">
<template id="wx_dll" template="wx_dll_b"
template_append="wx_append_nomono">
<depends>wxtiff</depends>
<depends>wxjpeg</depends>
<depends>wxpng</depends>
@ -294,7 +306,7 @@
<depends>wxregex</depends>
</template>
<template id="wx_base_dll" template="wx_dll_b"
template_append="wx_append_base">
template_append="wx_append_base_nomono">
<depends>wxzlib</depends>
<depends>wxregex</depends>
</template>

2
build/bakefiles/common_contrib.bkl
View File

@ -26,8 +26,6 @@
<template id="wx_contrib_dll"
template="wx_dll_b" template_append="wx_append">
<include>$(CONTRIB_HDR_DIR)</include>
<!-- Always link against the wxWin library in monolithic build: -->
<sys-lib>$(WXLIB_MONO)</sys-lib>
</template>

2
build/bakefiles/common_samples.bkl
View File

@ -24,8 +24,6 @@
<template id="wx_sample_b" template="wx">
<include>$(SRCDIR)</include>
<!-- Always link against the wxWin library in monolithic build: -->
<sys-lib>$(WXLIB_MONO)</sys-lib>
<ldflags>$(SAMPLES_RPATH_FLAG)</ldflags>
<define>$(DLLFLAG)</define>
</template>