fix

3 files changed, 20 insertions, 17 deletions

diff --git a/drivers/SCsub b/drivers/SCsub
index 71ebb85c38..7337482628 100644
--- a/drivers/SCsub
+++ b/drivers/SCsub
@@ -2,10 +2,11 @@ Import('env')
 
 env_drivers = env.Clone()
 
-env_drivers.drivers_sources=[]
+env.drivers_sources=[]
 #env.add_source_files(env.drivers_sources,"*.cpp")
 env_drivers.Append(CPPPATH=["vorbis"])
-Export(env = env_drivers)
+
+Export('env_drivers')
 
 SConscript('unix/SCsub');
 SConscript('alsa/SCsub');
@@ -61,7 +62,7 @@ if (env["squish"]=="yes" and env["tools"]=="yes"):
 
 num = 0
 cur_base = ""
-total = len(env_drivers.drivers_sources)
+total = len(env.drivers_sources)
 max_src = 64
 list = []
 lib_list = []
@@ -69,11 +70,11 @@ lib_list = []
 import string
 
 if env['vsproj']=="yes":
-	env.AddToVSProject(env_drivers.drivers_sources)
+	env.AddToVSProject(env.drivers_sources)
 
 if (env.split_drivers): #split drivers, this used to be needed for windows until separate builders for windows were created
 
-	for f in env_drivers.drivers_sources:
+	for f in env.drivers_sources:
 		fname = ""
 		if type(f) == type(""):
 			fname = env.File(f).path
@@ -107,6 +108,6 @@ if (env.split_drivers): #split drivers, this used to be needed for windows until
 
 	env.Prepend(LIBS=lib_list)
 else:
-	env_drivers.add_source_files(env_drivers.drivers_sources,"*.cpp")
-	lib = env_drivers.Library("drivers",env_drivers.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 13a844c39a..bd0f428cfc 100644
--- a/drivers/builtin_openssl2/SCsub
+++ b/drivers/builtin_openssl2/SCsub
@@ -1,4 +1,5 @@
 Import('env')
+Import('env_drivers')
 
 openssl_sources = [
 "ssl/t1_lib.c",
@@ -641,17 +642,17 @@ openssl_sources = [
 
 #env.drivers_sources+=openssl_sources
 
-env.Append(CPPPATH=["#drivers/builtin_openssl2/crypto"])
-env.Append(CPPPATH=["#drivers/builtin_openssl2/openssl"])
-env.Append(CPPPATH=["#drivers/builtin_openssl2/crypto/evp"])
-env.Append(CPPPATH=["#drivers/builtin_openssl2/crypto/asn1"])
-env.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.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.Append(CFLAGS=["-Wno-error=implicit-function-declaration"])
+	env_drivers.Append(CFLAGS=["-Wno-error=implicit-function-declaration"])
 
-env.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 e40ebcf720..40e3d0c0f0 100644
--- a/drivers/openssl/SCsub
+++ b/drivers/openssl/SCsub
@@ -1,5 +1,6 @@
+Import('env_drivers')
 Import('env')
 
-env.add_source_files(env.drivers_sources,"*.cpp")
-env.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")