[Jake2-commits] jake2 Jake2.bat,NONE,1.1.2.2 build.xml,1.26,1.26.4.1

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

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

Modified Files:
      Tag: render-refactoring
	build.xml 
Added Files:
      Tag: render-refactoring
	Jake2.bat 
Log Message:
merge with current HEAD

Index: build.xml
===================================================================
RCS file: /cvsroot/jake2/jake2/build.xml,v
retrieving revision 1.26
retrieving revision 1.26.4.1
diff -C2 -d -r1.26 -r1.26.4.1
*** build.xml	7 Jun 2005 08:50:12 -0000	1.26
--- build.xml	25 Dec 2005 18:11:21 -0000	1.26.4.1
***************
*** 144,147 ****
--- 144,151 ----
  			<include name="mirrors"/>
  		</jar>
+ 		<property name="classes" value="${java.home}/lib/rt.jar"/>
+         <condition property="classes" value="${java.home}/../Classes/classes.jar">
+             <os name="Mac OS X"/>
+         </condition> 		
  		<!-- proguard printseeds="on" printusage="off" outjar="${dist}/lib/jake2.jar"
  			defaultpackage="" overloadaggressively="off" printmapping="jake2.map">
***************
*** 149,153 ****
  			<libraryjar name="lib/jogl/jogl.jar"/>
  			<libraryjar name="lib/joal/linux/joal.jar"/>
! 			<libraryjar name="${java.home}/lib/rt.jar"/>
  			<keep access="public" name="jake2.Jake2">
  				<method name="main(java.lang.String[])"/>
--- 153,157 ----
  			<libraryjar name="lib/jogl/jogl.jar"/>
  			<libraryjar name="lib/joal/linux/joal.jar"/>
! 			<libraryjar name="${classes}"/>
  			<keep access="public" name="jake2.Jake2">
  				<method name="main(java.lang.String[])"/>

--- NEW FILE: Jake2.bat ---
@echo off
SET PATH=lib\joal\windows;%PATH%
SET CP=build;resources;lib/jogl/jogl.jar;lib/joal/windows/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