projects
/
org.ibex.core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fixed Darwin builds
[org.ibex.core.git]
/
src
/
org
/
ibex
/
plat
/
Darwin.java
diff --git
a/src/org/ibex/plat/Darwin.java
b/src/org/ibex/plat/Darwin.java
index
34cad44
..
3a4ec12
100644
(file)
--- a/
src/org/ibex/plat/Darwin.java
+++ b/
src/org/ibex/plat/Darwin.java
@@
-6,9
+6,12
@@
package org.ibex.plat;
import gnu.gcj.RawData;
import org.ibex.util.*;
import org.ibex.js.*;
import gnu.gcj.RawData;
import org.ibex.util.*;
import org.ibex.js.*;
-import org.ibex.*;
+import org.ibex.graphics.*;
+import org.ibex.core.*;
+import org.ibex.net.*;
public class Darwin extends POSIX {
public class Darwin extends POSIX {
+ public static void main(String[] s) throws Exception { org.ibex.core.Main.main(s); }
private static final Class openGLClass = OpenGL.class;
static Darwin singleton;
private CarbonOpenGL openGL;
private static final Class openGLClass = OpenGL.class;
static Darwin singleton;
private CarbonOpenGL openGL;
@@
-93,7
+96,7
@@
public class Darwin extends POSIX {
protected Scheduler _getScheduler() { return new DarwinScheduler(); }
protected native void runApplicationEventLoop();
protected Scheduler _getScheduler() { return new DarwinScheduler(); }
protected native void runApplicationEventLoop();
- private class DarwinScheduler extends org.ibex.Scheduler {
+ private class DarwinScheduler extends org.ibex.util.Scheduler {
public void run() {
new Thread() { public void run() { defaultRun(); } }.start();
runApplicationEventLoop();
public void run() {
new Thread() { public void run() { defaultRun(); } }.start();
runApplicationEventLoop();
@@
-330,7
+333,7
@@
public class Darwin extends POSIX {
else
return /*new QZCarbonPicture(data,w,h);*/ null;
}
else
return /*new QZCarbonPicture(data,w,h);*/ null;
}
- protected org.ibex.Font.Glyph _createGlyph(org.ibex.Font f, char c) {
+ protected org.ibex.graphics.Font.Glyph _createGlyph(org.ibex.graphics.Font f, char c) {
if(openGL != null)
return openGL._createGlyph(f, c);
else
if(openGL != null)
return openGL._createGlyph(f, c);
else