FWGS/waf
2
0
Fork 0
mirror of https://gitlab.com/ita1024/waf.git synced 2024-11-22 18:07:12 +01:00
Code Issues Projects Releases Wiki Activity

enable static and shared libraries with the same extension (use -v to catch the mistakes)

Browse Source
This commit is contained in:
Thomas Nagy 2012-06-04 19:55:37 +02:00
parent 386560fbbc
commit 4d56d7039f
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
waflib/Tools/msvc.py
View File

@ -692,13 +692,6 @@ def visual_studio_add_flags(self):
def msvc_common_flags(conf):
"""
Setup the flags required for executing the msvc compiler
The default is to allow a static and a shared library having the same name in the same directory, the static one being prefixed by 'lib'. If you feel that this
is incorrect, just change the extension (issue #824)::
bld.env.STLIB_ST = bld.env.SHLIB_ST = '%s.lib'
bld.stlib(..., name='libfoo')
bld.shlib(..., name='foo')
"""
v = conf.env
@ -737,7 +730,7 @@ def msvc_common_flags(conf):
# linker
v['LIB_ST'] = '%s.lib' # template for adding shared libs
v['LIBPATH_ST'] = '/LIBPATH:%s' # template for adding libpaths
v['STLIB_ST'] = 'lib%s.lib'
v['STLIB_ST'] = '%s.lib'
v['STLIBPATH_ST'] = '/LIBPATH:%s'
v.append_value('LINKFLAGS', ['/NOLOGO'])
@ -754,7 +747,7 @@ def msvc_common_flags(conf):
# static library
v['LINKFLAGS_cstlib'] = []
v['cstlib_PATTERN'] = v['cxxstlib_PATTERN'] = 'lib%s.lib'
v['cstlib_PATTERN'] = v['cxxstlib_PATTERN'] = '%s.lib'
# program
v['cprogram_PATTERN'] = v['cxxprogram_PATTERN'] = '%s.exe'