diff options
Diffstat (limited to 'make/build-common.xml')
| -rw-r--r-- | make/build-common.xml | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/make/build-common.xml b/make/build-common.xml index 414b0eba2..f68cc43be 100644 --- a/make/build-common.xml +++ b/make/build-common.xml @@ -279,8 +279,6 @@ <property name="jogl-glmobile-dbg.jar" value="${build.jogl}/jogl-glmobile-dbg.jar" /> <property name="jogl-util.jar" value="${build.jogl}/jogl-util.jar" /> <property name="jogl-util-graph.jar" value="${build.jogl}/jogl-util-graph.jar" /> - <property name="jogl-glutess.jar" value="${build.jogl}/jogl-glu-tess.jar" /> - <property name="jogl-glumipmap.jar" value="${build.jogl}/jogl-glu-mipmap.jar" /> <property name="jogl-util-fixedfuncemu.jar" value="${build.jogl}/jogl-util-fixedfuncemu.jar" /> <property name="jogl-awt.jar" value="${build.jogl}/jogl-awt.jar" /> <property name="jogl-swt.jar" value="${build.jogl}/jogl-swt.jar" /> @@ -291,6 +289,7 @@ <property name="jogl-os-android.jar" value="${build.jogl}/jogl-os-android.jar" /> <property name="jogl-gldesktop.jar" value="${build.jogl}/jogl-gldesktop.jar" /> <property name="jogl-gldesktop-dbg.jar" value="${build.jogl}/jogl-gldesktop-dbg.jar" /> + <property name="jogl-glu.jar" value="${build.jogl}/jogl-glu.jar" /> <property name="jogl-glu-gldesktop.jar" value="${build.jogl}/jogl-glu-gldesktop.jar" /> <property name="jogl-util-gldesktop.jar" value="${build.jogl}/jogl-util-gldesktop.jar" /> <property name="jogl-omx.jar" value="${build.jogl}/jogl-omx.jar" /> @@ -303,8 +302,6 @@ <pathelement location="${jogl-glmobile-dbg.jar}" /> <pathelement location="${jogl-util.jar}" /> <pathelement location="${jogl-util-graph.jar}" /> - <pathelement location="${jogl-glutess.jar}" /> - <pathelement location="${jogl-glumipmap.jar}" /> <pathelement location="${jogl-util-fixedfuncemu.jar}" /> <pathelement location="${jogl-awt.jar}" /> <pathelement location="${jogl-swt.jar}" /> @@ -314,6 +311,7 @@ <pathelement location="${jogl-os-osx.jar}" /> <pathelement location="${jogl-gldesktop.jar}" /> <pathelement location="${jogl-gldesktop-dbg.jar}" /> + <pathelement location="${jogl-glu.jar}" /> <pathelement location="${jogl-glu-gldesktop.jar}" /> <pathelement location="${jogl-util-gldesktop.jar}" /> <pathelement location="${jogl-omx.jar}" /> @@ -325,14 +323,13 @@ <pathelement location="${jogl-glmobile-dbg.jar}" /> <pathelement location="${jogl-util.jar}" /> <pathelement location="${jogl-util-graph.jar}" /> - <pathelement location="${jogl-glutess.jar}" /> - <pathelement location="${jogl-glumipmap.jar}" /> <pathelement location="${jogl-util-fixedfuncemu.jar}" /> <pathelement location="${jogl-os-x11.jar}" /> <pathelement location="${jogl-os-win.jar}" /> <pathelement location="${jogl-os-osx.jar}" /> <pathelement location="${jogl-gldesktop.jar}" /> <pathelement location="${jogl-gldesktop-dbg.jar}" /> + <pathelement location="${jogl-glu.jar}" /> <pathelement location="${jogl-glu-gldesktop.jar}" /> <pathelement location="${jogl-util-gldesktop.jar}" /> <pathelement location="${jogl-omx.jar}" /> @@ -343,8 +340,7 @@ <pathelement location="${jogl-glmobile-dbg.jar}" /> <pathelement location="${jogl-util.jar}" /> <pathelement location="${jogl-util-graph.jar}" /> - <pathelement location="${jogl-glutess.jar}" /> - <pathelement location="${jogl-glumipmap.jar}" /> + <pathelement location="${jogl-glu.jar}" /> <pathelement location="${jogl-util-fixedfuncemu.jar}" /> <pathelement location="${jogl-os-x11.jar}" /> <pathelement location="${jogl-omx.jar}" /> @@ -355,14 +351,13 @@ <pathelement location="${jogl-glmobile-dbg.jar}" /> <pathelement location="${jogl-util.jar}" /> <pathelement location="${jogl-util-graph.jar}" /> - <pathelement location="${jogl-glutess.jar}" /> - <pathelement location="${jogl-glumipmap.jar}" /> + <pathelement location="${jogl-glu.jar}" /> <pathelement location="${jogl-util-fixedfuncemu.jar}" /> <pathelement location="${jogl-os-android.jar}" /> <pathelement location="${jogl-omx.jar}" /> </path> <!-- - ${jogl-core.jar} ${jogl-glutess.jar} ${jogl-glumipmap.jar} ${jogl-glu-gldesktop.jar} ${jogl-os-x11.jar} ${jogl-os-win.jar} ${jogl-os-osx.jar} ${jogl-gldesktop.jar} ${jogl-gldesktop-dbg.jar} ${jogl-glmobile.jar} ${jogl-glmobile-dbg.jar} ${jogl-omx.jar} ${jogl-util.jar} ${jogl-util-graph.jar} ${jogl-util-gldesktop.jar} ${jogl-util-awt.jar} ${jogl-util-fixedfuncemu.jar} ${jogl-sdk.jar} --> + ${jogl-core.jar} ${jogl-glu.jar} ${jogl-glu-gldesktop.jar} ${jogl-os-x11.jar} ${jogl-os-win.jar} ${jogl-os-osx.jar} ${jogl-gldesktop.jar} ${jogl-gldesktop-dbg.jar} ${jogl-glmobile.jar} ${jogl-glmobile-dbg.jar} ${jogl-omx.jar} ${jogl-util.jar} ${jogl-util-graph.jar} ${jogl-util-gldesktop.jar} ${jogl-util-awt.jar} ${jogl-util-fixedfuncemu.jar} ${jogl-sdk.jar} --> <property name="newt-core.jar" value="${build.newt}/newt-core.jar" /> <property name="newt-ogl.jar" value="${build.newt}/newt-ogl.jar" /> |