ScummVM/scummvm-sites
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm-sites.git synced 2026-05-21 05:40:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

BUILDBOT: Try to fix MXE toolchain for Win32

Browse Source
This commit is contained in:
Lothar Serra Mari
2020-06-01 19:25:19 +02:00
parent c5f534ef56
commit f94cd8975c
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/master.cfg
+2 -2
View File
@@ -289,7 +289,7 @@ scumm_buildonly_platforms.append("debian-x86-clang")
scumm_root_mingw_w32 = "/opt/toolchains/mxe/usr/i686-w64-mingw32.static"
scumm_env_mingw_w32 = copy.deepcopy(scumm_env)
scumm_env_mingw_w32["PATH"] = "/opt/toolchains/mxe/usr/bin:%s/bin:%s" % (scumm_root_mingw_w32, DEFAULT_PATH)
scumm_env_mingw_w32["CXX"] = "ccache i686-w64-mingw32.static-g++"
scumm_env_mingw_w32["CXX"] = "ccache /opt/toolchains/mxe/usr/bin/i686-w64-mingw32.static-g++"
scumm_env_mingw_w32["CXXFLAGS"] = "-isystem %s/include" % scumm_root_mingw_w32
scumm_env_mingw_w32["LDFLAGS"] = "-L%s/lib" % scumm_root_mingw_w32
scumm_env_mingw_w32["PKG_CONFIG_LIBDIR"] = "%s/lib/pkgconfig" % scumm_root_mingw_w32
@@ -333,7 +333,7 @@ scumm_desktop_platforms.append("mingw-w32")
scumm_root_mingw_w64 = "/opt/toolchains/mxe/usr/x86_64-w64-mingw32.static"
scumm_env_mingw_w64 = copy.deepcopy(scumm_env)
scumm_env_mingw_w64["PATH"] = "/opt/toolchains/mxe/usr/bin:%s/bin:%s" % (scumm_root_mingw_w64, DEFAULT_PATH)
scumm_env_mingw_w64["CXX"] = "ccache x86_64-w64-mingw32.static-g++"
scumm_env_mingw_w64["CXX"] = "ccache /opt/toolchains/mxe/usr/bin/x86_64-w64-mingw32.static-g++"
scumm_env_mingw_w64["CXXFLAGS"] = "-isystem %s/include" % scumm_root_mingw_w64
scumm_env_mingw_w64["LDFLAGS"] = "-L%s/lib" % scumm_root_mingw_w64
scumm_env_mingw_w64["PKG_CONFIG_LIBDIR"] = "%s/lib/pkgconfig" % scumm_root_mingw_w64