RomkaZVO/xash3d-fwgs
1
0
Fork 0
mirror of https://github.com/FWGS/xash3d-fwgs.git synced 2026-08-05 03:24:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

scripts: waifulib: sdl2: add paths support for SDL mingw dev package

Browse Source
This commit is contained in:
Alibek Omarov
2026-01-24 07:22:57 +05:00
parent cc9e3a5a81
commit 8bb6968ab8
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/waifulib/sdl2.py
View File

@@ -63,12 +63,18 @@ def sdl2_configure_path(conf, path, libname):
conf.env[LIB] = [libname]
conf.end_msg('yes: {0}, {1}, {2}'.format(conf.env[LIB], conf.env[LIBPATH], conf.env[INCLUDES]))
else:
if conf.env.DEST_OS == 'win32' and conf.env.COMPILER_CC != 'msvc':
if conf.env.DEST_CPU == 'x86':
triplet = 'i686-w64-mingw32'
else:
triplet = conf.env.DEST_CPU + '-w64-mingw32'
path = os.path.abspath(os.path.join(path, triplet))
conf.env[INCLUDES] = [
os.path.abspath(os.path.join(path, 'include')),
os.path.abspath(os.path.join(path, 'include/%s' % libname))
]
libpath = 'lib'
if conf.env.COMPILER_CC == 'msvc':
if conf.env.DEST_OS == 'win32' and conf.env.COMPILER_CC == 'msvc':
if conf.env.DEST_CPU == 'x86_64':
libpath = 'lib/x64'
else:

2
scripts/waifulib/vgui.py
View File

@@ -45,7 +45,7 @@ def check_vgui(conf):
else: conf.end_msg('yes')
conf.start_msg('Does this toolchain able to link VGUI?')
if conf.env.DEST_OS == 'win32' and conf.env.COMPILER_CXX == 'g++':
if conf.env.DEST_OS == 'win32' and conf.env.COMPILER_CXX != 'msvc':
conf.end_msg('no')
# we have ABI incompatibility ONLY on MinGW
Logs.warn('vgui can\'t be linked with MinGW')