AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

many changed to enable multilib build

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21393 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík 2003-06-25 16:29:51 +00:00
parent 7e8c564c1a
commit e86e15224d
8 changed files with 101 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/bakefiles/Makefile
View File

@ -104,7 +104,7 @@ Makefile: regenMakefile.py
@exit 1
# from wx.bkl
../../Makefile.in: common.bkl config.bkl files.bkl monolithic.bkl wxwin.py wx.bkl
../../Makefile.in: common.bkl config.bkl files.bkl monolithic.bkl multilib.bkl wxwin.py wx.bkl
$(BAKEFILE) $(BAKEARGS) -fautoconf -o../../Makefile.in wx.bkl
touch ../../Makefile.in
@ -474,6 +474,6 @@ Makefile: regenMakefile.py
touch ../../samples/internat/Makefile.in
# from ../../contrib/build/xrc/xrc.bkl
../../contrib/src/xrc/Makefile.in: common.bkl common_samples.bkl config.bkl ../../contrib/build/xrc/xrc.bkl
../../contrib/src/xrc/Makefile.in: common.bkl common_contrib.bkl config.bkl ../../contrib/build/xrc/xrc.bkl
$(BAKEFILE) $(BAKEARGS) -fautoconf -o../../contrib/src/xrc/Makefile.in -DWXTOPDIR=/../../.. -DAUTOCONF_MACROS_FILE=../../autoconf_inc.m4 ../../contrib/build/xrc/xrc.bkl
touch ../../contrib/src/xrc/Makefile.in

5
build/bakefiles/common.bkl
View File

@ -74,11 +74,14 @@
<!-- Names of component libraries: -->
<!-- =============================================================== -->
<set var="WXLIB_BASE">
<if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('base')))</if>
</set>
<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>
<if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('html')))</if>
</set>
<set var="WXLIB_MONO">

1
build/bakefiles/config.bkl
View File

@ -19,7 +19,6 @@
</description>
</option>
<!-- FIXME - to be option, not hardcoded value!! -->
<option name="MONOLITHIC">
<values>0 1</values>
<default-value>0</default-value>

66
build/bakefiles/files.bkl
View File

