mirror of
https://git.eden-emu.dev/eden-emu/eden
synced 2026-04-29 19:48:58 +02:00
adapt to new master
This commit is contained in:
parent
fbe25febd7
commit
19c369e2ef
2 changed files with 2 additions and 13 deletions
|
|
@ -1,13 +0,0 @@
|
||||||
diff --git a/library/aesni.h b/library/aesni.h
|
|
||||||
index 754c984c79..59e27afd3e 100644
|
|
||||||
--- a/library/aesni.h
|
|
||||||
+++ b/library/aesni.h
|
|
||||||
@@ -35,7 +35,7 @@
|
|
||||||
/* GCC-like compilers: currently, we only support intrinsics if the requisite
|
|
||||||
* target flag is enabled when building the library (e.g. `gcc -mpclmul -msse2`
|
|
||||||
* or `clang -maes -mpclmul`). */
|
|
||||||
-#if (defined(__GNUC__) || defined(__clang__)) && defined(__AES__) && defined(__PCLMUL__)
|
|
||||||
+#if (defined(__GNUC__) || defined(__clang__)) && !defined(__OPENORBIS__)
|
|
||||||
#define MBEDTLS_AESNI_HAVE_INTRINSICS
|
|
||||||
#endif
|
|
||||||
/* For 32-bit, we only support intrinsics */
|
|
||||||
2
externals/cmake-modules/DetectPlatform.cmake
vendored
2
externals/cmake-modules/DetectPlatform.cmake
vendored
|
|
@ -17,6 +17,8 @@
|
||||||
|
|
||||||
if (${CMAKE_SYSTEM_NAME} STREQUAL "SunOS")
|
if (${CMAKE_SYSTEM_NAME} STREQUAL "SunOS")
|
||||||
set(PLATFORM_SUN ON)
|
set(PLATFORM_SUN ON)
|
||||||
|
elseif (${CMAKE_SYSTEM_NAME} STREQUAL "OpenOrbis")
|
||||||
|
set(PLATFORM_PS4 ON)
|
||||||
elseif (${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
|
elseif (${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
|
||||||
set(PLATFORM_FREEBSD ON)
|
set(PLATFORM_FREEBSD ON)
|
||||||
elseif (${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD")
|
elseif (${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD")
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue