diff options
| author | Sven Gothel <[email protected]> | 2010-03-28 01:45:00 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2010-03-28 01:45:00 +0100 |
| commit | 9e8ba29142d83d5749fc9650715019fef3539b1d (patch) | |
| tree | 9062b73c85c4facf9011b357fbda2b1195eb23a2 /src/newt | |
| parent | 2dc67e8f8faeb418061e0dd450b37d4cb3ce4c2f (diff) | |
| parent | ea23f9505e3fcf3a5b928855eba739ad123b64f4 (diff) | |
Merge branch 'master' of github.com:mbien/jogl
Diffstat (limited to 'src/newt')
6 files changed, 18 insertions, 5 deletions
diff --git a/src/newt/Newt.iml b/src/newt/Newt.iml new file mode 100644 index 000000000..ab8359299 --- /dev/null +++ b/src/newt/Newt.iml @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<module type="JAVA_MODULE" version="4"> + <component name="NewModuleRootManager" inherit-compiler-output="true"> + <exclude-output /> + <content url="file://$MODULE_DIR$"> + <sourceFolder url="file://$MODULE_DIR$/classes" isTestSource="false" /> + </content> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> + <orderEntry type="module" module-name="Nativewindow" /> + </component> +</module> + diff --git a/src/newt/classes/com/sun/javafx/newt/opengl/GLWindow.java b/src/newt/classes/com/sun/javafx/newt/opengl/GLWindow.java index e809d2cdc..98010b2f1 100644 --- a/src/newt/classes/com/sun/javafx/newt/opengl/GLWindow.java +++ b/src/newt/classes/com/sun/javafx/newt/opengl/GLWindow.java @@ -36,7 +36,7 @@ package com.sun.javafx.newt.opengl; import com.sun.javafx.newt.*; import javax.media.nativewindow.*; import javax.media.opengl.*; -import com.sun.opengl.impl.GLDrawableHelper; +import com.jogamp.opengl.impl.GLDrawableHelper; import java.util.*; /** diff --git a/src/newt/classes/com/sun/javafx/newt/opengl/broadcom/egl/Display.java b/src/newt/classes/com/sun/javafx/newt/opengl/broadcom/egl/Display.java index debe9e9b9..1b74aebc3 100644 --- a/src/newt/classes/com/sun/javafx/newt/opengl/broadcom/egl/Display.java +++ b/src/newt/classes/com/sun/javafx/newt/opengl/broadcom/egl/Display.java @@ -34,7 +34,7 @@ package com.sun.javafx.newt.opengl.broadcom.egl; import com.sun.javafx.newt.impl.*; -import com.sun.opengl.impl.egl.*; +import com.jogamp.opengl.impl.egl.*; import javax.media.nativewindow.*; import javax.media.nativewindow.egl.*; diff --git a/src/newt/classes/com/sun/javafx/newt/opengl/broadcom/egl/Window.java b/src/newt/classes/com/sun/javafx/newt/opengl/broadcom/egl/Window.java index 11672dde3..8446ec20f 100755 --- a/src/newt/classes/com/sun/javafx/newt/opengl/broadcom/egl/Window.java +++ b/src/newt/classes/com/sun/javafx/newt/opengl/broadcom/egl/Window.java @@ -34,7 +34,7 @@ package com.sun.javafx.newt.opengl.broadcom.egl; import com.sun.javafx.newt.impl.*; -import com.sun.opengl.impl.egl.*; +import com.jogamp.opengl.impl.egl.*; import javax.media.nativewindow.*; import javax.media.opengl.GLCapabilities; import javax.media.opengl.GLProfile; diff --git a/src/newt/classes/com/sun/javafx/newt/opengl/kd/KDDisplay.java b/src/newt/classes/com/sun/javafx/newt/opengl/kd/KDDisplay.java index 5aeae75ea..9e328a223 100755 --- a/src/newt/classes/com/sun/javafx/newt/opengl/kd/KDDisplay.java +++ b/src/newt/classes/com/sun/javafx/newt/opengl/kd/KDDisplay.java @@ -35,7 +35,7 @@ package com.sun.javafx.newt.opengl.kd; import com.sun.javafx.newt.*; import com.sun.javafx.newt.impl.*; -import com.sun.opengl.impl.egl.*; +import com.jogamp.opengl.impl.egl.*; import javax.media.nativewindow.*; import javax.media.nativewindow.egl.*; diff --git a/src/newt/classes/com/sun/javafx/newt/opengl/kd/KDWindow.java b/src/newt/classes/com/sun/javafx/newt/opengl/kd/KDWindow.java index 605e9c064..9919d1f6f 100755 --- a/src/newt/classes/com/sun/javafx/newt/opengl/kd/KDWindow.java +++ b/src/newt/classes/com/sun/javafx/newt/opengl/kd/KDWindow.java @@ -35,7 +35,7 @@ package com.sun.javafx.newt.opengl.kd; import com.sun.javafx.newt.*; import com.sun.javafx.newt.impl.*; -import com.sun.opengl.impl.egl.*; +import com.jogamp.opengl.impl.egl.*; import javax.media.nativewindow.*; import javax.media.opengl.GLCapabilities; import javax.media.opengl.GLProfile; |