From 0f770551cebca90c92b7a39b0e0135a445af51f9 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <eighthave@users.sourceforge.net>
Date: Sat, 22 Mar 2008 02:28:22 +0000
Subject: merging in pdj-0.8.4.tar.gz from
 http://www.le-son666.com/software/pdj/

svn path=/trunk/externals/loaders/pdj/; revision=9624
---
 src/java/com/e1/pdj/JikesCompiler.java |  1 -
 src/java/com/e1/pdj/PDJSystem.java     | 20 +++++++-------------
 2 files changed, 7 insertions(+), 14 deletions(-)

(limited to 'src/java/com/e1')

diff --git a/src/java/com/e1/pdj/JikesCompiler.java b/src/java/com/e1/pdj/JikesCompiler.java
index f9337b2..041a4f7 100644
--- a/src/java/com/e1/pdj/JikesCompiler.java
+++ b/src/java/com/e1/pdj/JikesCompiler.java
@@ -1,6 +1,5 @@
 package com.e1.pdj;
 
-import java.io.*;
 import com.cycling74.max.MaxSystem;
 
 public class JikesCompiler extends GenericCompiler {
diff --git a/src/java/com/e1/pdj/PDJSystem.java b/src/java/com/e1/pdj/PDJSystem.java
index 3d30a53..1fd50d2 100644
--- a/src/java/com/e1/pdj/PDJSystem.java
+++ b/src/java/com/e1/pdj/PDJSystem.java
@@ -7,6 +7,7 @@ import java.awt.Frame;
 import java.awt.Toolkit;
 import java.io.*;
 
+import java.awt.GraphicsEnvironment;
 /**
  * Startup class for pdj.
  */
@@ -50,7 +51,7 @@ public class PDJSystem {
 		// this is a hack to be sure that statics of MaxSystem are loaded
 		// before everything
 		Class cls = MaxSystem.class;
-
+		
 		String osname = System.getProperty("os.name");
 
 		if ( osname.indexOf("Linux") != -1 ) {
@@ -71,20 +72,13 @@ public class PDJSystem {
 
 		if ( osname.indexOf("OS X") != -1 ) {
 			// maps PD object as a JVM native library
-			try {
-				Runtime.getRuntime().load(pdjHome + "/pdj.pd_darwin");
-			} catch (UnsatisfiedLinkError e ) {
-				Runtime.getRuntime().load(pdjHome + "/pdj.pd_imac");
-			}
+			Runtime.getRuntime().load(pdjHome + "/pdj.d_fat");
 			loaded = 1;
- 
-            // this will initialize the AWT component in another thread
-            new Thread(new Runnable() {
-            		public void run() {
-                    Class clz = Component.class;
-            		}
-    			}).start();
 
+            if ( System.getenv("PDJ_USE_AWT") != null ) {
+			    GraphicsEnvironment.getLocalGraphicsEnvironment().getScreenDevices();
+			    Toolkit.getDefaultToolkit();
+            }
 			GenericCompiler.rtJar = "/System/Library/Frameworks/JavaVM.framework/Classes/classes.jar:";
 
 			return;
-- 
cgit v1.2.1