@ -10,15 +10,19 @@
respectively
* file groups are:
BASE_CMN common base files (all platforms)
GUICMN common GUI files (all platforms)
BASE_CMN common base files (all platforms)
GUI_CMN common GUI files (all platforms)
BASE_AND_GUI_CMN_SRC files that must be compiled both into GUI
and base library (all platforms)
BASE_$(platform) base files used on platform
$(port)LOWLEVEL low-level GUI classes
$(port) high-level files for a port
XWIN_LOWLEVEL low-level classes for X Window System port
BASE_$(platform) base files used on platform
BASE_AND_GUI_$(platform)_SRC base & gui files used on platform
$(port)LOWLEVEL low-level GUI classes
$(port) high-level files for a port
XWIN_LOWLEVEL low-level classes for X Window System port
HTML wxHTML files
HTML wxHTML files
* one file may be listed in several groups
@ -33,18 +37,20 @@
<set var="BASE_UNIX_SRC">
src/unix/baseunix.cpp
src/unix/dialup.cpp
src/unix/dir.cpp
src/unix/gsocket.c
src/unix/mimetype.cpp
src/unix/snglinst.cpp
src/unix/threadpsx.cpp
</set>
<set var="BASE_AND_GUI_UNIX_SRC">
src/unix/utilsunx.cpp
</set>
<set var="BASE_UNIX_HDR">
wx/unix/gsockunx.h
wx/unix/mimetype.h
</set>
<set var="BASE_WIN32_SRC">
src/msw/gsocket.c
src/msw/gsockmsw.c
@ -59,6 +65,9 @@
src/msw/thread.cpp
src/msw/utils.cpp
src/msw/utilsexc.cpp
</set>
<set var="BASE_AND_GUI_WIN32_SRC">
src/msw/mslu.cpp
src/msw/volume.cpp
</set>
<set var="BASE_WIN32_HDR">
@ -67,17 +76,24 @@
wx/msw/mimetype.h
wx/msw/winundef.h
</set>
<set var="BASE_MAC_SRC">
</set>
<set var="BASE_AND_GUI_MAC_SRC">
</set>
<set var="BASE_MAC_HDR">
</set>
<set var="BASE_OS2_SRC">
src/os2/dir.cpp
src/os2/utils.cpp
src/os2/utilsexc.cpp
</set>
<set var="BASE_AND_GUI_OS2_SRC">
</set>
<set var="BASE_OS2_HDR">
</set>
<set var="BASE_CMN_SRC">
src/common/appbase.cpp
src/common/clntdata.cpp
@ -92,7 +108,6 @@
src/common/dynlib.cpp
src/common/dynload.cpp
src/common/encconv.cpp
src/common/event.cpp
src/common/extended.c
src/common/ffile.cpp
src/common/file.cpp
@ -102,7 +117,6 @@
src/common/filesys.cpp
src/common/fmapbase.cpp
src/common/fs_inet.cpp
src/common/fs_mem.cpp
src/common/fs_zip.cpp
src/common/ftp.cpp
src/common/hash.cpp
@ -116,7 +130,6 @@
src/common/memory.cpp
src/common/mimecmn.cpp
src/common/module.cpp
src/common/msgout.cpp
src/common/mstream.cpp
src/common/object.cpp
src/common/process.cpp
@ -138,13 +151,17 @@
src/common/txtstrm.cpp
src/common/unzip.c
src/common/url.cpp
src/common/utilscmn.cpp
src/common/variant.cpp
src/common/wfstream.cpp
src/common/wxchar.cpp
src/common/zipstrm.cpp
src/common/zstream.cpp
</set>
<set var="BASE_AND_GUI_CMN_SRC">
src/common/fs_mem.cpp
src/common/msgout.cpp
src/common/utilscmn.cpp
</set>
<set var="BASE_CMN_HDR">
wx/arrimpl.cpp
wx/listimpl.cpp
@ -244,7 +261,7 @@
<!-- Common GUI files -->
<!-- ====================================================================== -->
<set var="GUICMN_SRC">
<set var="GUI_CMN_SRC">
src/generic/selstore.cpp
src/generic/busyinfo.cpp
src/generic/calctrl.cpp
@ -272,6 +289,7 @@
src/generic/treectlg.cpp
src/generic/wizard.cpp
src/common/appcmn.cpp
src/common/event.cpp
src/common/fontmap.cpp
src/common/accesscmn.cpp
src/common/artprov.cpp
@ -311,7 +329,6 @@
src/common/imagall.cpp
src/common/imagbmp.cpp
src/common/image.cpp
src/common/imagfill.cpp
src/common/imaggif.cpp
src/common/imagiff.cpp
src/common/imagjpeg.cpp
@ -320,6 +337,7 @@
src/common/imagpnm.cpp
src/common/imagtiff.cpp
src/common/imagxpm.cpp
src/common/imagfill.cpp
src/common/layout.cpp
src/common/lboxcmn.cpp
src/common/matrix.cpp
@ -343,7 +361,7 @@
src/common/wincmn.cpp
src/common/xpmdecod.cpp
</set>
<set var="GUICMN_HDR">
<set var="GUI_CMN_HDR">
wx/selstore.h
wx/generic/accel.h
wx/generic/calctrl.h
@ -358,6 +376,7 @@
wx/generic/gridctrl.h
wx/generic/grid.h
wx/generic/helpext.h
wx/generic/logg.h
wx/helphtml.h
wx/generic/imaglist.h
wx/generic/laywin.h
@ -389,6 +408,7 @@
src/common/taskbarcmn.cpp
src/unix/taskbarx11.cpp
src/generic/printps.cpp
src/unix/dialup.cpp
</set>
<set var="XWIN_LOWLEVEL_HDR">
wx/unix/fontutil.h
@ -873,7 +893,6 @@
src/msw/menuitem.cpp
src/msw/metafile.cpp
src/msw/msgdlg.cpp
src/msw/mslu.cpp
src/msw/nativdlg.cpp
src/msw/notebook.cpp
src/msw/ownerdrw.cpp
@ -1671,16 +1690,23 @@
<if cond="PLATFORM_MACOSX=='1'">$(BASE_MAC_SRC)</if>
<if cond="PLATFORM_WIN32=='1'">$(BASE_WIN32_SRC)</if>
</set>
<set var="BASE_AND_GUI_PLATFORM_SRC">
<if cond="PLATFORM_UNIX=='1'">$(BASE_AND_GUI_UNIX_SRC)</if>
<if cond="PLATFORM_MACOSX=='1'">$(BASE_AND_GUI_MAC_SRC)</if>
<if cond="PLATFORM_WIN32=='1'">$(BASE_AND_GUI_WIN32_SRC)</if>
</set>
<set var="BASE_PLATFORM_HDR">
<if cond="PLATFORM_UNIX=='1'">$(BASE_UNIX_HDR)</if>
<if cond="PLATFORM_MACOSX=='1'">$(BASE_MAC_HDR)</if>
<if cond="PLATFORM_WIN32=='1'">$(BASE_WIN32_HDR)</if>
</set>
<set var="BASE_SRC">
$(BASE_CMN_SRC) $(BASE_PLATFORM_SRC)
</set>
<set var="BASE_AND_GUI_SRC">
$(BASE_AND_GUI_CMN_SRC) $(BASE_AND_GUI_PLATFORM_SRC)
</set>
<set var="LOWLEVEL_SRC">
@ -1727,16 +1753,16 @@
src/common/init.cpp
</if>
<if cond="USE_GUI=='1' and WXUNIV=='0'">
$(LOWLEVEL_SRC) $(GUI_SRC) $(GUICMN_SRC)
$(LOWLEVEL_SRC) $(GUI_SRC) $(GUI_CMN_SRC)
</if>
<if cond="USE_GUI=='1' and WXUNIV=='1'">
$(LOWLEVEL_SRC) $(UNIV_SRC) $(UNIV_THEMES_SRC) $(GUICMN_SRC)
$(LOWLEVEL_SRC) $(UNIV_SRC) $(UNIV_THEMES_SRC) $(GUI_CMN_SRC)
</if>
</set>
<set var="ALL_HEADERS">
$(BASE_CMN_HDR) $(BASE_PLATFORM_HDR)
$(GUICMN_HDR) $(GUI_HDR) $(LOWLEVEL_HDR)
$(GUI_CMN_HDR) $(GUI_HDR) $(LOWLEVEL_HDR)
$(HTML_HDR)
</set>

