RomkaZVO/xash3d-fwgs
1
0
Fork 0
mirror of https://github.com/FWGS/xash3d-fwgs.git synced 2026-08-07 21:10:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

scripts: waifulib: sdl2: avoid abspath usage that causes problems when the path is concatenated with something else

Browse Source
This commit is contained in:
Alibek Omarov
2024-12-10 13:55:20 +03:00
parent 415184cabc
commit 698d631742
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/waifulib/sdl2.py
View File

@@ -41,14 +41,14 @@ def sdl2_configure_path(conf, path, libname):
conf.env[HAVE] = 1
if conf.env.DEST_OS == 'darwin':
conf.env[INCLUDES] = [os.path.abspath(os.path.join(path, 'Headers'))]
conf.env[INCLUDES] = [os.path.join(path, 'Headers')]
conf.env[FRAMEWORKPATH] = [my_dirname(path)]
conf.env[FRAMEWORK] = [libname]
conf.end_msg('yes: {0}, {1}, {2}'.format(conf.env[FRAMEWORK], conf.env[FRAMEWORKPATH], conf.env[INCLUDES]))
else:
conf.env[INCLUDES] = [
os.path.abspath(os.path.join(path, 'include')),
os.path.abspath(os.path.join(path, 'include/%s' % libname))
os.path.join(path, 'include'),
os.path.join(path, 'include/%s' % libname)
]
libpath = 'lib'
if conf.env.COMPILER_CC == 'msvc':
@@ -56,7 +56,7 @@ def sdl2_configure_path(conf, path, libname):
libpath = 'lib/x64'
else:
libpath = 'lib/' + conf.env.DEST_CPU
conf.env[LIBPATH] = [os.path.abspath(os.path.join(path, libpath))]
conf.env[LIBPATH] = [os.path.join(path, libpath)]
conf.env[LIB] = [libname]
conf.end_msg('yes: {0}, {1}, {2}'.format(conf.env[LIB], conf.env[LIBPATH], conf.env[INCLUDES]))