use only one of the drivers (jogl/joal or lwjgl) because of library collisions jogl/joal is the defaultmerge_render-refactoring

2 files changed, 17 insertions, 8 deletions

diff --git a/Jake2.bat b/Jake2.bat
index ede8427..c9ea34d 100644
--- a/Jake2.bat
+++ b/Jake2.bat
@@ -1,4 +1,10 @@
 @echo off
-SET PATH=lib\joal\windows;%PATH%
-SET CP=build;resources;lib/jogl/jogl.jar;lib/joal/joal.jar;lib/lwjgl/lwjgl.jar;lib/lwjgl/lwjgl_util.jar
-java -Xmx100M -Dsun.java2d.noddraw=true -Djava.library.path=lib/jogl/windows;lib/joal/windows;lib/lwjgl/windows -cp %CP% jake2.Jake2
\ No newline at end of file
+
+REM for lwjgl
+REM SET LIB=lib/lwjgl/windows
+REM SET CP=build;resources;lib/lwjgl/lwjgl.jar;lib/lwjgl/lwjgl_util.jar
+
+REM for jogl and joal
+SET LIB=lib/jogl/windows;lib/joal/windows
+SET CP=build;resources;lib/jogl/jogl.jar;lib/joal/joal.jar;lib/joal/gluegen-rt.jar;
+java -Xmx100M -Dsun.java2d.noddraw=true -Djava.library.path=%LIB% -cp %CP% jake2.Jake2
\ No newline at end of file
diff --git a/Jake2.sh b/Jake2.sh
index 106423a..d9622d2 100644
--- a/Jake2.sh
+++ b/Jake2.sh
@@ -1,10 +1,13 @@
 #!/bin/bash
 
-# $Id: Jake2.sh,v 1.5 2006-10-24 23:00:43 cawe Exp $
-
 cd `dirname $0`
 
-export LD_LIBRARY_PATH=lib/joal/linux:lib/lwjgl/linux
-CP=build:resources:lib/jogl/jogl.jar:lib/joal/joal.jar:lib/lwjgl/lwjgl.jar:lib/lwjgl/lwjgl_util.jar
+# for lwjgl
+#LIB=lib/lwjgl/linux
+#CP=build:resources:lib/lwjgl/lwjgl.jar:lib/lwjgl/lwjgl_util.jar
+
+# for jogl and joal
+LIB=lib/jogl/linux:lib/joal/linux
+CP=build:resources:lib/jogl/jogl.jar:lib/joal/joal.jar:lib/joal/gluegen-rt.jar
 
-exec java -Xmx100M -Djava.library.path=lib/jogl/linux:lib/joal/linux:lib/lwjgl/linux -cp $CP jake2.Jake2 $*
+exec java -Xmx100M -Djava.library.path=$LIB -cp $CP jake2.Jake2 $*
\ No newline at end of file