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

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

Revision: 2653
          http://svn.sourceforge.net/java-game-lib/?rev=2653&view=rev
Author:   matzon
Date:     2006-11-18 13:56:31 -0800 (Sat, 18 Nov 2006)

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

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/fmod3/FMOD.java
    trunk/LWJGL/src/native/common/fmod3/org_lwjgl_fmod3_FMOD.c

Modified: trunk/LWJGL/src/java/org/lwjgl/fmod3/FMOD.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/fmod3/FMOD.java	2006-11-18 21:28:17 UTC (rev 2652)
+++ trunk/LWJGL/src/java/org/lwjgl/fmod3/FMOD.java	2006-11-18 21:56:31 UTC (rev 2653)
@@ -194,6 +194,9 @@
 
 	/** Version of FMOD */
 	public static final String VERSION = "1.0beta3";
+	
+	/** Current version of the JNI library */
+	static final int JNI_VERSION = 1;	
 
 	static {
 		initialize();
@@ -211,10 +214,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 + "'");
 		}
 
@@ -242,7 +245,7 @@
 	/**
 	 * Return the version of the native library
 	 */
-	private static native String getNativeLibraryVersion();  
+	private static native int getNativeLibraryVersion();  
 
 	/**
 	 * @return true if AL has been created

Modified: trunk/LWJGL/src/native/common/fmod3/org_lwjgl_fmod3_FMOD.c
===================================================================
--- trunk/LWJGL/src/native/common/fmod3/org_lwjgl_fmod3_FMOD.c	2006-11-18 21:28:17 UTC (rev 2652)
+++ trunk/LWJGL/src/native/common/fmod3/org_lwjgl_fmod3_FMOD.c	2006-11-18 21:56:31 UTC (rev 2653)
@@ -38,10 +38,10 @@
 /*
  * Class:     org_lwjgl_fmod3_FMOD
  * Method:    getNativeLibraryVersion
- * Signature: ()Ljava/lang/String;
+ * Signature: ()I
  */
-JNIEXPORT jstring JNICALL Java_org_lwjgl_fmod3_FMOD_getNativeLibraryVersion(JNIEnv * env, jclass clazz) {
-  return NewStringNative(env, VERSION);
+JNIEXPORT jint JNICALL Java_org_lwjgl_fmod3_FMOD_getNativeLibraryVersion(JNIEnv * env, jclass clazz) {
+  return org_lwjgl_fmod3_FMOD_JNI_VERSION;
 }
 
 /*


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