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

cross-compiled libraries have host embedded in the name again

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22047 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2003-07-17 14:13:32 +00:00
parent 34b08d2cf5
commit ea66c762e8
12 changed files with 326 additions and 352 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/bakefiles/common.bkl
View File

@@ -179,7 +179,7 @@
</template>
<template id="3rdparty_lib" template="common_settings,anylib">
<libname>$(id)$(WXDEBUGFLAG)</libname>
<libname>$(id)$(WXDEBUGFLAG)$(HOST_SUFFIX)</libname>
</template>

2
build/bakefiles/config.bkl
View File

@@ -102,6 +102,7 @@
<option name="EXTRALIBS_GUI"/>
<option name="EXTRALIBS_OPENGL"/>
<option name="SAMPLES_RPATH_FLAG"/>
<option name="HOST_SUFFIX"/>
<set var="TOP_SRCDIR">$(top_srcdir)/</set>
<set var="RUNTIME_LIBS">dynamic</set>
@@ -129,6 +130,7 @@
<set var="TOOLKIT_LOWERCASE">$(TOOLKIT.lower())</set>
<set var="TOOLKIT_VERSION"/>
<set var="SAMPLES_RPATH_FLAG"/>
<set var="HOST_SUFFIX"/>
<set var="EXTRALIBS"/>
<set var="EXTRALIBS_GUI"/>
<set var="EXTRACFLAGS"/>

2
build/bakefiles/jpeg.bkl
View File

@@ -8,7 +8,7 @@
<set var="wxUSE_LIBJPEG">builtin</set>
</if>
<set var="LIB_JPEG">
<if cond="wxUSE_LIBJPEG=='builtin'">wxjpeg$(WXDEBUGFLAG)</if>
<if cond="wxUSE_LIBJPEG=='builtin'">wxjpeg$(WXDEBUGFLAG)$(HOST_SUFFIX)</if>
</set>
<set var="INC_JPEG">
<if cond="wxUSE_LIBJPEG=='builtin'">$(TOP_SRCDIR)src/jpeg</if>

2
build/bakefiles/odbc.bkl
View File

@@ -11,7 +11,7 @@
</set>
</if>
<set var="LIB_ODBC">
<if cond="wxUSE_ODBC=='builtin'">wxodbc$(WXDEBUGFLAG)</if>
<if cond="wxUSE_ODBC=='builtin'">wxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX)</if>
</set>
<set var="INC_ODBC">
<if cond="wxUSE_ODBC=='builtin'">$(TOP_SRCDIR)src/odbc</if>

2
build/bakefiles/png.bkl
View File

@@ -8,7 +8,7 @@
<set var="wxUSE_LIBPNG">builtin</set>
</if>
<set var="LIB_PNG">
<if cond="wxUSE_LIBPNG=='builtin'">wxpng$(WXDEBUGFLAG)</if>
<if cond="wxUSE_LIBPNG=='builtin'">wxpng$(WXDEBUGFLAG)$(HOST_SUFFIX)</if>
</set>
<set var="INC_PNG">
<if cond="wxUSE_LIBPNG=='builtin'">$(TOP_SRCDIR)src/png</if>

2
build/bakefiles/regex.bkl
View File

@@ -8,7 +8,7 @@
<set var="wxUSE_REGEX">builtin</set>
</if>
<set var="LIB_REGEX">
<if cond="wxUSE_REGEX=='builtin'">wxregex$(WXDEBUGFLAG)</if>
<if cond="wxUSE_REGEX=='builtin'">wxregex$(WXDEBUGFLAG)$(HOST_SUFFIX)</if>
</set>
<set var="INC_REGEX">
<if cond="wxUSE_REGEX=='builtin'">$(TOP_SRCDIR)src/regex</if>

2
build/bakefiles/tiff.bkl
View File

@@ -8,7 +8,7 @@
<set var="wxUSE_LIBTIFF">builtin</set>
</if>
<set var="LIB_TIFF">
<if cond="wxUSE_LIBTIFF=='builtin'">wxtiff$(WXDEBUGFLAG)</if>
<if cond="wxUSE_LIBTIFF=='builtin'">wxtiff$(WXDEBUGFLAG)$(HOST_SUFFIX)</if>
</set>
<set var="INC_TIFF">
<if cond="wxUSE_LIBTIFF=='builtin'">$(TOP_SRCDIR)src/tiff</if>

8
build/bakefiles/wxwin.py
View File

@@ -39,12 +39,12 @@ def mkLibName(wxid):
suffixes, prefixes, version tags etc. This must be kept in sync
with variables defined in common.bkl!"""
if wxid == 'mono':
return '$(WXNAMEPREFIXGUI)$(WXNAMESUFFIX)$(WXVERSIONTAG)'
return '$(WXNAMEPREFIXGUI)$(WXNAMESUFFIX)$(WXVERSIONTAG)$(HOST_SUFFIX)'
if wxid == 'base':
return '$(WXNAMEPREFIX)$(WXNAMESUFFIX)$(WXVERSIONTAG)'
return '$(WXNAMEPREFIX)$(WXNAMESUFFIX)$(WXVERSIONTAG)$(HOST_SUFFIX)'
if wxid in LIBS_NOGUI:
return '$(WXNAMEPREFIX)$(WXNAMESUFFIX)_%s$(WXVERSIONTAG)' % wxid
return '$(WXNAMEPREFIXGUI)$(WXNAMESUFFIX)_%s$(WXVERSIONTAG)' % wxid
return '$(WXNAMEPREFIX)$(WXNAMESUFFIX)_%s$(WXVERSIONTAG)$(HOST_SUFFIX)' % wxid
return '$(WXNAMEPREFIXGUI)$(WXNAMESUFFIX)_%s$(WXVERSIONTAG)$(HOST_SUFFIX)' % wxid
def mkDllName(wxid):
"""Returns string that can be used as DLL name, including name

2
build/bakefiles/zlib.bkl
View File

@@ -8,7 +8,7 @@
<set var="wxUSE_ZLIB">builtin</set>
</if>
<set var="LIB_ZLIB">
<if cond="wxUSE_ZLIB=='builtin'">wxzlib$(WXDEBUGFLAG)</if>
<if cond="wxUSE_ZLIB=='builtin'">wxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX)</if>
</set>
<set var="INC_ZLIB">
<if cond="wxUSE_ZLIB=='builtin'">$(TOP_SRCDIR)src/zlib</if>