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

don't link wxBase against GUI libraries

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21712 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2003-07-06 18:55:09 +00:00
parent fa10c70ceb
commit c74dc1630d
5 changed files with 45 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
build/bakefiles/common.bkl
View File

@@ -221,7 +221,8 @@
<include>$(INC_REGEX)</include>
</template>
<template id="wx_append">
<!-- for both GUI and wxBase libs/samples: -->
<template id="wx_append_base">
<!-- link against builtin 3rd party libs, if needed: -->
<sys-lib>$(LIB_TIFF)</sys-lib>
<sys-lib>$(LIB_JPEG)</sys-lib>
@@ -258,6 +259,11 @@
</if>
</template>
<!-- for GUI libs/samples: -->
<template id="wx_append" template="wx_append_base">
<ldlibs>$(EXTRALIBS_GUI)</ldlibs>
</template>
<template id="wx_lib_b" template="wx,anylib">
<set var="WXLIBNAME">$(wxwin.mkLibName(wxid))</set>
<libname>$(WXLIBNAME)</libname>
@@ -282,6 +288,7 @@
</template>
<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">
<depends>wxtiff</depends>
<depends>wxjpeg</depends>
@@ -290,6 +297,11 @@
<depends cond="FORMAT=='autoconf'">wxodbc</depends>
<depends>wxregex</depends>
</template>
<template id="wx_base_dll" template="wx_dll_b"
template_append="wx_append_base">
<depends>wxzlib</depends>
<depends>wxregex</depends>
</template>
<!-- =============================================================== -->
<!-- Support for wxWindows samples and contrib: -->

2
build/bakefiles/config.bkl
View File

@@ -82,6 +82,7 @@
<option name="TOOLKIT_LOWERCASE"/>
<option name="TOOLKIT_VERSION"/>
<option name="EXTRALIBS"/>
<option name="EXTRALIBS_GUI"/>
<option name="SAMPLES_RPATH_FLAG"/>
<set var="TOP_SRCDIR">$(top_srcdir)/</set>
</if>
@@ -99,6 +100,7 @@
<set var="TOOLKIT_VERSION"/>
<set var="SAMPLES_RPATH_FLAG"/>
<set var="EXTRALIBS"/>
<set var="EXTRALIBS_GUI"/>
<set var="EXTRACFLAGS"/>
<set var="SRCDIR">