From 99260742d24001976a476959f725a461110a7575 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Wed, 11 Mar 2015 14:58:02 +0100 Subject: [PATCH] mingw: all code is position independent --- libs/backends/jack/wscript | 5 +++-- libs/backends/wavesaudio/wscript | 6 ++++-- libs/evoral/wscript | 5 +++-- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/libs/backends/jack/wscript b/libs/backends/jack/wscript index 17c786766f..752682f8cc 100644 --- a/libs/backends/jack/wscript +++ b/libs/backends/jack/wscript @@ -60,8 +60,9 @@ def build(bld): ] obj.use = 'libardour libpbd ardouralsautil' obj.install_path = os.path.join(bld.env['LIBDIR'], 'backends') - obj.cxxflags = [ '-fPIC' ] - obj.cflags = [ '-fPIC' ] + if bld.env['build_target'] != 'mingw': + obj.cxxflags = [ '-fPIC' ] + obj.cflags = [ '-fPIC' ] if (bld.env['build_target'] == 'mingw'): obj.uselib = [ 'PORTAUDIO' ] diff --git a/libs/backends/wavesaudio/wscript b/libs/backends/wavesaudio/wscript index 5235803034..1303791817 100644 --- a/libs/backends/wavesaudio/wscript +++ b/libs/backends/wavesaudio/wscript @@ -83,13 +83,15 @@ def build(bld): 'portmidi/src/pm_common' ] - obj.cxxflags = [ '-fPIC' ] - obj.cflags = [ '-fPIC', '-fms-extensions' ] obj.name = 'waves_audiobackend' obj.target = 'waves_audiobackend' obj.use = 'libardour libpbd' if bld.env['build_target'] == 'mingw': obj.uselib = ['PORTAUDIO'] + obj.cxxflags = [ '-fPIC' ] + obj.cflags = [ '-fPIC', '-fms-extensions' ] + else: + obj.cflags = ['-fms-extensions' ] obj.install_path = os.path.join(bld.env['LIBDIR'], 'backends') if bld.env['build_target']== 'mingw': diff --git a/libs/evoral/wscript b/libs/evoral/wscript index e6f1a8f8b8..f97096b329 100644 --- a/libs/evoral/wscript +++ b/libs/evoral/wscript @@ -71,9 +71,10 @@ def build(bld): libsmf.name = 'libsmf' libsmf.target = 'smf' libsmf.uselib = 'GLIB' - libsmf.cxxflags = [ '-fPIC' ] - libsmf.cflags = [ '-fPIC' ] libsmf.install_path = bld.env['LIBDIR'] + if bld.env['build_target'] != 'mingw': + libsmf.cxxflags = [ '-fPIC' ] + libsmf.cflags = [ '-fPIC' ] lib_source = ''' src/Control.cpp -- 2.30.2