12
build/bakefiles/monolithic.bkl
View File

@ -4,19 +4,20 @@
<set var="MONOLIB_SRC">
<if cond="USE_GUI=='0'">
src/common/init.cpp $(BASE_SRC)
src/common/init.cpp $(BASE_SRC) $(BASE_AND_GUI_SRC)
</if>
<if cond="USE_GUI=='1'">
$(BASE_SRC) $(CORE_SRC) $(HTML_SRC)
$(BASE_SRC) $(BASE_AND_GUI_SRC) $(CORE_SRC) $(HTML_SRC)
</if>
</set>
<dll id="monodll" template="wx_dll"
cond="SHARED=='1' and MONOLITHIC=='1'">
<define>wxUSE_BASE</define>
<define>__WXBASE__</define>
<define>wxUSE_BASE=1</define>
<define>WXMAKINGDLL</define>
<sources>$(MONOLIB_SRC)</sources>
<library>$(LIB_ZLIB)</library>
<library>$(LIB_REGEX)</library>
<library>$(LIB_PNG)</library>
@ -27,7 +28,8 @@
<lib id="monolib" template="wx_lib"
cond="SHARED=='0' and MONOLITHIC=='1'">
<define>wxUSE_BASE</define>
<define>__WXBASE__</define>
<define>wxUSE_BASE=1</define>
<sources>$(MONOLIB_SRC)</sources>
</lib>

49
build/bakefiles/multilib.bkl
View File

