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

static libs depend on 3rd party ones now, too (for convenience)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22572 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík 2003-08-04 11:59:44 +00:00
parent 0a3d26b81f
commit 5c802b3d9b
2 changed files with 170 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
build/bakefiles/common.bkl
View File

@ -379,20 +379,7 @@ $(TAB)copy "$(DOLLAR)(InputPath)" $(LIBDIRNAME)\wx\setup.h
<mac_version>$(WXMACVERSION)</mac_version>
</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_nomono">
<depends>wxtiff</depends>
<depends>wxjpeg</depends>
<depends>wxpng</depends>
<depends>wxexpat</depends>
<depends>wxzlib</depends>
<depends cond="FORMAT=='autoconf'">wxodbc</depends>
<depends>wxregex</depends>
</template>
<template id="wx_base_dll" template="wx_dll_b"
template_append="wx_append_base_nomono">
<template id="wx_3rdparty_dependencies">
<depends>wxtiff</depends>
<depends>wxjpeg</depends>
<depends>wxpng</depends>
@ -402,6 +389,13 @@ $(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_dll" template="wx_dll_b,wx_3rdparty_dependencies"
template_append="wx_append_nomono"/>
<template id="wx_base_dll" template="wx_dll_b,wx_3rdparty_dependencies"
template_append="wx_append_base_nomono"/>
<!-- =============================================================== -->
<!-- Support for wxWindows samples and contrib: -->
<!-- =============================================================== -->

162
build/wx.dsw
View File

@ -46,6 +46,24 @@ Package=<5>
Package=<4>
{{{
Begin Project Dependency
Project_Dep_Name wxtiff
End Project Dependency
Begin Project Dependency
Project_Dep_Name wxjpeg
End Project Dependency
Begin Project Dependency
Project_Dep_Name wxpng
End Project Dependency
Begin Project Dependency
Project_Dep_Name wxexpat
End Project Dependency
Begin Project Dependency
Project_Dep_Name wxzlib
End Project Dependency
Begin Project Dependency
Project_Dep_Name wxregex
End Project Dependency
}}}
###############################################################################
@ -88,6 +106,24 @@ Package=<5>
Package=<4>
{{{
Begin Project Dependency
Project_Dep_Name wxtiff
End Project Dependency
Begin Project Dependency
Project_Dep_Name wxjpeg
End Project Dependency
Begin Project Dependency
Project_Dep_Name wxpng
End Project Dependency
Begin Project Dependency
Project_Dep_Name wxexpat
End Project Dependency
Begin Project Dependency
Project_Dep_Name wxzlib
End Project Dependency
Begin Project Dependency
Project_Dep_Name wxregex
End Project Dependency
}}}
###############################################################################
@ -133,6 +169,24 @@ Package=<5>
Package=<4>
{{{
Begin Project Dependency
Project_Dep_Name wxtiff
End Project Dependency
Begin Project Dependency
Project_Dep_Name wxjpeg
End Project Dependency
Begin Project Dependency
Project_Dep_Name wxpng
End Project Dependency
Begin Project Dependency
Project_Dep_Name wxexpat
End Project Dependency
Begin Project Dependency
Project_Dep_Name wxzlib
End Project Dependency
Begin Project Dependency
Project_Dep_Name wxregex
End Project Dependency
}}}
###############################################################################
@ -187,6 +241,24 @@ Package=<5>
Package=<4>
{{{
Begin Project Dependency
Project_Dep_Name wxtiff
End Project Dependency
Begin Project Dependency
Project_Dep_Name wxjpeg
End Project Dependency
Begin Project Dependency
Project_Dep_Name wxpng
End Project Dependency
Begin Project Dependency
Project_Dep_Name wxexpat
End Project Dependency
Begin Project Dependency
Project_Dep_Name wxzlib
End Project Dependency
Begin Project Dependency
Project_Dep_Name wxregex
End Project Dependency
}}}
###############################################################################
@ -229,6 +301,24 @@ Package=<5>
Package=<4>
{{{
Begin Project Dependency
Project_Dep_Name wxtiff
End Project Dependency
Begin Project Dependency
Project_Dep_Name wxjpeg
End Project Dependency
Begin Project Dependency
Project_Dep_Name wxpng
End Project Dependency
Begin Project Dependency
Project_Dep_Name wxexpat
End Project Dependency
Begin Project Dependency
Project_Dep_Name wxzlib
End Project Dependency
Begin Project Dependency
Project_Dep_Name wxregex
End Project Dependency
}}}
###############################################################################
@ -277,6 +367,24 @@ Package=<5>
Package=<4>
{{{
Begin Project Dependency
Project_Dep_Name wxtiff
End Project Dependency
Begin Project Dependency
Project_Dep_Name wxjpeg
End Project Dependency
Begin Project Dependency
Project_Dep_Name wxpng
End Project Dependency
Begin Project Dependency
Project_Dep_Name wxexpat
End Project Dependency
Begin Project Dependency
Project_Dep_Name wxzlib
End Project Dependency
Begin Project Dependency
Project_Dep_Name wxregex
End Project Dependency
}}}
###############################################################################
@ -322,6 +430,24 @@ Package=<5>
Package=<4>
{{{
Begin Project Dependency
Project_Dep_Name wxtiff
End Project Dependency
Begin Project Dependency
Project_Dep_Name wxjpeg
End Project Dependency
Begin Project Dependency
Project_Dep_Name wxpng
End Project Dependency
Begin Project Dependency
Project_Dep_Name wxexpat
End Project Dependency
Begin Project Dependency
Project_Dep_Name wxzlib
End Project Dependency
Begin Project Dependency
Project_Dep_Name wxregex
End Project Dependency
}}}
###############################################################################
@ -367,6 +493,24 @@ Package=<5>
Package=<4>
{{{
Begin Project Dependency
Project_Dep_Name wxtiff
End Project Dependency
Begin Project Dependency
Project_Dep_Name wxjpeg
End Project Dependency
Begin Project Dependency
Project_Dep_Name wxpng
End Project Dependency
Begin Project Dependency
Project_Dep_Name wxexpat
End Project Dependency
Begin Project Dependency
Project_Dep_Name wxzlib
End Project Dependency
Begin Project Dependency
Project_Dep_Name wxregex
End Project Dependency
}}}
###############################################################################
@ -484,6 +628,24 @@ Package=<5>
Package=<4>
{{{
Begin Project Dependency
Project_Dep_Name wxtiff
End Project Dependency
Begin Project Dependency
Project_Dep_Name wxjpeg
End Project Dependency
Begin Project Dependency
Project_Dep_Name wxpng
End Project Dependency
Begin Project Dependency
Project_Dep_Name wxexpat
End Project Dependency
Begin Project Dependency
Project_Dep_Name wxzlib
End Project Dependency
Begin Project Dependency
Project_Dep_Name wxregex
End Project Dependency
}}}
###############################################################################