Menu
▾
▴
java-game-lib-cvs — Commits to the repository will be send to this list.
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(134) |
Sep
(52) |
Oct
(13) |
Nov
(342) |
Dec
(163) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(44) |
Feb
(62) |
Mar
(158) |
Apr
(38) |
May
(70) |
Jun
(58) |
Jul
(104) |
Aug
(207) |
Sep
(83) |
Oct
(122) |
Nov
(23) |
Dec
(49) |
| 2004 |
Jan
(119) |
Feb
(132) |
Mar
(192) |
Apr
(140) |
May
(77) |
Jun
(74) |
Jul
(201) |
Aug
(63) |
Sep
(102) |
Oct
(70) |
Nov
(173) |
Dec
(78) |
| 2005 |
Jan
(174) |
Feb
(197) |
Mar
(105) |
Apr
(59) |
May
(77) |
Jun
(43) |
Jul
(21) |
Aug
(18) |
Sep
(47) |
Oct
(37) |
Nov
(74) |
Dec
(50) |
| 2006 |
Jan
(44) |
Feb
(19) |
Mar
(32) |
Apr
(24) |
May
(31) |
Jun
(55) |
Jul
(138) |
Aug
(28) |
Sep
(12) |
Oct
(41) |
Nov
(58) |
Dec
(24) |
| 2007 |
Jan
(28) |
Feb
(14) |
Mar
(10) |
Apr
(68) |
May
(30) |
Jun
(26) |
Jul
(18) |
Aug
(63) |
Sep
(19) |
Oct
(29) |
Nov
(20) |
Dec
(10) |
| 2008 |
Jan
(38) |
Feb
(7) |
Mar
(37) |
Apr
(120) |
May
(41) |
Jun
(36) |
Jul
(39) |
Aug
(24) |
Sep
(28) |
Oct
(30) |
Nov
(36) |
Dec
(75) |
| 2009 |
Jan
(46) |
Feb
(22) |
Mar
(50) |
Apr
(70) |
May
(134) |
Jun
(105) |
Jul
(75) |
Aug
(34) |
Sep
(38) |
Oct
(34) |
Nov
(19) |
Dec
(20) |
| 2010 |
Jan
(11) |
Feb
(20) |
Mar
(65) |
Apr
(83) |
May
(104) |
Jun
(73) |
Jul
(78) |
Aug
(57) |
Sep
(43) |
Oct
(35) |
Nov
(9) |
Dec
(4) |
| 2011 |
Jan
(21) |
Feb
(11) |
Mar
(18) |
Apr
(10) |
May
(18) |
Jun
(15) |
Jul
(48) |
Aug
(25) |
Sep
(17) |
Oct
(45) |
Nov
(15) |
Dec
(12) |
| 2012 |
Jan
(21) |
Feb
(9) |
Mar
(12) |
Apr
(9) |
May
(9) |
Jun
(5) |
Jul
(1) |
Aug
(10) |
Sep
(12) |
Oct
(1) |
Nov
(28) |
Dec
(5) |
| 2013 |
Jan
(4) |
Feb
(1) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2014 |
Jan
|
Feb
(1) |
Mar
(1) |
Apr
|
May
(2) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(1) |
Nov
|
Dec
|
| 2015 |
Jan
(1) |
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
(2) |
Nov
|
Dec
|
| 2016 |
Jan
(2) |
Feb
(1) |
Mar
(1) |
Apr
(1) |
May
(2) |
Jun
|
Jul
(1) |
Aug
(2) |
Sep
|
Oct
|
Nov
(1) |
Dec
|
| 2017 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| S | M | T | W | T | F | S |
|---|---|---|---|---|---|---|
|
|
|
|
|
|
|
1
|
|
2
(2) |
3
(3) |
4
|
5
|
6
(1) |
7
|
8
|
|
9
|
10
(2) |
11
|
12
|
13
(1) |
14
(1) |
15
|
|
16
|
17
(1) |
18
(1) |
19
|
20
(1) |
21
|
22
(2) |
|
23
(1) |
24
|
25
(7) |
26
|
27
|
28
|
29
|
|
30
|
|
|
|
|
|
|
|
From: Brian M. <ma...@us...> - 2003-11-25 22:34:10
|
Update of /cvsroot/java-game-lib/LWJGL In directory sc8-pr-cvs1:/tmp/cvs-serv11830 Modified Files: build.xml Log Message: better !win32 support Index: build.xml CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/build.xml =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/build.xml,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- build.xml 22 Nov 2003 22:30:37 -0000 1.12 +++ build.xml 25 Nov 2003 22:34:07 -0000 1.13 @@ -1,12 +1,13 @@ -<project name="LWJGL" default="compile" basedir="."> +<project name="LWJGL" default="compile_java" basedir="."> <!-- ================================================================== --> <!-- Global properties for build --> <!-- ================================================================== --> - <property name="lwjgl.src.headers" value="${lwjgl.src}/native/common"/> <property name="lwjgl.src" value="./src"/> + <property name="lwjgl.src.headers" value="${lwjgl.src}/native/common"/> + <property name="lwjgl.src.native" value="./src/native"/> <property name="lwjgl.bin" value="./bin"/> - <property name="lwjgl.lib" value="./lib"/> + <property name="lwjgl.lib" value="./libs"/> <property name="lwjgl.dist" value="./dist"/> <property name="lwjgl.docs" value="./doc"/> <property name="lwjgl.temp" value="./temp"/> @@ -53,7 +54,7 @@ </patternset> <!-- Files to include in linux, glibc2.3 package --> - <patternset id="lwjgl-linux-glibc2.3.fileset"> + <patternset id="lwjgl-linux.fileset"> <patternset refid="lwjgl-common.fileset"/> <include name="liblwjgl.so"/> <include name="liblwjgl_d.so"/> @@ -128,11 +129,11 @@ <!-- Cleans up any files created during the execution of this script --> <target name="clean" description="Cleans the diectories controlled by this ant script (temp, dist, lib, javadoc, class files in bin)"> - <delete dir="${lwjgl.temp}" quiet="true" taskname="cleaning temp folder"/> - <delete dir="${lwjgl.dist}" quiet="true" taskname="cleaning dist folder"/> - <delete dir="${lwjgl.docs}/javadoc" quiet="true" taskname="cleaning javadoc folder"/> - <delete dir="${lwjgl.bin}/org" quiet="true" taskname="cleaning bin folder"/> - <delete taskname="cleaning bin folder"> + <delete dir="${lwjgl.temp}" quiet="true" failonerror="false" taskname="cleaning temp folder"/> + <delete dir="${lwjgl.dist}" quiet="true" failonerror="false" taskname="cleaning dist 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> </target> @@ -180,13 +181,37 @@ <!-- Compiles LWJGL on Linux platforms --> <target name="compile_native_linux" description="Compiles LWJGL on Linux platforms" if="lwjgl.platform.linux"> <echo>Compiling Linux LWJGL version</echo> - <apply executable="make"/> + <apply executable="sh" dir="${lwjgl.src.native}"> + <fileset dir="${lwjgl.src.native}"> + <include name="build.sh"/> + </fileset> + </apply> + <move file="${lwjgl.src.native}/.libs/liblwjgl.0.0.0" tofile="${lwjgl.lib}/liblwjgl.so"/> + + <apply executable="sh" dir="${lwjgl.src.native}"> + <fileset dir="${lwjgl.src.native}"> + <include name="build_debug.sh"/> + </fileset> + </apply> + <move file="${lwjgl.src.native}/.libs/liblwjgl.0.0.0" tofile="${lwjgl.lib}/liblwjgl_d.so"/> </target> <!-- Compiles LWJGL on Mac OS X platforms --> <target name="compile_native_mac" description="Compiles LWJGL on Mac OS X platforms" if="lwjgl.platform.mac"> <echo>Compiling Mac OS X LWJGL version</echo> - <apply executable="make"/> + <apply executable="sh" dir="${lwjgl.src.native}"> + <fileset dir="${lwjgl.src.native}"> + <include name="build.sh"/> + </fileset> + </apply> + <move file="${lwjgl.src.native}/.libs/liblwjgl.0.0.0" tofile="${lwjgl.lib}/liblwjgl.jnilib"/> + + <apply executable="sh" dir="${lwjgl.src.native}"> + <fileset dir="${lwjgl.src.native}"> + <include name="build_debug.sh"/> + </fileset> + </apply> + <move file="${lwjgl.src.native}/.libs/liblwjgl.0.0.0" tofile="${lwjgl.lib}/liblwjgl_d.jnilib"/> </target> <!-- Packages the files --> @@ -226,7 +251,7 @@ <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"/> - + <!-- 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/src" dest="."/> @@ -235,11 +260,10 @@ </target> <!-- Generates the native headers from source files --> - <target name="headers" description="invokes javah on java classes, producing the headers needed for native compilation" depends="compile"> + <target name="headers" description="invokes javah on java classes, producing the headers needed for native compilation" depends="compile_java"> <javah classpath="${lwjgl.bin}" destdir="${lwjgl.src.headers}" force="yes"> <class name="org.lwjgl.Display"/> <class name="org.lwjgl.Sys"/> - <class name="org.lwjgl.Window"/> <class name="org.lwjgl.input.Controller"/> <class name="org.lwjgl.input.Cursor"/> @@ -261,7 +285,7 @@ <class name="org.lwjgl.opengl.GL"/> <class name="org.lwjgl.opengl.GLU"/> <class name="org.lwjgl.opengl.GLCaps"/> - <class name="org.lwjgl.opengl.GLWindow"/> + <class name="org.lwjgl.opengl.Window"/> <class name="org.lwjgl.opengl.Pbuffer"/> </javah> </target> |
|
From: Elias N. <eli...@us...> - 2003-11-25 22:34:08
|
Update of /cvsroot/java-game-lib/LWJGL/src/native/common In directory sc8-pr-cvs1:/tmp/cvs-serv11813/src/native/common Modified Files: org_lwjgl_opengl_Window.h Log Message: Fixed nSetVSyncEnabled() signature Index: org_lwjgl_opengl_Window.h CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_Window.h =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_Window.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- org_lwjgl_opengl_Window.h 25 Nov 2003 22:28:28 -0000 1.8 +++ org_lwjgl_opengl_Window.h 25 Nov 2003 22:34:04 -0000 1.9 @@ -122,9 +122,9 @@ /* * Class: org_lwjgl_opengl_Window * Method: nSetVSyncEnabled - * Signature: (Z)Z + * Signature: (Z)V */ -JNIEXPORT jboolean JNICALL Java_org_lwjgl_opengl_Window_nSetVSyncEnabled +JNIEXPORT void JNICALL Java_org_lwjgl_opengl_Window_nSetVSyncEnabled (JNIEnv *, jclass, jboolean); #ifdef __cplusplus |
|
From: Elias N. <eli...@us...> - 2003-11-25 22:34:08
|
Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl In directory sc8-pr-cvs1:/tmp/cvs-serv11813/src/java/org/lwjgl/opengl Modified Files: Window.java Log Message: Fixed nSetVSyncEnabled() signature Index: Window.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/Window.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/Window.java,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- Window.java 3 Nov 2003 11:23:56 -0000 1.17 +++ Window.java 25 Nov 2003 22:34:04 -0000 1.18 @@ -361,7 +361,7 @@ nSetVSyncEnabled(sync); } - private static native boolean nSetVSyncEnabled(boolean sync); + private static native void nSetVSyncEnabled(boolean sync); } |
|
From: Elias N. <eli...@us...> - 2003-11-25 22:28:33
|
Update of /cvsroot/java-game-lib/LWJGL/src/native/common In directory sc8-pr-cvs1:/tmp/cvs-serv10391/src/native/common Modified Files: org_lwjgl_Sys.h org_lwjgl_openal_CoreAL.h org_lwjgl_openal_eax_BaseEAX.h org_lwjgl_openal_eax_CoreEAX.h org_lwjgl_openal_eax_EAXBufferProperties.h org_lwjgl_openal_eax_EAXListenerProperties.h org_lwjgl_opengl_CoreGL13.h org_lwjgl_opengl_Pbuffer.h org_lwjgl_opengl_Window.h Log Message: New JNI headers Index: org_lwjgl_Sys.h CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/org_lwjgl_Sys.h =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_Sys.h,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- org_lwjgl_Sys.h 28 Oct 2003 19:25:50 -0000 1.14 +++ org_lwjgl_Sys.h 25 Nov 2003 22:28:27 -0000 1.15 @@ -19,7 +19,7 @@ /* Inaccessible static: LIBRARY_NAME */ /* Inaccessible static: DEBUG */ /* Inaccessible static: _debug */ -/* Inaccessible static: class_000240 */ +/* Inaccessible static: class_00024org_00024lwjgl_00024Sys */ /* * Class: org_lwjgl_Sys * Method: getTimerResolution @@ -62,7 +62,7 @@ /* * Class: org_lwjgl_Sys - * Method: openURL + * Method: nOpenURL * Signature: (Ljava/lang/String;)V */ JNIEXPORT void JNICALL Java_org_lwjgl_Sys_nOpenURL Index: org_lwjgl_openal_CoreAL.h CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/org_lwjgl_openal_CoreAL.h =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_openal_CoreAL.h,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- org_lwjgl_openal_CoreAL.h 11 Aug 2003 19:58:12 -0000 1.11 +++ org_lwjgl_openal_CoreAL.h 25 Nov 2003 22:28:27 -0000 1.12 @@ -8,10 +8,10 @@ extern "C" { #endif /* Inaccessible static: created */ -/* Inaccessible static: class_000240 */ -/* Inaccessible static: class_000241 */ +/* Inaccessible static: class_00024org_00024lwjgl_00024openal_00024BaseAL */ +/* Inaccessible static: class_00024java_00024lang_00024String */ /* Inaccessible static: _00024assertionsDisabled */ -/* Inaccessible static: class_000240 */ +/* Inaccessible static: class_00024org_00024lwjgl_00024openal_00024CoreAL */ /* * Class: org_lwjgl_openal_CoreAL * Method: alEnable Index: org_lwjgl_openal_eax_BaseEAX.h CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/org_lwjgl_openal_eax_BaseEAX.h =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_openal_eax_BaseEAX.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- org_lwjgl_openal_eax_BaseEAX.h 2 Jul 2003 22:42:41 -0000 1.2 +++ org_lwjgl_openal_eax_BaseEAX.h 25 Nov 2003 22:28:28 -0000 1.3 @@ -1,35 +1,3 @@ -/* - * Copyright (c) 2002 Lightweight Java Game Library Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * * Neither the name of 'Lightweight Java Game Library' nor the names of - * its contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - /* DO NOT EDIT THIS FILE - it is machine generated */ #include <jni.h> /* Header for class org_lwjgl_openal_eax_BaseEAX */ Index: org_lwjgl_openal_eax_CoreEAX.h CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/org_lwjgl_openal_eax_CoreEAX.h =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_openal_eax_CoreEAX.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- org_lwjgl_openal_eax_CoreEAX.h 2 Jul 2003 22:42:41 -0000 1.2 +++ org_lwjgl_openal_eax_CoreEAX.h 25 Nov 2003 22:28:28 -0000 1.3 @@ -1,35 +1,3 @@ -/* - * Copyright (c) 2002 Lightweight Java Game Library Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * * Neither the name of 'Lightweight Java Game Library' nor the names of - * its contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - /* DO NOT EDIT THIS FILE - it is machine generated */ #include <jni.h> /* Header for class org_lwjgl_openal_eax_CoreEAX */ Index: org_lwjgl_openal_eax_EAXBufferProperties.h CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/org_lwjgl_openal_eax_EAXBufferProperties.h =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_openal_eax_EAXBufferProperties.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- org_lwjgl_openal_eax_EAXBufferProperties.h 2 Jul 2003 22:42:41 -0000 1.2 +++ org_lwjgl_openal_eax_EAXBufferProperties.h 25 Nov 2003 22:28:28 -0000 1.3 @@ -1,35 +1,3 @@ -/* - * Copyright (c) 2002 Lightweight Java Game Library Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * * Neither the name of 'Lightweight Java Game Library' nor the names of - * its contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - /* DO NOT EDIT THIS FILE - it is machine generated */ #include <jni.h> /* Header for class org_lwjgl_openal_eax_EAXBufferProperties */ Index: org_lwjgl_openal_eax_EAXListenerProperties.h CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/org_lwjgl_openal_eax_EAXListenerProperties.h =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_openal_eax_EAXListenerProperties.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- org_lwjgl_openal_eax_EAXListenerProperties.h 2 Jul 2003 22:42:41 -0000 1.2 +++ org_lwjgl_openal_eax_EAXListenerProperties.h 25 Nov 2003 22:28:28 -0000 1.3 @@ -1,35 +1,3 @@ -/* - * Copyright (c) 2002 Lightweight Java Game Library Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * * Neither the name of 'Lightweight Java Game Library' nor the names of - * its contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - /* DO NOT EDIT THIS FILE - it is machine generated */ #include <jni.h> /* Header for class org_lwjgl_openal_eax_EAXListenerProperties */ Index: org_lwjgl_opengl_CoreGL13.h CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_CoreGL13.h =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_CoreGL13.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- org_lwjgl_opengl_CoreGL13.h 2 Aug 2003 10:55:32 -0000 1.4 +++ org_lwjgl_opengl_CoreGL13.h 25 Nov 2003 22:28:28 -0000 1.5 @@ -7,6 +7,10 @@ #ifdef __cplusplus extern "C" { #endif +/* Inaccessible static: _00024assertionsDisabled */ +/* Inaccessible static: class_00024org_00024lwjgl_00024opengl_00024CoreGL11 */ +/* Inaccessible static: _00024assertionsDisabled */ +/* Inaccessible static: class_00024org_00024lwjgl_00024opengl_00024CoreGL12 */ /* * Class: org_lwjgl_opengl_CoreGL13 * Method: glActiveTexture Index: org_lwjgl_opengl_Pbuffer.h CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_Pbuffer.h =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_Pbuffer.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- org_lwjgl_opengl_Pbuffer.h 20 May 2003 12:20:12 -0000 1.1 +++ org_lwjgl_opengl_Pbuffer.h 25 Nov 2003 22:28:28 -0000 1.2 @@ -7,11 +7,9 @@ #ifdef __cplusplus extern "C" { #endif -/* Inaccessible static: _00024assertionsDisabled */ #undef org_lwjgl_opengl_Pbuffer_PBUFFER_SUPPORTED #define org_lwjgl_opengl_Pbuffer_PBUFFER_SUPPORTED 1L /* Inaccessible static: currentBuffer */ -/* Inaccessible static: class_00024org_00024lwjgl_00024opengl_00024Pbuffer */ /* * Class: org_lwjgl_opengl_Pbuffer * Method: nIsBufferLost Index: org_lwjgl_opengl_Window.h CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_Window.h =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/org_lwjgl_opengl_Window.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- org_lwjgl_opengl_Window.h 20 Oct 2003 14:17:47 -0000 1.7 +++ org_lwjgl_opengl_Window.h 25 Nov 2003 22:28:28 -0000 1.8 @@ -21,7 +21,8 @@ /* Inaccessible static: fullscreen */ /* Inaccessible static: vsync */ /* Inaccessible static: vbo_tracker */ -/* Inaccessible static: class_000240 */ +/* Inaccessible static: context */ +/* Inaccessible static: class_00024org_00024lwjgl_00024opengl_00024Window */ /* * Class: org_lwjgl_opengl_Window * Method: nSetTitle @@ -121,9 +122,9 @@ /* * Class: org_lwjgl_opengl_Window * Method: nSetVSyncEnabled - * Signature: (Z)V + * Signature: (Z)Z */ -JNIEXPORT void JNICALL Java_org_lwjgl_opengl_Window_nSetVSyncEnabled +JNIEXPORT jboolean JNICALL Java_org_lwjgl_opengl_Window_nSetVSyncEnabled (JNIEnv *, jclass, jboolean); #ifdef __cplusplus |
|
From: Elias N. <eli...@us...> - 2003-11-25 22:01:32
|
Update of /cvsroot/java-game-lib/LWJGL/src/native In directory sc8-pr-cvs1:/tmp/cvs-serv3670 Modified Files: build.sh build_debug.sh Log Message: Fixed build scripts Index: build.sh CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/build.sh =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/build.sh,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- build.sh 25 Nov 2003 21:26:55 -0000 1.2 +++ build.sh 25 Nov 2003 22:01:28 -0000 1.3 @@ -4,4 +4,4 @@ ./autogen.sh ./configure make -strip .libs/liblwjgl.0 +strip .libs/liblwjgl.0.0.0 Index: build_debug.sh CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/build_debug.sh =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/build_debug.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- build_debug.sh 25 Nov 2003 21:26:55 -0000 1.1 +++ build_debug.sh 25 Nov 2003 22:01:29 -0000 1.2 @@ -4,4 +4,4 @@ ./autogen.sh ./configure --enable-debug make -strip .libs/liblwjgl.0 +strip .libs/liblwjgl.0.0.0 |
|
From: Elias N. <eli...@us...> - 2003-11-25 21:26:58
|
Update of /cvsroot/java-game-lib/LWJGL/src/native In directory sc8-pr-cvs1:/tmp/cvs-serv28194 Modified Files: build.sh Added Files: build_debug.sh Log Message: Added linux/mac debug build script --- NEW FILE: build_debug.sh --- CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/build_debug.sh #!/bin/bash make distclean ./autogen.sh ./configure --enable-debug make strip .libs/liblwjgl.0 Index: build.sh CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/build.sh =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/build.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- build.sh 25 Nov 2003 21:23:37 -0000 1.1 +++ build.sh 25 Nov 2003 21:26:55 -0000 1.2 @@ -1,5 +1,6 @@ #!/bin/bash +make distclean ./autogen.sh ./configure make |
|
From: Elias N. <eli...@us...> - 2003-11-25 21:23:42
|
Update of /cvsroot/java-game-lib/LWJGL/src/native In directory sc8-pr-cvs1:/tmp/cvs-serv27422 Added Files: build.sh Log Message: Added linux/mac build script --- NEW FILE: build.sh --- CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/build.sh #!/bin/bash ./autogen.sh ./configure make strip .libs/liblwjgl.0 |
|
From: Elias N. <eli...@us...> - 2003-11-23 12:52:11
|
Update of /cvsroot/java-game-lib/LWJGL/src/native/win32 In directory sc8-pr-cvs1:/tmp/cvs-serv29434/win32 Modified Files: org_lwjgl_input_Mouse.cpp Log Message: Native cursor fix in win32 Index: org_lwjgl_input_Mouse.cpp CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/win32/org_lwjgl_input_Mouse.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/org_lwjgl_input_Mouse.cpp,v retrieving revision 1.38 retrieving revision 1.39 diff -u -d -r1.38 -r1.39 --- org_lwjgl_input_Mouse.cpp 28 Oct 2003 16:23:16 -0000 1.38 +++ org_lwjgl_input_Mouse.cpp 23 Nov 2003 12:52:08 -0000 1.39 @@ -249,18 +249,18 @@ JNIEXPORT void JNICALL Java_org_lwjgl_input_Mouse_nSetNativeCursor (JNIEnv *env, jclass clazz, jlong cursor_handle) { + if (mDIDevice == NULL) + throwException(env, "null device!"); if (cursor_handle != 0) { - if (mDIDevice == NULL) - throwException(env, "null device!"); - mDIDevice->Unacquire(); - if(mDIDevice->SetCooperativeLevel(hwnd, DISCL_NONEXCLUSIVE | DISCL_FOREGROUND) != DI_OK) { - throwException(env, "Could not set the CooperativeLevel."); - return; - } HCURSOR cursor = (HCURSOR)cursor_handle; SetClassLong(hwnd, GCL_HCURSOR, (LONG)cursor); SetCursor(cursor); if (!usingNativeCursor) { + mDIDevice->Unacquire(); + if(mDIDevice->SetCooperativeLevel(hwnd, DISCL_NONEXCLUSIVE | DISCL_FOREGROUND) != DI_OK) { + throwException(env, "Could not set the CooperativeLevel."); + return; + } /* Reset cursor position to middle of the window */ RECT clientRect; GetWindowRect(hwnd, &windowRect); @@ -282,6 +282,7 @@ } ShowCursor(FALSE); usingNativeCursor = false; + mDIDevice->Acquire(); } } } |
|
From: Brian M. <ma...@us...> - 2003-11-22 22:30:40
|
Update of /cvsroot/java-game-lib/LWJGL In directory sc8-pr-cvs1:/tmp/cvs-serv13353 Modified Files: build.xml Log Message: ant 1.5.x support Index: build.xml CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/build.xml =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/build.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- build.xml 13 Nov 2003 23:16:58 -0000 1.11 +++ build.xml 22 Nov 2003 22:30:37 -0000 1.12 @@ -12,16 +12,6 @@ <property name="lwjgl.temp" value="./temp"/> <property name="lwjgl.res" value="./res"/> <property name="lwjgl.version" value="0.8"/> - - <!-- ================================================================== --> - <!-- Initialize build --> - <!-- ================================================================== --> - <mkdir dir="${lwjgl.bin}" taskname="initialiazing bin folder"/> - <mkdir dir="${lwjgl.lib}" taskname="initialiazing lib folder"/> - <mkdir dir="${lwjgl.dist}" taskname="initialiazing dist folder"/> - <mkdir dir="${lwjgl.docs}/javadoc" taskname="initialiazing docs folder"/> - <mkdir dir="${lwjgl.res}" taskname="initialiazing res folder"/> - <mkdir dir="${lwjgl.temp}" taskname="initialiazing temp folder"/> <!-- ================================================================== --> <!-- Filesets used for targets --> @@ -96,6 +86,18 @@ <!-- Everything below this line is targets. --> <!-- Do not modify, unless you know what you're doing --> <!-- ================================================================== --> + + <!-- ================================================================== --> + <!-- Initialize build --> + <!-- ================================================================== --> + <target name="initialize"> + <mkdir dir="${lwjgl.bin}" taskname="initialiazing bin folder"/> + <mkdir dir="${lwjgl.lib}" taskname="initialiazing lib folder"/> + <mkdir dir="${lwjgl.dist}" taskname="initialiazing dist folder"/> + <mkdir dir="${lwjgl.docs}/javadoc" taskname="initialiazing docs folder"/> + <mkdir dir="${lwjgl.res}" taskname="initialiazing res folder"/> + <mkdir dir="${lwjgl.temp}" taskname="initialiazing temp folder"/> + </target> <!-- Creates a splash screen --> <target name="splash"> @@ -113,7 +115,9 @@ <!-- the javadoc target, since the 'distribution' target will try to create the javadoc --> <!-- archive. --> <antcall target="clean"/> - <antcall target="compile"/> + <antcall target="initialize"/> + <antcall target="compile_java"/> + <antcall target="compile_native"/> <antcall target="jars"/> <antcall target="distribution_application"/> <antcall target="javadoc"/> @@ -134,7 +138,7 @@ </target> <!-- Compiles the code for LWJGL --> - <target name="compile" description="Compiles code"> + <target name="compile" depends="initialize" description="Compiles code"> <antcall target="compile_java"/> <antcall target="compile_native"/> </target> @@ -186,7 +190,7 @@ </target> <!-- Packages the files --> - <target name="jars" depends="compile" description="packages the java source files"> + <target name="jars" description="packages the java source files"> <!-- Create lwjgl.jar --> <jar destfile="${lwjgl.lib}/lwjgl.jar" taskname="lwjgl.jar"> <fileset refid="lwjgl.fileset"/> |
|
From: Elias N. <eli...@us...> - 2003-11-22 19:20:13
|
Update of /cvsroot/java-game-lib/LWJGL/src/native/linux In directory sc8-pr-cvs1:/tmp/cvs-serv13503/linux Modified Files: org_lwjgl_Sys.cpp Log Message: Newline fix Index: org_lwjgl_Sys.cpp CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/linux/org_lwjgl_Sys.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/org_lwjgl_Sys.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -u -d -r1.18 -r1.19 --- org_lwjgl_Sys.cpp 28 Oct 2003 19:26:51 -0000 1.18 +++ org_lwjgl_Sys.cpp 22 Nov 2003 19:20:05 -0000 1.19 @@ -186,4 +186,5 @@ const char * urlString = env->GetStringUTFChars(url, NULL); printf("*** Please visit %s\n", urlString); env->ReleaseStringUTFChars(url, urlString); -} \ No newline at end of file +} + |
|
From: Brian M. <ma...@us...> - 2003-11-20 22:15:13
|
Update of /cvsroot/java-game-lib/LWJGL/website In directory sc8-pr-cvs1:/tmp/cvs-serv11383 Modified Files: index.html Log Message: added irc to front page Index: index.html CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/website/index.html =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/website/index.html,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- index.html 10 Jul 2003 14:19:46 -0000 1.4 +++ index.html 20 Nov 2003 22:15:10 -0000 1.5 @@ -111,6 +111,7 @@ <td colspan="5" align="center"> <p> </p> <p><font face="Fixedsys" size="1"><u>The</u> solution for Java based OpenGL games</font></p> + <p><font face="Fixedsys" size="1">Please join us on <a href="irc://irc.freenode.net/lwjgl">Internet Relay Chat</a> (IRC)</font></p> <p> </p> </td> </tr> |
|
From: Caspian Rychlik-P. <ci...@us...> - 2003-11-18 11:10:23
|
Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl In directory sc8-pr-cvs1:/tmp/cvs-serv16919/src/java/org/lwjgl/opengl Modified Files: CoreGL11.java GL.java Log Message: Fixed naming problems with a couple of methods Index: CoreGL11.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/CoreGL11.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/CoreGL11.java,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- CoreGL11.java 19 Aug 2003 10:26:51 -0000 1.16 +++ CoreGL11.java 18 Nov 2003 11:10:17 -0000 1.17 @@ -350,7 +350,7 @@ private static native void nglMap1f(int target, float u1, float u2, int stride, int order, FloatBuffer points, int points_offset); public static native void glLogicOp(int opcode); public static native void glLoadName(int name); - public static void glLoadMatrixf(FloatBuffer m) { + public static void glLoadMatrix(FloatBuffer m) { nglLoadMatrixf(m, m.position()); } private static native void nglLoadMatrixf(FloatBuffer m, int m_offset); Index: GL.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/GL.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/GL.java,v retrieving revision 1.43 retrieving revision 1.44 diff -u -d -r1.43 -r1.44 --- GL.java 20 Oct 2003 14:17:47 -0000 1.43 +++ GL.java 18 Nov 2003 11:10:18 -0000 1.44 @@ -677,7 +677,7 @@ } private static native void nglLoadProgramNV(int target, int id, int len, ByteBuffer pProgram, int pProgram_offset); - public static void glLoadTransposeMatrixfARB(FloatBuffer pfMtx) { + public static void glLoadTransposeMatrixARB(FloatBuffer pfMtx) { nglLoadTransposeMatrixfARB(pfMtx, pfMtx.position()); } private static native void nglLoadTransposeMatrixfARB(FloatBuffer pfMtx, int pfMtx_offset); |
|
From: Elias N. <eli...@us...> - 2003-11-17 07:45:59
|
Update of /cvsroot/java-game-lib/LWJGL/src/native/win32 In directory sc8-pr-cvs1:/tmp/cvs-serv5387 Modified Files: org_lwjgl_opengl_Window.cpp Log Message: Win32 window creation tweaks Index: org_lwjgl_opengl_Window.cpp CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/win32/org_lwjgl_opengl_Window.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/org_lwjgl_opengl_Window.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- org_lwjgl_opengl_Window.cpp 20 Oct 2003 14:17:47 -0000 1.11 +++ org_lwjgl_opengl_Window.cpp 17 Nov 2003 07:45:14 -0000 1.12 @@ -380,10 +380,10 @@ if (fullscreen) { exstyle = WS_EX_APPWINDOW | WS_EX_TOPMOST; - windowflags = WS_POPUP | WS_VISIBLE; + windowflags = WS_POPUP; } else { exstyle = WS_EX_APPWINDOW; - windowflags = WS_OVERLAPPED | WS_BORDER | WS_CAPTION | WS_VISIBLE | WS_MINIMIZEBOX | WS_SYSMENU; + windowflags = WS_OVERLAPPED | WS_BORDER | WS_CAPTION | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_MINIMIZEBOX | WS_SYSMENU; } // If we're not a fullscreen window, adjust the height to account for the @@ -423,7 +423,6 @@ printf("Created window\n"); #endif -// ShowWindow(hwnd, SW_SHOWNORMAL); ShowWindow(hwnd, SW_SHOW); UpdateWindow(hwnd); SetForegroundWindow(hwnd); |
|
From: Elias N. <eli...@us...> - 2003-11-14 08:20:38
|
Update of /cvsroot/java-game-lib/LWJGL/src/native/common In directory sc8-pr-cvs1:/tmp/cvs-serv28719/common Modified Files: Makefile.am Log Message: Removed Math.cpp from automake Index: Makefile.am CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/Makefile.am =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/common/Makefile.am,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- Makefile.am 11 Oct 2003 16:29:40 -0000 1.13 +++ Makefile.am 14 Nov 2003 08:20:32 -0000 1.14 @@ -15,8 +15,6 @@ org_lwjgl_input_Joystick.h \ org_lwjgl_input_Keyboard.h \ org_lwjgl_input_Mouse.h \ - org_lwjgl_Math.cpp \ - org_lwjgl_Math.h \ org_lwjgl_openal_ALC.cpp \ org_lwjgl_openal_ALC.h \ org_lwjgl_openal_BaseAL.cpp \ |
|
From: Brian M. <ma...@us...> - 2003-11-13 23:17:04
|
Update of /cvsroot/java-game-lib/LWJGL In directory sc8-pr-cvs1:/tmp/cvs-serv12490 Modified Files: build.xml Log Message: getting there :) Index: build.xml CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/build.xml =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/build.xml,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- build.xml 24 Aug 2003 20:47:00 -0000 1.10 +++ build.xml 13 Nov 2003 23:16:58 -0000 1.11 @@ -1,308 +1,352 @@ <project name="LWJGL" default="compile" basedir="."> - <!-- set global properties for this build --> - <property name="lwjgl.src" value="./src"/> - <property name="lwjgl.bin" value="./bin"/> - <property name="lwjgl.lib" value="./lib"/> - <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.version" value="0.7"/> - <property name="lwjgl.src.headers" value="${lwjgl.src}/native/common"/> - - <!-- Creates a splash screen --> - <target name="splash"> - <splash imageurl="http://java-game-lib.sourceforge.net/images/logo.png" showduration="0" taskname="progressscreen"/> - </target> - - <!-- Initializes whatever needs to be done before any targets are executed --> - <target name="initialize"> - <mkdir dir="${lwjgl.bin}" taskname="initialiazing bin folder"/> - <mkdir dir="${lwjgl.lib}" taskname="initialiazing lib folder"/> - <mkdir dir="${lwjgl.dist}" taskname="initialiazing dist folder"/> - <mkdir dir="${lwjgl.docs}/javadoc" taskname="initialiazing docs folder"/> - <mkdir dir="${lwjgl.res}" taskname="initialiazing res folder"/> - <mkdir dir="${lwjgl.temp}" taskname="initialiazing temp folder"/> - </target> - - <target name="all" depends="splash" description="compile. package. javadoc and distribute"> - - <!-- - Though we perform all targets, we do it in somewhat mixed. - This is because we want the 'distribution_application' target to be - executed as soon as possible, since this target is most likely to fail. - That way we don't spend time doing javadocs, if the 'distribution_application' - target is going to fail anyway. However we cannot call the 'distribution' before - the javadoc target, since the 'distribution' target will try to create the javadoc - archive. - --> + <!-- ================================================================== --> + <!-- Global properties for build --> + <!-- ================================================================== --> + <property name="lwjgl.src.headers" value="${lwjgl.src}/native/common"/> + <property name="lwjgl.src" value="./src"/> + <property name="lwjgl.bin" value="./bin"/> + <property name="lwjgl.lib" value="./lib"/> + <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.version" value="0.8"/> + + <!-- ================================================================== --> + <!-- Initialize build --> + <!-- ================================================================== --> + <mkdir dir="${lwjgl.bin}" taskname="initialiazing bin folder"/> + <mkdir dir="${lwjgl.lib}" taskname="initialiazing lib folder"/> + <mkdir dir="${lwjgl.dist}" taskname="initialiazing dist folder"/> + <mkdir dir="${lwjgl.docs}/javadoc" taskname="initialiazing docs folder"/> + <mkdir dir="${lwjgl.res}" taskname="initialiazing res folder"/> + <mkdir dir="${lwjgl.temp}" taskname="initialiazing temp folder"/> - <antcall target="clean"/> - <antcall target="compile"/> - <antcall target="package"/> - <antcall target="distribution_application"/> - <antcall target="javadoc"/> - <antcall target="distribution_javadoc"/> - <antcall target="distribution_source"/> - <antcall target="internal_clean"/> - </target> - - <target name="clean" description="Cleans the diectories controlled by this ant script (temp, dist, lib, javadoc, class files in bin)"> - <delete dir="${lwjgl.temp}" quiet="true" taskname="cleaning temp folder"/> - <delete dir="${lwjgl.dist}" quiet="true" taskname="cleaning dist folder"/> - <delete dir="${lwjgl.docs}/javadoc" quiet="true" taskname="cleaning javadoc folder"/> - <delete dir="${lwjgl.bin}/org" quiet="true" taskname="cleaning bin folder"/> - <delete taskname="cleaning bin folder"> - <fileset dir="${lwjgl.bin}" includes="*.class"/> - </delete> - </target> - - <target name="compile" depends="initialize" description="Compiles the java source directory"> - <javac srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/**.java" source="1.4" taskname="lwjgl"/> - <javac srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/input/**" source="1.4" taskname="input"/> - <javac srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/openal/**" source="1.4" taskname="openal"/> - <javac srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/opengl/**" source="1.4" taskname="opengl"/> - <javac srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/test/**" source="1.4" taskname="test"/> - <javac srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/vector/**" source="1.4" taskname="vector"/> - </target> + <!-- ================================================================== --> + <!-- Filesets used for targets --> + <!-- ================================================================== --> + + <!-- Files to include in the lwjgl.jar file --> + <fileset id="lwjgl.fileset" dir="${lwjgl.bin}"> + <include name="**"/> + <exclude name="**.*"/> + <exclude name="org/lwjgl/test/**"/> + </fileset> + + <!-- Files to include in the lwjgl_test.jar file --> + <fileset id="lwjgl_test.fileset" dir="${lwjgl.bin}"> + <exclude name="**.*"/> + <include name="org/lwjgl/test/**"/> + </fileset> - <target name="package" depends="compile" description="packages the java source files"> - <!-- Create lwjgl.jar --> - <jar destfile="${lwjgl.lib}/lwjgl.jar" taskname="lwjgl.jar"> - <fileset dir="${lwjgl.bin}"> - <include name="**"/> - <exclude name="**.*"/> - <exclude name="org/lwjgl/test/**"/> - </fileset> - </jar> - - <!-- Create lwjgl_test.jar --> - <jar destfile="${lwjgl.lib}/lwjgl_test.jar" taskname="lwjgl_test.jar"> - <fileset dir="${lwjgl.bin}"> - <exclude name="**.*"/> - <include name="org/lwjgl/test/**"/> - </fileset> - </jar> - </target> + <!-- Files to make Javadoc from --> + <fileset id="lwjgl.javadoc.fileset" dir="${lwjgl.src}/java"> + <include name="**/*.java" /> + <exclude name="org/lwjgl/test/**"/> + </fileset> + + <!-- Files to include in common package --> + <patternset id="lwjgl-common.fileset"> + <include name="*.jar"/> + <include name="CREDITS"/> + <include name="LICENSE"/> + <include name="README"/> + </patternset> - <target name="javadoc" description="Creates javadoc from java source code"> - <javadoc destdir="${lwjgl.docs}/javadoc" author="true" version="true" use="true" source="1.4" windowtitle="LWJGL API"> - - <fileset dir="${lwjgl.src}/java"> - <include name="**/*.java" /> - <exclude name="org/lwjgl/test/**"/> - </fileset> - - <doctitle><![CDATA[<h1>Lightweight Java Game Toolkit</h1>]]></doctitle> - <bottom><![CDATA[<i>Copyright © 2003 lwjgl.org. All Rights Reserved.</i>]]></bottom> - </javadoc> - </target> + <!-- Files to include in win32 package --> + <patternset id="lwjgl-win32.fileset"> + <patternset refid="lwjgl-common.fileset"/> + <include name="lwjgl.dll"/> + <include name="lwjgl_d.dll"/> + <include name="lwjglaudio.dll"/> + </patternset> - <target name="distribution" depends="package" description="Creates a versioned distribution of lwjgl"> - <antcall target="distribution_application"/> - <antcall target="distribution_javadoc"/> - <antcall target="distribution_source"/> - <antcall target="internal_clean"/> - </target> + <!-- Files to include in linux, glibc2.3 package --> + <patternset id="lwjgl-linux-glibc2.3.fileset"> + <patternset refid="lwjgl-common.fileset"/> + <include name="liblwjgl.so"/> + <include name="liblwjgl_d.so"/> + <include name="libopenal.so"/> + </patternset> + + <!-- Files to include in mac os x package --> + <patternset id="lwjgl-macosx.fileset"> + <patternset refid="lwjgl-common.fileset"/> + <include name="liblwjgl.jnilib"/> + <include name="liblwjgl_d.jnilib"/> + <include name="openal.dylib"/> + </patternset> + + <!-- Files to include in source distribution --> + <fileset id="lwjgl.source.fileset" dir="."> + <include name="build.xml"/> + <include name="src/**"/> + <exclude name="**/*CVS*"/> + <exclude name="native/projb/**"/> + </fileset> + + <!-- Files to include in media distribution --> + <fileset id="lwjgl.media.fileset" dir="${lwjgl.res}"> + <include name="**"/> + <exclude name="**/*CVS*"/> + </fileset> + + <!-- ================================================================== --> + <!-- Everything below this line is targets. --> + <!-- Do not modify, unless you know what you're doing --> + <!-- ================================================================== --> - <target name="cvsbuild" description="Builds lwjgl, by exporting files from cvs into a LWJGL folder and executing the package target on that folders build file"> - <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"/> - <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="package"/> - </target> + <!-- Creates a splash screen --> + <target name="splash"> + <splash imageurl="http://java-game-lib.sourceforge.net/images/logo.png" showduration="0" taskname="progressscreen"/> + </target> - <target name="headers" description="invokes javah on java classes, producing the headers needed for native compilation" depends="compile"> - <javah classpath="${lwjgl.bin}" destdir="${lwjgl.src.headers}" force="yes"> - <class name="org.lwjgl.Display"/> - <class name="org.lwjgl.Sys"/> - <class name="org.lwjgl.Window"/> - - <class name="org.lwjgl.input.Controller"/> - <class name="org.lwjgl.input.Cursor"/> - <class name="org.lwjgl.input.Keyboard"/> - <class name="org.lwjgl.input.Mouse"/> - - <class name="org.lwjgl.openal.ALC"/> - <class name="org.lwjgl.openal.BaseAL"/> - <class name="org.lwjgl.openal.CoreAL"/> - <class name="org.lwjgl.openal.eax.BaseEAX"/> - <class name="org.lwjgl.openal.eax.CoreEAX"/> - <class name="org.lwjgl.openal.eax.EAXBufferProperties"/> - <class name="org.lwjgl.openal.eax.EAXListenerProperties"/> - - <class name="org.lwjgl.opengl.CoreGL11"/> - <class name="org.lwjgl.opengl.CoreGL12"/> - <class name="org.lwjgl.opengl.CoreGL13"/> - <class name="org.lwjgl.opengl.CoreGL14"/> - <class name="org.lwjgl.opengl.GL"/> - <class name="org.lwjgl.opengl.GLU"/> - <class name="org.lwjgl.opengl.GLCaps"/> - <class name="org.lwjgl.opengl.GLWindow"/> - <class name="org.lwjgl.opengl.Pbuffer"/> - </javah> - </target> + <!-- Performs all the tasks needed for a distribution of LWJGL --> + <target name="all" depends="splash" description="compile. make jars. javadoc and distribute"> - <!-- Creates a versioned distribution for all supported platforms --> - <target name="distribution_application"> - <!-- check for file presence --> - <available file="${lwjgl.lib}/lwjglaudio.dll" property="lwjgl.lwjglaudio_dll.exists"/> - <fail unless="lwjgl.lwjglaudio_dll.exists" message="Missing lwjglaudio.dll in lib directory"/> - - <available file="${lwjgl.lib}/libopenal.so" property="lwjgl.libopenal_so.exists"/> - <fail unless="lwjgl.libopenal_so.exists" message="Missing libopenal.so in lib directory"/> - - <available file="${lwjgl.lib}/lwjgl.dll" property="lwjgl.lwjgl_dll.exists"/> - <fail unless="lwjgl.lwjgl_dll.exists" message="Missing lwjgl.dll in lib directory"/> - - <available file="${lwjgl.lib}/lwjgl_d.dll" property="lwjgl.lwjgl_d_dll.exists"/> - <fail unless="lwjgl.lwjgl_d_dll.exists" message="Missing lwjgl_d.dll in lib directory"/> - - <available file="${lwjgl.lib}/liblwjgl.so" property="lwjgl.liblwjgl_so.exists"/> - <fail unless="lwjgl.liblwjgl_so.exists" message="Missing liblwjgl.so in lib directory"/> - - <available file="${lwjgl.lib}/liblwjgl_d.so" property="lwjgl.liblwjgl_d_so.exists"/> - <fail unless="lwjgl.liblwjgl_d_so.exists" message="Missing liblwjgl_d.so in lib directory"/> - - <available file="${lwjgl.lib}/lwjgl.jar" property="lwjgl.lwjgl_jar.exists"/> - <fail unless="lwjgl.lwjgl_jar.exists" message="Missing lwjgl.jar in lib directory"/> - - <available file="${lwjgl.lib}/lwjgl_test.jar" property="lwjgl.lwjgl_test_jar.exists"/> - <fail unless="lwjgl.lwjgl_test_jar.exists" message="Missing lwjgl_test.jar in lib directory"/> - - <mkdir dir="${lwjgl.temp}/lwjgl-${lwjgl.version}"/> - - <!-- copy files to lwjgl directory for proper zipping --> - <copy todir="${lwjgl.temp}/lwjgl-${lwjgl.version}"> - <fileset dir="${lwjgl.lib}/"> - <include name="lwjgl.dll"/> - <include name="lwjgl_d.dll"/> - <include name="lwjglaudio.dll"/> - <include name="liblwjgl.so"/> - <include name="liblwjgl_d.so"/> - <include name="libopenal.so"/> - <include name="lwjgl.jar"/> - <include name="lwjgl_test.jar"/> - </fileset> - <fileset dir="${lwjgl.docs}"> - <include name="CREDITS"/> - <include name="LICENSE"/> - <include name="README"/> - </fileset> - </copy> - - <!-- zip 'em up --> - <zip destfile="${lwjgl.dist}/lwjgl-${lwjgl.version}.zip" basedir="${lwjgl.temp}/"/> - </target> - - <!-- Creates a versioned distribution for win32 --> - <target name="distribution_application_win32"> - <!-- check for file presence --> - <available file="${lwjgl.lib}/lwjglaudio.dll" property="lwjgl.lwjglaudio_dll.exists"/> - <fail unless="lwjgl.lwjglaudio_dll.exists" message="Missing lwjglaudio.dll in lib directory"/> - - <available file="${lwjgl.lib}/lwjgl.dll" property="lwjgl.lwjgl_dll.exists"/> - <fail unless="lwjgl.lwjgl_dll.exists" message="Missing lwjgl.dll in lib directory"/> + <!-- Though we perform all targets, we do it in somewhat mixed. --> + <!-- This is because we want the 'distribution_application' target to be --> + <!-- executed as soon as possible, since this target is most likely to fail. --> + <!-- That way we don't spend time doing javadocs, if the 'distribution_application' --> + <!-- target is going to fail anyway. However we cannot call the 'distribution' before --> + <!-- the javadoc target, since the 'distribution' target will try to create the javadoc --> + <!-- archive. --> + <antcall target="clean"/> + <antcall target="compile"/> + <antcall target="jars"/> + <antcall target="distribution_application"/> + <antcall target="javadoc"/> + <antcall target="distribution_javadoc"/> + <antcall target="distribution_source"/> + <antcall target="internal_clean"/> + </target> - <available file="${lwjgl.lib}/lwjgl_d.dll" property="lwjgl.lwjgl_d_dll.exists"/> - <fail unless="lwjgl.lwjgl_d_dll.exists" message="Missing lwjgl_d.dll in lib directory"/> + <!-- Cleans up any files created during the execution of this script --> + <target name="clean" description="Cleans the diectories controlled by this ant script (temp, dist, lib, javadoc, class files in bin)"> + <delete dir="${lwjgl.temp}" quiet="true" taskname="cleaning temp folder"/> + <delete dir="${lwjgl.dist}" quiet="true" taskname="cleaning dist folder"/> + <delete dir="${lwjgl.docs}/javadoc" quiet="true" taskname="cleaning javadoc folder"/> + <delete dir="${lwjgl.bin}/org" quiet="true" taskname="cleaning bin folder"/> + <delete taskname="cleaning bin folder"> + <fileset dir="${lwjgl.bin}" includes="*.class"/> + </delete> + </target> - <available file="${lwjgl.lib}/lwjgl.jar" property="lwjgl.lwjgl_jar.exists"/> - <fail unless="lwjgl.lwjgl_jar.exists" message="Missing lwjgl.jar in lib directory"/> + <!-- Compiles the code for LWJGL --> + <target name="compile" description="Compiles code"> + <antcall target="compile_java"/> + <antcall target="compile_native"/> + </target> + + <!-- Compiles the Java source code --> + <target name="compile_java" description="Compiles the java source code"> + <javac srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/**.java" source="1.4" taskname="lwjgl"/> + <javac srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/input/**" source="1.4" taskname="input"/> + <javac srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/openal/**" source="1.4" taskname="openal"/> + <javac srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/opengl/**" source="1.4" taskname="opengl"/> + <javac srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/vector/**" source="1.4" taskname="vector"/> + <javac srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/test/**" source="1.4" taskname="test"/> + </target> + + <!-- Compiles the native files --> + <target name="compile_native" description="Compiles the native files"> + <!-- check each platform, and run their build target --> + <condition property="lwjgl.platform.windows"> + <os family="windows"/> + </condition> + <antcall target="compile_native_win32"/> - <available file="${lwjgl.lib}/lwjgl_test.jar" property="lwjgl.lwjgl_test_jar.exists"/> - <fail unless="lwjgl.lwjgl_test_jar.exists" message="Missing lwjgl_test.jar in lib directory"/> - - <mkdir dir="${lwjgl.temp}/lwjgl-${lwjgl.version}"/> - - <!-- copy files to lwjgl directory for proper zipping --> - <copy todir="${lwjgl.temp}/lwjgl-${lwjgl.version}"> - <fileset dir="${lwjgl.lib}/"> - <include name="lwjgl.dll"/> - <include name="lwjgl_d.dll"/> - <include name="lwjglaudio.dll"/> - <include name="lwjgl.jar"/> - <include name="lwjgl_test.jar"/> - </fileset> - <fileset dir="${lwjgl.docs}"> - <include name="CREDITS"/> - <include name="LICENSE"/> - <include name="README"/> - </fileset> - </copy> + <condition property="lwjgl.platform.linux"> + <os name="Linux"/> + </condition> + <antcall target="compile_native_linux"/> - <!-- zip 'em up --> - <zip destfile="${lwjgl.dist}/lwjgl-${lwjgl.version}.zip" basedir="${lwjgl.temp}/"/> - </target> + <condition property="lwjgl.platform.mac"> + <os name="Mac OS X"/> + </condition> + <antcall target="compile_native_mac"/> + </target> + + <!-- Compiles LWJGL on Win32 platforms --> + <target name="compile_native_win32" description="Compiles LWJGL on Win32 platforms" if="lwjgl.platform.windows"> + <echo>Sorry, LWJGL does not yet allow compilation of the win32 version via commandline</echo> + </target> + + <!-- Compiles LWJGL on Linux platforms --> + <target name="compile_native_linux" description="Compiles LWJGL on Linux platforms" if="lwjgl.platform.linux"> + <echo>Compiling Linux LWJGL version</echo> + <apply executable="make"/> + </target> + + <!-- Compiles LWJGL on Mac OS X platforms --> + <target name="compile_native_mac" description="Compiles LWJGL on Mac OS X platforms" if="lwjgl.platform.mac"> + <echo>Compiling Mac OS X LWJGL version</echo> + <apply executable="make"/> + </target> + + <!-- Packages the files --> + <target name="jars" depends="compile" description="packages the java source files"> + <!-- Create lwjgl.jar --> + <jar destfile="${lwjgl.lib}/lwjgl.jar" taskname="lwjgl.jar"> + <fileset refid="lwjgl.fileset"/> + </jar> + + <!-- Create lwjgl_test.jar --> + <jar destfile="${lwjgl.lib}/lwjgl_test.jar" taskname="lwjgl_test.jar"> + <fileset refid="lwjgl_test.fileset"/> + </jar> + </target> - <!-- Creates a versioned distribution for linux --> - <target name="distribution_application_linux"> - <!-- check for file presence --> - <available file="${lwjgl.lib}/libopenal.so" property="lwjgl.libopenal_so.exists"/> - <fail unless="lwjgl.libopenal_so.exists" message="Missing libopenal.so in lib directory"/> - - <available file="${lwjgl.lib}/liblwjgl.so" property="lwjgl.liblwjgl_so.exists"/> - <fail unless="lwjgl.liblwjgl_so.exists" message="Missing liblwjgl.so in lib directory"/> + <!-- Creates the Javadoc --> + <target name="javadoc" description="Creates javadoc from java source code"> + <javadoc destdir="${lwjgl.docs}/javadoc" author="true" version="true" use="true" source="1.4" windowtitle="LWJGL API"> + <fileset refid="lwjgl.javadoc.fileset"/> + <doctitle><![CDATA[<h1>Lightweight Java Game Toolkit</h1>]]></doctitle> + <bottom><![CDATA[<i>Copyright © 2003 lwjgl.org. All Rights Reserved.</i>]]></bottom> + </javadoc> + </target> + + <!-- Creates a distribution from the compiled files --> + <target name="distribution" depends="jars" description="Creates a versioned distribution of lwjgl"> + <antcall target="distribution_application"/> + <antcall target="distribution_javadoc"/> + <antcall target="distribution_source"/> + <antcall target="distribution_resources"/> + <antcall target="internal_clean"/> + </target> + + <!-- Creates a build of LWJGL directly from CVS --> + <target name="cvsbuild" description="Builds lwjgl, by exporting files from cvs into a LWJGL folder and executing the package target on that folders build file"> + <!-- Check that files do not exist BEFORE doing the CVS build --> + <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"/> - <available file="${lwjgl.lib}/liblwjgl_d.so" property="lwjgl.liblwjgl_d_so.exists"/> - <fail unless="lwjgl.liblwjgl_d_so.exists" message="Missing liblwjgl_d.so in lib directory"/> - - <available file="${lwjgl.lib}/lwjgl.jar" property="lwjgl.lwjgl_jar.exists"/> - <fail unless="lwjgl.lwjgl_jar.exists" message="Missing lwjgl.jar in lib directory"/> + <!-- 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/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="all"/> + </target> + + <!-- Generates the native headers from source files --> + <target name="headers" description="invokes javah on java classes, producing the headers needed for native compilation" depends="compile"> + <javah classpath="${lwjgl.bin}" destdir="${lwjgl.src.headers}" force="yes"> + <class name="org.lwjgl.Display"/> + <class name="org.lwjgl.Sys"/> + <class name="org.lwjgl.Window"/> + + <class name="org.lwjgl.input.Controller"/> + <class name="org.lwjgl.input.Cursor"/> + <class name="org.lwjgl.input.Keyboard"/> + <class name="org.lwjgl.input.Mouse"/> + + <class name="org.lwjgl.openal.ALC"/> + <class name="org.lwjgl.openal.BaseAL"/> + <class name="org.lwjgl.openal.CoreAL"/> + <class name="org.lwjgl.openal.eax.BaseEAX"/> + <class name="org.lwjgl.openal.eax.CoreEAX"/> + <class name="org.lwjgl.openal.eax.EAXBufferProperties"/> + <class name="org.lwjgl.openal.eax.EAXListenerProperties"/> + + <class name="org.lwjgl.opengl.CoreGL11"/> + <class name="org.lwjgl.opengl.CoreGL12"/> + <class name="org.lwjgl.opengl.CoreGL13"/> + <class name="org.lwjgl.opengl.CoreGL14"/> + <class name="org.lwjgl.opengl.GL"/> + <class name="org.lwjgl.opengl.GLU"/> + <class name="org.lwjgl.opengl.GLCaps"/> + <class name="org.lwjgl.opengl.GLWindow"/> + <class name="org.lwjgl.opengl.Pbuffer"/> + </javah> + </target> + + <!-- Creates a versioned distribution for all supported platforms --> + <target name="distribution_application"> + <!-- check each platform, and run their copy target --> + <condition property="lwjgl.platform.windows"> + <os family="windows"/> + </condition> + <antcall target="distribute_win32"/> - <available file="${lwjgl.lib}/lwjgl_test.jar" property="lwjgl.lwjgl_test_jar.exists"/> - <fail unless="lwjgl.lwjgl_test_jar.exists" message="Missing lwjgl_test.jar in lib directory"/> - - <mkdir dir="${lwjgl.temp}/lwjgl-${lwjgl.version}"/> - - <!-- copy files to lwjgl directory for proper zipping --> - <copy todir="${lwjgl.temp}/lwjgl-${lwjgl.version}"> - <fileset dir="${lwjgl.lib}/"> - <include name="lwjgl.so"/> - <include name="lwjgl_d.so"/> - <include name="libopenal.so"/> - <include name="lwjgl.jar"/> - <include name="lwjgl_test.jar"/> - </fileset> - <fileset dir="${lwjgl.docs}"> - <include name="CREDITS"/> - <include name="LICENSE"/> - <include name="README"/> - </fileset> - </copy> + <condition property="lwjgl.platform.linux"> + <os name="Linux"/> + </condition> + <antcall target="distribute_linux"/> - <!-- zip 'em up --> - <zip destfile="${lwjgl.dist}/lwjgl-${lwjgl.version}.zip" basedir="${lwjgl.temp}/"/> - </target> - - <!-- Creates a versioned distribution of javadocs --> - <target name="distribution_javadoc"> - <zip destfile="${lwjgl.dist}/lwjgl-docs-${lwjgl.version}.zip" basedir="${lwjgl.docs}" includes="javadoc/**"/> - </target> + <condition property="lwjgl.platform.mac"> + <os name="Mac OS X"/> + </condition> + <antcall target="distribute_macosx"/> + </target> + + <!-- Distributes win32 files --> + <target name="distribute_win32" description="Distributes win32 files" if="lwjgl.platform.windows"> + <!-- copy files from lib/platform to temp --> + <copy todir="${lwjgl.temp}/lwjgl-win32-${lwjgl.version}"> + <fileset dir="${lwjgl.lib}"> + <patternset refid="lwjgl-win32.fileset"/> + <patternset refid="lwjgl-common.fileset"/> + </fileset> + <fileset dir="${lwjgl.docs}"> + <patternset refid="lwjgl-common.fileset"/> + </fileset> + </copy> + <zip destfile="${lwjgl.dist}/lwjgl-win32-${lwjgl.version}.zip" basedir="${lwjgl.temp}" includes="**"/> + </target> + + <!-- Distributes linux files --> + <target name="distribute_linux" description="Distributes linux files" if="lwjgl.platform.linux"> + <!-- copy files from lib/platform to temp --> + <copy todir="${lwjgl.temp}/lwjgl-linux-${lwjgl.version}"> + <fileset dir="${lwjgl.lib}"> + <patternset refid="lwjgl-linux.fileset"/> + <patternset refid="lwjgl-common.fileset"/> + </fileset> + <fileset dir="${lwjgl.docs}"> + <patternset refid="lwjgl-common.fileset"/> + </fileset> + </copy> + <zip destfile="${lwjgl.dist}/lwjgl-linux-${lwjgl.version}.zip" basedir="${lwjgl.temp}" includes="**"/> + </target> + + <!-- Distributes macosx files --> + <target name="distribute_macosx" description="Distributes macosx files" if="lwjgl.platform.macosx"> + <!-- copy files from lib/platform to temp --> + <copy todir="${lwjgl.temp}/lwjgl-macosx-${lwjgl.version}"> + <fileset dir="${lwjgl.lib}"> + <patternset refid="lwjgl-macosx.fileset"/> + <patternset refid="lwjgl-common.fileset"/> + </fileset> + <fileset dir="${lwjgl.docs}"> + <patternset refid="lwjgl-common.fileset"/> + </fileset> + </copy> + <zip destfile="${lwjgl.dist}/lwjgl-macosx-${lwjgl.version}.zip" basedir="${lwjgl.temp}" includes="**"/> + </target> + + <!-- Creates a versioned distribution of javadocs --> + <target name="distribution_javadoc"> + <zip destfile="${lwjgl.dist}/lwjgl-docs-${lwjgl.version}.zip" basedir="${lwjgl.docs}" includes="javadoc/**"/> + </target> - <!-- Creates a versioned distribution of the source code --> - <target name="distribution_source"> - <zip destfile="${lwjgl.dist}/lwjgl-source-${lwjgl.version}.zip"> - <fileset dir="${lwjgl.src}/"> - <patternset> - <include name="**/*.java"/> - <include name="**/*.cpp"/> - <include name="**/*.c"/> - <include name="**/*.h"/> - <include name="**/*.am"/> - <exclude name="**/*CVS*"/> - <exclude name="**/.*"/> - </patternset> - </fileset> - </zip> - </target> + <!-- Creates a versioned distribution of the source code --> + <target name="distribution_source"> + <zip destfile="${lwjgl.dist}/lwjgl-source-${lwjgl.version}.zip"> + <fileset refid="lwjgl.source.fileset"/> + </zip> + </target> + + <!-- Creates a versioned distribution of the resource files --> + <target name="distribution_resources"> + <zip destfile="${lwjgl.dist}/lwjgl-media-${lwjgl.version}.zip"> + <fileset refid="lwjgl.media.fileset"/> + </zip> + </target> - <!-- clean internal temporary directories --> - <target name="internal_clean"> - <delete dir="${lwjgl.temp}" taskname="cleanup"/> - </target> + <!-- clean internal temporary directories --> + <target name="internal_clean"> + <delete dir="${lwjgl.temp}" taskname="cleanup"/> + </target> </project> |
|
From: Caspian Rychlik-P. <ci...@us...> - 2003-11-10 01:42:00
|
Update of /cvsroot/java-game-lib/LWJGL/src/native/win32 In directory sc8-pr-cvs1:/tmp/cvs-serv9306/src/native/win32 Modified Files: org_lwjgl_Display.cpp Log Message: Removed some annoying debugging Index: org_lwjgl_Display.cpp CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/win32/org_lwjgl_Display.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/win32/org_lwjgl_Display.cpp,v retrieving revision 1.54 retrieving revision 1.55 diff -u -d -r1.54 -r1.55 --- org_lwjgl_Display.cpp 23 Oct 2003 07:18:07 -0000 1.54 +++ org_lwjgl_Display.cpp 10 Nov 2003 01:41:57 -0000 1.55 @@ -40,7 +40,7 @@ */ #include "Window.h" -#include "org_lwjgl_Display.h" +#include "org_lwjgl_Display.h" #include "common_tools.h" #define WINDOWCLASSNAME "LWJGLWINDOW" @@ -112,9 +112,9 @@ #endif j = 0; while(EnumDisplaySettingsExA((const char *) DisplayDevice.DeviceName, j++, &DevMode, 0) != 0) { -#ifdef _DEBUG - printf("Checking setting #%d\n", j); -#endif +//#ifdef _DEBUG +// printf("Checking setting #%d\n", j); +//#endif if (DevMode.dmBitsPerPel > 8) { AvailableModes++; } @@ -493,9 +493,9 @@ TCHAR szDriverKey[MY_BUFSIZE]; strcpy(szDriverKey, &szAdapterKey[18]); -#ifdef _DEBUG - printf("Driver key: %s\n", szDriverKey); -#endif +//#ifdef _DEBUG +// printf("Driver key: %s\n", szDriverKey); +//#endif if(RegOpenKeyEx(HKEY_LOCAL_MACHINE, TEXT(szDriverKey), @@ -557,26 +557,26 @@ } strcat(driverDLL, driver); strcat(driverDLL, ".dll"); -#ifdef _DEBUG - printf("Driver dll = %s\n", driverDLL); -#endif +//#ifdef _DEBUG +// printf("Driver dll = %s\n", driverDLL); +//#endif DWORD var = 0; DWORD dwInfoSize = GetFileVersionInfoSize(driverDLL, &var); LPVOID lpInfoBuff = new unsigned char[dwInfoSize]; BOOL bRetval = GetFileVersionInfo(driverDLL, NULL, dwInfoSize, lpInfoBuff); if (bRetval == 0) { -#ifdef _DEBUG - printf("GetFileVersionInfo failed\n"); -#endif +//#ifdef _DEBUG +// printf("GetFileVersionInfo failed\n"); +//#endif } else { VS_FIXEDFILEINFO * fxdFileInfo; UINT uiLen = 0; bRetval = VerQueryValue(lpInfoBuff, TEXT("\\"), (void **) &fxdFileInfo, &uiLen); if (bRetval == 0) { -#ifdef _DEBUG - printf("VerQueryValue failed\n"); -#endif +//#ifdef _DEBUG +// printf("VerQueryValue failed\n"); +//#endif } else { TCHAR version[256]; TCHAR ms[10], ls[10]; |
|
From: Caspian Rychlik-P. <ci...@us...> - 2003-11-10 01:40:44
|
Update of /cvsroot/java-game-lib/LWJGL/src/native/common In directory sc8-pr-cvs1:/tmp/cvs-serv9136/src/native/common Removed Files: org_lwjgl_Math.cpp Log Message: Removed --- org_lwjgl_Math.cpp DELETED --- CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/common/org_lwjgl_Math.cpp |
|
From: Elias N. <eli...@us...> - 2003-11-06 14:30:38
|
Update of /cvsroot/java-game-lib/LWJGL/src/native/macosx In directory sc8-pr-cvs1:/tmp/cvs-serv20861/macosx Modified Files: Window.h org_lwjgl_Display.cpp org_lwjgl_Sys.cpp org_lwjgl_input_Keyboard.cpp Log Message: Fixed Mac OS X keyboard translation Index: Window.h CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/macosx/Window.h =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/macosx/Window.h,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- Window.h 24 Oct 2003 11:45:55 -0000 1.10 +++ Window.h 6 Nov 2003 14:30:23 -0000 1.11 @@ -45,7 +45,8 @@ #include <jni.h> #include <Carbon/Carbon.h> extern void resetMode(JNIEnv *env); - extern bool switchMode(JNIEnv *env, long width, long height, long bpp, long freq); + extern bool switchMode(JNIEnv *env, long width, long height, long bpp, long freq); + extern bool switchToNearestMode(JNIEnv *env, long width, long height, long bpp, long freq); extern void handleKeyboardEvent(EventRef event); extern void handleMouseEvent(EventRef event); Index: org_lwjgl_Display.cpp CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/macosx/org_lwjgl_Display.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/macosx/org_lwjgl_Display.cpp,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 Index: org_lwjgl_Sys.cpp CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/macosx/org_lwjgl_Sys.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/macosx/org_lwjgl_Sys.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- org_lwjgl_Sys.cpp 28 Oct 2003 19:25:50 -0000 1.8 +++ org_lwjgl_Sys.cpp 6 Nov 2003 14:30:25 -0000 1.9 @@ -146,12 +146,11 @@ CopyCStringToPascal(urlString, urlStr); env->ReleaseStringUTFChars(url, urlString); - - err = ICStart(&inst, '????'); // Use your creator code if you have one! +/* err = ICStart(&inst, '????'); // Use your creator code if you have one! if (err == noErr) { startSel = 0; endSel = urlStr[0]; err = ICLaunchURL(inst, "\p", (char *) &urlStr[1], urlStr[0], &startSel, &endSel); (void) ICStop(inst); - } -} \ No newline at end of file + }*/ +} Index: org_lwjgl_input_Keyboard.cpp CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/macosx/org_lwjgl_input_Keyboard.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/macosx/org_lwjgl_input_Keyboard.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- org_lwjgl_input_Keyboard.cpp 3 Nov 2003 13:34:06 -0000 1.17 +++ org_lwjgl_input_Keyboard.cpp 6 Nov 2003 14:30:25 -0000 1.18 @@ -43,6 +43,7 @@ #include "tools.h" #include "org_lwjgl_input_Keyboard.h" #include "common_tools.h" +#include <CoreServices/CoreServices.h> #define KEYBOARD_SIZE 256 #define TRANSLATION_BUFFER_SIZE 10 @@ -52,6 +53,7 @@ static bool buffer_enabled = false; static bool translation_enabled = false; static event_queue_t event_queue; +static UInt32 deadKeyState; static bool handleMappedKey(unsigned char mapped_code, unsigned char state) { unsigned char old_state = key_buf[mapped_code]; @@ -109,7 +111,7 @@ return true; } -static bool writeAsciiChars(int num_chars, const char *buffer) { +static bool writeAsciiChars(int num_chars, const unsigned char *buffer) { if (num_chars == 0) return false; unsigned char c = buffer[0]; @@ -125,64 +127,69 @@ return true; } -static bool handleUnicode(EventRef event) { - UniChar unicode_buffer[TRANSLATION_BUFFER_SIZE]; - UInt32 data_size; - int num_chars; - OSStatus err = GetEventParameter(event, kEventParamKeyUnicodes, typeUnicodeText, NULL, 0, &data_size, NULL); - if (err != noErr) { -#ifdef _DEBUG - printf("Could not get unicode char count\n"); -#endif - return false; - } - num_chars = data_size/sizeof(UniChar); - if (num_chars >= TRANSLATION_BUFFER_SIZE) { -#ifdef _DEBUG - printf("Unicode chars could not fit in buffer\n"); -#endif - return false; - } - err = GetEventParameter(event, kEventParamKeyUnicodes, typeUnicodeText, NULL, data_size, NULL, unicode_buffer); - if (err != noErr) { -#ifdef _DEBUG - printf("Could not get unicode chars\n"); -#endif - return false; - } - return writeUniChars(num_chars, unicode_buffer); -} +static bool handleTranslation(EventRef event, bool state) { + UniChar unicodeInputString[TRANSLATION_BUFFER_SIZE]; -static bool handleAscii(EventRef event) { - char ascii_buffer[TRANSLATION_BUFFER_SIZE]; - UInt32 data_size; - int num_chars; - OSStatus err = GetEventParameter(event, kEventParamKeyMacCharCodes, typeChar, NULL, 0, &data_size, NULL); + KeyboardLayoutRef layout; + OSStatus err = KLGetCurrentKeyboardLayout(&layout); if (err != noErr) { #ifdef _DEBUG - printf("Could not get ascii char count\n"); + printf("Could not get current keyboard layout\n"); #endif return false; } - num_chars = data_size/sizeof(char); - if (num_chars >= TRANSLATION_BUFFER_SIZE) { + + UInt32 keyboardType; + UInt32 modifierKeyState; + UInt32 virtualKeyCode; + UniCharCount actualStringLength; + OSStatus status; + UCKeyboardLayout *uchrHandle; + bool success = GetEventParameter(event, kEventParamKeyCode, typeUInt32, NULL, sizeof(virtualKeyCode), NULL, &virtualKeyCode) == noErr; + success = success && GetEventParameter(event, kEventParamKeyboardType, typeUInt32, NULL, sizeof(keyboardType), NULL, &keyboardType) == noErr; + success = success && GetEventParameter(event, kEventParamKeyModifiers, typeUInt32, NULL, sizeof(modifierKeyState), NULL, &modifierKeyState) == noErr; + if (!success) { #ifdef _DEBUG - printf("Ascii chars could not fit in buffer\n"); + printf("Could not get event parameters for character translation\n"); #endif return false; } - err = GetEventParameter(event, kEventParamKeyMacCharCodes, typeChar, NULL, data_size, NULL, ascii_buffer); - if (err != noErr) { + err = KLGetKeyboardLayoutProperty(layout, kKLuchrData, (const void **)&uchrHandle); + if (err == noErr && uchrHandle != NULL) { + UInt16 action = state ? kUCKeyActionDown : kUCKeyActionUp; + status = UCKeyTranslate(uchrHandle, virtualKeyCode, action, + modifierKeyState, keyboardType, 0, + &deadKeyState, TRANSLATION_BUFFER_SIZE, + &actualStringLength, unicodeInputString); + if (state) + return writeUniChars(actualStringLength, unicodeInputString); + } else { + void * kchrHandle; + err = KLGetKeyboardLayoutProperty(layout, kKLKCHRData, (const void **)&kchrHandle); + if (err == noErr && kchrHandle != NULL) { + UInt16 action = state ? 0x80 : 0x00; + UInt16 key_code = (virtualKeyCode & 0x7f); + UInt16 modifier_code = (modifierKeyState & 0xff00); + UInt16 code = modifier_code | action | key_code; + UInt32 character = KeyTranslate(kchrHandle, code, &deadKeyState); + int count = 0; + unsigned char ascii_buffer[2]; + unsigned char c1 = (unsigned char)(character & 0xff); + if (c1 != 0) + ascii_buffer[count++] = c1; + unsigned char c2 = (unsigned char)((character & 0xff0000) >> 16); + if (c2 != 0) + ascii_buffer[count++] = c2; + if (state) + return writeAsciiChars(count, ascii_buffer); + } else { #ifdef _DEBUG - printf("Could not get ascii chars\n"); + printf("Could not translate key\n"); #endif - return false; + return false; + } } - return writeAsciiChars(num_chars, ascii_buffer); -} - -static bool handleTranslation(EventRef event) { - return handleUnicode(event) || handleAscii(event); + return false; } static void doKeyDown(EventRef event) { @@ -194,7 +201,7 @@ #endif return; } - if (handleKey(key_code, 1) && !handleTranslation(event)) { + if (handleKey(key_code, 1) && !handleTranslation(event, true)) { putEventElement(&event_queue, 0); putEventElement(&event_queue, 0); } @@ -209,7 +216,7 @@ #endif return; } - if (handleKey(key_code, 0) && !handleTranslation(event)) { + if (handleKey(key_code, 0) && !handleTranslation(event, false)) { putEventElement(&event_queue, 0); putEventElement(&event_queue, 0); } @@ -360,6 +367,7 @@ JNIEXPORT void JNICALL Java_org_lwjgl_input_Keyboard_nCreate(JNIEnv * env, jclass clazz) { buffer_enabled = false; translation_enabled = false; + deadKeyState = 0; initEventQueue(&event_queue); memset(key_buf, 0, KEYBOARD_SIZE*sizeof(unsigned char)); setupMappings(); |
|
From: Elias N. <eli...@us...> - 2003-11-03 13:34:09
|
Update of /cvsroot/java-game-lib/LWJGL/src/native/macosx In directory sc8-pr-cvs1:/tmp/cvs-serv1819/macosx Modified Files: org_lwjgl_Display.cpp org_lwjgl_input_Keyboard.cpp org_lwjgl_opengl_Window.cpp Log Message: Updated to make input work with Mac OS X 10.3 Index: org_lwjgl_Display.cpp CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/macosx/org_lwjgl_Display.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/macosx/org_lwjgl_Display.cpp,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- org_lwjgl_Display.cpp 24 Oct 2003 11:45:55 -0000 1.25 +++ org_lwjgl_Display.cpp 3 Nov 2003 13:34:06 -0000 1.26 @@ -108,6 +108,24 @@ return false; } +bool switchToNearestMode(JNIEnv *env, long width, long height, long bpp, long freq) { + init(env); + if (display_captured) + return false; + display_captured = true; + CGDisplayCapture(kCGDirectMainDisplay); + boolean_t match; + CFDictionaryRef mode = CGDisplayBestModeForParametersAndRefreshRate(kCGDirectMainDisplay, bpp, width, height, freq, &match); + if (mode == NULL) + return false; + CGDisplayErr err = CGDisplaySwitchToMode(kCGDirectMainDisplay, mode); + if (!err) { + saveMode(env, width, height, bpp, freq); + return true; + } else + return false; +} + void resetMode(JNIEnv *env) { init(env); if (!display_captured) Index: org_lwjgl_input_Keyboard.cpp CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/macosx/org_lwjgl_input_Keyboard.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/macosx/org_lwjgl_input_Keyboard.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- org_lwjgl_input_Keyboard.cpp 22 Oct 2003 10:57:19 -0000 1.16 +++ org_lwjgl_input_Keyboard.cpp 3 Nov 2003 13:34:06 -0000 1.17 @@ -45,7 +45,7 @@ #include "common_tools.h" #define KEYBOARD_SIZE 256 -#define UNICODE_BUFFER_SIZE 10 +#define TRANSLATION_BUFFER_SIZE 10 static unsigned char key_buf[KEYBOARD_SIZE]; static unsigned char key_map[KEYBOARD_SIZE]; @@ -60,7 +60,7 @@ if (buffer_enabled) { putEventElement(&event_queue, mapped_code); putEventElement(&event_queue, state); - return true; + return translation_enabled; } } return false; @@ -91,7 +91,7 @@ return (unsigned char)((ch & 0xff00) >> 16); } -static bool writeChars(int num_chars, UniChar *buffer) { +static bool writeUniChars(int num_chars, const UniChar *buffer) { if (num_chars == 0) return false; unsigned char b0 = getFirstByte(buffer[0]); @@ -109,8 +109,24 @@ return true; } +static bool writeAsciiChars(int num_chars, const char *buffer) { + if (num_chars == 0) + return false; + unsigned char c = buffer[0]; + putEventElement(&event_queue, 0); + putEventElement(&event_queue, c); + for (int i = 1; i < num_chars; i++) { + putEventElement(&event_queue, 0); + putEventElement(&event_queue, 0); + unsigned char c = buffer[i]; + putEventElement(&event_queue, 0); + putEventElement(&event_queue, c); + } + return true; +} + static bool handleUnicode(EventRef event) { - UniChar unicode_buffer[UNICODE_BUFFER_SIZE]; + UniChar unicode_buffer[TRANSLATION_BUFFER_SIZE]; UInt32 data_size; int num_chars; OSStatus err = GetEventParameter(event, kEventParamKeyUnicodes, typeUnicodeText, NULL, 0, &data_size, NULL); @@ -121,7 +137,7 @@ return false; } num_chars = data_size/sizeof(UniChar); - if (num_chars >= UNICODE_BUFFER_SIZE) { + if (num_chars >= TRANSLATION_BUFFER_SIZE) { #ifdef _DEBUG printf("Unicode chars could not fit in buffer\n"); #endif @@ -134,7 +150,39 @@ #endif return false; } - return writeChars(num_chars, unicode_buffer); + return writeUniChars(num_chars, unicode_buffer); +} + +static bool handleAscii(EventRef event) { + char ascii_buffer[TRANSLATION_BUFFER_SIZE]; + UInt32 data_size; + int num_chars; + OSStatus err = GetEventParameter(event, kEventParamKeyMacCharCodes, typeChar, NULL, 0, &data_size, NULL); + if (err != noErr) { +#ifdef _DEBUG + printf("Could not get ascii char count\n"); +#endif + return false; + } + num_chars = data_size/sizeof(char); + if (num_chars >= TRANSLATION_BUFFER_SIZE) { +#ifdef _DEBUG + printf("Ascii chars could not fit in buffer\n"); +#endif + return false; + } + err = GetEventParameter(event, kEventParamKeyMacCharCodes, typeChar, NULL, data_size, NULL, ascii_buffer); + if (err != noErr) { +#ifdef _DEBUG + printf("Could not get ascii chars\n"); +#endif + return false; + } + return writeAsciiChars(num_chars, ascii_buffer); +} + +static bool handleTranslation(EventRef event) { + return handleUnicode(event) || handleAscii(event); } static void doKeyDown(EventRef event) { @@ -146,16 +194,9 @@ #endif return; } - if (handleKey(key_code, 1)) { - if (translation_enabled) { - if (!handleUnicode(event)) { - putEventElement(&event_queue, 0); - putEventElement(&event_queue, 0); - } - } else { - putEventElement(&event_queue, 0); - putEventElement(&event_queue, 0); - } + if (handleKey(key_code, 1) && !handleTranslation(event)) { + putEventElement(&event_queue, 0); + putEventElement(&event_queue, 0); } } @@ -168,7 +209,7 @@ #endif return; } - if (handleKey(key_code, 0)) { + if (handleKey(key_code, 0) && !handleTranslation(event)) { putEventElement(&event_queue, 0); putEventElement(&event_queue, 0); } Index: org_lwjgl_opengl_Window.cpp CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/macosx/org_lwjgl_opengl_Window.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/macosx/org_lwjgl_opengl_Window.cpp,v retrieving revision 1.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- org_lwjgl_opengl_Window.cpp 2 Nov 2003 11:34:27 -0000 1.30 +++ org_lwjgl_opengl_Window.cpp 3 Nov 2003 13:34:06 -0000 1.31 @@ -113,7 +113,7 @@ return; } if (!current_fullscreen) { - if (!switchMode(env, width, height, bpp, 60)) { + if (!switchToNearestMode(env, width, height, bpp, 60)) { destroyMode(env, clazz); extgl_Close(); throwException(env, "Could not switch mode."); |
|
From: Elias N. <eli...@us...> - 2003-11-03 13:34:09
|
Update of /cvsroot/java-game-lib/LWJGL/src/native In directory sc8-pr-cvs1:/tmp/cvs-serv1819 Modified Files: dummy.cpp Log Message: Updated to make input work with Mac OS X 10.3 Index: dummy.cpp CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/dummy.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/dummy.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- dummy.cpp 8 Sep 2003 16:34:38 -0000 1.5 +++ dummy.cpp 3 Nov 2003 13:34:06 -0000 1.6 @@ -1 +1,2 @@ -int blah; +void dummy() { +} |
|
From: Caspian Rychlik-P. <ci...@us...> - 2003-11-03 11:24:00
|
Update of /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl In directory sc8-pr-cvs1:/tmp/cvs-serv11573/src/java/org/lwjgl/opengl Modified Files: Window.java Log Message: Added getContext() to Window Index: Window.java CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/Window.java =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/java/org/lwjgl/opengl/Window.java,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- Window.java 21 Oct 2003 15:11:58 -0000 1.16 +++ Window.java 3 Nov 2003 11:23:56 -0000 1.17 @@ -73,29 +73,12 @@ /** Tracks VBO state for the window context */ private static VBOTracker vbo_tracker; + + /** A unique context object, so we can track different contexts between creates() and destroys() */ + private static Window context; /** - * Construct a Window. Some OSs may not support non-fullscreen windows; in - * which case the window will be fullscreen regardless. - * - * A fullscreen window MUST track changes to the display settings and change its - * width and height accordingly. - * - * In this abstract base class, no actual window peer is constructed. This should be - * done in specialised derived classes. - * - * Only one Window can be created() at a time; to create another Window you must - * first destroy() the first window. - * - * The dimensions may be ignored if the window cannot be made non- - * fullscreen. The position may be ignored in either case. - * - * @param title The window's title - * @param x Position on x axis of top left corner of window. - * @param y Position on y axis of top left corner of window. - * @param width Width of window - * @param height Height of window - * @throws RuntimeException if you attempt to create more than one window at the same time + * Only constructed by ourselves */ private Window() { } @@ -312,6 +295,7 @@ nCreate(title, x, y, width, height, fullscreen, color, alpha, depth, stencil, extensions); GLCaps.determineAvailableExtensions(extensions); created = true; + context = new Window(); } /** @@ -322,6 +306,14 @@ return; nDestroy(); created = false; + context = null; + } + + /** + * @return the unique Window context + */ + public static final Window getContext() { + return context; } /** |
|
From: Elias N. <eli...@us...> - 2003-11-02 14:41:24
|
Update of /cvsroot/java-game-lib/LWJGL/src/native/linux In directory sc8-pr-cvs1:/tmp/cvs-serv11734/linux Modified Files: org_lwjgl_opengl_Window.cpp Log Message: Removed a XSetInputFocus call from linux Window.cpp Index: org_lwjgl_opengl_Window.cpp CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/linux/org_lwjgl_opengl_Window.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/org_lwjgl_opengl_Window.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- org_lwjgl_opengl_Window.cpp 20 Oct 2003 14:17:47 -0000 1.10 +++ org_lwjgl_opengl_Window.cpp 2 Nov 2003 14:41:20 -0000 1.11 @@ -226,7 +226,7 @@ XMapRaised(disp, win); waitMapped(disp, win); XClearWindow(disp, win); - XSetInputFocus(current_disp, current_win, RevertToParent, CurrentTime); +// XSetInputFocus(current_disp, current_win, RevertToParent, CurrentTime); XSync(disp, True); } |
|
From: Elias N. <eli...@us...> - 2003-11-02 11:34:30
|
Update of /cvsroot/java-game-lib/LWJGL/src/native/macosx In directory sc8-pr-cvs1:/tmp/cvs-serv16406/macosx Modified Files: org_lwjgl_opengl_Window.cpp Log Message: Removed extra ; in mac Window.cpp Index: org_lwjgl_opengl_Window.cpp CVS Browser: http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/java-game-lib/LWJGL/src/native/macosx/org_lwjgl_opengl_Window.cpp =================================================================== RCS file: /cvsroot/java-game-lib/LWJGL/src/native/macosx/org_lwjgl_opengl_Window.cpp,v retrieving revision 1.29 retrieving revision 1.30 diff -u -d -r1.29 -r1.30 --- org_lwjgl_opengl_Window.cpp 24 Oct 2003 11:59:18 -0000 1.29 +++ org_lwjgl_opengl_Window.cpp 2 Nov 2003 11:34:27 -0000 1.30 @@ -51,7 +51,7 @@ static bool current_fullscreen; static void destroyMode(JNIEnv *env, jclass clazz) { - if (!current_fullscreen); + if (!current_fullscreen) resetMode(env); } |
