mirror of
https://github.com/love2d/love.git
synced 2026-08-12 08:30:56 +02:00
Merge pull request #1645 from MikuAuahDark/windows-arm-rework
LÖVE on Windows 10 ARM patches (step 2)
This commit is contained in:
@@ -65,8 +65,6 @@ if(POLICY CMP0072)
|
||||
cmake_policy(SET CMP0072 NEW)
|
||||
endif()
|
||||
|
||||
find_package(OpenGL)
|
||||
|
||||
if(MEGA)
|
||||
# LOVE_MSVC_DLLS contains runtime DLLs that should be bundled with the love
|
||||
# binary (in e.g. the installer). Example: msvcp140.dll.
|
||||
@@ -88,7 +86,6 @@ if(MEGA)
|
||||
set(LOVE_LINK_DIRS ${SDL_LINK_DIR})
|
||||
|
||||
set(LOVE_LINK_LIBRARIES
|
||||
${OPENGL_gl_LIBRARY}
|
||||
${MEGA_FREETYPE}
|
||||
${MEGA_LIBOGG}
|
||||
${MEGA_LIBVORBISFILE}
|
||||
|
||||
+1
-1
@@ -71,7 +71,7 @@
|
||||
#endif
|
||||
|
||||
// NEON instructions.
|
||||
#if defined(__ARM_NEON)
|
||||
#if defined(__ARM_NEON) || defined(_M_ARM64)
|
||||
# define LOVE_SIMD_NEON
|
||||
#endif
|
||||
|
||||
|
||||
@@ -1020,7 +1020,7 @@ drflac_bool32 drflac_next_cuesheet_track(drflac_cuesheet_track_iterator* pIter,
|
||||
#define DRFLAC_X64
|
||||
#elif defined(__i386) || defined(_M_IX86)
|
||||
#define DRFLAC_X86
|
||||
#elif defined(__arm__) || defined(_M_ARM)
|
||||
#elif defined(__arm__) || defined(_M_ARM) || defined(_M_ARM64)
|
||||
#define DRFLAC_ARM
|
||||
#endif
|
||||
|
||||
|
||||
@@ -617,7 +617,7 @@ end:
|
||||
return g_have_simd - 1;
|
||||
#endif
|
||||
}
|
||||
#elif defined(__ARM_NEON) || defined(__aarch64__)
|
||||
#elif defined(__ARM_NEON) || defined(__aarch64__) || defined(_M_ARM64)
|
||||
#include <arm_neon.h>
|
||||
#define DRMP3_HAVE_SSE 0
|
||||
#define DRMP3_HAVE_SIMD 1
|
||||
|
||||
@@ -508,7 +508,8 @@ MY_CPU_LE_UNALIGN means that CPU is LITTLE ENDIAN and CPU supports unaligned mem
|
||||
#if defined(MY_CPU_AMD64) \
|
||||
|| defined(_M_IA64) \
|
||||
|| defined(__AARCH64EL__) \
|
||||
|| defined(__AARCH64EB__)
|
||||
|| defined(__AARCH64EB__) \
|
||||
|| defined(_M_ARM64)
|
||||
#define MY_CPU_64BIT
|
||||
#endif
|
||||
|
||||
@@ -529,7 +530,7 @@ MY_CPU_LE_UNALIGN means that CPU is LITTLE ENDIAN and CPU supports unaligned mem
|
||||
#define MY_CPU_32BIT
|
||||
#endif
|
||||
|
||||
#if defined(_WIN32) && defined(_M_ARM)
|
||||
#if defined(_WIN32) && (defined(_M_ARM) || defined(_M_ARM64))
|
||||
#define MY_CPU_ARM_LE
|
||||
#endif
|
||||
|
||||
|
||||
Reference in New Issue
Block a user