From 565e8cc3148c4377edf563ce9e0fe421d3ab3d09 Mon Sep 17 00:00:00 2001 From: tildearrow Date: Sun, 1 Jan 2023 13:41:10 -0500 Subject: [PATCH] Revert "..." This reverts commit 347d8348038a029005d1481be26aced5218dd2b4. --- scripts/Cross-MinGW.cmake | 4 ++-- scripts/release-win32.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/Cross-MinGW.cmake b/scripts/Cross-MinGW.cmake index 6f662d37..09871d6b 100644 --- a/scripts/Cross-MinGW.cmake +++ b/scripts/Cross-MinGW.cmake @@ -1,7 +1,7 @@ set(TARGET_PREFIX ${CMAKE_SYSTEM_PROCESSOR}-w64-mingw32) -set(CMAKE_C_COMPILER ${TARGET_PREFIX}-gcc) -set(CMAKE_CXX_COMPILER ${TARGET_PREFIX}-g++) +set(CMAKE_C_COMPILER ${TARGET_PREFIX}-gcc-posix) +set(CMAKE_CXX_COMPILER ${TARGET_PREFIX}-g++-posix) set(PKG_CONFIG_EXECUTABLE ${TARGET_PREFIX}-pkg-config) set(CMAKE_FIND_ROOT_PATH /usr/${TARGET_PREFIX}) diff --git a/scripts/release-win32.sh b/scripts/release-win32.sh index 89243486..c763eed5 100755 --- a/scripts/release-win32.sh +++ b/scripts/release-win32.sh @@ -15,7 +15,7 @@ fi cd win32build # TODO: potential Arch-ism? -cmake -DCMAKE_TOOLCHAIN_FILE=scripts/Cross-MinGW-x86.cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS="-O2" -DCMAKE_CXX_FLAGS="-O2 -Wall -Wextra -Wno-unused-parameter -Wno-cast-function-type -Werror" -DBUILD_SHARED_LIBS=OFF -DSUPPORT_XP=ON .. || exit 1 +i686-w64-mingw32-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS="-O2" -DCMAKE_CXX_FLAGS="-O2 -Wall -Wextra -Wno-unused-parameter -Wno-cast-function-type -Werror" -DBUILD_SHARED_LIBS=OFF -DSUPPORT_XP=ON .. || exit 1 make -j8 || exit 1 i686-w64-mingw32-strip -s furnace.exe || exit 1