@ -1,26 +1,50 @@
<?xml version="1.0" ?>
<makefile>
<!-- ================================================================= -->
<!-- wxBase library -->
<!-- ================================================================= -->
<dll id="basedll" template="wx_dll"
cond="SHARED=='1' and MONOLITHIC=='0'">
<define>WXMAKINGDLL</define>
<define>__WXBASE__</define>
<define>wxUSE_BASE=1</define>
<define>wxUSE_GUI=0</define>
<sources>$(BASE_SRC) $(BASE_AND_GUI_SRC)</sources>
<library>$(LIB_ZLIB)</library>
<library>$(LIB_REGEX)</library>
<library>$(LIB_PNG)</library>
<library>$(LIB_JPEG)</library>
<library>$(LIB_TIFF)</library>
</dll>
<lib id="baselib" template="wx_lib"
cond="SHARED=='0' and MONOLITHIC=='0'">
<define>__WXBASE__</define>
<define>wxUSE_BASE=1</define>
<define>wxUSE_GUI=0</define>
<sources>$(BASE_SRC) $(BASE_AND_GUI_SRC)</sources>
</lib>
<!-- ================================================================= -->
<!-- Main GUI library -->
<!-- ================================================================= -->
<dll id="coredll" template="wx_dll"
cond="SHARED=='1' and MONOLITHIC=='0'">
cond="SHARED=='1' and USE_GUI=='1' and MONOLITHIC=='0'">
<define>WXMAKINGDLL</define>
<sources>$(BASE_SRC) $(CORE_SRC)</sources>
<sources>$(BASE_AND_GUI_SRC) $(CORE_SRC)</sources>
<wx-lib>base</wx-lib>
<library>$(LIB_ZLIB)</library>
<library>$(LIB_REGEX)</library>
<library>$(LIB_PNG)</library>
<library>$(LIB_JPEG)</library>
<library>$(LIB_TIFF)</library>
<library>$(LIB_ODBC)</library>
<library>$(LIB_ODBC)</library>
</dll>
<lib id="corelib" template="wx_lib"
cond="SHARED=='0' and MONOLITHIC=='0'">
<sources>$(BASE_SRC) $(CORE_SRC)</sources>
cond="SHARED=='0' and USE_GUI=='1' and MONOLITHIC=='0'">
<sources>$(BASE_AND_GUI_SRC) $(CORE_SRC)</sources>
</lib>
@ -29,14 +53,15 @@
<!-- ================================================================ -->
<dll id="htmldll" template="wx_dll"
cond="SHARED=='1' and MONOLITHIC=='0'">
cond="SHARED=='1' and USE_GUI=='1' and MONOLITHIC=='0'">
<define>WXMAKINGDLL</define>
<sources>$(HTML_SRC)</sources>
<wx-lib>core</wx-lib>
<wx-lib>base</wx-lib>
</dll>
<lib id="htmllib" template="wx_lib"
cond="SHARED=='0' and MONOLITHIC=='0'">
cond="SHARED=='0' and USE_GUI=='1' and MONOLITHIC=='0'">
<sources>$(HTML_SRC)</sources>
</lib>

6
build/bakefiles/regenMakefile.py
View File

@ -60,7 +60,7 @@ def addMakefile(bake, makedirs, deps=[], args={}):
# main makefile:
addMakefile('wx.bkl', {'all':'..','autoconf':'../..'},
['common.bkl', 'config.bkl', 'files.bkl', 'monolithic.bkl',
'wxwin.py'])
'multilib.bkl', 'wxwin.py'])
# samples main makefile:
addMakefile('../../samples/samples.bkl', {'all':'../../samples'})
@ -83,11 +83,13 @@ def onSubmakefile(type, dirname, names):
for bake in bakes:
if type==CONTRIB_DIR:
acdir = '../../contrib/src/%s' % dirname.split('/')[-1]
ruledep = 'common_contrib.bkl'
else:
acdir = dirname
ruledep = 'common_samples.bkl'
addMakefile('%s/%s' % (dirname, bake),
{'all':dirname,'autoconf':acdir},
deps=['common.bkl','common_samples.bkl','config.bkl'],
deps=['common.bkl',ruledep,'config.bkl'],
args=args)
os.path.walk('../../samples', onSubmakefile, None)

2
build/bakefiles/wx.bkl
View File

@ -17,7 +17,7 @@
<!-- wxWindows variant where everything is in one library: -->
<include file="monolithic.bkl"/>
<!-- ...and when there are multiple libraries: -->
<!-- <include file="multilib.bkl"/> -->
<include file="multilib.bkl"/>
<!-- Samples target (not dependency of 'all'): -->