diff options
-rwxr-xr-x | LICENSE.txt | 43 | ||||
-rw-r--r-- | README.txt | 172 | ||||
-rwxr-xr-x | make/build.xml | 16 | ||||
-rwxr-xr-x | make/scripts/make.joal.all.android-aarch64-cross.sh | 9 | ||||
-rwxr-xr-x | make/scripts/make.joal.all.android-armv6-cross.sh | 11 | ||||
-rwxr-xr-x | make/scripts/make.joal.all.android-x86-cross.sh | 10 | ||||
-rwxr-xr-x | make/scripts/make.joal.all.generic.sh | 6 | ||||
-rwxr-xr-x | make/scripts/make.joal.all.linux-aarch64-cross.sh | 6 | ||||
-rwxr-xr-x | make/scripts/make.joal.all.linux-armv6hf-cross.sh | 6 | ||||
-rwxr-xr-x | make/scripts/make.joal.all.linux-armv6hf.sh | 6 | ||||
-rwxr-xr-x | make/scripts/make.joal.all.linux-x86-clang.sh | 6 | ||||
-rwxr-xr-x | make/scripts/make.joal.all.linux-x86.sh | 6 | ||||
-rwxr-xr-x | make/scripts/make.joal.all.linux-x86_64-clang.sh | 6 | ||||
-rwxr-xr-x | make/scripts/make.joal.all.linux-x86_64.sh | 6 | ||||
-rwxr-xr-x | make/scripts/make.joal.all.macosx-java6.sh | 30 | ||||
-rwxr-xr-x | make/scripts/make.joal.all.macosx.sh | 8 | ||||
-rwxr-xr-x | make/scripts/make.joal.all.solaris-x86_64.sh | 6 | ||||
-rwxr-xr-x | make/scripts/make.joal.all.win32.bat | 20 | ||||
-rwxr-xr-x | make/scripts/make.joal.all.win64.bat | 19 | ||||
-rw-r--r-- | www/index.html | 2 |
20 files changed, 173 insertions, 221 deletions
diff --git a/LICENSE.txt b/LICENSE.txt index c4d1404..97bd585 100755 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,5 +1,47 @@ JOAL is released under the BSD license. The full license terms follow: +L.1) The JOAL source tree contains code from the JogAmp Community + which is covered by the Simplified BSD 2-clause license: + + Copyright 2010 - 2019 JogAmp Community. All rights reserved. + + Redistribution and use in source and binary forms, with or without modification, are + permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, this list of + conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright notice, this list + of conditions and the following disclaimer in the documentation and/or other materials + provided with the distribution. + + THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS OR IMPLIED + WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND + FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JogAmp Community OR + CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + The views and conclusions contained in the software and documentation are those of the + authors and should not be interpreted as representing official policies, either expressed + or implied, of JogAmp Community. + + You can address the JogAmp Community via: + Web http://jogamp.org/ + Forum/Mailinglist http://jogamp.762907.n3.nabble.com/ + Chatrooms + IRC irc.freenode.net #jogamp + Jabber conference.jabber.org room: jogamp (deprecated!) + Repository http://jogamp.org/git/ + Email mediastream _at_ jogamp _dot_ org + + +L.2) The GlueGen source tree contains code from Sun Microsystems, Inc. + which is covered by the New BSD 3-clause license: + Copyright (c) 2003-2006 Sun Microsystems, Inc. All Rights Reserved. Redistribution and use in source and binary forms, with or without @@ -33,3 +75,4 @@ JOAL is released under the BSD license. The full license terms follow: You acknowledge that this software is not designed or intended for use in the design, construction, operation or maintenance of any nuclear facility. + @@ -1,38 +1,6 @@ -/** -* Copyright (c) 2003 Sun Microsystems, Inc. All Rights Reserved. -* -* Redistribution and use in source and binary forms, with or without -* modification, are permitted provided that the following conditions are met: -* -* -Redistribution of source code must retain the above copyright notice, -* this list of conditions and the following disclaimer. -* -* -Redistribution in binary form must reproduce the above copyright notice, -* this list of conditions and the following disclaimer in the documentation -* and/or other materials provided with the distribution. -* -* Neither the name of Sun Microsystems, Inc. or the names of contributors may -* be used to endorse or promote products derived from this software without -* specific prior written permission. -* -* This software is provided "AS IS," without a warranty of any kind. -* ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES, INCLUDING -* ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR -* NON-INFRINGEMENT, ARE HEREBY EXCLUDED. SUN MIDROSYSTEMS, INC. ("SUN") AND ITS -* LICENSORS SHALL NOT BE LIABLE FOR ANY DAMAGES SUFFERED BY LICENSEE AS A -* RESULT OF USING, MODIFYING OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES. -* IN NO EVENT WILL SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT -* OR DATA, OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR -* PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF LIABILITY, -* ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE, EVEN IF SUN HAS -* BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. -* -* You acknowledge that this software is not designed or intended for use in the -* design, construction, operation or maintenance of any nuclear facility. -*/ - Project: com.jogamp.openal.* & com.jogamp.openal.sound3d.* -Purpose Open Source Java Bindings for OpenAL and Object-Oriented 3D sound toolkit +Purpose: Open Source Java Bindings for OpenAL and Object-Oriented 3D sound toolkit +License: See LICENSE.txt Author: -- JOAL/Sound3D API Original Author Athomas Goldberg @@ -40,43 +8,45 @@ Author: Java Games Initiative Software Advanced Technologies Group, Sun Microsystems + (see git log) -- This file updated 08/19/2003 by Ole Arndt <ole at sugarshark dot com> -- This file updated 11/23/2003 by Gregory Pierce <[email protected]> -- This file updated 12/21/2005 by Kenneth Russell <[email protected]> + -- This file updated 02/15/2014 by Sven Gothel <[email protected]> (see git log) Introduction: ============= -This is the source tree for the Java Game Initiative (JGI) Open Source -client game programming APIs for OpenAL and Sound3D. +The JOAL Project hosts a reference implementation of the +Java bindings for OpenAL API, and is designed to provide +hardware-supported 3D spatialized audio for applications written +in Java. + +This project also hosts the Sound3D Toolkit, a high level +API for spatialized audio built on top of the OpenAL bindings. +This toolkit is designed to provide access to all the features +of OpenAL through an intuitive, easy to use, object-oriented +interface. Build Requirements: =================== -This project has been built under Win32, Linux, and OSX. The following -packages and tools have been used: +This project has been built under Win32, Linux, Android and MacOS. + +Check GlueGen's HowToBuild <https://jogamp.org/gluegen/doc/HowToBuild.html> +for basic prerequisites. + +Additionally the following packages and tools have been used: * All Systems: - -- Sun J2SDK 1.4.2 (available at java.sun.com) - -- ANT 1.5.3 (available at apache.org) - -- JUnit 3.8.1 (available at junit.org) copy junit.jar to the apache-ant lib directory + -- See GlueGen's HowToBuild <https://jogamp.org/gluegen/doc/HowToBuild.html> * Windows: - -- Win32 (Win XP in the case of our machine) - -- OpenAL1.0 SDK from Creative Labs (available at http://developer.creative.com - under "Gaming -> Development Kits -> Open AL") - -- MinGW 2.0.0 plus the following updates: (all available at www.mingw.org) - -- binutils 2.13.90 - -- w32api-2.2 - -- mingw-runtime-2.4 + -- CMake 3.15.2 <https://cmake.org/download/> * Linux: - -- Linux i386 (Redhat 9.0) - -- gcc 3.2.2, binutils 2.13.90 - -- OpenAL CVS version from opensource.creative.com (see CVS instructions at - www.openal.org) - + -- cmake -- OpenAL Soft: OpenAL: ALSA, OSS, PulseAudio, WaveFile, Null apt-get install cmake autoconf \ @@ -85,12 +55,13 @@ packages and tools have been used: * OSX -- OSX 10.2 or later - -- OSX Developer Tools - -- OpenAL1.0 SDK from Creative Labs (avaulable at http://developer.creative.com under "Gaming->Development Kits->Open AL") + -- OSX Developer Tools Xcode + -- CMake 3.15.2 <https://cmake.org/download/> + and install the commandline tools <https://stackoverflow.com/questions/30668601/installing-cmake-command-line-tools-on-a-mac> JOAL requires the GlueGen workspace to be checked out as a sibling -directory to the joal directory ("cvs co gluegen"). GlueGen will be -built automatially during the JOAL build process. +directory to the joal directory. +See GlueGen's HowToBuild <https://jogamp.org/gluegen/doc/HowToBuild.html> Directory Organization: ======================= @@ -102,87 +73,36 @@ Directory Organization: -- unit_tests A couple of small tests -- www JOAL project webpage files -Preparations: -============= - -* Windows: - Grab the OpenAL SDK from the openal.org downloads and install it. - -* Linux: - OpenAL comes with various Linux distributions. You might have it already. - If not, try rpmfind, apt-get or emerge. - - More up-to-date versions are available from openal.org in the - downloads section. Install first the openal-[version].i586.rpm and - then the openal-devel-[version]-i586.rpm. Unfortunately, due to - confusion in the OpenAL version numbering, the version from - openal.org may seem to be "older" than the version preinstalled on - the Linux distribution, even though it is more recent. To work - around this problem, do the following steps: - - # rpm --force --upgrade openal-0.0.8-1.i586.rpm - # rpm -i openal-devel-0.0.8-1.i586.rpm - - Now test to make sure the RPMs are installed: - - # rpm -qa | grep -i openal - openal-0.0.8-1 - openal-devel-0.0.8-1 - - For the newest version you need to compile OpenAL yourself from CVS: - - -- follow the instruction at www.openal.org to check out a fresh copy - -- in the linux subdir type './autogen.sh - -- look at the build options with ./configure --help - -- configure it with./configure --enable-sdl --enable-vorbis [-enable-more] - (see openal.spec for a full set) - -- build it with make && make test and run the tests - -- as root type make install - -- add /usr/local/lib to you /etc/ld.so.conf and run ldconfig - -* OSX: - Grab the OpenAL SDK from openal.org and install it. - - GIT ==== JOAL can be build w/ openal-soft, which is a git submodule of JOAL. -This is the default for our JogAmp build. +This is the default for our JogAmp build on all platforms. Cloning [and pulling] JOAL incl. openal-soft can be performed w/ the option '--recurse-submodules'. - git clone --recurse-submodules git://jogamp.org/srv/scm/joal.git - cd joal ; git pull --recurse-submodules + > cd /home/dude/projects/jogamp/ + > git clone --recurse-submodules git://jogamp.org/srv/scm/joal.git + > cd joal ; git pull --recurse-submodules JOAL Build Instructions: =================== -Download the current ANTLR jar file (http://www.antlr.org/). - -Copy the gluegen.properties file from the make/ subdirectory of the -GlueGen workspace into your home directory, or in particular where the -Java system property user.home points to (on Windows, this is -C:\Documents and Settings\username\). Edit the value of the antlr.jar -property this file to point to the full path of the ANTLR jar. ANTLR -is used during the glue code generation process. - -Copy the joal.properties file from the make/ subdirectory into your -home directory, or in particular where the Java system property -user.home points to (on Windows, this is C:\Documents and -Settings\username\). -On Windows, you may want to edit the win32.c.compiler property to -indicate the C compiler you prefer to use (vc6, vc7 or mingw). - -On OS X, you can produce 'fat' dual PowerPC/x86 binaries on an -appropriately-equipped machine by uncommenting the declaration of the -'macosxfat' property. - -To clean: ant clean -To build: ant all (or just ant) -To build docs: ant javadoc -To test: ant runtests +Change into the joal/make directory + > cd /home/dude/projects/jogamp/make/ + +To clean: + > ant clean +To build: + > ant -Dtarget.sourcelevel=1.8 -Dtarget.targetlevel=1.8 -Dtarget.rt.jar=/your/openjdk8/lib/rt.jar +To build docs: + > ant -Dtarget.sourcelevel=1.8 -Dtarget.targetlevel=1.8 -Dtarget.rt.jar=/your/openjdk8/lib/rt.jar javadoc +To test: + > ant -Dtarget.sourcelevel=1.8 -Dtarget.targetlevel=1.8 -Dtarget.rt.jar=/your/openjdk8/lib/rt.jar runtests + +Instead of properties, you may also use environment variables, +see GlueGen's HowToBuild <https://jogamp.org/gluegen/doc/HowToBuild.html>. Release Info: Initial Release: This release contains an implementation of the Java diff --git a/make/build.xml b/make/build.xml index 5137ae3..8ab752f 100755 --- a/make/build.xml +++ b/make/build.xml @@ -128,6 +128,9 @@ <property name="src.java" value="${project.root}/${rootrel.src.java}" /> <property name="build" value="${project.root}/${rootrel.build}" /> <property name="tempdir" value="${project.root}/build-temp" /> + <delete includeEmptyDirs="true" failonerror="false"> + <fileset dir="${tempdir}" /> + </delete> <mkdir dir="${tempdir}" /> <!-- The generated source directories. --> @@ -363,6 +366,7 @@ debug="${javacdebug}" debuglevel="${javacdebuglevel}"> <src path="${src.java}" /> <src path="${src.generated.java}" /> + <!-- compilerarg line="release ${target.releaselevel}"/ --> </javac> </target> @@ -531,6 +535,7 @@ <copy file="lib/bsinc_inc.h" todir="${build}/openal-soft" overwrite="true"/> <exec dir="${build}/openal-soft" executable="cmake" logError="true" failonerror="false" failifexecutionfails="false"> <env key="PATH" value="${env.PATH}"/> + <arg line="-G 'MinGW Makefiles'"/> <arg value="../../openal-soft"/> <arg value="-DCMAKE_TOOLCHAIN_FILE=../../openal-soft/cmake/toolchain.windows.cmake"/> </exec> @@ -874,11 +879,18 @@ <!-- - Clean up all that is built. --> + <target name="clean-temp" depends="init"> + <delete includeEmptyDirs="true" failonerror="false"> + <fileset dir="${tempdir}" /> + </delete> + </target> + <target name="clean" depends="init"> <delete includeEmptyDirs="true" quiet="true"> <fileset dir="${build}" /> <fileset dir="${javadoc}" /> <fileset dir="${javadoc.dev}" /> + <fileset dir="${tempdir}" /> </delete> <ant antfile="build-test.xml" target="clean"/> </target> @@ -887,7 +899,9 @@ <!-- - Build everything. --> - <target name="all" depends="joal.build, test.compile, tag.build, developer-zip-archive"/> + <target name="all" depends="joal.build, test.compile, tag.build, developer-zip-archive"> + <antcall target="clean-temp" inheritAll="true" inheritRefs="true" /> + </target> <target name="joal.build" depends="init"> <!-- Generate and compile the Java sources. --> diff --git a/make/scripts/make.joal.all.android-aarch64-cross.sh b/make/scripts/make.joal.all.android-aarch64-cross.sh index 7a26862..b9b8bd7 100755 --- a/make/scripts/make.joal.all.android-aarch64-cross.sh +++ b/make/scripts/make.joal.all.android-aarch64-cross.sh @@ -26,12 +26,11 @@ export TARGET_ADB_PORT=5555 export TARGET_ROOT=/data/projects export TARGET_ANT_HOME=/usr/share/ant -export ANDROID_VERSION=21 -export SOURCE_LEVEL=1.6 -export TARGET_LEVEL=1.6 -export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar +export ANDROID_VERSION=24 +export SOURCE_LEVEL=1.8 +export TARGET_LEVEL=1.8 +export TARGET_RT_JAR=/opt-share/jre1.8.0_212/lib/rt.jar -#export GCC_VERSION=4.4.3 export GCC_VERSION=4.9 export HOST_ARCH=linux-x86_64 export TARGET_TRIPLE=aarch64-linux-android diff --git a/make/scripts/make.joal.all.android-armv6-cross.sh b/make/scripts/make.joal.all.android-armv6-cross.sh index a7b3124..3a2e5cc 100755 --- a/make/scripts/make.joal.all.android-armv6-cross.sh +++ b/make/scripts/make.joal.all.android-armv6-cross.sh @@ -26,13 +26,12 @@ export TARGET_ADB_PORT=5555 export TARGET_ROOT=/data/projects export TARGET_ANT_HOME=/usr/share/ant -export ANDROID_VERSION=9 -export SOURCE_LEVEL=1.6 -export TARGET_LEVEL=1.6 -export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar +export ANDROID_VERSION=24 +export SOURCE_LEVEL=1.8 +export TARGET_LEVEL=1.8 +export TARGET_RT_JAR=/opt-share/jre1.8.0_212/lib/rt.jar -#export GCC_VERSION=4.4.3 -export GCC_VERSION=4.8 +export GCC_VERSION=4.9 export HOST_ARCH=linux-x86_64 export TARGET_TRIPLE=arm-linux-androideabi diff --git a/make/scripts/make.joal.all.android-x86-cross.sh b/make/scripts/make.joal.all.android-x86-cross.sh index 5a57c31..f1d2924 100755 --- a/make/scripts/make.joal.all.android-x86-cross.sh +++ b/make/scripts/make.joal.all.android-x86-cross.sh @@ -71,13 +71,13 @@ elif [ ! -e $ANDROID_HOME ] ; then fi export ANDROID_HOME -export ANDROID_VERSION=9 -export SOURCE_LEVEL=1.6 -export TARGET_LEVEL=1.6 -export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar +export ANDROID_VERSION=24 +export SOURCE_LEVEL=1.8 +export TARGET_LEVEL=1.8 +export TARGET_RT_JAR=/opt-share/jre1.8.0_212/lib/rt.jar #export GCC_VERSION=4.4.3 -export GCC_VERSION=4.7 +export GCC_VERSION=4.9 HOST_ARCH=linux-x86 export TARGET_TRIPLE=i686-linux-android export TOOLCHAIN_NAME=x86 diff --git a/make/scripts/make.joal.all.generic.sh b/make/scripts/make.joal.all.generic.sh index 5e463fd..2331912 100755 --- a/make/scripts/make.joal.all.generic.sh +++ b/make/scripts/make.joal.all.generic.sh @@ -1,8 +1,8 @@ #! /bin/sh -export SOURCE_LEVEL=1.6 -export TARGET_LEVEL=1.6 -export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar +export SOURCE_LEVEL=1.8 +export TARGET_LEVEL=1.8 +export TARGET_RT_JAR=/opt-share/jre1.8.0_212/lib/rt.jar #export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org" export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet" diff --git a/make/scripts/make.joal.all.linux-aarch64-cross.sh b/make/scripts/make.joal.all.linux-aarch64-cross.sh index 0db7a1d..124be59 100755 --- a/make/scripts/make.joal.all.linux-aarch64-cross.sh +++ b/make/scripts/make.joal.all.linux-aarch64-cross.sh @@ -27,9 +27,9 @@ export GLUEGEN_CPPTASKS_FILE="../../gluegen/make/lib/gluegen-cpptasks-linux-aarc #export JUNIT_DISABLED="true" #export JUNIT_RUN_ARG0="-Dnewt.test.Screen.disableScreenMode" -export SOURCE_LEVEL=1.6 -export TARGET_LEVEL=1.6 -export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar +export SOURCE_LEVEL=1.8 +export TARGET_LEVEL=1.8 +export TARGET_RT_JAR=/opt-share/jre1.8.0_212/lib/rt.jar #export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org" export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet" diff --git a/make/scripts/make.joal.all.linux-armv6hf-cross.sh b/make/scripts/make.joal.all.linux-armv6hf-cross.sh index f420195..e5265c9 100755 --- a/make/scripts/make.joal.all.linux-armv6hf-cross.sh +++ b/make/scripts/make.joal.all.linux-armv6hf-cross.sh @@ -38,9 +38,9 @@ export GLUEGEN_CPPTASKS_FILE="../../gluegen/make/lib/gluegen-cpptasks-linux-armv #export JUNIT_DISABLED="true" #export JUNIT_RUN_ARG0="-Dnewt.test.Screen.disableScreenMode" -export SOURCE_LEVEL=1.6 -export TARGET_LEVEL=1.6 -export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar +export SOURCE_LEVEL=1.8 +export TARGET_LEVEL=1.8 +export TARGET_RT_JAR=/opt-share/jre1.8.0_212/lib/rt.jar #export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org" export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet" diff --git a/make/scripts/make.joal.all.linux-armv6hf.sh b/make/scripts/make.joal.all.linux-armv6hf.sh index 7e5f18a..c9d35f0 100755 --- a/make/scripts/make.joal.all.linux-armv6hf.sh +++ b/make/scripts/make.joal.all.linux-armv6hf.sh @@ -23,9 +23,9 @@ fi # -Dtarget.targetlevel=1.6 \ # -Dtarget.rt.jar=/opt-share/jre1.6.0_30/lib/rt.jar \ -export SOURCE_LEVEL=1.6 -export TARGET_LEVEL=1.6 -export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar +export SOURCE_LEVEL=1.8 +export TARGET_LEVEL=1.8 +export TARGET_RT_JAR=/opt-share/jre1.8.0_212/lib/rt.jar #export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org" export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet" diff --git a/make/scripts/make.joal.all.linux-x86-clang.sh b/make/scripts/make.joal.all.linux-x86-clang.sh index 1c27a52..f800a0c 100755 --- a/make/scripts/make.joal.all.linux-x86-clang.sh +++ b/make/scripts/make.joal.all.linux-x86-clang.sh @@ -18,9 +18,9 @@ if [ -z "$ANT_PATH" ] ; then exit fi -export SOURCE_LEVEL=1.6 -export TARGET_LEVEL=1.6 -export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar +export SOURCE_LEVEL=1.8 +export TARGET_LEVEL=1.8 +export TARGET_RT_JAR=/opt-share/jre1.8.0_212/lib/rt.jar export GLUEGEN_PROPERTIES_FILE="lib/gluegen-clang.properties" # or -Dgcc.compat.compiler=clang diff --git a/make/scripts/make.joal.all.linux-x86.sh b/make/scripts/make.joal.all.linux-x86.sh index 1adf02c..86ad7b9 100755 --- a/make/scripts/make.joal.all.linux-x86.sh +++ b/make/scripts/make.joal.all.linux-x86.sh @@ -18,9 +18,9 @@ if [ -z "$ANT_PATH" ] ; then exit fi -export SOURCE_LEVEL=1.6 -export TARGET_LEVEL=1.6 -export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar +export SOURCE_LEVEL=1.8 +export TARGET_LEVEL=1.8 +export TARGET_RT_JAR=/opt-share/jre1.8.0_212/lib/rt.jar #export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org" export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet" diff --git a/make/scripts/make.joal.all.linux-x86_64-clang.sh b/make/scripts/make.joal.all.linux-x86_64-clang.sh index 5501f12..c945cf9 100755 --- a/make/scripts/make.joal.all.linux-x86_64-clang.sh +++ b/make/scripts/make.joal.all.linux-x86_64-clang.sh @@ -18,9 +18,9 @@ if [ -z "$ANT_PATH" ] ; then exit fi -export SOURCE_LEVEL=1.6 -export TARGET_LEVEL=1.6 -export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar +export SOURCE_LEVEL=1.8 +export TARGET_LEVEL=1.8 +export TARGET_RT_JAR=/opt-share/jre1.8.0_212/lib/rt.jar export GLUEGEN_PROPERTIES_FILE="lib/gluegen-clang.properties" # or -Dgcc.compat.compiler=clang diff --git a/make/scripts/make.joal.all.linux-x86_64.sh b/make/scripts/make.joal.all.linux-x86_64.sh index 6ce47d5..68bb6c8 100755 --- a/make/scripts/make.joal.all.linux-x86_64.sh +++ b/make/scripts/make.joal.all.linux-x86_64.sh @@ -18,9 +18,9 @@ if [ -z "$ANT_PATH" ] ; then exit fi -export SOURCE_LEVEL=1.6 -export TARGET_LEVEL=1.6 -export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar +export SOURCE_LEVEL=1.8 +export TARGET_LEVEL=1.8 +export TARGET_RT_JAR=/opt-share/jre1.8.0_212/lib/rt.jar #export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org" export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet" diff --git a/make/scripts/make.joal.all.macosx-java6.sh b/make/scripts/make.joal.all.macosx-java6.sh deleted file mode 100755 index f30856f..0000000 --- a/make/scripts/make.joal.all.macosx-java6.sh +++ /dev/null @@ -1,30 +0,0 @@ -#! /bin/sh - -if [ -e /opt-share/etc/profile.ant ] ; then - . /opt-share/etc/profile.ant -fi - -# -Dc.compiler.debug=true -# -# -Dtarget.sourcelevel=1.6 \ -# -Dtarget.targetlevel=1.6 \ -# -Dtarget.rt.jar=/opt-share/jre1.6.0_30/lib/rt.jar \ - -# Force OSX SDK 10.6, if desired -# export SDKROOT=macosx10.6 - -JAVA_HOME=`/usr/libexec/java_home -version 1.6` -PATH=$JAVA_HOME/bin:$PATH -export JAVA_HOME PATH - -export SOURCE_LEVEL=1.6 -export TARGET_LEVEL=1.6 -export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar - -#export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org" -export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet" - -#BUILD_ARCHIVE=true \ -ant \ - -Drootrel.build=build-macosx-java6 \ - $* 2>&1 | tee make.joal.all.macosx-java6.log diff --git a/make/scripts/make.joal.all.macosx.sh b/make/scripts/make.joal.all.macosx.sh index 466bf61..7826fa8 100755 --- a/make/scripts/make.joal.all.macosx.sh +++ b/make/scripts/make.joal.all.macosx.sh @@ -4,15 +4,15 @@ if [ -e /opt-share/etc/profile.ant ] ; then . /opt-share/etc/profile.ant fi -JAVA_HOME=`/usr/libexec/java_home -version 1.7` +JAVA_HOME=`/usr/libexec/java_home -version 11` PATH=$JAVA_HOME/bin:$PATH export JAVA_HOME PATH # -Dc.compiler.debug=true -export SOURCE_LEVEL=1.6 -export TARGET_LEVEL=1.6 -export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar +export SOURCE_LEVEL=1.8 +export TARGET_LEVEL=1.8 +export TARGET_RT_JAR=/opt-share/jre1.8.0_212/lib/rt.jar #export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org" export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet" diff --git a/make/scripts/make.joal.all.solaris-x86_64.sh b/make/scripts/make.joal.all.solaris-x86_64.sh index 1548031..de2c809 100755 --- a/make/scripts/make.joal.all.solaris-x86_64.sh +++ b/make/scripts/make.joal.all.solaris-x86_64.sh @@ -20,9 +20,9 @@ fi # -Drootrel.build=build-x86_64 \ -export SOURCE_LEVEL=1.6 -export TARGET_LEVEL=1.6 -export TARGET_RT_JAR=/opt-share/jre1.6.0_30/lib/rt.jar +export SOURCE_LEVEL=1.8 +export TARGET_LEVEL=1.8 +export TARGET_RT_JAR=/opt-share/jre1.8.0_212/lib/rt.jar #export JOGAMP_JAR_CODEBASE="Codebase: *.jogamp.org" export JOGAMP_JAR_CODEBASE="Codebase: *.goethel.localnet" diff --git a/make/scripts/make.joal.all.win32.bat b/make/scripts/make.joal.all.win32.bat index 40a535a..62a7ce3 100755 --- a/make/scripts/make.joal.all.win32.bat +++ b/make/scripts/make.joal.all.win32.bat @@ -1,19 +1,23 @@ set THISDIR="C:\JOGL"
-set J2RE_HOME=c:\jre1.8.0_66_x32
-set JAVA_HOME=c:\jdk1.8.0_66_x32
-set ANT_PATH=C:\apache-ant-1.9.4
-set CMAKE_PATH=C:\cmake-2.8.10.2-win32-x86
+set J2RE_HOME=c:\jre-11.0.4+11_x32
+set JAVA_HOME=c:\jdk-11.0.4+11_x32
+set ANT_PATH=C:\apache-ant-1.10.5
+set GIT_PATH=C:\cygwin\bin
+set SEVENZIP=C:\Program Files\7-Zip
-set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw\bin;%CMAKE_PATH%\bin;%PATH%
+set CMAKE_PATH=C:\cmake-3.15.2-win32-x86
+set CMAKE_C_COMPILER=c:\mingw32\bin\gcc
+
+set PATH=%J2RE_HOME%\bin;%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw32\bin;%CMAKE_PATH%\bin;%GIT_PATH%;%SEVENZIP%;%PATH%
set LIB_GEN=%THISDIR%\lib
set CLASSPATH=.;%THISDIR%\build-win32\classes
REM -Dc.compiler.debug=true
-set SOURCE_LEVEL=1.6
-set TARGET_LEVEL=1.6
-set TARGET_RT_JAR=c:\jre1.6.0_30\lib\rt.jar
+set SOURCE_LEVEL=1.8
+set TARGET_LEVEL=1.8
+set TARGET_RT_JAR=C:\jre1.8.0_212\lib\rt.jar
REM set JOGAMP_JAR_CODEBASE=Codebase: *.jogamp.org
set JOGAMP_JAR_CODEBASE=Codebase: *.goethel.localnet
diff --git a/make/scripts/make.joal.all.win64.bat b/make/scripts/make.joal.all.win64.bat index eb41e54..710d199 100755 --- a/make/scripts/make.joal.all.win64.bat +++ b/make/scripts/make.joal.all.win64.bat @@ -1,20 +1,23 @@ set THISDIR="C:\JOGL"
-set J2RE_HOME=c:\jre1.8.0_66_x64
-set JAVA_HOME=c:\jdk1.8.0_66_x64
-set ANT_PATH=C:\apache-ant-1.9.4
-set CMAKE_PATH=C:\cmake-2.8.10.2-win32-x86
+set J2RE_HOME=c:\jre-11.0.4+11_x64
+set JAVA_HOME=c:\jdk-11.0.4+11_x64
+set ANT_PATH=C:\apache-ant-1.10.5
+set GIT_PATH=C:\cygwin\bin
+set SEVENZIP=C:\Program Files\7-Zip
+
+set CMAKE_PATH=C:\cmake-3.15.2-win64-x64
set CMAKE_C_COMPILER=c:\mingw64\bin\gcc
-set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw64\bin;c:\mingw\bin;%CMAKE_PATH%\bin;%PATH%
+set PATH=%J2RE_HOME%\bin;%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw64\bin;%CMAKE_PATH%\bin;%GIT_PATH%;%SEVENZIP%;%PATH%
set LIB_GEN=%THISDIR%\lib
set CLASSPATH=.;%THISDIR%\build-win64\classes
REM -Dc.compiler.debug=true
-set SOURCE_LEVEL=1.6
-set TARGET_LEVEL=1.6
-set TARGET_RT_JAR=c:\jre1.6.0_30\lib\rt.jar
+set SOURCE_LEVEL=1.8
+set TARGET_LEVEL=1.8
+set TARGET_RT_JAR=C:\jre1.8.0_212\lib\rt.jar
REM set JOGAMP_JAR_CODEBASE=Codebase: *.jogamp.org
set JOGAMP_JAR_CODEBASE=Codebase: *.goethel.localnet
diff --git a/www/index.html b/www/index.html index c307b7c..ff6236d 100644 --- a/www/index.html +++ b/www/index.html @@ -42,7 +42,7 @@ <p> The JOAL Project hosts a reference implementation of the Java bindings for OpenAL API, and is designed to provide - hardware-supported 3D spatialized audio for games written + hardware-supported 3D spatialized audio for applications written in Java. </p> <p> |