diff options
| author | Sven Gothel <[email protected]> | 2012-10-16 15:10:52 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2012-10-16 15:10:52 +0200 |
| commit | 69a13e7d8429c5f51df5d486b53ba7c7eeede120 (patch) | |
| tree | ff6c2c4cac4abeb2f5665feb7e329d8e9ca5f536 /scripts | |
| parent | e142788fe2f8a27f1ac4febcead1b1564a0116cc (diff) | |
Fix build of dist: remove lwjgl, use jogamp lib location, fix scripts
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/Jake2.bat | 4 | ||||
| -rw-r--r-- | scripts/Jake2.sh | 5 | ||||
| -rw-r--r-- | scripts/Jake2_dedicated.sh | 2 | ||||
| -rw-r--r-- | scripts/Jake2_lwjgl.bat | 4 | ||||
| -rw-r--r-- | scripts/Jake2_lwjgl.sh | 8 | ||||
| -rw-r--r-- | scripts/Jake2_mac.sh | 7 | ||||
| -rw-r--r-- | scripts/Jake2_mac_lwjgl.sh | 7 |
7 files changed, 5 insertions, 32 deletions
diff --git a/scripts/Jake2.bat b/scripts/Jake2.bat index bc8da76..96074bd 100644 --- a/scripts/Jake2.bat +++ b/scripts/Jake2.bat @@ -1,4 +1,4 @@ @echo off SET PATH=lib\windows;%PATH% -SET CP=lib/jake2.jar;lib/jogl.jar;lib/joal.jar;lib/gluegen-rt.jar -start javaw -Xmx100M -Dsun.java2d.noddraw=true -Djava.library.path=lib/windows -cp %CP% jake2.Jake2
\ No newline at end of file +SET CP=lib/jogamp/gluegen-rt.jar;lib/jogamp/joal.jar;lib/jogamp/jogl-all.jar;lib/jake2.jar +start javaw -Dsun.java2d.noddraw=true -cp %CP% jake2.Jake2 diff --git a/scripts/Jake2.sh b/scripts/Jake2.sh index 29a00ce..50aa11b 100644 --- a/scripts/Jake2.sh +++ b/scripts/Jake2.sh @@ -2,7 +2,6 @@ cd `dirname $0` -export LD_LIBRARY_PATH=lib/linux -CP=lib/jake2.jar:lib/jogl.jar:lib/joal.jar:lib/gluegen-rt.jar +CP=lib/jogamp/gluegen-rt.jar:lib/jogamp/joal.jar:lib/jogamp/jogl-all.jar:lib/jake2.jar -exec java -Xmx100M -Djava.library.path=lib/linux -cp $CP jake2.Jake2 +exec java -cp $CP jake2.Jake2 diff --git a/scripts/Jake2_dedicated.sh b/scripts/Jake2_dedicated.sh index 8f9484e..0f210ed 100644 --- a/scripts/Jake2_dedicated.sh +++ b/scripts/Jake2_dedicated.sh @@ -2,6 +2,6 @@ cd `dirname $0`/.. -CP=dist/lib/jake2.jar +CP=lib/jake2.jar exec java -Xmx64M -cp $CP $D_ARGS jake2.Jake2 +set dedicated 1 +set timeout 12000 $* diff --git a/scripts/Jake2_lwjgl.bat b/scripts/Jake2_lwjgl.bat deleted file mode 100644 index 950bcab..0000000 --- a/scripts/Jake2_lwjgl.bat +++ /dev/null @@ -1,4 +0,0 @@ -@echo off -SET PATH=lib\windows;%PATH% -SET CP=lib/jake2.jar;lib/lwjgl.jar;lib/lwjgl_util.jar -start javaw -Xmx100M -Dsun.java2d.noddraw=true -Djava.library.path=lib/windows/lwjgl -cp %CP% jake2.Jake2
\ No newline at end of file diff --git a/scripts/Jake2_lwjgl.sh b/scripts/Jake2_lwjgl.sh deleted file mode 100644 index 6dfcdf5..0000000 --- a/scripts/Jake2_lwjgl.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash - -cd `dirname $0` - -export LD_LIBRARY_PATH=lib/linux/lwjgl -CP=lib/jake2.jar:lib/lwjgl.jar:lib/lwjgl_util.jar - -exec java -Xmx100M -Djava.library.path=lib/linux/lwjgl -cp $CP jake2.Jake2 diff --git a/scripts/Jake2_mac.sh b/scripts/Jake2_mac.sh deleted file mode 100644 index f09dd52..0000000 --- a/scripts/Jake2_mac.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -export LD_LIBRARY_PATH=lib/osx -export DYLD_LIBRARY_PATH=lib/osx -CP=lib/jake2.jar:lib/jogl.jar:lib/joal.jar:lib/gluegen-rt.jar - -exec java -Xmx100M -Djava.library.path=lib/osx -cp $CP jake2.Jake2 diff --git a/scripts/Jake2_mac_lwjgl.sh b/scripts/Jake2_mac_lwjgl.sh deleted file mode 100644 index 8408e8f..0000000 --- a/scripts/Jake2_mac_lwjgl.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -export LD_LIBRARY_PATH=lib/osx/lwjgl -export DYLD_LIBRARY_PATH=lib/osx/lwjgl -CP=lib/jake2.jar:lib/lwjgl.jar:lib/lwjgl_util.jar - -exec java -Xmx100M -Djava.library.path=lib/osx/lwjgl -cp $CP jake2.Jake2 |