java-game-lib-cvs Mailing List for Lightweight Java Game Library

Revision: 2456
Author:   elias_naur
Date:     2006-07-07 07:06:46 -0700 (Fri, 07 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2456&view=rev

Log Message:
-----------
Linux: Remove Makefiles

Removed Paths:
-------------
    trunk/LWJGL/src/native/linux/Makefile
    trunk/LWJGL/src/native/linux/Makefile.amd64
Deleted: trunk/LWJGL/src/native/linux/Makefile
===================================================================
--- trunk/LWJGL/src/native/linux/Makefile	2006-07-07 14:05:06 UTC (rev 2455)
+++ trunk/LWJGL/src/native/linux/Makefile	2006-07-07 14:06:46 UTC (rev 2456)
@@ -1,21 +0,0 @@
-
-
-CC=gcc
-LINKER=gcc
-STRIP=strip
-CFLAGS_LINK=-Wl,--version-script=lwjgl.map -O2 -shared -Wall
-LIBS=-L/usr/X11R6/lib -L/usr/X11/lib -lm -lX11 -lXext -lpthread -L$(JAVA_HOME)/jre/lib/i386 -ljawt -Wl,-static,-lXxf86vm,-lXcursor,-lXrender,-lXrandr,-lXfixes,-call_shared
-CFLAGS_O=-fPIC -O2 -D_X11 -Wall -std=c99 -pthread -c -I../common -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I$(AL_HOME)/include
-SRC=$(wildcard *.c) $(wildcard ../common/*.c) $(wildcard ../generated/*c)
-OBJECTS=$(subst .c,.o,$(SRC))
-LIBRARY=liblwjgl.so
-
-$(LIBRARY): $(OBJECTS)
-	$(LINKER) $(CFLAGS_LINK) -o $@ $(OBJECTS) $(LIBS)
-	$(STRIP) $@
-
-.c.o:
-	$(CC) $(CFLAGS_O) $< -o $@
-
-clean:
-	rm -f $(OBJECTS) $(LIBRARY)

Deleted: trunk/LWJGL/src/native/linux/Makefile.amd64
===================================================================
--- trunk/LWJGL/src/native/linux/Makefile.amd64	2006-07-07 14:05:06 UTC (rev 2455)
+++ trunk/LWJGL/src/native/linux/Makefile.amd64	2006-07-07 14:06:46 UTC (rev 2456)
@@ -1,21 +0,0 @@
-
-
-CC=gcc
-LINKER=gcc
-STRIP=strip
-CFLAGS_LINK=-fPIC -shared -Wall
-LIBS=-L/usr/X11R6/lib64 -L/usr/X11/lib -lm -lX11 -lXext -lpthread -L$(JAVA_HOME)/jre/lib/amd64 -ljawt -lXxf86vm -Wl,-static,-lXcursor,-lXrender,-lXrandr,-lXfixes,-call_shared
-CFLAGS_O=-fPIC -O2 -D_X11 -Wall -std=c99 -pthread -c -I../common -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I$(AL_HOME)/include
-SRC=$(wildcard *.c) $(wildcard ../common/*.c) $(wildcard ../generated/*c)
-OBJECTS=$(subst .c,.o,$(SRC))
-LIBRARY=liblwjgl.so
-
-$(LIBRARY): $(OBJECTS)
-	$(LINKER) $(CFLAGS_LINK) -o $@ $(OBJECTS) $(LIBS)
-	$(STRIP) $@
-
-.c.o:
-	$(CC) $(CFLAGS_O) $< -o $@
-
-clean:
-	rm -f $(OBJECTS) $(LIBRARY)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2455
Author:   elias_naur
Date:     2006-07-07 07:05:06 -0700 (Fri, 07 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2455&view=rev

Log Message:
-----------
Linux: Remove debug echos from build.xml

Modified Paths:
--------------
    trunk/LWJGL/platform_build/linux_ant/build.xml
Modified: trunk/LWJGL/platform_build/linux_ant/build.xml
===================================================================
--- trunk/LWJGL/platform_build/linux_ant/build.xml	2006-07-07 14:02:13 UTC (rev 2454)
+++ trunk/LWJGL/platform_build/linux_ant/build.xml	2006-07-07 14:05:06 UTC (rev 2455)
@@ -18,11 +18,9 @@
 		<exec executable="uname" outputproperty="hwplatform">
 			<arg value="-i"/>
 		</exec>
-		<echo message="${hwplatform}"/>
 		<condition property="libs" value="${libs64}" else="${libs32}">
 			<equals arg1="${hwplatform}" arg2="x86_64"/>
 		</condition>
-		<echo message="${libs}"/>
 		<property name="linker_flags" value="-Wl,--version-script=${native}/linux/lwjgl.map -shared -O2 -Wall -o ${libname} ${libs}"/>
 		<apply dir="." executable="cc" dest="." skipemptyfilesets="true" failonerror="true">
 			<arg line="${cflags}"/>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2454
Author:   elias_naur
Date:     2006-07-07 07:02:13 -0700 (Fri, 07 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2454&view=rev

Log Message:
-----------
Linux: Support x86_64 building

Modified Paths:
--------------
    trunk/LWJGL/platform_build/linux_ant/build.xml
Modified: trunk/LWJGL/platform_build/linux_ant/build.xml
===================================================================
--- trunk/LWJGL/platform_build/linux_ant/build.xml	2006-07-07 12:41:36 UTC (rev 2453)
+++ trunk/LWJGL/platform_build/linux_ant/build.xml	2006-07-07 14:02:13 UTC (rev 2454)
@@ -3,9 +3,9 @@
 <project name="lwjgl native code, linux" basedir="../../bin" default="compile">
 	<property name="native" location="../src/native"/>
 	<property name="libname" value="liblwjgl.so"/>
-	<property name="libs" value="-L/usr/X11R6/lib -L/usr/X11/lib -lm -lX11 -lXext -lpthread -L${java.home}/lib/i386 -ljawt -Wl,-static,-lXxf86vm,-lXcursor,-lXrender,-lXrandr,-lXfixes,-call_shared"/>
+	<property name="libs32" value="-L/usr/X11R6/lib -L/usr/X11/lib -lm -lX11 -lXext -lpthread -L${java.home}/lib/i386 -ljawt -Wl,-static,-lXxf86vm,-lXcursor,-lXrender,-lXrandr,-lXfixes,-call_shared"/>
+	<property name="libs64" value="-L/usr/X11R6/lib64 -L/usr/X11/lib64 -lm -lX11 -lXext -lpthread -L${java.home}/lib/amd64 -ljawt -Wl,-static,-lXxf86vm,-lXcursor,-lXrender,-lXrandr,-lXfixes,-call_shared"/>
 	<property name="cflags" value="-O2 -Wall -c -fPIC -std=c99 -pthread"/>
-	<property name="linker_flags" value="-Wl,--version-script=${native}/linux/lwjgl.map -shared -O2 -Wall -o ${libname} ${libs}"/>
 	
 	<target name="clean">
 		<delete>
@@ -15,6 +15,15 @@
 	</target>
 	
     <target name="compile">
+		<exec executable="uname" outputproperty="hwplatform">
+			<arg value="-i"/>
+		</exec>
+		<echo message="${hwplatform}"/>
+		<condition property="libs" value="${libs64}" else="${libs32}">
+			<equals arg1="${hwplatform}" arg2="x86_64"/>
+		</condition>
+		<echo message="${libs}"/>
+		<property name="linker_flags" value="-Wl,--version-script=${native}/linux/lwjgl.map -shared -O2 -Wall -o ${libname} ${libs}"/>
 		<apply dir="." executable="cc" dest="." skipemptyfilesets="true" failonerror="true">
 			<arg line="${cflags}"/>
 			<arg value="-I${java.home}/include"/>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2453
Author:   elias_naur
Date:     2006-07-07 05:41:36 -0700 (Fri, 07 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2453&view=rev

Log Message:
-----------
Mac OS X: Added support for compile_native target. Moved optional libraries to compile_native_optional target

Modified Paths:
--------------
    trunk/LWJGL/build.xml

Added Paths:
-----------
    trunk/LWJGL/platform_build/macosx_ant/
    trunk/LWJGL/platform_build/macosx_ant/build-symbol-list
    trunk/LWJGL/platform_build/macosx_ant/build.xml

Removed Paths:
-------------
    trunk/LWJGL/src/native/macosx/build-symbol-list
    trunk/LWJGL/src/native/macosx/build.xml
Modified: trunk/LWJGL/build.xml
===================================================================
--- trunk/LWJGL/build.xml	2006-07-07 11:47:56 UTC (rev 2452)
+++ trunk/LWJGL/build.xml	2006-07-07 12:41:36 UTC (rev 2453)
@@ -646,10 +646,10 @@
 		</condition>
 		<antcall target="-compile_native_linux" />
 
-		<condition property="lwjgl.platform.mac">
+		<condition property="lwjgl.platform.macosx">
 			<os name="Mac OS X" />
 		</condition>
-		<antcall target="-compile_native_mac" />
+		<antcall target="-compile_native_macosx" />
 	</target>	
 
 	<target name="compile_native_optional" depends="headers" description="Compiles the native files">
@@ -658,6 +658,10 @@
 			<os name="Linux" />
 		</condition>
 		<antcall target="-compile_native_linux_optional" />
+		<condition property="lwjgl.platform.macosx">
+			<os name="Mac OS X" />
+		</condition>
+		<antcall target="-compile_native_macosx_optional" />
 	</target>	
 	
 	
@@ -706,7 +710,7 @@
 	<!-- Compiles LWJGL on Linux platforms -->
 	<target name="-compile_native_linux" if="lwjgl.platform.linux">
 		<ant antfile="platform_build/linux_ant/build.xml" inheritAll="false"/>
-		<copy file="${lwjgl.bin}/liblwjgl.so" tofile="${lwjgl.lib}/linux/liblwjgl.so" />
+		<copy file="${lwjgl.bin}/liblwjgl.so" todir="${lwjgl.lib}/linux"/>
 	</target>
 
 	<target name="-compile_native_linux_optional" if="lwjgl.platform.linux">
@@ -715,7 +719,6 @@
 		<fail message="Missing JAVA_HOME path environment property" unless="env.JAVA_HOME"/>		
 		<fail message="Missing FMOD path environment property" unless="env.FMOD"/>		
 		
-		<exec executable="make" dir="${lwjgl.src.native}/linux"/>
 		<exec executable="make" dir="${lwjgl.src.native}/common/devil">
 			<arg line="-f Makefile.linux"/>
 		</exec>
@@ -726,22 +729,25 @@
 		<move file="${lwjgl.src.native}/common/fmod3/liblwjgl-fmod3.so" tofile="${lwjgl.lib}/linux/liblwjgl-fmod3.so" />
 	</target>
 
+	<target name="-compile_native_macosx" if="lwjgl.platform.macosx">
+		<ant antfile="platform_build/macosx_ant/build.xml" inheritAll="false"/>
+		<copy file="${lwjgl.bin}/liblwjgl.jnilib" todir="${lwjgl.lib}/macosx"/>
+	</target>
+
 	<!-- Compiles LWJGL on Mac OS X platforms  -->
-	<target name="-compile_native_mac" if="lwjgl.platform.mac">
+	<target name="-compile_native_macosx_optional" if="lwjgl.platform.macosx">
 	
 		<!-- check for required properties -->
 		<property environment="env"/>
 		<fail message="Missing AL path environment property" unless="env.AL"/>		
 		<fail message="Missing FMOD path environment property" unless="env.FMOD"/>			
 	
-    		<exec executable="make" dir="${lwjgl.src.native}/macosx" failonerror="true"/>
 		<exec executable="make" dir="${lwjgl.src.native}/common/devil">
                         <arg line="-f Makefile.macosx"/>
                 </exec>
                 <exec executable="make" dir="${lwjgl.src.native}/common/fmod3">
                         <arg line="-f Makefile.macosx"/>
                 </exec>
-    		<move file="${lwjgl.src.native}/macosx/liblwjgl.jnilib" tofile="${lwjgl.lib}/macosx/liblwjgl.jnilib" />   
 		<move file="${lwjgl.src.native}/common/devil/liblwjgl-devil.jnilib" tofile="${lwjgl.lib}/macosx/liblwjgl-devil.jnilib" />
 		<move file="${lwjgl.src.native}/common/fmod3/liblwjgl-fmod3.jnilib" tofile="${lwjgl.lib}/macosx/liblwjgl-fmod3.jnilib" />
   </target> 	

Copied: trunk/LWJGL/platform_build/macosx_ant/build-symbol-list (from rev 2451, trunk/LWJGL/src/native/macosx/build-symbol-list)
===================================================================
--- trunk/LWJGL/platform_build/macosx_ant/build-symbol-list	                        (rev 0)
+++ trunk/LWJGL/platform_build/macosx_ant/build-symbol-list	2006-07-07 12:41:36 UTC (rev 2453)
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+nm -g "$1"/*.o | grep "Java_" | cut -d ' ' -f3 | cut -c 1-

Copied: trunk/LWJGL/platform_build/macosx_ant/build.xml (from rev 2451, trunk/LWJGL/src/native/macosx/build.xml)
===================================================================
--- trunk/LWJGL/platform_build/macosx_ant/build.xml	                        (rev 0)
+++ trunk/LWJGL/platform_build/macosx_ant/build.xml	2006-07-07 12:41:36 UTC (rev 2453)
@@ -0,0 +1,82 @@
+<?xml version="1.0" ?>
+<project name="OS X Native code" basedir="../../bin" default="nativelibrary">
+	<property name="native" location="../src/native"/>
+
+	<target name="init">
+		<mkdir dir="ppc"/>
+		<mkdir dir="intel"/>
+	</target>
+	
+	<target name="clean">
+		<delete failonerror="false">
+			<fileset dir="intel"/>
+			<fileset dir="ppc"/>
+			<fileset dir="." includes="liblwjgl.jnilib"/>
+			<fileset dir="." includes="lwjgl.symbols"/>
+		</delete>
+	</target>
+
+	<target name="compile">
+		<apply dir="${dstdir}" executable="${compiler}" os="Mac OS X" skipemptyfilesets="true" failonerror="true" dest="${dstdir}">
+			<arg line="${cflags} -O2 -Wall -c -fPIC -I${sdkroot}/System/Library/Frameworks/JavaVM.framework/Versions/A/Headers -I${native}/common -I${native}/macosx"/>
+			<!-- Map from *.m and *.c to .o -->
+			<mapper type="regexp" from="^(.*)\.(c|m)" to="\1.o"/>
+			<fileset dir="${native}/macosx" includes="*.m"/>
+			<fileset dir="${native}/macosx" includes="*.c"/>
+			<fileset dir="${native}/common" includes="*.c"/>
+			<fileset dir="${native}/generated" includes="*.c"/>
+		</apply>
+	</target>
+	
+	<target name="link">
+		<apply dir="${objdir}" parallel="true" executable="${linker}" os="Mac OS X" failonerror="true" skipemptyfilesets="true">
+			<arg line="${linkerflags} -exported_symbols_list ../lwjgl.symbols -dynamiclib -o ${libname} -framework Foundation -framework AppKit -framework JavaVM -framework Carbon"/>
+			<fileset dir="${objdir}" includes="*.o"/>
+		</apply>
+		<apply dir="${objdir}" executable="strip" os="Mac OS X" failonerror="true">
+			<arg line="-S -X"/>
+			<fileset dir="." file="${libname}"/>
+		</apply>
+	</target>
+	
+	<target name="nativelibrary" depends="init">
+		<property name="universal_sdkroot" location="/Developer/SDKs/MacOSX10.4u.sdk"/>
+		<property name="legacy_sdkroot" location="/Developer/SDKs/MacOSX10.3.9.sdk"/>
+		<property name="universal_flags" value="-isysroot ${universal_sdkroot} -arch i386"/>
+		<antcall target="compile">
+			<param name="dstdir" location="intel"/>
+			<param name="compiler" value="gcc-4.0"/>
+			<param name="sdkroot" location="${universal_sdkroot}"/>
+			<param name="cflags" value="${universal_flags}"/>
+		</antcall>
+		<antcall target="compile">
+			<param name="dstdir" location="ppc"/>
+			<param name="compiler" value="gcc-3.3"/>
+			<param name="sdkroot" location="${legacy_sdkroot}"/>
+			<param name="cflags" value=""/>
+		</antcall>
+		<exec vmlauncher="false" executable="../platform_build/macosx_ant/build-symbol-list" output="lwjgl.symbols" failonerror="true">
+			<arg path="intel"/>
+		</exec>
+		<antcall target="link">
+			<param name="objdir" location="intel"/>
+			<param name="libname" value="liblwjgl-intel.jnilib"/>
+			<param name="linker" value="gcc-4.0"/>
+			<param name="linkerflags" value="${universal_flags}"/>
+		</antcall>
+		<antcall target="link">
+			<param name="objdir" location="ppc"/>
+			<param name="libname" value="liblwjgl-ppc.jnilib"/>
+			<param name="linker" value="gcc-3.3"/>
+			<param name="linkerflags" value=""/>
+		</antcall>
+		<apply dir="." parallel="true" executable="lipo" os="Mac OS X" failonerror="true" skipemptyfilesets="true" >
+			<arg value="-create"/>
+			<srcfile/>
+			<arg value="-output"/>
+			<arg path="liblwjgl.jnilib"/>
+			<fileset file="ppc/liblwjgl-ppc.jnilib"/>
+			<fileset file="intel/liblwjgl-intel.jnilib"/>
+		</apply>
+	</target>
+</project>

Deleted: trunk/LWJGL/src/native/macosx/build-symbol-list
===================================================================
--- trunk/LWJGL/src/native/macosx/build-symbol-list	2006-07-07 11:47:56 UTC (rev 2452)
+++ trunk/LWJGL/src/native/macosx/build-symbol-list	2006-07-07 12:41:36 UTC (rev 2453)
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-nm -g intel/*.o | grep "Java_" | cut -d ' ' -f3 | cut -c 1-

Deleted: trunk/LWJGL/src/native/macosx/build.xml
===================================================================
--- trunk/LWJGL/src/native/macosx/build.xml	2006-07-07 11:47:56 UTC (rev 2452)
+++ trunk/LWJGL/src/native/macosx/build.xml	2006-07-07 12:41:36 UTC (rev 2453)
@@ -1,76 +0,0 @@
-<?xml version="1.0" ?>
-<project name="OS X Native code" basedir="." default="nativelibrary">
-	<target name="init">
-		<mkdir dir="ppc"/>
-		<mkdir dir="intel"/>
-	</target>
-	
-	<target name="clean">
-		<delete failonerror="false">
-			<fileset dir="intel"/>
-			<fileset dir="ppc"/>
-			<fileset dir="." includes="liblwjgl.jnilib"/>
-		</delete>
-	</target>
-
-	<target name="compile">
-		<apply dir="${dstdir}" executable="${compiler}" os="Mac OS X" skipemptyfilesets="true" failonerror="true" dest="${dstdir}">
-			<arg line="${cflags} -O2 -Wall -c -fPIC -I${sdkroot}/System/Library/Frameworks/JavaVM.framework/Versions/A/Headers -I../../common -I.."/>
-			<mapper type="regexp" from="^(.*)\.(c|m)" to="\1.o"/>
-			<fileset dir="." includes="*.m"/>
-			<fileset dir="." includes="*.c"/>
-			<fileset dir="../common" includes="*.c"/>
-			<fileset dir="../generated" includes="*.c"/>
-		</apply>
-	</target>
-	
-	<target name="link">
-		<apply dir="${objdir}" parallel="true" executable="${linker}" os="Mac OS X" failonerror="true" skipemptyfilesets="true">
-			<arg line="${linkerflags} -exported_symbols_list ../lwjgl.symbols -dynamiclib -o ${libname} -framework Foundation -framework AppKit -framework JavaVM -framework Carbon"/>
-			<fileset dir="${objdir}" includes="*.o"/>
-		</apply>
-		<apply dir="${objdir}" executable="strip" os="Mac OS X" failonerror="true">
-			<arg line="-S -X"/>
-			<fileset dir="." file="${libname}"/>
-		</apply>
-	</target>
-	
-	<target name="nativelibrary" depends="init">
-		<property name="universal_sdkroot" location="/Developer/SDKs/MacOSX10.4u.sdk"/>
-		<property name="legacy_sdkroot" location="/Developer/SDKs/MacOSX10.3.9.sdk"/>
-		<property name="universal_flags" value="-isysroot ${universal_sdkroot} -arch i386"/>
-		<antcall target="compile">
-			<param name="dstdir" location="intel"/>
-			<param name="compiler" value="gcc-4.0"/>
-			<param name="sdkroot" location="${universal_sdkroot}"/>
-			<param name="cflags" value="${universal_flags}"/>
-		</antcall>
-		<antcall target="compile">
-			<param name="dstdir" location="ppc"/>
-			<param name="compiler" value="gcc-3.3"/>
-			<param name="sdkroot" location="${legacy_sdkroot}"/>
-			<param name="cflags" value=""/>
-		</antcall>
-		<exec executable="./build-symbol-list" output="lwjgl.symbols"/>
-		<antcall target="link">
-			<param name="objdir" location="intel"/>
-			<param name="libname" value="liblwjgl-intel.jnilib"/>
-			<param name="linker" value="gcc-4.0"/>
-			<param name="linkerflags" value="${universal_flags}"/>
-		</antcall>
-		<antcall target="link">
-			<param name="objdir" location="ppc"/>
-			<param name="libname" value="liblwjgl-ppc.jnilib"/>
-			<param name="linker" value="gcc-3.3"/>
-			<param name="linkerflags" value=""/>
-		</antcall>
-		<apply dir="." parallel="true" executable="lipo" os="Mac OS X" failonerror="true" skipemptyfilesets="true" >
-			<arg value="-create"/>
-			<srcfile/>
-			<arg value="-output"/>
-			<arg path="liblwjgl.jnilib"/>
-			<fileset file="ppc/liblwjgl-ppc.jnilib"/>
-			<fileset file="intel/liblwjgl-intel.jnilib"/>
-		</apply>
-	</target>
-</project>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2452
Author:   elias_naur
Date:     2006-07-07 04:47:56 -0700 (Fri, 07 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2452&view=rev

Log Message:
-----------
Commented out cvsbuild target - using it will propbably cause confusion

Modified Paths:
--------------
    trunk/LWJGL/build.xml
Modified: trunk/LWJGL/build.xml
===================================================================
--- trunk/LWJGL/build.xml	2006-07-07 11:00:32 UTC (rev 2451)
+++ trunk/LWJGL/build.xml	2006-07-07 11:47:56 UTC (rev 2452)
@@ -747,19 +747,19 @@
   </target> 	
 	 
 	<!-- Creates a build of LWJGL directly from CVS -->
-	<target name="cvsbuild" description="Builds lwjgl from cvs">
+	<!--	<target name="cvsbuild" description="Builds lwjgl from cvs">-->
 		<!-- Check that files do not exist BEFORE doing the CVS build -->
-		<available file="LWJGL/build.xml" property="lwjgl.preexistingfiles" />
+		<!--		<available file="LWJGL/build.xml" property="lwjgl.preexistingfiles" />
 		<available file="${lwjgl.src}/java/org/lwjgl/Sys.java" property="lwjgl.preexistingfiles" />
-		<fail if="lwjgl.preexistingfiles" message="Cannot perform webbuild from nonempty folder" />
+		<fail if="lwjgl.preexistingfiles" message="Cannot perform webbuild from nonempty folder" />-->
 
 		<!-- checkout files and build using checked out buildfiles 'all' target -->
-		<cvs command="export -D 'now'" compressionlevel="3" cvsRoot=":pserver:ano...@cv...:/cvsroot/java-game-lib" package="LWJGL/build.xml" dest="." />
+		<!--		<cvs command="export -D 'now'" compressionlevel="3" cvsRoot=":pserver:ano...@cv...:/cvsroot/java-game-lib" package="LWJGL/build.xml" dest="." />
 		<cvs command="export -D 'now'" compressionlevel="3" cvsRoot=":pserver:ano...@cv...:/cvsroot/java-game-lib" package="LWJGL/src" dest="." />
 		<cvs command="export -D 'now'" compressionlevel="3" cvsRoot=":pserver:ano...@cv...:/cvsroot/java-game-lib" package="LWJGL/doc" dest="." />
 		<ant dir="LWJGL" target="compile_native_all" />
 		<ant dir="LWJGL" target="release" />
-	</target>	 
+	</target>	 -->
 	
 	<!-- -->
 	<target name="sign" description="Using released files, creates the necessary files used for jnlp demos">


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2451
Author:   elias_naur
Date:     2006-07-07 04:00:32 -0700 (Fri, 07 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2451&view=rev

Log Message:
-----------
Added linux specific build.xml for building liblwjgl.so. Moved FMOD and Devil native builds to compile_native_optional ant target

Modified Paths:
--------------
    trunk/LWJGL/build.xml

Added Paths:
-----------
    trunk/LWJGL/platform_build/linux_ant/
    trunk/LWJGL/platform_build/linux_ant/build.xml
Modified: trunk/LWJGL/build.xml
===================================================================
--- trunk/LWJGL/build.xml	2006-07-07 10:38:54 UTC (rev 2450)
+++ trunk/LWJGL/build.xml	2006-07-07 11:00:32 UTC (rev 2451)
@@ -1,4 +1,4 @@
-<project name="LWJGL" default="compile" basedir=".">
+<project name="LWJGL" default="all" basedir=".">
 
 	<!-- ================================================================== -->
 	<!-- Global properties for build 																				-->
@@ -249,10 +249,7 @@
 	<target name="clean" description="Cleans the diectories controlled by this ant script">
 		<delete dir="${lwjgl.temp}" quiet="true" failonerror="false" taskname="cleaning temp folder" />
 		<delete dir="${lwjgl.docs}/javadoc" quiet="true" failonerror="false" taskname="cleaning javadoc folder" />
-		<delete dir="${lwjgl.bin}/org" quiet="true" failonerror="false" taskname="cleaning bin folder" />
-		<delete taskname="cleaning bin folder" failonerror="false">
-			<fileset dir="${lwjgl.bin}" includes="*.class" />
-		</delete>
+		<delete dir="${lwjgl.bin}" quiet="true" failonerror="false" taskname="cleaning bin folder" />
 	</target>
 	
 	<!-- Creates a distribution of LWJGL -->
@@ -297,6 +294,8 @@
 		<antcall target="-distribute" />
 	</target>
 
+	<target name="all" description="Creates the Java archives and the natives for the current platform" depends="jars, compile_native"/>
+
 	<!-- Create ONLY the jar archives -->
 	<target name="jars" description="Creates the Java archives ONLY and places them in libs/" depends="-initialize, compile, -createjars">
 		<move todir="libs/">
@@ -465,7 +464,7 @@
 	</target>
 	
 	<!-- Compiles the Java source code -->
-	<target name="compile" description="Compiles the java source code">
+	<target name="compile" description="Compiles the java source code" depends="-initialize">
 		<javac debug="yes" destdir="${lwjgl.bin}" includes="org/lwjgl/opengl/**" source="1.4" target="1.4" classpath="${lwjgl.lib}/jinput.jar" taskname="core">
 			<src path="${lwjgl.src}/java/"/>
 			<src path="${lwjgl.src}/generated/"/>
@@ -632,6 +631,8 @@
 		</apply>
 	</target>
 
+	<target name="compile_native_all" depends="compile_native, compile_native_optional" description="Compiles the native files"/>
+
 	<!-- Compiles the native files -->
 	<target name="compile_native" depends="headers" description="Compiles the native files">
 		<!-- check each platform, and run their build target -->
@@ -650,7 +651,16 @@
 		</condition>
 		<antcall target="-compile_native_mac" />
 	</target>	
+
+	<target name="compile_native_optional" depends="headers" description="Compiles the native files">
+		<!-- check each platform, and run their build target -->
+		<condition property="lwjgl.platform.linux">
+			<os name="Linux" />
+		</condition>
+		<antcall target="-compile_native_linux_optional" />
+	</target>	
 	
+	
 	<!-- Compiles LWJGL on Win32 platforms  -->
 	<target name="-compile_native_win32" if="lwjgl.platform.windows">
 		<echo>Compiling Win32 LWJGL version</echo>
@@ -695,9 +705,12 @@
 
 	<!-- Compiles LWJGL on Linux platforms -->
 	<target name="-compile_native_linux" if="lwjgl.platform.linux">
-		<echo>Compiling Linux LWJGL version</echo>
+		<ant antfile="platform_build/linux_ant/build.xml" inheritAll="false"/>
+		<copy file="${lwjgl.bin}/liblwjgl.so" tofile="${lwjgl.lib}/linux/liblwjgl.so" />
+	</target>
 
-		<!-- check for required properties -->
+	<target name="-compile_native_linux_optional" if="lwjgl.platform.linux">
+				<!-- check for required properties -->
 		<property environment="env"/>
 		<fail message="Missing JAVA_HOME path environment property" unless="env.JAVA_HOME"/>		
 		<fail message="Missing FMOD path environment property" unless="env.FMOD"/>		
@@ -709,7 +722,6 @@
 		<exec executable="make" dir="${lwjgl.src.native}/common/fmod3">
                         <arg line="-f Makefile.linux"/>
                 </exec>
-		<move file="${lwjgl.src.native}/linux/liblwjgl.so" tofile="${lwjgl.lib}/linux/liblwjgl.so" />
 		<move file="${lwjgl.src.native}/common/devil/liblwjgl-devil.so" tofile="${lwjgl.lib}/linux/liblwjgl-devil.so" />
 		<move file="${lwjgl.src.native}/common/fmod3/liblwjgl-fmod3.so" tofile="${lwjgl.lib}/linux/liblwjgl-fmod3.so" />
 	</target>
@@ -745,12 +757,12 @@
 		<cvs command="export -D 'now'" compressionlevel="3" cvsRoot=":pserver:ano...@cv...:/cvsroot/java-game-lib" package="LWJGL/build.xml" dest="." />
 		<cvs command="export -D 'now'" compressionlevel="3" cvsRoot=":pserver:ano...@cv...:/cvsroot/java-game-lib" package="LWJGL/src" dest="." />
 		<cvs command="export -D 'now'" compressionlevel="3" cvsRoot=":pserver:ano...@cv...:/cvsroot/java-game-lib" package="LWJGL/doc" dest="." />
-		<ant dir="LWJGL" target="compile_native" />
+		<ant dir="LWJGL" target="compile_native_all" />
 		<ant dir="LWJGL" target="release" />
 	</target>	 
 	
 	<!-- -->
-	<target name="sign" description="Using relased files, creates the nescesarry files used for jnlp demos">
+	<target name="sign" description="Using released files, creates the necessary files used for jnlp demos">
 		<!-- delete existing temp -->
 		<delete dir="${lwjgl.temp}"/>		
 		

Added: trunk/LWJGL/platform_build/linux_ant/build.xml
===================================================================
--- trunk/LWJGL/platform_build/linux_ant/build.xml	                        (rev 0)
+++ trunk/LWJGL/platform_build/linux_ant/build.xml	2006-07-07 11:00:32 UTC (rev 2451)
@@ -0,0 +1,39 @@
+<?xml version="1.0"?>
+
+<project name="lwjgl native code, linux" basedir="../../bin" default="compile">
+	<property name="native" location="../src/native"/>
+	<property name="libname" value="liblwjgl.so"/>
+	<property name="libs" value="-L/usr/X11R6/lib -L/usr/X11/lib -lm -lX11 -lXext -lpthread -L${java.home}/lib/i386 -ljawt -Wl,-static,-lXxf86vm,-lXcursor,-lXrender,-lXrandr,-lXfixes,-call_shared"/>
+	<property name="cflags" value="-O2 -Wall -c -fPIC -std=c99 -pthread"/>
+	<property name="linker_flags" value="-Wl,--version-script=${native}/linux/lwjgl.map -shared -O2 -Wall -o ${libname} ${libs}"/>
+	
+	<target name="clean">
+		<delete>
+			<fileset dir="." includes="*.o"/>
+			<fileset file="${libname}"/>
+		</delete>
+	</target>
+	
+    <target name="compile">
+		<apply dir="." executable="cc" dest="." skipemptyfilesets="true" failonerror="true">
+			<arg line="${cflags}"/>
+			<arg value="-I${java.home}/include"/>
+			<arg value="-I${java.home}/include/linux"/>
+			<arg value="-I${native}/common"/>
+			<arg value="-I${native}/linux"/>
+			<mapper type="glob" from="*.c" to="*.o"/>
+			<fileset dir="${native}/linux" includes="*.c"/>
+			<fileset dir="${native}/generated" includes="*.c"/>
+			<fileset dir="${native}/common" includes="*.c"/>
+		</apply>
+		<apply dir="." parallel="true" executable="cc" failonerror="true">
+			<srcfile/>
+			<arg line="${linker_flags}"/>
+			<fileset dir="." includes="*.o"/>
+		</apply>
+		<apply dir="." parallel="true" executable="strip" failonerror="true">
+			<fileset file="${libname}"/>
+		</apply>
+    </target>
+</project>
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2450
Author:   elias_naur
Date:     2006-07-07 03:38:54 -0700 (Fri, 07 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2450&view=rev

Log Message:
-----------
Made build.xml use location in properties where appropriate

Modified Paths:
--------------
    trunk/LWJGL/build.xml
Modified: trunk/LWJGL/build.xml
===================================================================
--- trunk/LWJGL/build.xml	2006-07-07 10:36:26 UTC (rev 2449)
+++ trunk/LWJGL/build.xml	2006-07-07 10:38:54 UTC (rev 2450)
@@ -3,16 +3,16 @@
 	<!-- ================================================================== -->
 	<!-- Global properties for build 																				-->
 	<!-- ================================================================== -->
-	<property name="lwjgl.src" 			value="./src" />
-	<property name="lwjgl.src.native" 	value="${lwjgl.src}/native" />
-	<property name="lwjgl.src.headers" 	value="${lwjgl.src.native}/common" />
-	<property name="lwjgl.src.templates"	value="${lwjgl.src}/templates" />
-	<property name="lwjgl.bin" 			value="./bin" />
-	<property name="lwjgl.lib" 			value="./libs" />
-	<property name="lwjgl.dist" 			value="./dist" />
-	<property name="lwjgl.docs" 			value="./doc" />
-	<property name="lwjgl.temp" 			value="./temp" />
-	<property name="lwjgl.res" 			value="./res" />
+	<property name="lwjgl.src" 			location="src" />
+	<property name="lwjgl.src.native" 	location="${lwjgl.src}/native" />
+	<property name="lwjgl.src.headers" 	location="${lwjgl.src.native}/common" />
+	<property name="lwjgl.src.templates"	location="${lwjgl.src}/templates" />
+	<property name="lwjgl.bin" 			location="bin" />
+	<property name="lwjgl.lib" 			location="libs" />
+	<property name="lwjgl.dist" 			location="dist" />
+	<property name="lwjgl.docs" 			location="doc" />
+	<property name="lwjgl.temp" 			location="temp" />
+	<property name="lwjgl.res" 			location="res" />
 	<property name="lwjgl.version" 		value="1.0beta2" />
 
 	<property name="opengl-template-pattern" value="org/lwjgl/opengl/GL*.java,org/lwjgl/opengl/ARB*.java,org/lwjgl/opengl/ATI*.java,org/lwjgl/opengl/EXT*.java,org/lwjgl/opengl/NV*.java,org/lwjgl/opengl/HP*.java,org/lwjgl/opengl/IBM*.java,org/lwjgl/opengl/SUN*.java"/>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 2449
Author:   elias_naur
Date:     2006-07-07 03:36:26 -0700 (Fri, 07 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/java-game-lib/?rev=2449&view=rev

Log Message:
-----------
Added a native NewStringNativeUnsigned to avoid compile warnings

Modified Paths:
--------------
    trunk/LWJGL/src/generated/org/lwjgl/opengl/ATITextFragmentShader.java
    trunk/LWJGL/src/generated/org/lwjgl/opengl/EXTTimerQuery.java
    trunk/LWJGL/src/java/org/lwjgl/util/generator/NativeMethodStubsGenerator.java
    trunk/LWJGL/src/native/common/common_tools.c
    trunk/LWJGL/src/native/common/common_tools.h
    trunk/LWJGL/src/native/generated/org_lwjgl_openal_AL10.c
    trunk/LWJGL/src/native/generated/org_lwjgl_opengl_EXTTimerQuery.c
    trunk/LWJGL/src/native/generated/org_lwjgl_opengl_GL11.c
Modified: trunk/LWJGL/src/generated/org/lwjgl/opengl/ATITextFragmentShader.java
===================================================================
--- trunk/LWJGL/src/generated/org/lwjgl/opengl/ATITextFragmentShader.java	2006-07-05 10:47:15 UTC (rev 2448)
+++ trunk/LWJGL/src/generated/org/lwjgl/opengl/ATITextFragmentShader.java	2006-07-07 10:36:26 UTC (rev 2449)
@@ -1,24 +1,24 @@
-/* MACHINE GENERATED FILE, DO NOT EDIT */
-
-package org.lwjgl.opengl;
-
-import org.lwjgl.LWJGLException;
-import org.lwjgl.BufferChecks;
-import java.nio.*;
-
-public final class ATITextFragmentShader {
-	/**
-	 * Accepted by the <cap> parameter of Disable, Enable, and IsEnabled,
-	 * and by the <pname> parameter of GetBooleanv, GetIntegerv, GetFloatv,
-	 * and GetDoublev, and by the <target> parameter of ProgramStringARB,
-	 * BindProgramARB, ProgramEnvParameter4{d,dv,f,fv}ARB,
-	 * ProgramLocalParameter4{d,dv,f,fv}ARB,
-	 * GetProgramEnvParameter{dv,fv}ARB, GetProgramLocalParameter{dv,fv}ARB,
-	 * GetProgramivARB, GetProgramfvATI, and GetProgramStringARB.
-	 */
-	public static final int GL_TEXT_FRAGMENT_SHADER_ATI = 0x8200;
-
-	private ATITextFragmentShader() {
-	}
-
-}
+/* MACHINE GENERATED FILE, DO NOT EDIT */
+
+package org.lwjgl.opengl;
+
+import org.lwjgl.LWJGLException;
+import org.lwjgl.BufferChecks;
+import java.nio.*;
+
+public final class ATITextFragmentShader {
+	/**
+	 * Accepted by the <cap> parameter of Disable, Enable, and IsEnabled,
+	 * and by the <pname> parameter of GetBooleanv, GetIntegerv, GetFloatv,
+	 * and GetDoublev, and by the <target> parameter of ProgramStringARB,
+	 * BindProgramARB, ProgramEnvParameter4{d,dv,f,fv}ARB,
+	 * ProgramLocalParameter4{d,dv,f,fv}ARB,
+	 * GetProgramEnvParameter{dv,fv}ARB, GetProgramLocalParameter{dv,fv}ARB,
+	 * GetProgramivARB, GetProgramfvATI, and GetProgramStringARB.
+	 */
+	public static final int GL_TEXT_FRAGMENT_SHADER_ATI = 0x8200;
+
+	private ATITextFragmentShader() {
+	}
+
+}

Modified: trunk/LWJGL/src/generated/org/lwjgl/opengl/EXTTimerQuery.java
===================================================================
--- trunk/LWJGL/src/generated/org/lwjgl/opengl/EXTTimerQuery.java	2006-07-05 10:47:15 UTC (rev 2448)
+++ trunk/LWJGL/src/generated/org/lwjgl/opengl/EXTTimerQuery.java	2006-07-07 10:36:26 UTC (rev 2449)
@@ -1,35 +1,35 @@
-/* MACHINE GENERATED FILE, DO NOT EDIT */
-
-package org.lwjgl.opengl;
-
-import org.lwjgl.LWJGLException;
-import org.lwjgl.BufferChecks;
-import java.nio.*;
-
-public final class EXTTimerQuery {
-	/**
-	 * Accepted by the <target> parameter of BeginQuery, EndQuery, and
-	 * GetQueryiv:
-	 */
-	public static final int GL_TIME_ELAPSED_EXT = 0x88bf;
-
-	private EXTTimerQuery() {
-	}
-
-
-	public static void glGetQueryObjecti64EXT(int id, int pname, LongBuffer params) {
-		long function_pointer = GLContext.getCapabilities().EXT_timer_query_glGetQueryObjecti64vEXT_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		BufferChecks.checkBuffer(params, 1);
-		nglGetQueryObjecti64vEXT(id, pname, params, params.position(), function_pointer);
-	}
-	private static native void nglGetQueryObjecti64vEXT(int id, int pname, LongBuffer params, int params_position, long function_pointer);
-
-	public static void glGetQueryObjectui64EXT(int id, int pname, LongBuffer params) {
-		long function_pointer = GLContext.getCapabilities().EXT_timer_query_glGetQueryObjectui64vEXT_pointer;
-		BufferChecks.checkFunctionAddress(function_pointer);
-		BufferChecks.checkBuffer(params, 1);
-		nglGetQueryObjectui64vEXT(id, pname, params, params.position(), function_pointer);
-	}
-	private static native void nglGetQueryObjectui64vEXT(int id, int pname, LongBuffer params, int params_position, long function_pointer);
-}
+/* MACHINE GENERATED FILE, DO NOT EDIT */
+
+package org.lwjgl.opengl;
+
+import org.lwjgl.LWJGLException;
+import org.lwjgl.BufferChecks;
+import java.nio.*;
+
+public final class EXTTimerQuery {
+	/**
+	 * Accepted by the <target> parameter of BeginQuery, EndQuery, and
+	 * GetQueryiv:
+	 */
+	public static final int GL_TIME_ELAPSED_EXT = 0x88bf;
+
+	private EXTTimerQuery() {
+	}
+
+
+	public static void glGetQueryObjectEXT(int id, int pname, LongBuffer params) {
+		long function_pointer = GLContext.getCapabilities().EXT_timer_query_glGetQueryObjecti64vEXT_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		BufferChecks.checkBuffer(params, 1);
+		nglGetQueryObjecti64vEXT(id, pname, params, params.position(), function_pointer);
+	}
+	private static native void nglGetQueryObjecti64vEXT(int id, int pname, LongBuffer params, int params_position, long function_pointer);
+
+	public static void glGetQueryObjectuEXT(int id, int pname, LongBuffer params) {
+		long function_pointer = GLContext.getCapabilities().EXT_timer_query_glGetQueryObjectui64vEXT_pointer;
+		BufferChecks.checkFunctionAddress(function_pointer);
+		BufferChecks.checkBuffer(params, 1);
+		nglGetQueryObjectui64vEXT(id, pname, params, params.position(), function_pointer);
+	}
+	private static native void nglGetQueryObjectui64vEXT(int id, int pname, LongBuffer params, int params_position, long function_pointer);
+}

Modified: trunk/LWJGL/src/java/org/lwjgl/util/generator/NativeMethodStubsGenerator.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/util/generator/NativeMethodStubsGenerator.java	2006-07-05 10:47:15 UTC (rev 2448)
+++ trunk/LWJGL/src/java/org/lwjgl/util/generator/NativeMethodStubsGenerator.java	2006-07-07 10:36:26 UTC (rev 2449)
@@ -141,7 +141,7 @@
 				else
 					writer.print("safeNewBuffer(env, ");
 			} else if (String.class.equals(java_result_type))
-				writer.print("NewStringNative(env, ");
+				writer.print("NewStringNativeUnsigned(env, ");
 			writer.print(Utils.RESULT_VAR_NAME);
 			if (Buffer.class.isAssignableFrom(java_result_type)) {
 				writer.print(", ");

Modified: trunk/LWJGL/src/native/common/common_tools.c
===================================================================
--- trunk/LWJGL/src/native/common/common_tools.c	2006-07-05 10:47:15 UTC (rev 2448)
+++ trunk/LWJGL/src/native/common/common_tools.c	2006-07-07 10:36:26 UTC (rev 2449)
@@ -197,6 +197,13 @@
   return (char*) result;
 }
 
+/* creates locale specific string, unsigned argument to
+ * match GLuchar and ALuchar types
+ */
+jstring NewStringNativeUnsigned(JNIEnv *env, const unsigned char *str) {
+	return NewStringNative(env, (const char *)str);
+}
+
 // creates locale specific string
 jstring NewStringNative(JNIEnv *env, const char *str) { 
   jclass jcls_str;

Modified: trunk/LWJGL/src/native/common/common_tools.h
===================================================================
--- trunk/LWJGL/src/native/common/common_tools.h	2006-07-05 10:47:15 UTC (rev 2448)
+++ trunk/LWJGL/src/native/common/common_tools.h	2006-07-07 10:36:26 UTC (rev 2449)
@@ -137,6 +137,7 @@
 extern bool getBooleanProperty(JNIEnv *env, const char* propertyName);
 extern char * GetStringNativeChars(JNIEnv *env, jstring jstr);
 extern jstring NewStringNative(JNIEnv *env, const char *str);
+extern jstring NewStringNativeUnsigned(JNIEnv *env, const unsigned char *str);
 extern jobject newJavaManagedByteBuffer(JNIEnv *env, const int size);
 extern bool positionBuffer(JNIEnv *env, jobject buffer, jint position);
 

Modified: trunk/LWJGL/src/native/generated/org_lwjgl_openal_AL10.c
===================================================================
--- trunk/LWJGL/src/native/generated/org_lwjgl_openal_AL10.c	2006-07-05 10:47:15 UTC (rev 2448)
+++ trunk/LWJGL/src/native/generated/org_lwjgl_openal_AL10.c	2006-07-07 10:36:26 UTC (rev 2449)
@@ -155,7 +155,7 @@
 
 static jobject JNICALL Java_org_lwjgl_openal_AL10_alGetString(JNIEnv *env, jclass clazz, jint pname) {
 	ALubyte * __result = alGetString(pname);
-	return NewStringNative(env, __result);
+	return NewStringNativeUnsigned(env, __result);
 }
 
 static jint JNICALL Java_org_lwjgl_openal_AL10_alGetError(JNIEnv *env, jclass clazz) {

Modified: trunk/LWJGL/src/native/generated/org_lwjgl_opengl_EXTTimerQuery.c
===================================================================
--- trunk/LWJGL/src/native/generated/org_lwjgl_opengl_EXTTimerQuery.c	2006-07-05 10:47:15 UTC (rev 2448)
+++ trunk/LWJGL/src/native/generated/org_lwjgl_opengl_EXTTimerQuery.c	2006-07-07 10:36:26 UTC (rev 2449)
@@ -1,20 +1,20 @@
-/* MACHINE GENERATED FILE, DO NOT EDIT */
-
-#include <jni.h>
-#include "extgl.h"
-
-typedef void (APIENTRY *glGetQueryObjecti64vEXTPROC) (GLuint id, GLenum pname, GLint64EXT * params);
-typedef void (APIENTRY *glGetQueryObjectui64vEXTPROC) (GLuint id, GLenum pname, GLuint64EXT * params);
-
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTTimerQuery_nglGetQueryObjecti64vEXT(JNIEnv *env, jclass clazz, jint id, jint pname, jobject params, jint params_position, jlong function_pointer) {
-	GLint64EXT *params_address = ((GLint64EXT *)(*env)->GetDirectBufferAddress(env, params)) + params_position;
-	glGetQueryObjecti64vEXTPROC glGetQueryObjecti64vEXT = (glGetQueryObjecti64vEXTPROC)((intptr_t)function_pointer);
-	glGetQueryObjecti64vEXT(id, pname, params_address);
-}
-
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTTimerQuery_nglGetQueryObjectui64vEXT(JNIEnv *env, jclass clazz, jint id, jint pname, jobject params, jint params_position, jlong function_pointer) {
-	GLuint64EXT *params_address = ((GLuint64EXT *)(*env)->GetDirectBufferAddress(env, params)) + params_position;
-	glGetQueryObjectui64vEXTPROC glGetQueryObjectui64vEXT = (glGetQueryObjectui64vEXTPROC)((intptr_t)function_pointer);
-	glGetQueryObjectui64vEXT(id, pname, params_address);
-}
-
+/* MACHINE GENERATED FILE, DO NOT EDIT */
+
+#include <jni.h>
+#include "extgl.h"
+
+typedef void (APIENTRY *glGetQueryObjecti64vEXTPROC) (GLuint id, GLenum pname, GLint64EXT * params);
+typedef void (APIENTRY *glGetQueryObjectui64vEXTPROC) (GLuint id, GLenum pname, GLuint64EXT * params);
+
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTTimerQuery_nglGetQueryObjecti64vEXT(JNIEnv *env, jclass clazz, jint id, jint pname, jobject params, jint params_position, jlong function_pointer) {
+	GLint64EXT *params_address = ((GLint64EXT *)(*env)->GetDirectBufferAddress(env, params)) + params_position;
+	glGetQueryObjecti64vEXTPROC glGetQueryObjecti64vEXT = (glGetQueryObjecti64vEXTPROC)((intptr_t)function_pointer);
+	glGetQueryObjecti64vEXT(id, pname, params_address);
+}
+
+JNIEXPORT void JNICALL Java_org_lwjgl_opengl_EXTTimerQuery_nglGetQueryObjectui64vEXT(JNIEnv *env, jclass clazz, jint id, jint pname, jobject params, jint params_position, jlong function_pointer) {
+	GLuint64EXT *params_address = ((GLuint64EXT *)(*env)->GetDirectBufferAddress(env, params)) + params_position;
+	glGetQueryObjectui64vEXTPROC glGetQueryObjectui64vEXT = (glGetQueryObjectui64vEXTPROC)((intptr_t)function_pointer);
+	glGetQueryObjectui64vEXT(id, pname, params_address);
+}
+

Modified: trunk/LWJGL/src/native/generated/org_lwjgl_opengl_GL11.c
===================================================================
--- trunk/LWJGL/src/native/generated/org_lwjgl_opengl_GL11.c	2006-07-05 10:47:15 UTC (rev 2448)
+++ trunk/LWJGL/src/native/generated/org_lwjgl_opengl_GL11.c	2006-07-07 10:36:26 UTC (rev 2449)
@@ -843,7 +843,7 @@
 JNIEXPORT jobject JNICALL Java_org_lwjgl_opengl_GL11_nglGetString(JNIEnv *env, jclass clazz, jint name, jlong function_pointer) {
 	glGetStringPROC glGetString = (glGetStringPROC)((intptr_t)function_pointer);
 	const GLubyte * __result = glGetString(name);
-	return NewStringNative(env, __result);
+	return NewStringNativeUnsigned(env, __result);
 }
 
 JNIEXPORT void JNICALL Java_org_lwjgl_opengl_GL11_nglGetPolygonStipple(JNIEnv *env, jclass clazz, jobject mask, jint mask_position, jlong function_pointer) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.