diff -up sdljava-0.9.1/etc/build/linux/Makefile.regen sdljava-0.9.1/etc/build/linux/Makefile
--- sdljava-0.9.1/etc/build/linux/Makefile.regen	2005-02-20 23:19:13.000000000 +0100
+++ sdljava-0.9.1/etc/build/linux/Makefile	2007-09-07 12:17:40.000000000 +0200
@@ -4,7 +4,7 @@ CC = gcc
 
 CFLAGS=-O3
 
-INCLUDE=-I. -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I/usr/include -I/usr/include/SDL -I/usr/local/include -I/usr/local/include/SDL
+INCLUDE=-I. -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I/usr/include -I/usr/include/SDL -I@GCC_INCLUDE_PATH@ -D__NO_CTYPE -D_ISbit
 
 SDLJAVA_I=SDLAudio.i\
           SDLCdrom.i\
@@ -46,35 +46,35 @@ gfx:    libsdljava_gfx.so
 #
 # NOTE:  if you want to work on the sdljava native layer please un-comment these lines
 #
-#SDLAudio_wrap.c: SDLAudio.i common.i
-#	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLAudio.i
-#
-#SDLCdrom_wrap.c: SDLCdrom.i common.i
-#	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLCdrom.i
-#
-#SDLEvent_wrap.c: SDLEvent.i common.i
-#	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLEvent.i
-#
-#SDLGFX_wrap.c: SDLGFX.i common.i
-#	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLGFX.i
-#
-#SDLImage_wrap.c: SDLImage.i common.i
-#	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLImage.i
-#
-#SDLJoystick_wrap.c: SDLJoystick.i common.i
-#	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLJoystick.i
-#
-#SDLMain_wrap.c: SDLMain.i common.i
-#	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLMain.i
-#
-#SDLMixer_wrap.c: SDLMixer.i common.i
-#	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLMixer.i
-#
-#SDLTTF_wrap.c: SDLTTF.i common.i
-#	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLTTF.i
-#
-#SDLVideo_wrap.c: SDLVideo.i common.i
-#	$(SWIG) $(INCLUDE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLVideo.i
+SDLAudio_wrap.c: SDLAudio.i common.i
+	$(SWIG) $(INCLUDE) $(ARCH_DEFINE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLAudio.i
+
+SDLCdrom_wrap.c: SDLCdrom.i common.i
+	$(SWIG) $(INCLUDE) $(ARCH_DEFINE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLCdrom.i
+
+SDLEvent_wrap.c: SDLEvent.i common.i
+	$(SWIG) $(INCLUDE) $(ARCH_DEFINE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLEvent.i
+
+SDLGFX_wrap.c: SDLGFX.i common.i
+	$(SWIG) $(INCLUDE) $(ARCH_DEFINE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLGFX.i
+
+SDLImage_wrap.c: SDLImage.i common.i
+	$(SWIG) $(INCLUDE) $(ARCH_DEFINE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLImage.i
+
+SDLJoystick_wrap.c: SDLJoystick.i common.i
+	$(SWIG) $(INCLUDE) $(ARCH_DEFINE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLJoystick.i
+
+SDLMain_wrap.c: SDLMain.i common.i
+	$(SWIG) $(INCLUDE) $(ARCH_DEFINE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLMain.i
+
+SDLMixer_wrap.c: SDLMixer.i common.i
+	$(SWIG) $(INCLUDE) $(ARCH_DEFINE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLMixer.i
+
+SDLTTF_wrap.c: SDLTTF.i common.i
+	$(SWIG) $(INCLUDE) $(ARCH_DEFINE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLTTF.i
+
+SDLVideo_wrap.c: SDLVideo.i common.i
+	$(SWIG) $(INCLUDE) $(ARCH_DEFINE) -importall -java -package sdljava.x.swig -outdir ../x/swig SDLVideo.i
 
 %.o: %.c
 	$(CC) $(CFLAGS) $(INCLUDE) -c $< -o $@
diff -up sdljava-0.9.1/etc/build/gljava/linux/Makefile.regen sdljava-0.9.1/etc/build/gljava/linux/Makefile
--- sdljava-0.9.1/etc/build/gljava/linux/Makefile.regen	2005-02-20 23:19:13.000000000 +0100
+++ sdljava-0.9.1/etc/build/gljava/linux/Makefile	2007-09-07 12:17:40.000000000 +0200
@@ -4,12 +4,12 @@ CC = gcc
 
 CFLAGS=-O3
 
-INCLUDE=-I. -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I/usr/include -I/usr/local/include
+INCLUDE=-I. -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I/usr/include -I@GCC_INCLUDE_PATH@
 
 GLJAVA_I=glew.i
 
 GLJAVA_OBJ=glew_wrap.o
-GLJAVA_LIB=-lGLEW
+GLJAVA_LIB=-lGLEW -lGLU
 
 all:	libgljava.so
 
@@ -17,8 +17,8 @@ all:	libgljava.so
 #
 # NOTE:  if you want to work on the gljava native layer please un-comment the following line
 #
-#glew_wrap.c: glew.i gljava_common_typemaps.i opengl-1_1.i
-#	$(SWIG) $(INCLUDE) -importall -java -package org.gljava.opengl.x.swig -outdir ../../../../org/gljava/opengl/x/swig glew.i
+glew_wrap.c: glew.i gljava_common_typemaps.i opengl-1_1.i
+	$(SWIG) $(INCLUDE) $(ARCH_DEFINE) -importall -java -package org.gljava.opengl.x.swig -outdir ../../../../org/gljava/opengl/x/swig glew.i
 
 %.o: %.c
 	$(CC) $(CFLAGS) $(INCLUDE) -c $< -o $@
diff -up sdljava-0.9.1/etc/build/gljava/linux/ftgl/Makefile.regen sdljava-0.9.1/etc/build/gljava/linux/ftgl/Makefile
--- sdljava-0.9.1/etc/build/gljava/linux/ftgl/Makefile.regen	2005-02-20 23:19:13.000000000 +0100
+++ sdljava-0.9.1/etc/build/gljava/linux/ftgl/Makefile	2007-09-07 12:17:40.000000000 +0200
@@ -4,7 +4,7 @@ CC = gcc
 
 CFLAGS=-O3
 
-INCLUDE=-I. -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I/usr/include -I/usr/local/include -I/usr/include/freetype2 -I/usr/include/FTGL
+INCLUDE=-I. -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I/usr/include -I@GCC_INCLUDE_PATH@ -I/usr/include/freetype2 -I/usr/include/FTGL
 
 FTGLJAVA_OBJ=FTGL_wrap.o
 FTGLJAVA_LIB=-lGLU -lGL -lfreetype -lz -lftgl
@@ -15,9 +15,9 @@ all:	libftgljava.so
 #
 # NOTE:  if you want to work on the ftgljava native layer please un-comment the following line
 #
-#FTGL_wrap.cxx: FTGL.i FTFont.i FTFace.i FTGLBitmapFont.i FTGLExtrdFont.i FTGLOutlineFont.i FTGLPixmapFont.i FTGLPolygonFont.i FTGLTextureFont.i
-#	$(SWIG) -Wall -c++ $(INCLUDE) -importall -java -package org.gljava.opengl.ftgl -outdir ../../../../../org/gljava/opengl/ftgl FTGL.i
-#	./post-process.rb
+FTGL_wrap.cxx: FTGL.i FTFont.i FTFace.i FTGLBitmapFont.i FTGLExtrdFont.i FTGLOutlineFont.i FTGLPixmapFont.i FTGLPolygonFont.i FTGLTextureFont.i
+	$(SWIG) -Wall -c++ $(INCLUDE) $(ARCH_DEFINE) -importall -java -package org.gljava.opengl.ftgl -outdir ../../../../../org/gljava/opengl/ftgl FTGL.i
+	./post-process.rb
 
 %.o: %.cxx
 	$(CC) $(CFLAGS) $(INCLUDE) -c $< -o $@