[Java-game-lib-cvs] LWJGL/src/java/org/lwjgl/devil IL.java,1.16,1.17 ILU.java,1.12,1.13 ILUT.java,1.

Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/devil
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19251/org/lwjgl/devil

Modified Files:
	IL.java ILU.java ILUT.java 
Log Message:
using .dylibs for devil on mac

Index: ILUT.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/devil/ILUT.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- ILUT.java	4 May 2005 20:59:41 -0000	1.12
+++ ILUT.java	22 May 2005 11:09:02 -0000	1.13
@@ -128,15 +128,10 @@
 			throw new LWJGLException("Cannot create ILUT without having created IL instance");
 		}
 
-		// We need to do nothing when running on mac, since all is loaded in IL
-		if(LWJGLUtil.getPlatform() == LWJGLUtil.PLATFORM_MACOSX) {
-			return;
-		}
-
 		String[] ilutPaths = LWJGLUtil.getLibraryPaths(new String[]{
 			"ILUT", "ILUT.dll",
 			"ILUT", "libILUT.so",
-			"ILUT", "IL"}, ILU.class.getClassLoader());
+			"ILUT", "libILUT.dylib"}, ILUT.class.getClassLoader());
 		nCreate(ilutPaths);
 		created = true;
 
@@ -158,12 +153,6 @@
 	 * Exit cleanly by calling destroy.
 	 */
 	public static void destroy() {
-
-		// We need to do nothing when running on mac, since all is destroyed in IL
-		if(LWJGLUtil.getPlatform() == LWJGLUtil.PLATFORM_MACOSX) {
-			return;
-		}
-
 		resetNativeStubs(ILUT.class);
 		if (created) {
 			nDestroy();

Index: IL.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/devil/IL.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- IL.java	4 May 2005 20:59:40 -0000	1.16
+++ IL.java	22 May 2005 11:09:02 -0000	1.17
@@ -583,23 +583,13 @@
 		String[] illPaths = LWJGLUtil.getLibraryPaths(new String[]{
 			"DevIL", "DevIL.dll",
 			"IL", "libIL.so",
-			"IL", "IL"}, IL.class.getClassLoader());
+			"IL", "libIL.dylib"}, IL.class.getClassLoader());
 		nCreate(illPaths);
 		created = true;
 
 		try {
 			IL.initNativeStubs();
 			IL.ilInit();
-
-			// We need to initialize everything in one fell swoop on mac
-			if(LWJGLUtil.getPlatform() == LWJGLUtil.PLATFORM_MACOSX) {
-				ILU.initNativeStubs();
-				ILU.setCreated(true);
-
-				ILUT.initNativeStubs();
-				ILUT.setCreated(true);
-			}
-
 			created = true;
 		} catch (LWJGLException e) {
 			destroy();
@@ -613,17 +603,6 @@
 	public static void destroy() {
 		resetNativeStubs(IL.class);
 
-		// We need to destroy everything on mac in one go
-		if(LWJGLUtil.getPlatform() == LWJGLUtil.PLATFORM_MACOSX) {
-			ILU.resetNativeStubs(ILU.class);
-			ILU.nDestroy();
-			ILU.setCreated(false);
-
-			ILUT.resetNativeStubs(ILUT.class);
-			ILUT.nDestroy();
-			ILUT.setCreated(false);
-		}
-
 		if (created) {
 			nDestroy();
 		}

Index: ILU.java
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/devil/ILU.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- ILU.java	4 May 2005 20:59:41 -0000	1.12
+++ ILU.java	22 May 2005 11:09:02 -0000	1.13
@@ -163,15 +163,10 @@
 			throw new LWJGLException("Cannot create ILU without having created IL instance");
 		}
 
-		// We need to do nothing when running on mac, since all is loaded in IL
-		if(LWJGLUtil.getPlatform() == LWJGLUtil.PLATFORM_MACOSX) {
-			return;
-		}
-
 		String[] iluPaths = LWJGLUtil.getLibraryPaths(new String[]{
 			"ILU", "ILU.dll",
 			"ILU", "libILU.so",
-			"ILU", "ILU"}, ILU.class.getClassLoader());
+			"ILU", "libILU.dylib"}, ILU.class.getClassLoader());
 		nCreate(iluPaths);
 		created = true;
 
@@ -193,12 +188,6 @@
 	 * Exit cleanly by calling destroy.
 	 */
 	public static void destroy() {
-
-		// We need to do nothing when running on mac, since all is destroyed in IL
-		if(LWJGLUtil.getPlatform() == LWJGLUtil.PLATFORM_MACOSX) {
-			return;
-		}
-
 		resetNativeStubs(ILU.class);
 		if (created) {
 			nDestroy();