7fc9190f0e
* gcc is kept at -Np0, because of void-cross
```sh
git grep -l '^patch_args=-Np0' "srcpkgs/$1*/template" |
while read template; do
for p in ${template%/template}/patches/*; do
sed -i '
\,^[+-][+-][+-] /dev/null,b
/^[*-]\+ [0-9]\+\(,[0-9]\+\)\? [*-]\+$/b
s,^[*][*][*] ,&a/,
/^--- /{
s,\(^--- \)\(./\)*,\1a/,
s,[.][Oo][Rr][Ii][Gg]\([ /]\),\1,
s/[.][Oo][Rr][Ii][Gg]$//
s/[.]patched[.]\([^.]\)/.\1/
h
}
/^+++ -/{
g
s/^--- a/+++ b/
b
}
s,\(^+++ \)\(./\)*,\1b/,
' "$p"
done
sed -i '/^patch_args=/d' $template
done
```
32 lines
926 B
Diff
32 lines
926 B
Diff
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
|
index 26c617e..e162638 100644
|
|
--- a/src/CMakeLists.txt
|
|
+++ b/src/CMakeLists.txt
|
|
@@ -1361,11 +1361,11 @@ endif()
|
|
if( ZD_CMAKE_COMPILER_IS_GNUCXX_COMPATIBLE )
|
|
# Need to enable intrinsics for these files.
|
|
if( SSE_MATTERS )
|
|
- set_property( SOURCE
|
|
+ set_source_files_properties(
|
|
common/rendering/polyrenderer/poly_all.cpp
|
|
rendering/swrenderer/r_all.cpp
|
|
- utility/palette.cpp
|
|
- utility/x86.cpp
|
|
+ common/utility/palette.cpp
|
|
+ common/utility/x86.cpp
|
|
APPEND_STRING PROPERTY COMPILE_FLAGS " -msse2 -mmmx" )
|
|
endif()
|
|
endif()
|
|
diff --git a/src/common/utility/palette.cpp b/src/common/utility/palette.cpp
|
|
index f2a2987..b8de208 100644
|
|
--- a/src/common/utility/palette.cpp
|
|
+++ b/src/common/utility/palette.cpp
|
|
@@ -33,6 +33,8 @@
|
|
*/
|
|
|
|
#include <algorithm>
|
|
+#include <cfloat>
|
|
+#include <cmath>
|
|
#include "palutil.h"
|
|
#include "palentry.h"
|
|
#include "sc_man.h"
|