From 47fda71672d2f465278551c983f7a2a34dda3181 Mon Sep 17 00:00:00 2001
From: Shadowfacts <me@shadowfacts.net>
Date: Mon, 17 Jan 2022 11:45:44 -0500
Subject: [PATCH] Build for arm64 macOS

---
 coreAPI/pom.xml                               |  8 +++----
 .../games/input/ControllerEnvironment.java    |  3 +--
 plugins/OSX/build.xml                         | 22 +++++++++----------
 plugins/OSX/pom.xml                           |  8 +++----
 plugins/awt/pom.xml                           |  8 +++----
 pom.xml                                       | 12 +++++-----
 6 files changed, 30 insertions(+), 31 deletions(-)

diff --git a/coreAPI/pom.xml b/coreAPI/pom.xml
index ea3a46e..e3b04aa 100644
--- a/coreAPI/pom.xml
+++ b/coreAPI/pom.xml
@@ -23,9 +23,9 @@
             <plugin>
                 <artifactId>maven-source-plugin</artifactId>
             </plugin>
-            <plugin>
-                <artifactId>maven-javadoc-plugin</artifactId>
-            </plugin>
+            <!-- <plugin> -->
+            <!--     <artifactId>maven-javadoc-plugin</artifactId> -->
+            <!-- </plugin> -->
         </plugins>
     </build>
-</project>
\ No newline at end of file
+</project>
diff --git a/coreAPI/src/main/java/net/java/games/input/ControllerEnvironment.java b/coreAPI/src/main/java/net/java/games/input/ControllerEnvironment.java
index 6aa9ad8..044b4bd 100644
--- a/coreAPI/src/main/java/net/java/games/input/ControllerEnvironment.java
+++ b/coreAPI/src/main/java/net/java/games/input/ControllerEnvironment.java
@@ -39,7 +39,6 @@
 package net.java.games.input;
 
 import java.io.File;
-import java.security.AccessController;
 import java.security.PrivilegedAction;
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -158,4 +157,4 @@ public abstract class ControllerEnvironment {
     public static ControllerEnvironment getDefaultEnvironment() {
         return defaultEnvironment;
     }
-}
\ No newline at end of file
+}
diff --git a/plugins/OSX/build.xml b/plugins/OSX/build.xml
index 05bda4b..e7a1c6e 100644
--- a/plugins/OSX/build.xml
+++ b/plugins/OSX/build.xml
@@ -3,7 +3,7 @@
 	<description>OSX JInput Native Plugin</description>
 
 	<target name="init">
-		<mkdir dir="target/natives/x86_64"/>
+		<mkdir dir="target/natives/arm64"/>
 	</target>
 
 	<target name="compile">
@@ -17,7 +17,7 @@
 	
 	<target name="link">
 		<apply dir="${objdir}" parallel="true" executable="${linker}" os="Mac OS X" failonerror="true" skipemptyfilesets="true">
-			<arg line="${linkerflags} -dynamiclib -o ${libname} -framework JavaVM -framework CoreFoundation -framework IOKit -framework CoreServices"/>
+			<arg line="${linkerflags} -dynamiclib -o ${libname} -framework CoreFoundation -framework IOKit -framework CoreServices -L/Library/Java/JavaVirtualMachines/zulu-8.jdk/Contents/Home/lib"/>
 			<fileset dir="${objdir}" includes="*.o"/>
 		</apply>
 		<apply dir="${objdir}" executable="strip" os="Mac OS X" failonerror="true">
@@ -27,26 +27,26 @@
 	</target>
 	
 	<target name="compileNativeJinputLib" depends="init">
-		<property name="x86_64_sdkroot" location="/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk"/>
-		<property name="x86_64_flags" value="-isysroot ${x86_64_sdkroot} -arch x86_64 -mmacosx-version-min=10.5"/>
+		<property name="arm64_sdkroot" location="/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk"/>
+		<property name="arm64_flags" value="-isysroot ${arm64_sdkroot} -arch arm64 -mmacosx-version-min=10.5 -I/Library/Java/JavaVirtualMachines/zulu-8.jdk/Contents/Home/include/ -I/Library/Java/JavaVirtualMachines/zulu-8.jdk/Contents/Home/include/darwin/"/>
 		<antcall target="compile">
