From 803438d4485555e0deadab96aff0ee1514d76971 Mon Sep 17 00:00:00 2001 From: Ariel Manzur Date: Sat, 21 May 2016 19:31:58 -0300 Subject: [PATCH] SCons: using 1 env for all drivers (cherry picked from commit 6cf2353305922f3464ff91ae1b137e747e1d2961) (cherry picked from commit 12bd9ee6f27c6d40f91e0bee7b150fea257463cb) (cherry picked from commit 4c4d79e3c98182faf348f41f98d1cc3e5d843e69) (cherry picked from commit dbb4c0c9b759a384b3c454f4629976cb69a399d7) --- drivers/SCsub | 30 +++++++++++++++--------------- drivers/builtin_openssl2/SCsub | 18 +++++++++--------- drivers/openssl/SCsub | 6 +++--- drivers/png/SCsub | 7 ++++--- 4 files changed, 31 insertions(+), 30 deletions(-) diff --git a/drivers/SCsub b/drivers/SCsub index 63f37698fbb..7337482628c 100644 --- a/drivers/SCsub +++ b/drivers/SCsub @@ -1,9 +1,12 @@ Import('env') +env_drivers = env.Clone() + env.drivers_sources=[] #env.add_source_files(env.drivers_sources,"*.cpp") -env.Append(CPPPATH=["vorbis"]) -Export('env') +env_drivers.Append(CPPPATH=["vorbis"]) + +Export('env_drivers') SConscript('unix/SCsub'); SConscript('alsa/SCsub'); @@ -14,12 +17,9 @@ SConscript('gl_context/SCsub'); SConscript('pnm/SCsub'); if (env['openssl']!='no'): - env_ssl = env.Clone() - Export('env_ssl') - - env_ssl.Append(CPPFLAGS=['-DOPENSSL_ENABLED']); + env_drivers.Append(CPPFLAGS=['-DOPENSSL_ENABLED']); if (env['openssl']=="builtin"): - env_ssl.Append(CPPPATH=['#drivers/builtin_openssl2']) + env_drivers.Append(CPPPATH=['#drivers/builtin_openssl2']) SConscript("builtin_openssl2/SCsub"); SConscript('openssl/SCsub') @@ -47,7 +47,7 @@ if (env["vorbis"]=="yes" or env["speex"]=="yes" or env["theoralib"]=="yes" or en if (env["vorbis"]=="yes"): SConscript("vorbis/SCsub"); if (env["opus"]=="yes"): - SConscript('opus/SCsub'); + SConscript('opus/SCsub'); if (env["tools"]=="yes"): SConscript("convex_decomp/SCsub"); @@ -84,14 +84,14 @@ if (env.split_drivers): #split drivers, this used to be needed for windows until base = string.join(fname.split("/")[:2], "/") if base != cur_base and len(list) > max_src: if num > 0: - lib = env.Library("drivers"+str(num), list) + lib = env_drivers.Library("drivers"+str(num), list) lib_list.append(lib) list = [] num = num+1 cur_base = base list.append(f) - lib = env.Library("drivers"+str(num), list) + lib = env_drivers.Library("drivers"+str(num), list) lib_list.append(lib) if len(lib_list) > 0: @@ -99,15 +99,15 @@ if (env.split_drivers): #split drivers, this used to be needed for windows until if os.name=='posix' and sys.platform=='msys': env.Replace(ARFLAGS=['rcsT']) - lib = env.Library("drivers_collated", lib_list) + lib = env_drivers.Library("drivers_collated", lib_list) lib_list = [lib] drivers_base=[] - env.add_source_files(drivers_base,"*.cpp") - lib_list.insert(0, env.Library("drivers", drivers_base)) + env_drivers.add_source_files(drivers_base,"*.cpp") + lib_list.insert(0, env_drivers.Library("drivers", drivers_base)) env.Prepend(LIBS=lib_list) else: - env.add_source_files(env.drivers_sources,"*.cpp") - lib = env.Library("drivers",env.drivers_sources) + env_drivers.add_source_files(env.drivers_sources,"*.cpp") + lib = env_drivers.Library("drivers",env.drivers_sources) env.Prepend(LIBS=[lib]) diff --git a/drivers/builtin_openssl2/SCsub b/drivers/builtin_openssl2/SCsub index 06d6b07c116..bd0f428cfc4 100644 --- a/drivers/builtin_openssl2/SCsub +++ b/drivers/builtin_openssl2/SCsub @@ -1,5 +1,5 @@ Import('env') -Import('env_ssl') +Import('env_drivers') openssl_sources = [ "ssl/t1_lib.c", @@ -642,17 +642,17 @@ openssl_sources = [ #env.drivers_sources+=openssl_sources -env_ssl.Append(CPPPATH=["#drivers/builtin_openssl2/crypto"]) -env_ssl.Append(CPPPATH=["#drivers/builtin_openssl2/openssl"]) -env_ssl.Append(CPPPATH=["#drivers/builtin_openssl2/crypto/evp"]) -env_ssl.Append(CPPPATH=["#drivers/builtin_openssl2/crypto/asn1"]) -env_ssl.Append(CPPPATH=["#drivers/builtin_openssl2/crypto/modes"]) +env_drivers.Append(CPPPATH=["#drivers/builtin_openssl2/crypto"]) +env_drivers.Append(CPPPATH=["#drivers/builtin_openssl2/openssl"]) +env_drivers.Append(CPPPATH=["#drivers/builtin_openssl2/crypto/evp"]) +env_drivers.Append(CPPPATH=["#drivers/builtin_openssl2/crypto/asn1"]) +env_drivers.Append(CPPPATH=["#drivers/builtin_openssl2/crypto/modes"]) #env_ssl.Append(CPPPATH=["#drivers/builtin_openssl2/crypto/store"]) -env_ssl.Append(CPPFLAGS=["-DOPENSSL_NO_ASM","-DOPENSSL_THREADS","-DL_ENDIAN"]) +env_drivers.Append(CPPFLAGS=["-DOPENSSL_NO_ASM","-DOPENSSL_THREADS","-DL_ENDIAN"]) # Workaround for compilation error with GCC/Clang when -Werror is too greedy (GH-4517) import os if not (os.name=="nt" and os.getenv("VSINSTALLDIR")!=None): # not Windows and not MSVC - env_ssl.Append(CFLAGS=["-Wno-error=implicit-function-declaration"]) + env_drivers.Append(CFLAGS=["-Wno-error=implicit-function-declaration"]) -env_ssl.add_source_files(env.drivers_sources,openssl_sources) +env_drivers.add_source_files(env.drivers_sources,openssl_sources) diff --git a/drivers/openssl/SCsub b/drivers/openssl/SCsub index b7a84cd122f..40e3d0c0f06 100644 --- a/drivers/openssl/SCsub +++ b/drivers/openssl/SCsub @@ -1,6 +1,6 @@ -Import('env_ssl') +Import('env_drivers') Import('env') -env_ssl.add_source_files(env.drivers_sources,"*.cpp") -env_ssl.add_source_files(env.drivers_sources,"*.c") +env_drivers.add_source_files(env.drivers_sources,"*.cpp") +env_drivers.add_source_files(env.drivers_sources,"*.c") diff --git a/drivers/png/SCsub b/drivers/png/SCsub index df521de3ebd..9dbffeed1f5 100644 --- a/drivers/png/SCsub +++ b/drivers/png/SCsub @@ -1,4 +1,5 @@ Import('env') +Import('env_drivers') png_sources = [ @@ -25,15 +26,15 @@ png_sources = [ # Currently .ASM filter_neon.S does not compile on NT. import os if ("neon_enabled" in env and env["neon_enabled"]) and os.name!="nt": - env.Append(CPPFLAGS=["-DPNG_ARM_NEON_OPT=2"]) - env_neon = env.Clone(); + env_drivers.Append(CPPFLAGS=["-DPNG_ARM_NEON_OPT=2"]) + env_neon = env_drivers.Clone(); if "S_compiler" in env: env_neon['CC'] = env['S_compiler'] #env_neon.Append(CPPFLAGS=["-DPNG_ARM_NEON"]) png_sources.append(env_neon.Object("#drivers/png/arm/arm_init.c")) png_sources.append(env_neon.Object("#drivers/png/arm/filter_neon.S")) else: - env.Append(CPPFLAGS=["-DPNG_ARM_NEON_OPT=0"]) + env_drivers.Append(CPPFLAGS=["-DPNG_ARM_NEON_OPT=0"]) env.drivers_sources+=png_sources