diff options
| author | Kenneth Russel <[email protected]> | 2008-05-29 05:52:58 +0000 |
|---|---|---|
| committer | Kenneth Russel <[email protected]> | 2008-05-29 05:52:58 +0000 |
| commit | 5d94f5c240262c10504cad46ffe04c65bf7d8116 (patch) | |
| tree | 9d787d10a39c5492962b071dc7fe1011e984a7f4 | |
| parent | b3eed5170f323d1c6d4d90de28a691eebeb035df (diff) | |
Moved ES1 and ES2 demos into new packages in preparation for
conversion to platform-independent APIs
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/../svn-server-sync/jogl-demos/trunk@229 3298f667-5e0e-4b4a-8ed4-a3559d26a5f4
| -rw-r--r-- | make/build.xml | 6 | ||||
| -rwxr-xr-x | src/demos/es1/RedSquare.java (renamed from src/demos/apx/es1/RedSquare.java) | 2 | ||||
| -rwxr-xr-x | src/demos/es2/Basic.java (renamed from src/demos/apx/es2/Basic.java) | 2 | ||||
| -rwxr-xr-x | src/demos/es2/Shader.java (renamed from src/demos/apx/es2/Shader.java) | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/make/build.xml b/make/build.xml index 0b66f11..8306309 100644 --- a/make/build.xml +++ b/make/build.xml @@ -98,7 +98,7 @@ <pathelement location="${joal-demos.jar}" /> <pathelement location="${simple-xml.jar}" /> </path> - <javac destdir="${classes}" excludes="${jogl.cg.excludes},demos/nurbs/**,demos/apx/**" source="1.4" target="1.4" debug="true" debuglevel="source,lines"> + <javac destdir="${classes}" excludes="${jogl.cg.excludes},demos/nurbs/**,demos/es1/**,demos/es2/**" source="1.4" target="1.4" debug="true" debuglevel="source,lines"> <src path="${src}" /> <classpath refid="jogl-demos.classpath" /> </javac> @@ -147,7 +147,7 @@ <path id="jogl-demos.classpath"> <pathelement location="${jogl.jar}" /> </path> - <javac destdir="${classes}" includes="demos/apx/es1/**" source="1.4" target="1.4" debug="true" debuglevel="source,lines" + <javac destdir="${classes}" includes="demos/es1/**" source="1.4" target="1.4" debug="true" debuglevel="source,lines" bootclasspath="../../gluegen/make/lib/cdc_fp.jar"> <src path="${src}" /> <classpath refid="jogl-demos.classpath" /> @@ -164,7 +164,7 @@ <path id="jogl-demos.classpath"> <pathelement location="${jogl.jar}" /> </path> - <javac destdir="${classes}" includes="demos/apx/es2/**" source="1.4" target="1.4" debug="true" debuglevel="source,lines" + <javac destdir="${classes}" includes="demos/es2/**" source="1.4" target="1.4" debug="true" debuglevel="source,lines" bootclasspath="../../gluegen/make/lib/cdc_fp.jar"> <src path="${src}" /> <classpath refid="jogl-demos.classpath" /> diff --git a/src/demos/apx/es1/RedSquare.java b/src/demos/es1/RedSquare.java index 3b2e944..48ede76 100755 --- a/src/demos/apx/es1/RedSquare.java +++ b/src/demos/es1/RedSquare.java @@ -1,4 +1,4 @@ -package demos.apx.es1; +package demos.es1; import java.nio.*; import javax.media.opengl.*; diff --git a/src/demos/apx/es2/Basic.java b/src/demos/es2/Basic.java index 29b6581..d951d3b 100755 --- a/src/demos/apx/es2/Basic.java +++ b/src/demos/es2/Basic.java @@ -1,4 +1,4 @@ -package demos.apx; +package demos.es2; import java.nio.*; import javax.media.opengl.*; diff --git a/src/demos/apx/es2/Shader.java b/src/demos/es2/Shader.java index 3fde283..0222bfe 100755 --- a/src/demos/apx/es2/Shader.java +++ b/src/demos/es2/Shader.java @@ -1,4 +1,4 @@ -package demos.apx; +package demos.es2; import java.io.UnsupportedEncodingException; import java.nio.*; |