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

splitted gizmos library into gizmos and gizmos_xrc in order to fix broken compilation of DLLs

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33486 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2005-04-10 19:41:03 +00:00
parent b808efdb88
commit 1b53faea6e
4 changed files with 44 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
contrib/build/gizmos/gizmos.bkl
View File

@@ -12,6 +12,9 @@
multicell.cpp
splittree.cpp
statpict.cpp
</set>
<set var="GIZMOS_XRC_SRC">
xh_statpict.cpp
</set>
@@ -23,8 +26,8 @@
wx/gizmos/multicell.h
wx/gizmos/splittree.h
wx/gizmos/statpict.h
wx/gizmos/xh_statpict.h
wx/gizmos/gizmos.h
wx/gizmos/xh_statpict.h
</files>
</headers>
@@ -32,14 +35,31 @@
<define>WXUSINGDLL</define>
<define>WXMAKINGDLL_GIZMOS</define>
<sources>$(GIZMOS_SRC)</sources>
<wx-lib>base</wx-lib>
<wx-lib>core</wx-lib>
<wx-lib>base</wx-lib>
</dll>
<dll id="gizmos_xrcdll" template="wx_contrib_dll"
cond="SHARED=='1' and USE_XRC=='1'">
<define>WXUSINGDLL</define>
<define>WXMAKINGDLL_GIZMOS_XRC</define>
<sources>$(GIZMOS_XRC_SRC)</sources>
<library>gizmosdll</library>
<wx-lib>xrc</wx-lib>
<wx-lib>core</wx-lib>
<wx-lib>base</wx-lib>
</dll>
<lib id="gizmoslib" template="wx_contrib_lib" cond="SHARED=='0'">
<sources>$(GIZMOS_SRC)</sources>
</lib>
<lib id="gizmos_xrclib" template="wx_contrib_lib"
cond="SHARED=='0' and USE_XRC=='1'">
<sources>$(GIZMOS_XRC_SRC)</sources>
</lib>
<set var="MSVC6PRJ_MERGED_TARGETS" append="1">gizmos=gizmoslib+gizmosdll</set>
<set var="MSVC6PRJ_MERGED_TARGETS" append="1">gizmos_xrc=gizmos_xrclib+gizmos_xrcdll</set>
</makefile>