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

Revert "waf: try relative SDL2 path"

Browse Source 
This reverts commit 50f0ae5234b9a6085d88dde9e0cfd9b2e2da7849.
This commit is contained in:
mittorn 2019-04-09 09:35:27 +00:00 committed by Alibek Omarov
parent 6c1d911193
commit 7ccc9b0795
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/waflib/sdl2.py
View File

@ -31,14 +31,14 @@ 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.join(path, 'Headers') os.path.abspath(os.path.join(path, 'Headers'))
] ]
conf.env.FRAMEWORKPATH_SDL2 = [my_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 = [
os.path.join(path, 'include'), os.path.abspath(os.path.join(path, 'include')),
os.path.join(path, 'include/SDL2') 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':
@ -46,7 +46,7 @@ def sdl2_configure_path(conf, path):
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.join(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): def configure(conf):