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

making windows compilation work

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21529 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík 2003-06-30 21:41:29 +00:00
parent b00786ec12
commit cff5df9f18
3 changed files with 40 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
build/bakefiles/common.bkl
View File

@ -43,8 +43,8 @@
</set>
<set var="VENDORTAG">
<if cond="OFFICIAL_BUILD=='1'"></if>
<if cond="OFFICIAL_BUILD=='0'">_$(VENDOR)</if>
<if cond="PLATFORM_WIN32=='1' and OFFICIAL_BUILD=='1'"></if>
<if cond="PLATFORM_WIN32=='1' and OFFICIAL_BUILD=='0'">_$(VENDOR)</if>
</set>
<set var="WXDEBUGFLAG">
@ -114,13 +114,29 @@
<!-- =============================================================== -->
<!-- Where to store built libraries: -->
<!-- Where to store built libraries and objects: -->
<!-- =============================================================== -->
<if cond="FORMAT!='autoconf'">
<set var="WXDLLFLAG">
<if cond="SHARED=='1'">dll</if>
</set>
<set var="CFG_NAME_PART">
$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
</set>
<set var="OBJS" make_var="1">objs_$(COMPILER)_$(CFG_NAME_PART)</set>
<set var="BUILDDIR">$(OBJS)</set>
</if>
$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-$(WXVER_MAJOR).$(WXVER_MINOR)
<set var="LIBDIRNAME">
<if cond="FORMAT=='autoconf'">$(top_builddir)lib</if>
<if cond="FORMAT!='autoconf'">$(TOP_SRCDIR)lib$(DIRSEP)$(COMPILER)</if>
<if cond="FORMAT!='autoconf'">
$(TOP_SRCDIR)lib$(DIRSEP)$(COMPILER)_$(CFG_NAME_PART)
</if>
</set>
<!-- =============================================================== -->
<!-- Templates for libs: -->

10
build/bakefiles/config.bkl
View File

@ -60,6 +60,15 @@
Use this to name your customized DLLs differently
</description>
</option>
<option name="CFG">
<default-value></default-value>
<description>
Name of your custom configuration. This affects directory
where object files are stored as well as the location of
compiled .lib files and setup.h under the lib/ toplevel directory.
</description>
</option>
@ -96,7 +105,6 @@
<if cond="BUILDING_LIB=='0'">.</if>
</set>
<set var="TOP_SRCDIR">$(SRCDIR)/$(WXTOPDIR)</set>
<set var="BUILDDIR">objs_$(COMPILER)</set>
</if>
</makefile>

11
build/bakefiles/wxwin.py
View File

@ -5,6 +5,17 @@
#
import utils
# We use 'CFG' option in places where bakefile doesn't like it, so we must
# register a substitution function for it that provides additional knowledge
# about the option (in this case that it does not contain dir separators and
# so utils.nativePaths() doesn't have to do anything with it):
def __noopSubst(func, opt):
return '$(%s)' % opt.name
utils.addSubstituteCallback('CFG', __noopSubst)
def mk_wxid(id):
"""Creates wxWindows library identifier from bakefile target ID that
follows this convention: DLLs end with 'dll', static libraries