Merge branch 'master' into Playerbot

# Conflicts:
#	src/server/game/World/World.h
This commit is contained in:
郑佩茹
2023-02-09 12:40:25 -07:00
1253 changed files with 114535 additions and 40950 deletions

View File

@@ -20,12 +20,17 @@
#include "blake2-impl.h"
#if defined(__x86_64__) || defined(_M_X64) || defined(_M_AMD64)
#include <emmintrin.h>
#elif defined(__aarch64__) || defined(_M_ARM64)
#include "sse2neon.h"
#endif
#if defined(__SSSE3__)
#include <tmmintrin.h> /* for _mm_shuffle_epi8 and _mm_alignr_epi8 */
#endif
#if defined(__XOP__) && (defined(__GNUC__) || defined(__clang__))
#if defined(__x86_64__) && defined(__XOP__) && (defined(__GNUC__) || defined(__clang__))
#include <x86intrin.h>
#endif

10112
deps/argon2/argon2/blake2/sse2neon.h vendored Normal file

File diff suppressed because it is too large Load Diff