diff --git a/plugins/OSX/build.xml b/plugins/OSX/build.xml
index 264eebf..05bda4b 100644
--- a/plugins/OSX/build.xml
+++ b/plugins/OSX/build.xml
@@ -3,15 +3,15 @@
 	<description>OSX JInput Native Plugin</description>
 
 	<target name="init">
-		<mkdir dir="target/natives"/>
+		<mkdir dir="target/natives/x86_64"/>
 	</target>
 
 	<target name="compile">
 		<apply dir="${dstdir}" executable="${compiler}" os="Mac OS X" skipemptyfilesets="true" failonerror="true" dest="${dstdir}">
-			<arg line="${cflags} -O2 -Wall -c -fPIC -I${sdkroot}/System/Library/Frameworks/JavaVM.framework/Versions/A/Headers -I../../../../common/src/native -I.."/>
+			<arg line="${cflags} -O2 -Wall -c -fPIC -I${sdkroot}/System/Library/Frameworks/JavaVM.framework/Versions/A/Headers -I../../../../common/src/native -I../../generated-sources/natives/"/>
 			<mapper type="glob" from="*.c" to="*.o"/>
-			<fileset dir="." includes="*.c"/>
-			<fileset dir="../../../common/src/native" includes="*.c"/>
+			<fileset dir="src/main/native" includes="*.c"/>
+			<fileset dir="../common/src/native" includes="*.c"/>
 		</apply>
 	</target>
 	
@@ -27,55 +27,25 @@
 	</target>
 	
 	<target name="compileNativeJinputLib" depends="init">
-		<property name="ppc_sdkroot" location="/Developer/SDKs/MacOSX10.3.9.sdk"/>
-		<property name="universal_sdkroot" location="/Developer/SDKs/MacOSX10.4u.sdk"/>
-		<property name="x86_64_sdkroot" location="/Developer/SDKs/MacOSX10.5.sdk"/>
-		<property name="ppc_flags" value="-isysroot ${universal_sdkroot} -arch ppc -mmacosx-version-min=10.3"/>
-		<property name="universal_flags" value="-isysroot ${universal_sdkroot} -arch i386 -mmacosx-version-min=10.4"/>
+		<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"/>
-		<antcall target="compile">
-			<param name="dstdir" location="target/natives/ppc"/>
-			<param name="compiler" value="gcc-4.0"/>
-			<param name="sdkroot" location="${universal_sdkroot}"/>
-			<param name="cflags" value="${ppc_flags}"/>
-		</antcall>
-		<antcall target="link">
-			<param name="objdir" location="target/natives/ppc"/>
-			<param name="libname" value="libjinput-osx-ppc.jnilib"/>
-			<param name="linker" value="gcc-4.0"/>
-			<param name="linkerflags" value="${ppc_flags}"/>
-		</antcall>
-		<antcall target="compile">
-			<param name="dstdir" location="target/natives/i386"/>
-			<param name="compiler" value="gcc-4.0"/>
-			<param name="sdkroot" location="${universal_sdkroot}"/>
-			<param name="cflags" value="${universal_flags}"/>
-		</antcall>
-		<antcall target="link">
-			<param name="objdir" location="target/natives/i386"/>
-			<param name="libname" value="libjinput-osx-i386.jnilib"/>
-			<param name="linker" value="gcc-4.0"/>
-			<param name="linkerflags" value="${universal_flags}"/>
-		</antcall>
 		<antcall target="compile">
 			<param name="dstdir" location="target/natives/x86_64"/>
-			<param name="compiler" value="gcc-4.0"/>
+			<param name="compiler" value="gcc"/>
 			<param name="sdkroot" location="${x86_64_sdkroot}"/>
 			<param name="cflags" value="${x86_64_flags}"/>
 		</antcall>
 		<antcall target="link">
 			<param name="objdir" location="target/natives/x86_64"/>
 			<param name="libname" value="libjinput-osx-x86_64.jnilib"/>
-			<param name="linker" value="gcc-4.0"/>
+			<param name="linker" value="gcc"/>
 			<param name="linkerflags" value="${x86_64_flags}"/>
 		</antcall>
-		<apply dir="." parallel="true" executable="lipo" os="Mac OS X" failonerror="true" skipemptyfilesets="true" >
+		<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="libjinput-osx.jnilib"/>
-			<fileset file="target/natives/ppc/libjinput-osx-ppc.jnilib"/>
-			<fileset file="target/natives/i386/libjinput-osx-i386.jnilib"/>
+			<arg path="target/natives/libjinput-osx.jnilib"/>
 			<fileset file="target/natives/x86_64/libjinput-osx-x86_64.jnilib"/>
 		</apply>
 	</target>