diff --git a/gl-dri-natives/pom.xml b/gl-dri-natives/pom.xml index 79b2495c..c50fec60 100644 --- a/gl-dri-natives/pom.xml +++ b/gl-dri-natives/pom.xml @@ -21,33 +21,22 @@ ${project.parent.basedir} - - - unix - - - unix - !mac os x - - - - - - com.github.maven-nar - nar-maven-plugin - - - - - shared - dl - - - - - - - - - + + + + com.github.maven-nar + nar-maven-plugin + + + + + shared + dl + + + + + + + diff --git a/gl-dri-natives/src/main/c/jaggl_dri.c b/gl-dri-natives/src/main/c/jaggl_dri.c index a28ac0fd..520d4e43 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 #include 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; } diff --git a/pom.xml b/pom.xml index 845354a4..43896ed1 100644 --- a/pom.xml +++ b/pom.xml @@ -309,20 +309,6 @@ nonfree - - natives - - - - . - - - - gl-natives - gl-dri-natives - misc-natives - - mac @@ -330,6 +316,9 @@ mac + + gl-natives + @@ -360,6 +349,10 @@ !mac os x + + gl-natives + gl-dri-natives + @@ -391,6 +384,10 @@ windows + + gl-natives + misc-natives +