jengelh/gzdoom
SHA256
1
0
Fork 0
forked from pool/gzdoom
Code Pull Requests Activity

+ 0001-removed-some-32bit-only-CMake-code.patch

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/games/gzdoom?expand=0&rev=90
This commit is contained in:
Jan Engelhardt 2022-11-06 11:14:22 +00:00 committed by Git OBS Bridge
parent 5c248f341a
commit 96f3bbd0d4
3 changed files with 50 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
0001-removed-some-32bit-only-CMake-code.patch Normal file
View File

@ -0,0 +1,47 @@
From 9e76faff1f93688d035062913cc29b294b831576 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Thu, 20 Oct 2022 21:11:18 +0200
Subject: [PATCH] - removed some 32bit only CMake code.
---
src/CMakeLists.txt | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
Index: gzdoom-g4.9.0/src/CMakeLists.txt
===================================================================
--- gzdoom-g4.9.0.orig/src/CMakeLists.txt
+++ gzdoom-g4.9.0/src/CMakeLists.txt
@@ -156,8 +156,33 @@ endif()
# Decide on SSE setup
+# SSE only matters on 32-bit targets. We check compiler flags to know if we can do it.
+if( CMAKE_SIZEOF_VOID_P MATCHES "4" AND NOT CMAKE_OSX_ARCHITECTURES MATCHES ppc )
+ CHECK_CXX_COMPILER_FLAG( "-msse2 -mfpmath=sse" CAN_DO_MFPMATH )
+ CHECK_CXX_COMPILER_FLAG( -arch:SSE2 CAN_DO_ARCHSSE2 )
+ if( CAN_DO_MFPMATH )
+ set( SSE1_ENABLE "-msse -mfpmath=sse" )
+ set( SSE2_ENABLE "-msse2 -mfpmath=sse" )
+ elseif( CAN_DO_ARCHSSE2 )
+ set( SSE1_ENABLE -arch:SSE )
+ set( SSE2_ENABLE -arch:SSE2 )
+ endif()
+endif()
+
if( X64 )
set( HAVE_MMX 1 )
+else( X64 )
+ set( SAFE_CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} )
+
+ if( DEM_CMAKE_COMPILER_IS_GNUCXX_COMPATIBLE )
+ set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mmmx")
+ endif( DEM_CMAKE_COMPILER_IS_GNUCXX_COMPATIBLE )
+
+ CHECK_CXX_SOURCE_COMPILES("#include <mmintrin.h>
+ int main(void) { __m64 v = _m_from_int(0); }"
+ HAVE_MMX)
+
+ set( CMAKE_CXX_FLAGS ${SAFE_CMAKE_CXX_FLAGS} )
endif( X64 )
CHECK_CXX_SOURCE_COMPILES("#include <ppl.h>

3
gzdoom.changes
View File

@ -7,7 +7,8 @@ Sat Nov 5 19:55:42 UTC 2022 - Jan Engelhardt <jengelh@inai.de>
* The SoftPoly renderer was removed * The SoftPoly renderer was removed
- Delete gzdoom-sdlbug.patch (obsolete), - Delete gzdoom-sdlbug.patch (obsolete),
0001-fix-gzdoom.pk3-not-found-error.patch (merged) 0001-fix-gzdoom.pk3-not-found-error.patch (merged)
- Add 0001-build-unbreak-compilation-on-Linux.patch - Add 0001-build-unbreak-compilation-on-Linux.patch,
0001-removed-some-32bit-only-CMake-code.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Oct 24 23:24:06 UTC 2022 - Jan Engelhardt <jengelh@inai.de> Mon Oct 24 23:24:06 UTC 2022 - Jan Engelhardt <jengelh@inai.de>

1
gzdoom.spec
View File

@ -31,6 +31,7 @@ Patch2: gzdoom-lzma.patch
Patch3: 0001-build-unbreak-compilation-on-Linux.patch Patch3: 0001-build-unbreak-compilation-on-Linux.patch
Patch5: gzdoom-vulkan.patch Patch5: gzdoom-vulkan.patch
Patch6: gzdoom-discord.patch Patch6: gzdoom-discord.patch
Patch8: 0001-removed-some-32bit-only-CMake-code.patch
Patch9: 0001-Revert-use-static_assert-to-make-32-bit-builds-fail.patch Patch9: 0001-Revert-use-static_assert-to-make-32-bit-builds-fail.patch
BuildRequires: cmake >= 2.8.7 BuildRequires: cmake >= 2.8.7
BuildRequires: discord-rpc-devel BuildRequires: discord-rpc-devel