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

Merge pull request #4626 from akien-mga/pr-msvc-build 

Windows: Fix MinGW argument being passed to MSVC
This commit is contained in:
Rémi Verschelde 2016-05-11 19:07:02 +02:00
parent b42c4cce0f 972b0f78b3
commit eb64a8d373
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/builtin_openssl2/SCsub
View File

@ -650,8 +650,10 @@ 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/modes"])
#env_ssl.Append(CPPPATH=["#drivers/builtin_openssl2/crypto/store"]) #env_ssl.Append(CPPPATH=["#drivers/builtin_openssl2/crypto/store"])
env_ssl.Append(CPPFLAGS=["-DOPENSSL_NO_ASM","-DOPENSSL_THREADS","-DL_ENDIAN"]) env_ssl.Append(CPPFLAGS=["-DOPENSSL_NO_ASM","-DOPENSSL_THREADS","-DL_ENDIAN"])
env_ssl.Append(CFLAGS=["-Wno-error=implicit-function-declaration"]);
# Workaround for compilation error with MinGW
import os
if (os.name=="nt" and os.getenv("VSINSTALLDIR")==None): # Windows and not MSVC, so likely MinGW
env_ssl.Append(CFLAGS=["-Wno-error=implicit-function-declaration"]);
env_ssl.add_source_files(env.drivers_sources,openssl_sources) env_ssl.add_source_files(env.drivers_sources,openssl_sources)