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

android/app/CMakeLists.txt

@@ -39,7 +39,7 @@ execute_process(
 	AR=${CMAKE_AR} STRIP=${CMAKE_STRIP}
 	${PYTHON_EXECUTABLE} waf configure -T ${BUILD_TYPE} ${WAF_EXTRA_ARGS} cmake
 	--check-c-compiler=${C_COMPILER_ID} --check-cxx-compiler=${CXX_COMPILER_ID}
-	-s "${ENGINE_SOURCE_DIR}/SDL" --skip-sdl2-sanity-check --enable-bundled-deps
+	-s "${ENGINE_SOURCE_DIR}/3rdparty/SDL" --skip-sdl2-sanity-check --enable-bundled-deps
 	WORKING_DIRECTORY "${ENGINE_SOURCE_DIR}"
 )
 

scripts/waifulib/sdl2.py

@@ -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.join(path, 'include'),
-			os.path.abspath(os.path.join(path, 'include/%s' % libname))
+			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]))