make check for zlib + debug x86_64-linux-gnu
This commit is contained in:
13
SConstruct
13
SConstruct
@@ -307,10 +307,6 @@ if not env.GetOption('clean'):
|
||||
print("There's a problem with your compiler!")
|
||||
Exit(1)
|
||||
|
||||
if not conf.CheckLib('zlib' if (platform == "win32" and 'mingw' not in env["TOOLS"]) else 'z'):
|
||||
print('zlib must be installed!')
|
||||
Exit(1)
|
||||
|
||||
def check_lib(lib, disp, suffixes=[], versions=[], msvc_versions=[]):
|
||||
if "mingw" in env["TOOLS"] and lib.startswith("sfml"):
|
||||
lib = "lib" + lib
|
||||
@@ -347,6 +343,8 @@ if not env.GetOption('clean'):
|
||||
boost_versions = ['-1_84'] # This is a bit of a hack. :(
|
||||
suffixes = ['-mt', f'-mt-x{env["bits"]}']
|
||||
|
||||
zlib = 'zlib' if (platform == "win32" and 'mingw' not in env["TOOLS"]) else 'z'
|
||||
check_lib(zlib, 'zlib', [], [])
|
||||
|
||||
check_header('boost/lexical_cast.hpp', 'Boost.LexicalCast')
|
||||
check_header('boost/optional.hpp', 'Boost.Optional')
|
||||
@@ -448,9 +446,6 @@ def handle_bundled_libs(extension, prefix=''):
|
||||
target_dirs = ["#build/Blades of Exile", "#build/test"]
|
||||
for lib in bundled_libs:
|
||||
for lpath in env['LIBPATH']:
|
||||
# handle zlib edge case on linux
|
||||
if lib.endswith('lib') and prefix == 'lib':
|
||||
lib = lib.replace('lib', '')
|
||||
print(f'checking {lpath} for {prefix}{lib}')
|
||||
|
||||
try:
|
||||
@@ -472,6 +467,10 @@ def handle_bundled_libs(extension, prefix=''):
|
||||
break
|
||||
else:
|
||||
src_file = path.join(lpath, 'x86_64-linux-gnu', prefix + lib + extension)
|
||||
try:
|
||||
print(os.listdir(path.join(lpath, 'x86_64-linux-gnu')))
|
||||
except:
|
||||
pass
|
||||
if path.exists(src_file):
|
||||
print(src_file)
|
||||
for targ in target_dirs:
|
||||
|
Reference in New Issue
Block a user