diff options
| author | Sven Gothel <[email protected]> | 2011-10-18 07:00:46 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2011-10-18 07:00:46 +0200 |
| commit | 13488392fcd8f9253f82557158cd1e7c45c36e41 (patch) | |
| tree | 966e72568cee5ab96646c6e8f822a83628c91dbd /make/scripts | |
| parent | f818817f3c0b14fe8317eaf5e1e1fff0a19884d0 (diff) | |
Fix Solaris gcc args ; Adding JVM arch flags (-d32/-d64)
Diffstat (limited to 'make/scripts')
| -rw-r--r-- | make/scripts/setenv-build-jogl-x86.sh | 7 | ||||
| -rw-r--r-- | make/scripts/setenv-build-jogl-x86_64.sh | 7 |
2 files changed, 14 insertions, 0 deletions
diff --git a/make/scripts/setenv-build-jogl-x86.sh b/make/scripts/setenv-build-jogl-x86.sh index f2de867..5c56da4 100644 --- a/make/scripts/setenv-build-jogl-x86.sh +++ b/make/scripts/setenv-build-jogl-x86.sh @@ -26,5 +26,12 @@ if [ -e /opt-linux-x86/jre6 -a -e /opt-linux-x86/j2se6 ] ; then export J2RE_HOME JAVA_HOME fi +if [ -e /opt-solaris-x86/jre6 -a -e /opt-solaris-x86/j2se6 ] ; then + J2RE_HOME=/opt-solaris-x86/jre6 + JAVA_HOME=/opt-solaris-x86/j2se6 + PATH=$J2RE_HOME/bin:$JAVA_HOME/bin:$PATH + export J2RE_HOME JAVA_HOME +fi + export PATH diff --git a/make/scripts/setenv-build-jogl-x86_64.sh b/make/scripts/setenv-build-jogl-x86_64.sh index 9a4678b..695bede 100644 --- a/make/scripts/setenv-build-jogl-x86_64.sh +++ b/make/scripts/setenv-build-jogl-x86_64.sh @@ -26,6 +26,13 @@ if [ -e /opt-linux-x86_64/jre6 -a -e /opt-linux-x86_64/j2se6 ] ; then export J2RE_HOME JAVA_HOME fi +if [ -e /opt-solaris-x86_64/jre6 -a -e /opt-solaris-x86_64/j2se6 ] ; then + J2RE_HOME=/opt-solaris-x86_64/jre6/bin/amd64 + JAVA_HOME=/opt-solaris-x86_64/j2se6/bin/amd64 + PATH=$J2RE_HOME:$JAVA_HOME:$PATH + export J2RE_HOME JAVA_HOME +fi + export PATH |