Swiftdiff options
| -rw-r--r-- | 3rdParty/LibNATPMP/SConscript | 4 | ||||
| -rw-r--r-- | BuildTools/SCons/SConstruct | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/3rdParty/LibNATPMP/SConscript b/3rdParty/LibNATPMP/SConscript index 273c2d2..2a58242 100644 --- a/3rdParty/LibNATPMP/SConscript +++ b/3rdParty/LibNATPMP/SConscript @@ -1,21 +1,23 @@ Import(["env", "conf_env"]) +import os + if env.get("LIBNATPMP_BUNDLED", False) : ################################################################################ # Module flags ################################################################################ if env["SCONS_STAGE"] == "flags" : env["HAVE_LIBNATPMP"] = True env["LIBNATPMP_FLAGS"] = { "LIBPATH": [Dir(".")], "INTERNAL_CPPDEFINES": ["STATICLIB"], } - if env["CC"] in ("clang", "gcc") : + if os.path.basename(env["CC"]) in ("clang", "gcc") : env["LIBNATPMP_FLAGS"].update({"CPPFLAGS": ["-isystem" "3rdParty/LibNATPMP/src/libnatpmp"]}) else : env["LIBNATPMP_FLAGS"].update({"CPPPATH": [Dir("src/libnatpmp")]}) #if env["PLATFORM"] == "win32" : # env["LIBIDN_FLAGS"]["CPPPATH"] += [Dir("stubs/win32")] # if env["MSVC_VERSION"][:3] == "9.0" : diff --git a/BuildTools/SCons/SConstruct b/BuildTools/SCons/SConstruct index 6813747..9fba359 100644 --- a/BuildTools/SCons/SConstruct +++ b/BuildTools/SCons/SConstruct @@ -295,13 +295,13 @@ if env.get("try_libxml", True) and not env.get("HAVE_LIBXML", 0) : libxml_env.Append(CPPPATH = ["/usr/include/libxml2"]) conf = Configure(libxml_env, custom_tests = {"CheckVersion": CheckVersion}) if conf.CheckCHeader("libxml/parser.h") and conf.CheckLib("xml2") : # and conf.CheckVersion("LibXML", "2.6.23", "LIBXML_VERSION", "libxml/xmlversion.h", 20623): env["HAVE_LIBXML"] = 1 libxml_env.Append() - if env["CC"] in ("clang", "gcc"): + if os.path.basename(env["CC"]) in ("clang", "gcc"): env["LIBXML_FLAGS"] = { "CXXFLAGS": ["-isystem/usr/include/libxml2"], "LIBS": ["xml2"] } else: env["LIBXML_FLAGS"] = { "CPPPATH": ["/usr/include/libxml2"], "LIBS": ["xml2"] } conf.Finish() # Expat |