YGGverse/xash3d-fwgs
1
0
Fork 0
mirror of https://github.com/YGGverse/xash3d-fwgs.git synced 2025-01-17 18:40:02 +00:00
Code Issues Projects Releases Wiki Activity

waflib: sdl2: fix finding sdl2 on osx

Browse Source
This commit is contained in:
Alibek Omarov 2018-12-17 02:34:49 +03:00
parent 95ce9fc00f
commit 30c32b0088
1 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
scripts/waflib/sdl2.py
View File

@ -22,13 +22,18 @@ 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 configure(conf): def sdl2_configure_path(conf, path):
if conf.options.SDL2_PATH: conf.env.HAVE_SDL2 = 1
conf.start_msg('Configuring SDL2 by provided path') if conf.env.DEST_OS == 'darwin':
conf.env.HAVE_SDL2 = 1
conf.env.INCLUDES_SDL2 = [ conf.env.INCLUDES_SDL2 = [
os.path.abspath(os.path.join(conf.options.SDL2_PATH, 'include')), os.path.abspath(os.path.join(path, 'Headers'))
os.path.abspath(os.path.join(conf.options.SDL2_PATH, 'include/SDL2')) ]
conf.env.FRAMEWORKPATH_SDL2 = [path]
conf.env.FRAMEWORK_SDL2 = ['SDL2']
else:
conf.env.INCLUDES_SDL2 = [
os.path.abspath(os.path.join(path, 'include')),
os.path.abspath(os.path.join(path, 'include/SDL2'))
] ]
libpath = 'lib' libpath = 'lib'
if conf.env.COMPILER_CC == 'msvc': if conf.env.COMPILER_CC == 'msvc':
@ -36,8 +41,13 @@ def configure(conf):
libpath = 'lib/x64' libpath = 'lib/x64'
else: else:
libpath = 'lib/' + conf.env.DEST_CPU libpath = 'lib/' + conf.env.DEST_CPU
conf.env.LIBPATH_SDL2 = [os.path.abspath(os.path.join(conf.options.SDL2_PATH, libpath))] conf.env.LIBPATH_SDL2 = [os.path.abspath(os.path.join(path, libpath))]
conf.env.LIB_SDL2 = ['SDL2'] conf.env.LIB_SDL2 = ['SDL2']
def configure(conf):
if conf.options.SDL2_PATH:
conf.start_msg('Configuring SDL2 by provided path')
sdl2_configure_path(conf, conf.options.SDL2_PATH)
conf.end_msg('yes: {0}, {1}, {2}'.format(conf.env.LIB_SDL2, conf.env.LIBPATH_SDL2, conf.env.INCLUDES_SDL2)) conf.end_msg('yes: {0}, {1}, {2}'.format(conf.env.LIB_SDL2, conf.env.LIBPATH_SDL2, conf.env.INCLUDES_SDL2))
else: else:
try: try: