mirror of
https://github.com/Ardour/ardour.git
synced 2025-12-06 06:44:57 +01:00
Copy more mingw branches for MSVC
This commit is contained in:
parent
d133be6d8d
commit
78677b672c
10 changed files with 26 additions and 26 deletions
|
|
@ -577,7 +577,7 @@ def build(bld):
|
|||
obj.source += [ 'vst3_plugin_ui.cc' ]
|
||||
if sys.platform == 'darwin':
|
||||
obj.source += [ 'vst3_nsview_plugin_ui.mm' ]
|
||||
elif bld.env['build_target'] == 'mingw':
|
||||
elif bld.env['build_target'] == 'mingw' or bld.env['build_target'] == 'msvc':
|
||||
obj.source += [ 'vst3_hwnd_plugin_ui.cc' ]
|
||||
else:
|
||||
obj.source += [ 'vst3_x11_plugin_ui.cc' ]
|
||||
|
|
@ -613,7 +613,7 @@ def build(bld):
|
|||
# obj.source += [ 'toolbar_test.cc', 'enums.cc']
|
||||
|
||||
# executable version of the GTK GUI
|
||||
if bld.env['build_target'] == 'mingw':
|
||||
if bld.env['build_target'] == 'mingw' or bld.env['build_target'] == 'msvc':
|
||||
obj = bld (features = 'cxx c cxxprogram winres')
|
||||
else:
|
||||
obj = bld (features = 'cxx c cxxprogram')
|
||||
|
|
@ -664,7 +664,7 @@ def build(bld):
|
|||
obj.uselib += ' AUDIOUNITS OSX '
|
||||
obj.use += ' libappleutility'
|
||||
obj.source += [ 'cocoacarbon.mm', 'bundle_env_cocoa.cc' ]
|
||||
elif bld.env['build_target'] == 'mingw':
|
||||
elif bld.env['build_target'] == 'mingw' or bld.env['build_target'] == 'msvc':
|
||||
obj.source += [ 'bundle_env_mingw.cc' ]
|
||||
obj.source += [ 'windows_icon.rc' ]
|
||||
else:
|
||||
|
|
@ -674,7 +674,7 @@ def build(bld):
|
|||
obj.includes += ['../libs']
|
||||
obj.includes += ['../libs/vst3']
|
||||
|
||||
if bld.env['build_target'] == 'mingw':
|
||||
if bld.env['build_target'] == 'mingw' or bld.env['build_target'] == 'msvc':
|
||||
obj.linkflags += ' -mwindows'
|
||||
obj.use += [ 'PANGOFT2' ]
|
||||
|
||||
|
|
@ -682,7 +682,7 @@ def build(bld):
|
|||
obj.source += [ 'lv2_plugin_ui.cc' ]
|
||||
obj.use += [ 'SUIL' ]
|
||||
|
||||
if bld.is_defined('HAVE_FFTW35F') and bld.env['build_target'] != 'mingw':
|
||||
if bld.is_defined('HAVE_FFTW35F') and bld.env['build_target'] != 'mingw' and bld.env['build_target'] != 'msvc':
|
||||
bld.env['LIB_FFTW3F'] += ['fftw3f_threads']
|
||||
|
||||
if bld.is_defined('NEED_INTL'):
|
||||
|
|
@ -717,7 +717,7 @@ def build(bld):
|
|||
obj.source += [ 'vst3_plugin_ui.cc' ]
|
||||
if sys.platform == 'darwin':
|
||||
obj.source += [ 'vst3_nsview_plugin_ui.mm' ]
|
||||
elif bld.env['build_target'] == 'mingw':
|
||||
elif bld.env['build_target'] == 'mingw' or bld.env['build_target'] == 'msvc':
|
||||
obj.source += [ 'vst3_hwnd_plugin_ui.cc' ]
|
||||
else:
|
||||
obj.source += [ 'vst3_x11_plugin_ui.cc' ]
|
||||
|
|
@ -948,7 +948,7 @@ def build(bld):
|
|||
pgmname = bld.env['PROGRAM_NAME']
|
||||
bld.install_files(os.path.join(bld.env['DATADIR'], 'resources'), bld.path.ant_glob('resources/' + pgmname + '*'))
|
||||
|
||||
if bld.env['build_target'] == 'mingw':
|
||||
if bld.env['build_target'] == 'mingw' or bld.env['build_target'] == 'msvc':
|
||||
# These icons need to overwrite the files already installed in the icons
|
||||
# directory above. Do this in the external packaging scripts for now.
|
||||
#bld.install_files(os.path.join (bld.env['DATADIR'], 'icons'), bld.path.ant_glob('icons/cursor_square/*.png'))
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ def build(bld):
|
|||
if sys.platform == 'darwin':
|
||||
obj.uselib += ' AUDIOUNITS OSX'
|
||||
obj.use += ' libappleutility'
|
||||
elif bld.env['build_target'] == 'mingw':
|
||||
elif bld.env['build_target'] == 'mingw' or bld.env['build_target'] == 'msvc':
|
||||
if bld.env['DEBUG'] == False:
|
||||
obj.linkflags += ' -mwindows'
|
||||
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ def build(bld):
|
|||
and bld.is_defined('HAVE_GLIBMM')
|
||||
and bld.is_defined('HAVE_GTHREAD'))
|
||||
|
||||
if bld.is_defined('HAVE_FFTW35F') and bld.env['build_target'] != 'mingw':
|
||||
if bld.is_defined('HAVE_FFTW35F') and bld.env['build_target'] != 'mingw' and bld.env['build_target'] != 'msvc':
|
||||
bld.env['LIB_FFTW3F'] += ['fftw3f_threads']
|
||||
|
||||
audiographer_sources = [
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@ def build(bld):
|
|||
libsmf.uselib = 'GLIB'
|
||||
libsmf.use = [ 'libtemporal' ]
|
||||
libsmf.install_path = None
|
||||
if bld.env['build_target'] != 'mingw':
|
||||
if bld.env['build_target'] != 'mingw' and bld.env['build_target'] != 'msvc':
|
||||
libsmf.cxxflags = [ bld.env['compiler_flags_dict']['pic'] ]
|
||||
libsmf.cflags = [ bld.env['compiler_flags_dict']['pic'] ]
|
||||
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ def build(bld):
|
|||
|
||||
if sys.platform == 'darwin':
|
||||
obj.uselib += ' OSX'
|
||||
elif bld.env['build_target'] == 'mingw':
|
||||
elif bld.env['build_target'] == 'mingw' or bld.env['build_target'] == 'msvc:
|
||||
obj.uselib += ' GDI32'
|
||||
obj.linkflags += ' -mwindows'
|
||||
|
||||
|
|
@ -63,7 +63,7 @@ def build(bld):
|
|||
|
||||
if sys.platform == 'darwin':
|
||||
pass
|
||||
elif bld.env['build_target'] == 'mingw':
|
||||
elif bld.env['build_target'] == 'mingw' or bld.env['build_target'] == 'msvc':
|
||||
obj.linkflags += ' -mwindows'
|
||||
|
||||
obj.includes = [ '../pbd/', '../ardour/', '.' ]
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ def configure(conf):
|
|||
if conf.is_defined('USE_EXTERNAL_LIBS'):
|
||||
autowaf.check_pkg(conf, 'hidapi-hidraw', uselib_store='HIDAPI', mandatory=False)
|
||||
else:
|
||||
if conf.env['build_target'] == 'mingw':
|
||||
if conf.env['build_target'] == 'mingw' or conf.env['build_target'] == 'msvc':
|
||||
conf.check (compiler='cxx', lib='setupapi', mandatory=True, uselib_store='SETUPAPI')
|
||||
conf.define ('HAVE_HIDAPI', 1)
|
||||
elif sys.platform == 'darwin':
|
||||
|
|
@ -42,7 +42,7 @@ def build(bld):
|
|||
obj.install_path = bld.env['LIBDIR']
|
||||
obj.defines = '_POSIX_C_SOURCE=200809L'
|
||||
|
||||
if bld.env['build_target'] == 'mingw':
|
||||
if bld.env['build_target'] == 'mingw' or conf.env['build_target'] == 'msvc':
|
||||
obj.source = 'windows/hid.c'
|
||||
obj.linkflags = [ '-lsetupapi', '-mwindows' ]
|
||||
obj.uselib = 'SETUPAPI'
|
||||
|
|
|
|||
|
|
@ -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 = ''
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ def configure(conf):
|
|||
pass
|
||||
|
||||
def build(bld):
|
||||
if bld.env['build_target'] == 'mingw':
|
||||
if bld.env['build_target'] == 'mingw' or bld.env['build_target'] == 'msvc':
|
||||
return
|
||||
|
||||
obj = bld (features = 'c cprogram')
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ def build(bld):
|
|||
return
|
||||
|
||||
# commandline luasession wrapper script
|
||||
if bld.env['build_target'] != 'mingw':
|
||||
if bld.env['build_target'] != 'mingw' and bld.env['build_target'] != 'msvc':
|
||||
obj = bld(features = 'subst')
|
||||
obj.source = 'ardour-lua.sh.in'
|
||||
obj.target = 'ardour' + bld.env['MAJOR'] + '-lua'
|
||||
|
|
@ -64,13 +64,13 @@ def build(bld):
|
|||
if sys.platform == 'darwin':
|
||||
obj.uselib += ' AUDIOUNITS OSX'
|
||||
obj.use += ' libappleutility'
|
||||
elif bld.env['build_target'] == 'mingw':
|
||||
elif bld.env['build_target'] == 'mingw' or bld.env['build_target'] == 'msvc':
|
||||
obj.linkflags += ' -mwindows'
|
||||
|
||||
if bld.is_defined('NEED_INTL'):
|
||||
obj.linkflags += ' -lintl'
|
||||
|
||||
if bld.env['build_target'] == 'mingw':
|
||||
if bld.env['build_target'] == 'mingw' or bld.env['build_target'] == 'msvc':
|
||||
obj.install_path = bld.env['BINDIR']
|
||||
obj.target = 'ardour' + bld.env['MAJOR'] + '-lua'
|
||||
else:
|
||||
|
|
|
|||
|
|
@ -52,12 +52,12 @@ def build_ardour_util(bld, util):
|
|||
if sys.platform == 'darwin':
|
||||
obj.uselib += ' AUDIOUNITS OSX'
|
||||
obj.use += ' libappleutility'
|
||||
elif bld.env['build_target'] == 'mingw':
|
||||
elif bld.env['build_target'] == 'mingw' or bld.env['build_target'] == 'msvc':
|
||||
obj.linkflags += ' -mwindows'
|
||||
|
||||
obj.includes += ['../libs']
|
||||
|
||||
if bld.env['build_target'] == 'mingw':
|
||||
if bld.env['build_target'] == 'mingw' or bld.env['build_target'] == 'msvc':
|
||||
obj.install_path = bld.env['BINDIR']
|
||||
|
||||
if bld.is_defined('NEED_INTL'):
|
||||
|
|
@ -75,10 +75,10 @@ def build(bld):
|
|||
for util in utils:
|
||||
fn = os.path.splitext(os.path.basename(str(util)))[0]
|
||||
build_ardour_util(bld, fn)
|
||||
if bld.env['build_target'] != 'mingw':
|
||||
if bld.env['build_target'] != 'mingw' and bld.env['build_target'] != 'msvc':
|
||||
bld.symlink_as(bld.env['BINDIR'] + '/' + pgmprefix + "-" + fn, bld.env['LIBDIR'] + '/utils/ardour-util.sh')
|
||||
|
||||
if bld.env['build_target'] == 'mingw':
|
||||
if bld.env['build_target'] == 'mingw' or bld.env['build_target'] == 'msvc':
|
||||
return
|
||||
|
||||
obj = bld(features = 'subst')
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue