diff options
| author | Sven Gothel <[email protected]> | 2010-11-07 02:34:19 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2010-11-07 02:34:19 +0100 |
| commit | 55a60c28ca8f501aca0fff8c69b11564518f3a66 (patch) | |
| tree | 47d753e313da1de7573eaf23cca4336b70fe195c /make/build-common.xml | |
| parent | 113319a8de0998fbd8d7357d4e0273f802f9453a (diff) | |
Gluegen parts in src/gluegen (clean)
- Adding gluegen-gl.jar for GlueGen GL compile time parts.
- Removed dead build-gluegen.xml
- Adding com/jogamp/gluegen/runtime/opengl/* to jogl core
- Moved gluegen gl part to jogl/classes
Diffstat (limited to 'make/build-common.xml')
| -rw-r--r-- | make/build-common.xml | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/make/build-common.xml b/make/build-common.xml index ab2c9df32..381bee1aa 100644 --- a/make/build-common.xml +++ b/make/build-common.xml @@ -167,6 +167,13 @@ <pathelement location="${antlr.jar}" /> </path> + <property name="gluegen-gl.jar" value="${build.jogl}/gluegen-gl.jar" /> + + <path id="gluegen-gl.classpath"> + <pathelement location="${gluegen.jar}" /> + <pathelement location="${gluegen-gl.jar}" /> + </path> + <!-- JavaSE combinations --> <property name="gluegen-rt.jar" value="${build.gluegen}/gluegen-rt.jar" /> <property name="jogl.test.jar" value="${build.jogl}/jogl.test.jar"/> @@ -253,25 +260,26 @@ </path> <!-- CDC combinations . NO.AWT --> - <property name="gluegen-rt-cdc.jar" value="${build.gluegen}/gluegen-rt-cdc.jar" /> + <property name="gluegen-rt.cdc.jar" value="${build.gluegen}/gluegen-rt.cdc.jar" /> + <property name="gluegen-gl.cdc.jar" value="${build.jogl}/gluegen-gl.cdc.jar" /> <property name="nativewindow.all.cdc.jar" value="${build.nativewindow}/nativewindow.all.cdc.jar" /> <property name="jogl.all.cdc.jar" value="${build.jogl}/jogl.all.cdc.jar" /> <property name="newt.all.cdc.jar" value="${build.newt}/newt.all.cdc.jar" /> <path id="nativewindow_gluegen.classpath-cdc"> - <pathelement location="${gluegen-rt-cdc.jar}" /> + <pathelement location="${gluegen-rt.cdc.jar}" /> <pathelement location="${nativewindow.all.cdc.jar}" /> </path> <path id="nativewindow_gluegen_jogl.classpath-cdc"> - <pathelement location="${gluegen-rt-cdc.jar}" /> + <pathelement location="${gluegen-rt.cdc.jar}" /> <pathelement location="${nativewindow.all.cdc.jar}" /> <pathelement location="${jogl.all.cdc.jar}" /> </path> <path id="jogl_newt_all.classpath-cdc"> - <pathelement location="${gluegen-rt-cdc.jar}" /> + <pathelement location="${gluegen-rt.cdc.jar}" /> <pathelement location="${nativewindow.all.cdc.jar}" /> <pathelement location="${jogl.all.cdc.jar}" /> <pathelement location="${newt.all.cdc.jar}" /> |