openboe/oboe
2
0
Fork 0
Code Issues 146 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

fix tabs

Browse Source
This commit is contained in:
Nat Quayle Nelson
2024-07-18 13:51:42 -06:00
parent b66be91123
commit 685b90795a
1 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
SConstruct
View File

@@ -229,6 +229,7 @@ elif platform == "win32":
def build_app_package(env, source, build_dir, info): def build_app_package(env, source, build_dir, info):
env.Install(build_dir, source) env.Install(build_dir, source)
elif platform == "posix": elif platform == "posix":
env.Append(RPATH=["$ORIGIN"])
env.Append(CXXFLAGS=["-std=c++14","-include","global.hpp"]) env.Append(CXXFLAGS=["-std=c++14","-include","global.hpp"])
def build_app_package(env, source, build_dir, info): def build_app_package(env, source, build_dir, info):
env.Install(build_dir, source) env.Install(build_dir, source)
@@ -447,27 +448,27 @@ def handle_bundled_libs(extension, prefix=''):
target_dirs = ["#build/Blades of Exile", "#build/test"] target_dirs = ["#build/Blades of Exile", "#build/test"]
for lib in bundled_libs: for lib in bundled_libs:
for lpath in env['LIBPATH']: for lpath in env['LIBPATH']:
def check_path(src_file): def check_path(src_file):
_dir = os.path.dirname(src_file) _dir = os.path.dirname(src_file)
print(f'checking {_dir} for {prefix}{lib}') print(f'checking {_dir} for {prefix}{lib}')
try: try:
print(os.listdir(_dir)) print(os.listdir(_dir))
except: except:
pass pass
if path.exists(src_file) and src_file != "/usr/lib/x86_64-linux-gnu/libz.so": if path.exists(src_file) and src_file != "/usr/lib/x86_64-linux-gnu/libz.so":
for targ in target_dirs: for targ in target_dirs:
for so in os.listdir(_dir): for so in os.listdir(_dir):
if os.path.basename(src_file) in so: if os.path.basename(src_file) in so:
print(f'found {path.join(_dir, so)') print(f'found {path.join(_dir, so)')
env.Install(targ, path.join(_dir, so)) env.Install(targ, path.join(_dir, so))
return True return True
return False return False
if check_path(path.join(lpath, prefix + lib + extension)): if check_path(path.join(lpath, prefix + lib + extension)):
break break
elif check_path(path.join(lpath.replace('lib', 'bin'), prefix + lib + extension): elif check_path(path.join(lpath.replace('lib', 'bin'), prefix + lib + extension):
break break
else: else:
check_path(path.join(lpath, 'x86_64-linux-gnu', prefix + lib + extension)) check_path(path.join(lpath, 'x86_64-linux-gnu', prefix + lib + extension))
if platform == "darwin": if platform == "darwin":
targets = [ targets = [
"Blades of Exile", "Blades of Exile",