diff --git a/disable_sse.patch b/disable_sse.patch index 6e1b149..54a78a3 100644 --- a/disable_sse.patch +++ b/disable_sse.patch @@ -1,12 +1,12 @@ ---- src/CMakeLists.txt.orig 2018-04-18 16:11:00.227988702 +0200 -+++ src/CMakeLists.txt 2018-04-18 16:11:14.228041424 +0200 -@@ -97,9 +97,6 @@ if(APPLE) +--- src/CMakeLists.txt.orig 2020-04-29 12:44:22.087112317 +0000 ++++ src/CMakeLists.txt 2020-04-29 12:44:38.886604020 +0000 +@@ -159,9 +159,6 @@ if(APPLE) set_source_files_properties(${OSX_ICON} PROPERTIES MACOSX_PACKAGE_LOCATION Resources) endif(APPLE) -# enable SSE instructions for dumb library -set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_USE_SSE -msse") - - add_executable(slade WIN32 MACOSX_BUNDLE - External/lzma/C/LzmaDec.c - External/mus2mid/mus2mid.cpp + # External libraries are compiled separately to enable unity builds + add_subdirectory(External) + diff --git a/slade.changes b/slade.changes index 5f3ad37..a8755d5 100644 --- a/slade.changes +++ b/slade.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Apr 29 12:45:36 UTC 2020 - Guillaume GARDET + +- Refresh disable_sse.patch + ------------------------------------------------------------------- Sat Apr 18 17:06:32 UTC 2020 - Jan Engelhardt diff --git a/slade.spec b/slade.spec index 1d67dc6..fef8e47 100644 --- a/slade.spec +++ b/slade.spec @@ -33,6 +33,7 @@ BuildRequires: ImageMagick BuildRequires: cmake >= 3.1 BuildRequires: freeimage-devel BuildRequires: gcc-c++ >= 6 +BuildRequires: pkgconfig BuildRequires: update-desktop-files BuildRequires: wxWidgets-3_0-devel BuildRequires: zip @@ -54,7 +55,7 @@ game-specific formats, and even convert between some of them, or from/to other generic formats such as PNG. %prep -%setup -qn SLADE-%version +%setup -q -n SLADE-%version %patch -P 1 -P 2 -p1 %ifnarch %ix86 x86_64 %patch10 -p0 @@ -69,7 +70,7 @@ make %{?_smp_mflags} %if 0%{?suse_version} > 1320 strip-nondeterminism build/slade.pk3 %endif -b="%buildroot" +b=%{buildroot} install -Dm755 build/slade "$b/%_bindir/slade" install -Dm644 build/slade.pk3 "$b/%_datadir/slade3/slade.pk3"