From 7ccc9b079588686acadf5835b941ca035b803bea Mon Sep 17 00:00:00 2001 From: mittorn Date: Tue, 9 Apr 2019 09:35:27 +0000 Subject: [PATCH] Revert "waf: try relative SDL2 path" This reverts commit 50f0ae5234b9a6085d88dde9e0cfd9b2e2da7849. --- scripts/waflib/sdl2.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/waflib/sdl2.py b/scripts/waflib/sdl2.py index aacaffc7..368eecc1 100644 --- a/scripts/waflib/sdl2.py +++ b/scripts/waflib/sdl2.py @@ -31,14 +31,14 @@ def sdl2_configure_path(conf, path): conf.env.HAVE_SDL2 = 1 if conf.env.DEST_OS == 'darwin': 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.FRAMEWORK_SDL2 = ['SDL2'] else: conf.env.INCLUDES_SDL2 = [ - os.path.join(path, 'include'), - os.path.join(path, 'include/SDL2') + os.path.abspath(os.path.join(path, 'include')), + os.path.abspath(os.path.join(path, 'include/SDL2')) ] libpath = 'lib' if conf.env.COMPILER_CC == 'msvc': @@ -46,7 +46,7 @@ def sdl2_configure_path(conf, path): libpath = 'lib/x64' else: 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'] def configure(conf):