Swiftdiff options
Diffstat (limited to 'BuildTools')
| -rw-r--r-- | BuildTools/SCons/SConstruct | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/BuildTools/SCons/SConstruct b/BuildTools/SCons/SConstruct index d5faaf4..ada291e 100644 --- a/BuildTools/SCons/SConstruct +++ b/BuildTools/SCons/SConstruct @@ -349,7 +349,6 @@ if env["experimental"] : env["LIBMINIUPNPC_FLAGS"] = { "LIBS": ["miniupnpc"] } env["LIBMINIUPNPC_FLAGS"].update(libminiupnpc_flags) else : - env["HAVE_LIBMINIUPNPC"] = 1 env["LIBMINIUPNPC_BUNDLED"] = 1 conf.Finish() else : @@ -371,7 +370,6 @@ if env["experimental"] : env["LIBNATPMP_FLAGS"] = { "LIBS": ["natpmp"] } env["LIBNATPMP_FLAGS"].update(libnatpmp_flags) else : - env["HAVE_LIBNATPMP"] = 1 env["LIBNATPMP_BUNDLED"] = 1 conf.Finish() else : @@ -563,13 +561,14 @@ else : # Modules modules = [] -for dir in os.listdir(Dir("#/3rdParty").abspath) : - full_dir = os.path.join(Dir("#/3rdParty").abspath, dir) - if not os.path.isdir(full_dir) : - continue - sconscript = os.path.join(full_dir, "SConscript") - if os.path.isfile(sconscript) : - modules.append("3rdParty/" + dir) +if os.path.isdir(Dir("#/3rdParty").abspath) : + for dir in os.listdir(Dir("#/3rdParty").abspath) : + full_dir = os.path.join(Dir("#/3rdParty").abspath, dir) + if not os.path.isdir(full_dir) : + continue + sconscript = os.path.join(full_dir, "SConscript") + if os.path.isfile(sconscript) : + modules.append("3rdParty/" + dir) for dir in os.listdir(Dir("#").abspath) : full_dir = os.path.join(Dir("#").abspath, dir) if not os.path.isdir(full_dir) : |