FWGS/xash3d-fwgs
2
0
Fork 0
mirror of https://github.com/FWGS/xash3d-fwgs synced 2024-11-25 11:19:59 +01:00
Code Issues 2 Projects Releases Wiki Activity

waflib: try to fix sdl2 searching on osx again

Browse Source
This commit is contained in:
Alibek Omarov 2018-12-19 06:57:54 +03:00
parent 5d6d6c766e
commit aac44ef866
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/waflib/sdl2.py
View File

@ -22,13 +22,19 @@ def options(opt):
'--skip-sdl2-sanity-check', action='store_false', default = True, dest='SDL2_SANITY_CHECK', '--skip-sdl2-sanity-check', action='store_false', default = True, dest='SDL2_SANITY_CHECK',
help = 'Skip checking SDL2 sanity') help = 'Skip checking SDL2 sanity')
def my_dirname(path):
# really dumb, will not work with /path/framework//, but still enough
if path[-1] == '/':
path = path[:-1]
return os.path.dirname(path)
def sdl2_configure_path(conf, path): def sdl2_configure_path(conf, path):
conf.env.HAVE_SDL2 = 1 conf.env.HAVE_SDL2 = 1
if conf.env.DEST_OS == 'darwin': if conf.env.DEST_OS == 'darwin':
conf.env.INCLUDES_SDL2 = [ conf.env.INCLUDES_SDL2 = [
os.path.abspath(os.path.join(path, 'Headers')) os.path.abspath(os.path.join(path, 'Headers'))
] ]
conf.env.FRAMEWORKPATH_SDL2 = [os.path.dirname(path)] conf.env.FRAMEWORKPATH_SDL2 = [my_dirname(path)]
conf.env.FRAMEWORK_SDL2 = ['SDL2'] conf.env.FRAMEWORK_SDL2 = ['SDL2']
else: else:
conf.env.INCLUDES_SDL2 = [ conf.env.INCLUDES_SDL2 = [