Copy more mingw branches for MSVC
This commit is contained in:
@@ -122,7 +122,7 @@ def configure(conf):
|
||||
define_name='HAVE_LOCALTIME_R', execute = False, mandatory=False)
|
||||
|
||||
# Boost headers
|
||||
if Options.options.dist_target == 'mingw':
|
||||
if Options.options.dist_target == 'mingw' or Options.options.dist_target == 'msvc':
|
||||
conf.check(compiler='cxx',
|
||||
lib='ole32',
|
||||
mandatory=True,
|
||||
@@ -177,7 +177,7 @@ def build(bld):
|
||||
|
||||
if bld.env['build_target'] == 'x86_64':
|
||||
obj.defines += [ 'USE_X86_64_ASM' ]
|
||||
if bld.env['build_target'] == 'mingw':
|
||||
if bld.env['build_target'] == 'mingw' or bld.env['build_target'] == 'msvc':
|
||||
obj.defines += [ 'NO_POSIX_MEMALIGN' ]
|
||||
obj.source += [ 'windows_special_dirs.cc' ]
|
||||
obj.source += [ 'windows_timer_utils.cc' ]
|
||||
@@ -202,7 +202,7 @@ def build(bld):
|
||||
test/xml_test.cc
|
||||
test/test_common.cc
|
||||
'''.split()
|
||||
if bld.env['build_target'] == 'mingw':
|
||||
if bld.env['build_target'] == 'mingw' or bld.env['build_target'] == 'msvc':
|
||||
testobj.source += [ 'test/windows_timer_utils_test.cc' ]
|
||||
testobj.target = 'run-tests'
|
||||
testobj.includes = obj.includes + ['test', '../pbd']
|
||||
@@ -210,6 +210,6 @@ def build(bld):
|
||||
testobj.use = 'libpbd'
|
||||
testobj.name = 'libpbd-tests'
|
||||
testobj.defines = [ 'PACKAGE="' + I18N_PACKAGE + '"' ]
|
||||
if sys.platform != 'darwin' and bld.env['build_target'] != 'mingw':
|
||||
if sys.platform != 'darwin' and bld.env['build_target'] != 'mingw' and bld.env['build_target'] != 'msvc':
|
||||
testobj.lib = ['rt', 'dl']
|
||||
testobj.install_path = ''
|
||||
|
||||
Reference in New Issue
Block a user