From 55ca39da44a9f399b8aeff6d947be1e732ebd875 Mon Sep 17 00:00:00 2001
From: Josh Tynjala <joshtynjala@bowlerhat.dev>
Date: Wed, 1 Mar 2023 15:55:55 -0800
Subject: [PATCH] slightly different compiler flags with Raspberry Pi ARM64

---
 project/Build.xml            | 3 ++-
 project/lib/openal-files.xml | 2 +-
 project/lib/pixman-files.xml | 2 +-
 project/lib/sdl-files.xml    | 7 ++++---
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/project/Build.xml b/project/Build.xml
index d3531bd0c..987abb53a 100755
--- a/project/Build.xml
+++ b/project/Build.xml
@@ -240,7 +240,8 @@
 				<compilerflag value="-I/opt/vc/include/interface/vmcs_host/linux" />
 				<compilerflag value="-I/usr/include/libdrm" />
 				<compilerflag value="-I/usr/include/dbus-1.0" />
-				<compilerflag value="-I/usr/lib/arm-linux-gnueabihf/dbus-1.0/include" />
+				<compilerflag value="-I/usr/lib/arm-linux-gnueabihf/dbus-1.0/include" unless="HXCPP_ARM64" />
+				<compilerflag value="-I/usr/lib/aarch64-linux-gnu/dbus-1.0/include" if="HXCPP_ARM64" />
 				<compilerflag value="-I/usr/local/include" />
 
 				<compilerflag value="-ldrm" />
diff --git a/project/lib/openal-files.xml b/project/lib/openal-files.xml
index 552fd8006..e6e5c1cd4 100644
--- a/project/lib/openal-files.xml
+++ b/project/lib/openal-files.xml
@@ -99,7 +99,7 @@
             <compilerflag value="-msse2" unless="rpi" />
             <compilerflag value="-msse3" unless="rpi" />
             <compilerflag value="-mssse3" unless="rpi" />
-            <compilerflag value="-mfpu=neon" if="rpi" />
+            <compilerflag value="-mfpu=neon" if="rpi" unless="HXCPP_ARM64" />
             <compilerflag value="-fcommon" />
 
             <file name="${NATIVE_TOOLKIT_PATH}/openal/alc/backends/alsa.cpp" />
diff --git a/project/lib/pixman-files.xml b/project/lib/pixman-files.xml
index 5f221a93e..7f8da069c 100644
--- a/project/lib/pixman-files.xml
+++ b/project/lib/pixman-files.xml
@@ -3,7 +3,7 @@
 	<!-- TODO: ARM64 NEON -->
 
 	<!-- <set name="PIXMAN_ARM_SIMD" value="1" if="android || rpi" unless="HXCPP_ARMV7 || HXCPP_ARMV7S || HXCPP_ARM64 || HXCPP_X86" /> -->
-	<set name="PIXMAN_ARM_NEON" value="1" if="HXCPP_ARMV7 || HXCPP_ARMV7S || rpi" unless="ios || NDKV22+" />
+	<set name="PIXMAN_ARM_NEON" value="1" if="HXCPP_ARMV7 || HXCPP_ARMV7S || rpi" unless="ios || NDKV22+ || HXCPP_ARM64" />
 
 	<files id="native-toolkit-pixman">
 
diff --git a/project/lib/sdl-files.xml b/project/lib/sdl-files.xml
index 2da855f8b..836b94df4 100755
--- a/project/lib/sdl-files.xml
+++ b/project/lib/sdl-files.xml
@@ -145,8 +145,8 @@
 
             <section if="rpi">
 
-                <compilerflag value="-mfpu=neon" />
-                <compilerflag value="-mfloat-abi=hard" />
+                <compilerflag value="-mfpu=neon" unless="HXCPP_ARM64" />
+                <compilerflag value="-mfloat-abi=hard" unless="HXCPP_ARM64" />
                 <compilerflag value="-I-abi=hard" />
 
                 <compilerflag value="-I/opt/vc/include" />
@@ -156,7 +156,8 @@
                 <compilerflag value="-I/usr/include/interface/vcos/pthreads" />
                 <compilerflag value="-I/usr/include/interface/vmcs_host/linux" />
                 <compilerflag value="-I/usr/include/libdrm" />
-                <compilerflag value="-I/usr/lib/arm-linux-gnueabihf/dbus-1.0/include" />
+                <compilerflag value="-I/usr/lib/arm-linux-gnueabihf/dbus-1.0/include" unless="HXCPP_ARM64" />
+                <compilerflag value="-I/usr/lib/aarch64-linux-gnu/dbus-1.0/include" if="HXCPP_ARM64" />
                 <compilerflag value="-I/usr/local/include" />
 
             </section>