diff options
| author | Shauren <shauren.trinity@gmail.com> | 2023-03-25 00:06:32 +0100 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2023-03-25 00:06:32 +0100 |
| commit | da4eedf07b7d0fa86a80c6ba77734839477ccfe8 (patch) | |
| tree | 8cb488bd0b3608c3b374c6f606cf1f95eee8c76e | |
| parent | 6af42ce82da9273eb47a2a53637f1aaf08a63f1d (diff) | |
Dep: Fix build on m1 mac
| -rw-r--r-- | dep/argon2/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | dep/g3dlite/G3D-v9.0 hotfix17.diff | 13 | ||||
| -rw-r--r-- | dep/g3dlite/source/FileSystem.cpp | 2 |
3 files changed, 17 insertions, 4 deletions
diff --git a/dep/argon2/CMakeLists.txt b/dep/argon2/CMakeLists.txt index 45f58039f7f..e21f7a61a0c 100644 --- a/dep/argon2/CMakeLists.txt +++ b/dep/argon2/CMakeLists.txt @@ -10,12 +10,12 @@ file(GLOB_RECURSE sources *.c) -if(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64") +if(CMAKE_SYSTEM_PROCESSOR MATCHES "i686|amd64|x86_64|AMD64") list(REMOVE_ITEM sources - ${CMAKE_CURRENT_SOURCE_DIR}/argon2/opt.c) + ${CMAKE_CURRENT_SOURCE_DIR}/argon2/ref.c) else() list(REMOVE_ITEM sources - ${CMAKE_CURRENT_SOURCE_DIR}/argon2/ref.c) + ${CMAKE_CURRENT_SOURCE_DIR}/argon2/opt.c) endif() add_library(argon2 STATIC diff --git a/dep/g3dlite/G3D-v9.0 hotfix17.diff b/dep/g3dlite/G3D-v9.0 hotfix17.diff new file mode 100644 index 00000000000..cb5367c65f4 --- /dev/null +++ b/dep/g3dlite/G3D-v9.0 hotfix17.diff @@ -0,0 +1,13 @@ +diff --git a/dep/g3dlite/source/FileSystem.cpp b/dep/g3dlite/source/FileSystem.cpp +index 0898af7953..ff5da02344 100644 +--- a/dep/g3dlite/source/FileSystem.cpp ++++ b/dep/g3dlite/source/FileSystem.cpp +@@ -35,7 +35,7 @@ + # include <fnmatch.h> + # include <unistd.h> + # define _getcwd getcwd +-# if defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) ++# if defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__) + # define stat64 stat + # endif + # define _stat stat diff --git a/dep/g3dlite/source/FileSystem.cpp b/dep/g3dlite/source/FileSystem.cpp index 0898af79534..ff5da023443 100644 --- a/dep/g3dlite/source/FileSystem.cpp +++ b/dep/g3dlite/source/FileSystem.cpp @@ -35,7 +35,7 @@ # include <fnmatch.h> # include <unistd.h> # define _getcwd getcwd -# if defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) +# if defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__) # define stat64 stat # endif # define _stat stat |