godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix

This commit is contained in:
Ariel Manzur 2016-05-21 20:07:32 -03:00
parent 6cf2353305
commit 12bd9ee6f2
3 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/SCsub
View File

@ -2,10 +2,11 @@ Import('env')
env_drivers = env.Clone() env_drivers = env.Clone()
env_drivers.drivers_sources=[] env.drivers_sources=[]
#env.add_source_files(env.drivers_sources,"*.cpp") #env.add_source_files(env.drivers_sources,"*.cpp")
env_drivers.Append(CPPPATH=["vorbis"]) env_drivers.Append(CPPPATH=["vorbis"])
Export(env = env_drivers)
Export('env_drivers')
SConscript('unix/SCsub'); SConscript('unix/SCsub');
SConscript('alsa/SCsub'); SConscript('alsa/SCsub');
@ -61,7 +62,7 @@ if (env["squish"]=="yes" and env["tools"]=="yes"):
num = 0 num = 0
cur_base = "" cur_base = ""
total = len(env_drivers.drivers_sources) total = len(env.drivers_sources)
max_src = 64 max_src = 64
list = [] list = []
lib_list = [] lib_list = []
@ -69,11 +70,11 @@ lib_list = []
import string import string
if env['vsproj']=="yes": 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 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 = "" fname = ""
if type(f) == type(""): if type(f) == type(""):
fname = env.File(f).path 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) env.Prepend(LIBS=lib_list)
else: else:
env_drivers.add_source_files(env_drivers.drivers_sources,"*.cpp") env_drivers.add_source_files(env.drivers_sources,"*.cpp")
lib = env_drivers.Library("drivers",env_drivers.drivers_sources) lib = env_drivers.Library("drivers",env.drivers_sources)
env.Prepend(LIBS=[lib]) env.Prepend(LIBS=[lib])

17
drivers/builtin_openssl2/SCsub
View File

@ -1,4 +1,5 @@
Import('env') Import('env')
Import('env_drivers')
openssl_sources = [ openssl_sources = [
"ssl/t1_lib.c", "ssl/t1_lib.c",
@ -641,17 +642,17 @@ openssl_sources = [
#env.drivers_sources+=openssl_sources #env.drivers_sources+=openssl_sources
env.Append(CPPPATH=["#drivers/builtin_openssl2/crypto"]) env_drivers.Append(CPPPATH=["#drivers/builtin_openssl2/crypto"])
env.Append(CPPPATH=["#drivers/builtin_openssl2/openssl"]) env_drivers.Append(CPPPATH=["#drivers/builtin_openssl2/openssl"])
env.Append(CPPPATH=["#drivers/builtin_openssl2/crypto/evp"]) env_drivers.Append(CPPPATH=["#drivers/builtin_openssl2/crypto/evp"])
env.Append(CPPPATH=["#drivers/builtin_openssl2/crypto/asn1"]) env_drivers.Append(CPPPATH=["#drivers/builtin_openssl2/crypto/asn1"])
env.Append(CPPPATH=["#drivers/builtin_openssl2/crypto/modes"]) env_drivers.Append(CPPPATH=["#drivers/builtin_openssl2/crypto/modes"])
#env_ssl.Append(CPPPATH=["#drivers/builtin_openssl2/crypto/store"]) #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) # Workaround for compilation error with GCC/Clang when -Werror is too greedy (GH-4517)
import os import os
if not (os.name=="nt" and os.getenv("VSINSTALLDIR")!=None): # not Windows and not MSVC 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)

5
drivers/openssl/SCsub
View File

@ -1,5 +1,6 @@
Import('env_drivers')
Import('env') Import('env')
env.add_source_files(env.drivers_sources,"*.cpp") env_drivers.add_source_files(env.drivers_sources,"*.cpp")
env.add_source_files(env.drivers_sources,"*.c") env_drivers.add_source_files(env.drivers_sources,"*.c")