aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorB. Watson <yalhcru@gmail.com>2022-03-18 14:33:48 -0400
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2022-03-20 20:45:14 +0700
commit7a9a796aa1b02da54f0eee979bb7fae713b717ab (patch)
treeb8961528683def65b326e1277be9af59ff572ccd
parentf52bd7d4cd8e9523c9c08e938aba7d8da73553bb (diff)
games/zdoom: Fix 32-bit build.
Signed-off-by: B. Watson <yalhcru@gmail.com> Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-rw-r--r--games/zdoom/zdoom.SlackBuild4
1 files changed, 4 insertions, 0 deletions
diff --git a/games/zdoom/zdoom.SlackBuild b/games/zdoom/zdoom.SlackBuild
index 443ff986ab9c..366193890159 100644
--- a/games/zdoom/zdoom.SlackBuild
+++ b/games/zdoom/zdoom.SlackBuild
@@ -8,6 +8,7 @@
# version had no license, modified version released under the WTFPL,
# see http://www.wtfpl.net/txt/copying/ for details.
+# 20220318 bkw: fix 32-bit build (disable asm).
# 20211012 bkw: BUILD=2
# - Fix -current build.
# - New-style icons.
@@ -147,7 +148,10 @@ sed -i '/REGEX *MATCH/s,\[3-9\],[1-9][0-9]*,g' game-music-emu/CMakeLists.txt
mkdir release
cd release
+# 20220318 bkw: the x86 asm code won't build on 15.0, so it's disabled.
+# The x86_64 build never used it.
cmake \
+ -DNO_ASM=ON \
-DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
-DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-DCMAKE_BUILD_TYPE="Release" \