AxioDL
/
boo
mirror of https://github.com/AxioDL/boo.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixes for GCC aarch64 compilation

This commit is contained in:
Luke Street 2021-02-01 05:14:19 +00:00
parent 74aaa605f3
commit 3280363b6d
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
CMakeLists.txt
View File

@ -121,9 +121,14 @@ if(NOT GEKKO AND NOT CAFE AND NOT WINDOWS_STORE AND NOT NX AND NOT APPLE)
) )
endif() endif()
set(AudioMatrix_SRC lib/audiodev/AudioMatrix.cpp)
if(${CMAKE_SYSTEM_PROCESSOR} STREQUAL x86_64)
set(AudioMatrix_SRC lib/audiodev/AudioMatrixSSE.cpp)
endif()
if(WINDOWS_STORE) if(WINDOWS_STORE)
target_sources(boo PRIVATE target_sources(boo PRIVATE
lib/audiodev/AudioMatrixSSE.cpp ${AudioMatrix_SRC}
lib/audiodev/WASAPI.cpp lib/audiodev/WASAPI.cpp
lib/inputdev/HIDDeviceUWP.cpp lib/inputdev/HIDDeviceUWP.cpp
lib/inputdev/HIDListenerUWP.cpp lib/inputdev/HIDListenerUWP.cpp
@ -184,7 +189,7 @@ elseif(WIN32)
endif() endif()
target_sources(boo PRIVATE target_sources(boo PRIVATE
lib/audiodev/AudioMatrixSSE.cpp ${AudioMatrix_SRC}
lib/audiodev/WASAPI.cpp lib/audiodev/WASAPI.cpp
lib/graphicsdev/D3D11.cpp lib/graphicsdev/D3D11.cpp
lib/inputdev/HIDListenerWinUSB.cpp lib/inputdev/HIDListenerWinUSB.cpp
@ -212,10 +217,6 @@ elseif(WIN32)
Xinput Xinput
) )
elseif(APPLE) elseif(APPLE)
set(AudioMatrix_SRC lib/audiodev/AudioMatrix.cpp)
if(${CMAKE_SYSTEM_PROCESSOR} STREQUAL x86_64)
set(AudioMatrix_SRC lib/audiodev/AudioMatrixSSE.cpp)
endif()
target_sources(boo PRIVATE target_sources(boo PRIVATE
lib/audiodev/AQS.cpp lib/audiodev/AQS.cpp
${AudioMatrix_SRC} ${AudioMatrix_SRC}
@ -317,7 +318,8 @@ else(NOT GEKKO)
/usr/lib/dbus-1.0/include /usr/lib/dbus-1.0/include
/usr/lib64/dbus-1.0/include /usr/lib64/dbus-1.0/include
/usr/local/lib/dbus-1.0/include /usr/local/lib/dbus-1.0/include
/usr/lib/x86_64-linux-gnu/dbus-1.0/include/ /usr/lib/x86_64-linux-gnu/dbus-1.0/include
/usr/lib/aarch64-linux-gnu/dbus-1.0/include
PATH_SUFFIXES PATH_SUFFIXES
dbus-1.0/include/ dbus-1.0/include/
@ -383,7 +385,7 @@ else(NOT GEKKO)
) )
endif() endif()
target_sources(boo PRIVATE target_sources(boo PRIVATE
lib/audiodev/AudioMatrixSSE.cpp ${AudioMatrix_SRC}
lib/inputdev/HIDDeviceUdev.cpp lib/inputdev/HIDDeviceUdev.cpp
lib/inputdev/HIDListenerUdev.cpp lib/inputdev/HIDListenerUdev.cpp
) )
@ -396,7 +398,7 @@ else(NOT GEKKO)
) )
else() else()
target_sources(boo PRIVATE target_sources(boo PRIVATE
lib/audiodev/AudioMatrixSSE.cpp ${AudioMatrix_SRC}
lib/inputdev/HIDDeviceBSD.cpp lib/inputdev/HIDDeviceBSD.cpp
lib/inputdev/HIDListenerBSD.cpp lib/inputdev/HIDListenerBSD.cpp
) )

2
soxr/src/pffft.c
View File

@ -154,7 +154,7 @@ typedef __m128 v4sf;
/* /*
ARM NEON support macros ARM NEON support macros
*/ */
#elif !defined(PFFFT_SIMD_DISABLE) && (defined(__arm__) || defined(__arm64__)) #elif !defined(PFFFT_SIMD_DISABLE) && (defined(__arm__) || defined(__arm64__) || defined(__aarch64__))
# include <arm_neon.h> # include <arm_neon.h>
typedef float32x4_t v4sf; typedef float32x4_t v4sf;
# define SIMD_SZ 4 # define SIMD_SZ 4