From ed80e954282a4edc40af182c49dc7897b31a172b Mon Sep 17 00:00:00 2001
From: Graham <gpe@openrs2.dev>
Date: Mon, 26 Aug 2019 09:21:49 +0100
Subject: [PATCH] Stop building OS-specific modules on all systems

They were only built on all systems for the benefit of the site plugin,
but I'm not intending to use that any more.
---
 gl-dri-natives/pom.xml                | 47 ++++++++++-----------------
 gl-dri-natives/src/main/c/jaggl_dri.c |  8 -----
 2 files changed, 18 insertions(+), 37 deletions(-)

diff --git a/gl-dri-natives/pom.xml b/gl-dri-natives/pom.xml
index 79b2495..c50fec6 100644
--- a/gl-dri-natives/pom.xml
+++ b/gl-dri-natives/pom.xml
@@ -21,33 +21,22 @@
     <openrs2.root>${project.parent.basedir}</openrs2.root>
   </properties>
 
-  <profiles>
-    <profile>
-      <id>unix</id>
-      <activation>
-        <os>
-          <family>unix</family>
-          <name>!mac os x</name>
-        </os>
-      </activation>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>com.github.maven-nar</groupId>
-            <artifactId>nar-maven-plugin</artifactId>
-            <configuration>
-              <linker>
-                <sysLibs>
-                  <sysLib>
-                    <type>shared</type>
-                    <name>dl</name>
-                  </sysLib>
-                </sysLibs>
-              </linker>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>com.github.maven-nar</groupId>
+        <artifactId>nar-maven-plugin</artifactId>
+        <configuration>
+          <linker>
+            <sysLibs>
+              <sysLib>
+                <type>shared</type>
+                <name>dl</name>
+              </sysLib>
+            </sysLibs>
+          </linker>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/gl-dri-natives/src/main/c/jaggl_dri.c b/gl-dri-natives/src/main/c/jaggl_dri.c
index a28ac0f..520d4e4 100644
--- a/gl-dri-natives/src/main/c/jaggl_dri.c
+++ b/gl-dri-natives/src/main/c/jaggl_dri.c
@@ -1,14 +1,11 @@
 #include "jaggl_X11_dri.h"
 
-#if defined(__unix__)
 #include <dlfcn.h>
 #include <stddef.h>
 
 static void *jaggl_dri_handle;
-#endif
 
 JNIEXPORT jboolean JNICALL Java_jaggl_X11_dri_open(JNIEnv *env, jclass cls, jstring path) {
-#if defined(__unix__)
 	if (jaggl_dri_handle) {
 		dlclose(jaggl_dri_handle);
 		jaggl_dri_handle = NULL;
@@ -19,19 +16,14 @@ JNIEXPORT jboolean JNICALL Java_jaggl_X11_dri_open(JNIEnv *env, jclass cls, jstr
 	(*env)->ReleaseStringUTFChars(env, path, path_str);
 
 	return jaggl_dri_handle != NULL;
-#else
-	return JNI_FALSE;
-#endif
 }
 
 JNIEXPORT jboolean JNICALL Java_jaggl_X11_dri_close(JNIEnv *env, jclass cls) {
-#if defined(__unix__)
 	if (jaggl_dri_handle) {
 		dlclose(jaggl_dri_handle);
 		jaggl_dri_handle = NULL;
 		return JNI_TRUE;
 	}
-#endif
 
 	return JNI_FALSE;
 }