[Java-game-lib-cvs] SF.net SVN: java-game-lib: [2654] trunk/LWJGL/src

[<ma...@us...>]

Revision: 2654
          http://svn.sourceforge.net/java-game-lib/?rev=2654&view=rev
Author:   matzon
Date:     2006-11-18 14:03:02 -0800 (Sat, 18 Nov 2006)

Log Message:
-----------
JNI_VERSION restructure

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/devil/ILNative.java
    trunk/LWJGL/src/native/common/devil/extil.c

Modified: trunk/LWJGL/src/java/org/lwjgl/devil/ILNative.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/devil/ILNative.java	2006-11-18 21:56:31 UTC (rev 2653)
+++ trunk/LWJGL/src/java/org/lwjgl/devil/ILNative.java	2006-11-18 22:03:02 UTC (rev 2654)
@@ -54,6 +54,9 @@
 
 	/** Version of IL */
 	public static final String VERSION = "1.0beta3";
+	
+	/** Current version of the JNI library */
+	static final int JNI_VERSION = 1;	
 
 	private static void loadLibrary(final String lib_name) {
 		AccessController.doPrivileged(new PrivilegedAction() {
@@ -74,10 +77,10 @@
 		loadLibrary(JNI_LIBRARY_NAME);
 		
 		// check for mismatch
-		String nativeVersion = getNativeLibraryVersion();
-		if (!nativeVersion.equals(VERSION)) {
+		int nativeVersion = getNativeLibraryVersion();
+		if (nativeVersion != JNI_VERSION) {
 			throw new LinkageError(
-					"Version mismatch: jar version is '" + VERSION + 
+					"Version mismatch: jar version is '" + JNI_VERSION + 
 					"', native libary version is '" + nativeVersion + "'");
 		}		
 	}
@@ -88,7 +91,7 @@
 	static native void resetNativeStubsIL(Class clazz);
 	static native void nCreateIL(String[] ilPaths) throws LWJGLException;
 	static native void nDestroyIL();
-	private static native String getNativeLibraryVersion();  	
+	private static native int getNativeLibraryVersion();  	
 
 	static void createIL() throws LWJGLException {
 		String[] illPaths = LWJGLUtil.getLibraryPaths(new String[]{

Modified: trunk/LWJGL/src/native/common/devil/extil.c
===================================================================
--- trunk/LWJGL/src/native/common/devil/extil.c	2006-11-18 21:56:31 UTC (rev 2653)
+++ trunk/LWJGL/src/native/common/devil/extil.c	2006-11-18 22:03:02 UTC (rev 2654)
@@ -8,16 +8,17 @@
  #include <libgen.h>
  static void* devILhandle;
 #endif
+#include "org_lwjgl_devil_ILNative.h";
 
 static const char* VERSION = "1.0beta3";
 
 /*
  * Class:     org_lwjgl_devil_ILNative
  * Method:    getNativeLibraryVersion
- * Signature: ()Ljava/lang/String;
+ * Signature: ()I
  */
-JNIEXPORT jstring JNICALL Java_org_lwjgl_devil_ILNative_getNativeLibraryVersion(JNIEnv *env, jclass clazz) {
-  return NewStringNative(env, VERSION);
+JNIEXPORT jint JNICALL Java_org_lwjgl_devil_ILNative_getNativeLibraryVersion(JNIEnv *env, jclass clazz) {
+  return org_lwjgl_devil_ILNative_JNI_VERSION;
 }
 
 /**


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.