diff options
Diffstat (limited to 'make')
| -rw-r--r-- | make/build-common.xml | 4 | ||||
| -rw-r--r-- | make/make.jogl.all.linux-x86_64.sh | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/make/build-common.xml b/make/build-common.xml index d6c39c1ed..ccbf56fd6 100644 --- a/make/build-common.xml +++ b/make/build-common.xml @@ -34,7 +34,7 @@ </target> <target name="jogl.setup-version-non-RI" unless="jogl.ri"> - <property name="jogl.version" value="${jogl_base_version}-pre-${timestamp}" /> + <property name="jogl.version" value="${jogl_base_version}-pre-${version.timestamp}" /> </target> <target name="newt.setup-version-RI" if="newt.ri"> @@ -60,7 +60,7 @@ <property name="src" value="${project.root}/src" /> <property name="lib" value="${build}/lib" /> - <property name="archive.name" value="jogl-${tmp.version}-${os.and.arch}" /> + <property name="archive.name" value="jogl-${jogl.version}-${os.and.arch}" /> <property name="archive" value="${build}/${archive.name}" /> <property name="all.srcj.path" value="${src}/nativewindow/classes;${src}/jogl/classes;${src}/newt/classes" /> diff --git a/make/make.jogl.all.linux-x86_64.sh b/make/make.jogl.all.linux-x86_64.sh index b6c5e9d63..8ebcc8744 100644 --- a/make/make.jogl.all.linux-x86_64.sh +++ b/make/make.jogl.all.linux-x86_64.sh @@ -16,7 +16,6 @@ fi # -Dbuild.noarchives=true \ ant \ - -Dbuild.noarchives=true \ -Djogl.cg=1 -Dx11.cg.lib=../../lib-linux-x86_64 \ -Drootrel.build=build-x86_64 \ -DuseKD=true \ |