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

1. merged dll and lib VC++ projects into one project file, as in old projects

Browse Source 
2. removed dependencies on 3rd party libs for static libs (doesn't work due to bug in VC++ IDE)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22821 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2003-08-13 21:22:50 +00:00
parent 28249f1135
commit 7bd54b688e
2 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
build/bakefiles/common.bkl
View File

@@ -399,8 +399,8 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(LIBDIRNAME)\wx\setup.h
<depends>wxregex</depends>
</template>
<template id="wx_lib" template="wx_lib_b,wx_3rdparty_dependencies"/>
<template id="wx_base_lib" template="wx_lib_b,wx_3rdparty_dependencies">
<template id="wx_lib" template="wx_lib_b"/>
<template id="wx_base_lib" template="wx_lib_b">
<define>wxUSE_GUI=0</define>
</template>
@@ -462,6 +462,11 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(LIBDIRNAME)\wx\setup.h
<!-- Link against one wxWin library. Value must be literal! -->
<define-tag name="wx-lib" rules="exe,dll,module">
<sys-lib>$(wxwin.libToLink(value))</sys-lib>
<if cond="FORMAT=='msvc6prj'">
<depends-on-dsp>
$(value):$(nativePaths(WXTOPDIR))build\msw\wx_$(value).dsp
</depends-on-dsp>
</if>
</define-tag>
</makefile>

17
build/bakefiles/multilib.bkl
View File

@@ -24,6 +24,8 @@
<msvc-copy-setup-h/>
</lib>
<set var="MSVC6PRJ_MERGED_TARGETS" append="1">base=baselib+basedll</set>
<!-- ================================================================= -->
<!-- wxNet library -->
@@ -44,6 +46,8 @@
<msvc-headers>$(NET_CMN_HDR)</msvc-headers>
</lib>
<set var="MSVC6PRJ_MERGED_TARGETS" append="1">net=netlib+netdll</set>
<!-- ================================================================= -->
<!-- Main GUI library -->
@@ -66,6 +70,8 @@
<msvc-headers>$(ALL_GUI_HEADERS)</msvc-headers>
</lib>
<set var="MSVC6PRJ_MERGED_TARGETS" append="1">core=corelib+coredll</set>
<!-- ================================================================= -->
<!-- "Advanced" controls library -->
@@ -87,6 +93,8 @@
<msvc-headers>$(ADVANCED_HDR)</msvc-headers>
</lib>
<set var="MSVC6PRJ_MERGED_TARGETS" append="1">adv=advlib+advdll</set>
<!-- ================================================================= -->
<!-- DB classes library -->
@@ -127,6 +135,9 @@
<msvc-headers>$(DBGRID_HDR)</msvc-headers>
</lib>
<set var="MSVC6PRJ_MERGED_TARGETS" append="1">odbc=odbclib+odbcdll</set>
<set var="MSVC6PRJ_MERGED_TARGETS" append="1">dbgrid=dbgridlib+dbgriddll</set>
<!-- ================================================================ -->
<!-- wxHTML -->
@@ -148,12 +159,16 @@
<msvc-headers>$(HTML_HDR)</msvc-headers>
</lib>
<set var="MSVC6PRJ_MERGED_TARGETS" append="1">html=htmllib+htmldll</set>
<!-- ================================================================ -->
<!-- OpenGL -->
<!-- ================================================================ -->
<!-- included by wx.bkl from opengl.bkl -->
<set var="MSVC6PRJ_MERGED_TARGETS" append="1">gl=gllib+gldll</set>
<!-- ================================================================ -->
<!-- XML -->
@@ -175,4 +190,6 @@
<msvc-headers>$(XML_HDR)</msvc-headers>
</lib>
<set var="MSVC6PRJ_MERGED_TARGETS" append="1">xml=xmllib+xmldll</set>
</makefile>