From f94cd8975c600f6ae6b4ee20e0591ec0d6f410b1 Mon Sep 17 00:00:00 2001 From: Lothar Serra Mari Date: Mon, 1 Jun 2020 19:25:19 +0200 Subject: [PATCH] BUILDBOT: Try to fix MXE toolchain for Win32 --- config/master.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/master.cfg b/config/master.cfg index b9af5d6..c067e9e 100644 --- a/config/master.cfg +++ b/config/master.cfg @@ -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