-			<param name="dstdir" location="target/natives/x86_64"/>
+			<param name="dstdir" location="target/natives/arm64"/>
 			<param name="compiler" value="gcc"/>
-			<param name="sdkroot" location="${x86_64_sdkroot}"/>
-			<param name="cflags" value="${x86_64_flags}"/>
+			<param name="sdkroot" location="${arm64_sdkroot}"/>
+			<param name="cflags" value="${arm64_flags}"/>
 		</antcall>
 		<antcall target="link">
-			<param name="objdir" location="target/natives/x86_64"/>
-			<param name="libname" value="libjinput-osx-x86_64.jnilib"/>
+			<param name="objdir" location="target/natives/arm64"/>
+			<param name="libname" value="libjinput-osx-arm64.jnilib"/>
 			<param name="linker" value="gcc"/>
-			<param name="linkerflags" value="${x86_64_flags}"/>
+			<param name="linkerflags" value="${arm64_flags}"/>
 		</antcall>
 		<apply dir="target/natives" parallel="true" executable="lipo" os="Mac OS X" failonerror="true" skipemptyfilesets="true" >
 			<arg value="-create"/>
 			<srcfile/>
 			<arg value="-output"/>
 			<arg path="target/natives/libjinput-osx.jnilib"/>
-			<fileset file="target/natives/x86_64/libjinput-osx-x86_64.jnilib"/>
+			<fileset file="target/natives/arm64/libjinput-osx-arm64.jnilib"/>
 		</apply>
 	</target>
 </project>
diff --git a/plugins/OSX/pom.xml b/plugins/OSX/pom.xml
index 91cee0d..0f66ec2 100644
--- a/plugins/OSX/pom.xml
+++ b/plugins/OSX/pom.xml
@@ -24,9 +24,9 @@
             <plugin>
                 <artifactId>maven-source-plugin</artifactId>
             </plugin>
-            <plugin>
-                <artifactId>maven-javadoc-plugin</artifactId>
-            </plugin>
+            <!-- <plugin> -->
+            <!--     <artifactId>maven-javadoc-plugin</artifactId> -->
+            <!-- </plugin> -->
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
             </plugin>
@@ -66,4 +66,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
\ No newline at end of file
+</project>
diff --git a/plugins/awt/pom.xml b/plugins/awt/pom.xml
index 857846f..5374134 100644
--- a/plugins/awt/pom.xml
+++ b/plugins/awt/pom.xml
@@ -24,9 +24,9 @@
             <plugin>
                 <artifactId>maven-source-plugin</artifactId>
             </plugin>
-            <plugin>
-                <artifactId>maven-javadoc-plugin</artifactId>
-            </plugin>
+            <!-- <plugin> -->
+            <!--     <artifactId>maven-javadoc-plugin</artifactId> -->
+            <!-- </plugin> -->
         </plugins>
     </build>
-</project>
\ No newline at end of file
+</project>
diff --git a/pom.xml b/pom.xml
index 13c378c..b2539e1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,10 +56,10 @@
     <modules>
         <module>coreAPI</module>
         <module>plugins</module>
-        <module>applet</module>
-        <module>uberjar</module>
-        <module>examples</module>
-        <module>tests</module>
+        <!-- <module>applet</module> -->
+        <!-- <module>uberjar</module> -->
+        <!-- <module>examples</module> -->
+        <!-- <module>tests</module> -->
     </modules>
 
     <build>
@@ -72,7 +72,7 @@
                         <showDeprecation>true</showDeprecation>
                         <showWarnings>true</showWarnings>
                         <compilerArgs>
-                            <arg>-Werror</arg>
+                            <!-- <arg>-Werror</arg> -->
                             <arg>-Xlint:all,-options</arg>
                             <arg>-h</arg>
                             <arg>${project.build.directory}/generated-sources/natives</arg>
@@ -190,4 +190,4 @@
             </build>
         </profile>
     </profiles>
-</project>
\ No newline at end of file
+</project>