[Jake2-commits] jake2 Jake2.bat,1.2,1.3 Jake2.sh,1.5,1.6

[Carsten W. <ca...@us...>]

Update of /cvsroot/jake2/jake2
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv2791

Modified Files:
	Jake2.bat Jake2.sh 
Log Message:
use only one of the drivers (jogl/joal or lwjgl) because of library collisions

jogl/joal is the default

Index: Jake2.bat
===================================================================
RCS file: /cvsroot/jake2/jake2/Jake2.bat,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Jake2.bat	24 Oct 2006 23:00:43 -0000	1.2
--- Jake2.bat	14 Nov 2006 20:49:08 -0000	1.3
***************
*** 1,4 ****
  @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
--- 1,10 ----
  @echo off
! 
! 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

Index: Jake2.sh
===================================================================
RCS file: /cvsroot/jake2/jake2/Jake2.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Jake2.sh	24 Oct 2006 23:00:43 -0000	1.5
--- Jake2.sh	14 Nov 2006 20:49:08 -0000	1.6
***************
*** 1,10 ****
  #!/bin/bash
  
- # $Id$
- 
  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
  
! exec java -Xmx100M -Djava.library.path=lib/jogl/linux:lib/joal/linux:lib/lwjgl/linux -cp $CP jake2.Jake2 $*
--- 1,13 ----
  #!/bin/bash
  
  cd `dirname $0`
  
! # 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 -cp $CP jake2.Jake2 $*
\ No newline at end of file