From bc66447e3711768b50a0a64fe80bc22f0656f9f1 Mon Sep 17 00:00:00 2001 From: "Josh de Kock (ethe)" Date: Sat, 19 Dec 2015 14:41:09 +0000 Subject: [PATCH] fixed frameworks in wscripts --- common/wscript | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/common/wscript b/common/wscript index 6e0a6090..0243b4a0 100644 --- a/common/wscript +++ b/common/wscript @@ -133,10 +133,9 @@ def build(bld): uselib.append('PSAPI') uselib.append('WINMM') + clientlib = bld(features = ['c', 'cxx', 'cxxshlib', 'cshlib']) if bld.env['IS_MACOSX']: - clientlib = bld(features = ['c', 'cxx', 'cxxshlib', 'cshlib'], framework = ['CoreAudio', 'Accelerate']) - else: - clientlib = bld(features = ['c', 'cxx', 'cxxshlib', 'cshlib']) + clientlib.framework = ['CoreAudio', 'Accelerate'] clientlib.defines = 'HAVE_CONFIG_H' clientlib.use = uselib if bld.env['IS_WINDOWS']: @@ -197,10 +196,9 @@ def build(bld): # we don't want to build other stuff in this variant return + serverlib = bld(features = ['c', 'cxx', 'cxxshlib', 'cshlib']) if bld.env['IS_MACOSX']: - serverlib = bld(features = ['c', 'cxx', 'cxxshlib', 'cshlib'], framework = ['CoreAudio', 'CoreFoundation', 'Accelerate']) - else: - serverlib = bld(features = ['c', 'cxx', 'cxxshlib', 'cshlib']) + serverlib.framework = ['CoreAudio', 'CoreFoundation', 'Accelerate'] serverlib.defines = ['HAVE_CONFIG_H','SERVER_SIDE'] serverlib.includes = includes serverlib.name = 'serverlib' @@ -293,10 +291,9 @@ def build(bld): serverlib.env.append_value("LINKFLAGS", "-lnsl -lsocket") if bld.env['BUILD_NETLIB'] == True: + netlib = bld(features = ['c', 'cxx', 'cxxshlib', 'cshlib']) if bld.env['IS_MACOSX']: - netlib = bld(features = ['c', 'cxx', 'cxxshlib', 'cshlib'], framework = ['CoreAudio']) - else: - netlib = bld(features = ['c', 'cxx', 'cxxshlib', 'cshlib']) + netlib.framework = ['CoreAudio'] netlib.defines = ['HAVE_CONFIG_H','SERVER_SIDE'] netlib.includes = includes netlib.name = 'netlib'