Update of /cvsroot/java-game-lib/LWJGL/src/native/linux
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30748
Modified Files:
Makefile display.c org_lwjgl_opengl_LinuxAWTGLCanvasPeerInfo.c
Log Message:
Linux: Added -lm and -std=c99 to fix the warning abount round(). Removed some unnecessary headers
Index: display.c
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/display.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- display.c 22 Nov 2005 13:53:13 -0000 1.24
+++ display.c 23 Nov 2005 15:10:05 -0000 1.25
@@ -279,7 +279,7 @@
int i;
for (i = 0; i < length; i++) {
float scaled_gamma = ramp_ptr[i]*0xffff;
- short scaled_gamma_short = (unsigned short)round(scaled_gamma);
+ short scaled_gamma_short = (unsigned short)roundf(scaled_gamma);
native_ramp_ptr[i] = scaled_gamma_short;
native_ramp_ptr[i + length] = scaled_gamma_short;
native_ramp_ptr[i + length*2] = scaled_gamma_short;
Index: Makefile
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/Makefile,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- Makefile 10 Oct 2005 12:50:10 -0000 1.23
+++ Makefile 23 Nov 2005 15:10:05 -0000 1.24
@@ -4,8 +4,8 @@
LINKER=gcc
STRIP=strip
CFLAGS_LINK=-shared -Wall
-LIBS=-L/usr/X11R6/lib -L/usr/X11/lib -lX11 -lXext -lpthread -L$(JAVA_HOME)/jre/lib/i386 -ljawt -Wl,-static,-lXxf86vm,-lXcursor,-lXrender,-lXrandr,-call_shared
-CFLAGS_O=-fPIC -O2 -D_X11 -Wall -pthread -c -I../common -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I$(AL_HOME)/include
+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,-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
Index: org_lwjgl_opengl_LinuxAWTGLCanvasPeerInfo.c
===================================================================
RCS file: /cvsroot/java-game-lib/LWJGL/src/native/linux/org_lwjgl_opengl_LinuxAWTGLCanvasPeerInfo.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- org_lwjgl_opengl_LinuxAWTGLCanvasPeerInfo.c 27 May 2005 11:50:13 -0000 1.2
+++ org_lwjgl_opengl_LinuxAWTGLCanvasPeerInfo.c 23 Nov 2005 15:10:05 -0000 1.3
@@ -45,9 +45,7 @@
#include <X11/Xutil.h>
#include "awt_tools.h"
#include "org_lwjgl_opengl_LinuxAWTGLCanvasPeerInfo.h"
-#include "extgl_glx.h"
#include "context.h"
-#include "Window.h"
JNIEXPORT void JNICALL Java_org_lwjgl_opengl_LinuxAWTGLCanvasPeerInfo_nInitHandle
(JNIEnv *env, jclass clazz, int screen, jobject lock_buffer_handle, jobject peer_info_handle) {
|
