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

cloning env for builtin_openssl _and_ openssl :) 

(cherry picked from commit baaa74f215)
This commit is contained in:
Ariel Manzur 2016-05-06 22:43:22 -03:00 committed by Rémi Verschelde
parent ac06e3d4db
commit f8debd8152
4 changed files with 28 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
SConstruct
View File

@ -307,10 +307,10 @@ if selected_platform in platform_list:
if (env['musepack']=='yes'): if (env['musepack']=='yes'):
env.Append(CPPFLAGS=['-DMUSEPACK_ENABLED']); env.Append(CPPFLAGS=['-DMUSEPACK_ENABLED']);
if (env['openssl']!='no'): #if (env['openssl']!='no'):
env.Append(CPPFLAGS=['-DOPENSSL_ENABLED']); # env.Append(CPPFLAGS=['-DOPENSSL_ENABLED']);
if (env['openssl']=="builtin"): # if (env['openssl']=="builtin"):
env.Append(CPPPATH=['#drivers/builtin_openssl2']) # env.Append(CPPPATH=['#drivers/builtin_openssl2'])
if (env["builtin_zlib"]=='yes'): if (env["builtin_zlib"]=='yes'):
env.Append(CPPPATH=['#drivers/builtin_zlib/zlib']) env.Append(CPPPATH=['#drivers/builtin_zlib/zlib'])

15
drivers/SCsub
View File

@ -11,9 +11,20 @@ SConscript('pulseaudio/SCsub');
SConscript('windows/SCsub'); SConscript('windows/SCsub');
SConscript('gles2/SCsub'); SConscript('gles2/SCsub');
SConscript('gl_context/SCsub'); SConscript('gl_context/SCsub');
SConscript('openssl/SCsub');
SConscript('pnm/SCsub'); SConscript('pnm/SCsub');
if (env['openssl']!='no'):
env_ssl = env.Clone()
Export('env_ssl')
env_ssl.Append(CPPFLAGS=['-DOPENSSL_ENABLED']);
if (env['openssl']=="builtin"):
env_ssl.Append(CPPPATH=['#drivers/builtin_openssl2'])
SConscript("builtin_openssl2/SCsub");
SConscript('openssl/SCsub')
if (env["png"]=="yes"): if (env["png"]=="yes"):
SConscript("png/SCsub"); SConscript("png/SCsub");
if (env["jpg"]=="yes"): if (env["jpg"]=="yes"):
@ -26,8 +37,6 @@ SConscript("pvr/SCsub");
SConscript("etc1/SCsub") SConscript("etc1/SCsub")
if (env["builtin_zlib"]=="yes"): if (env["builtin_zlib"]=="yes"):
SConscript("builtin_zlib/SCsub"); SConscript("builtin_zlib/SCsub");
if (env["openssl"]=="builtin"):
SConscript("builtin_openssl2/SCsub");
SConscript("rtaudio/SCsub"); SConscript("rtaudio/SCsub");
SConscript("nedmalloc/SCsub"); SConscript("nedmalloc/SCsub");

20
drivers/builtin_openssl2/SCsub
View File

@ -1,4 +1,5 @@
Import('env') Import('env')
Import('env_ssl')
openssl_sources = [ openssl_sources = [
"nocpuid.c", "nocpuid.c",
@ -642,17 +643,14 @@ openssl_sources = [
#env.drivers_sources+=openssl_sources #env.drivers_sources+=openssl_sources
env_bossl = env.Clone() 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_ssl.Append(CPPPATH=["#drivers/builtin_openssl2/crypto/store"])
env_ssl.Append(CPPFLAGS=["-DOPENSSL_NO_ASM","-DOPENSSL_THREADS","-DL_ENDIAN"])
env_bossl.Append(CPPPATH=["#drivers/builtin_openssl2/crypto"]) env_ssl.add_source_files(env.drivers_sources,openssl_sources)
env_bossl.Append(CPPPATH=["#drivers/builtin_openssl2/openssl"])
env_bossl.Append(CPPPATH=["#drivers/builtin_openssl2/crypto/evp"])
env_bossl.Append(CPPPATH=["#drivers/builtin_openssl2/crypto/asn1"])
env_bossl.Append(CPPPATH=["#drivers/builtin_openssl2/crypto/modes"])
#env_bossl.Append(CPPPATH=["#drivers/builtin_openssl2/crypto/store"])
env_bossl.Append(CPPFLAGS=["-DOPENSSL_NO_ASM","-DOPENSSL_THREADS","-DL_ENDIAN"])
env_bossl.add_source_files(env.drivers_sources,openssl_sources)
Export('env_bossl')

6
drivers/openssl/SCsub
View File

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