[Java-game-lib-cvs] SF.net SVN: java-game-lib:[3531] trunk/LWJGL/src/java/org/lwjgl/util/applet /AppletLoader.java

[<ka...@us...>]

Revision: 3531
          http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3531&view=rev
Author:   kappa1
Date:     2011-05-13 16:24:10 +0000 (Fri, 13 May 2011)

Log Message:
-----------
AppletLoader: add support for optional mac arch specific natives, al_mac32, al_mac64, al_macppc, if they are not specified AppletLoader will fall back to the usual al_mac parameter.

Modified Paths:
--------------
    trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java

Modified: trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java	2011-05-11 14:21:59 UTC (rev 3530)
+++ trunk/LWJGL/src/java/org/lwjgl/util/applet/AppletLoader.java	2011-05-13 16:24:10 UTC (rev 3531)
@@ -713,7 +713,20 @@
 			}
 
 		} else if (osName.startsWith("Mac") || osName.startsWith("Darwin")) {
-			nativeJarList = getParameter("al_mac");
+			
+			// check if arch specific natives have been specified
+			if (System.getProperty("os.arch").endsWith("64")) {
+				nativeJarList = getParameter("al_mac64");
+			} else if (System.getProperty("os.arch").endsWith("ppc")) {
+				nativeJarList = getParameter("al_macppc");
+			} else {
+				nativeJarList = getParameter("al_mac32");
+			}
+
+			if (nativeJarList == null) {
+				nativeJarList = getParameter("al_mac");
+			}
+			
 		} else if (osName.startsWith("Solaris") || osName.startsWith("SunOS")) {
 			nativeJarList = getParameter("al_solaris");
 		} else if (osName.startsWith("FreeBSD")) {


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