more contrib tweaks

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21382 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík 2003-06-25 11:00:44 +00:00
parent bf25264013
commit fab9850d5d
2 changed files with 34 additions and 10 deletions

View File

@ -77,6 +77,9 @@
<set var="WXLIB_CORE">
<if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('core')))</if>
</set>
<set var="WXLIB_HTML">
<if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('core')))</if>
</set>
<set var="WXLIB_MONO">
<if cond="MONOLITHIC=='1'">$(mk.evalExpr(wxwin.mkLibName('mono')))</if>
@ -129,29 +132,23 @@
<sys-lib>$(LIB_REGEX)</sys-lib>
</template>
<template id="wx_lib" template="wx" template_append="wx_append">
<template id="wx_lib_b" template="wx">
<set var="WXLIBNAME">$(wxwin.mkLibName(wxid))</set>
<dirname>$(LIBDIRNAME)</dirname>
<libname>$(WXLIBNAME)</libname>
<install-to>$(LIBDIR)</install-to>
</template>
<template id="wx_dll" template="wx_lib">
<template id="wx_dll_b" template="wx_lib_b">
<set var="WXDLLNAME">$(wxwin.mkDllName(wxid))</set>
<dllname>$(WXDLLNAME)</dllname>
<version>$(WX_VERSION)</version>
<so_version>$(WXSOVERSION)</so_version>
<mac_version>$(WXMACVERSION)</mac_version>
</template>
<!-- =============================================================== -->
<!-- Contrib helpers: -->
<!-- =============================================================== -->
<template id="contrib">
<include>$(SRCDIR)/../../include</include>
</template>
<template id="wx_lib" template="wx_lib_b"/>
<template id="wx_dll" template="wx_dll_b" template_append="wx_append"/>
<!-- =============================================================== -->
<!-- Support for wxWindows samples and contrib: -->

View File

@ -0,0 +1,27 @@
<?xml version="1.0" ?>
<makefile>
<include file="common.bkl"/>
<set var="CONTRIB_HDR_DIR">$(SRCDIR)/../../include</set>
<!-- =============================================================== -->
<!-- Contrib lib helpers: -->
<!-- =============================================================== -->
<template id="wx_contrib_lib" template="wx_lib_b">
<include>$(CONTRIB_HDR_DIR)</include>
</template>
<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>
<template id="wx_contrib_headers">
<srcdir>$(CONTRIB_HDR_DIR)</srcdir>
</template>
</makefile>