clean up; gl test compiles under freebsd (but see makefile)

src/clump.cpp

@@ -2,6 +2,7 @@
 #include <cstdlib>
 #include <cstring>
 #include <cassert>
+#include <stdint.h>
 
 #include <new>
 

src/geometry.cpp

@@ -2,6 +2,7 @@
 #include <cstdlib>
 #include <cstring>
 #include <cassert>
+#include <stdint.h>
 
 #include <new>
 

src/gtaplg.cpp

@@ -2,6 +2,8 @@
 #include <cstdlib>
 #include <cstring>
 #include <cassert>
+#include <stdint.h>
+
 #include <new>
 
 #include "rwbase.h"

src/image.cpp

@@ -2,6 +2,8 @@
 #include <cstdlib>
 #include <cstring>
 #include <cassert>
+#include <stdint.h>
+
 #include <new>
 
 #include "rwbase.h"

src/ogl.cpp

@@ -2,6 +2,7 @@
 #include <cstdlib>
 #include <cstring>
 #include <cassert>
+#include <stdint.h>
 
 #include <new>
 

src/plugins.cpp

@@ -2,6 +2,8 @@
 #include <cstdlib>
 #include <cstring>
 #include <cassert>
+#include <stdint.h>
+
 #include <new>
 
 #include "rwbase.h"

src/ps2.cpp

@@ -2,6 +2,7 @@
 #include <cstdlib>
 #include <cstring>
 #include <cassert>
+#include <stdint.h>
 
 #include <new>
 

src/rwbase.cpp

@@ -2,6 +2,7 @@
 #include <cstdlib>
 #include <cstring>
 #include <cassert>
+#include <stdint.h>
 
 #include <new>
 

src/rwbase.h

@@ -1,22 +1,21 @@
 namespace rw {
 
-typedef char int8;
+/* get rid of the stupid _t */
-typedef short int16;
+typedef int8_t int8;
-typedef int int32;
+typedef int16_t int16;
-typedef long long int64;
+typedef int32_t int32;
-typedef unsigned char uint8;
+typedef int64_t int64;
-typedef unsigned short uint16;
+typedef uint8_t uint8;
-typedef unsigned int uint32;
+typedef uint16_t uint16;
-typedef unsigned long long uint64;
+typedef uint32_t uint32;
+typedef uint64_t uint64;
+typedef uintptr_t uintptr;
+
 typedef float float32;
 typedef int32 bool32;
 typedef uint8 byte;
 typedef uint32 uint;
-#if __WORDSIZE == 64
 typedef uint64 uintptr;
-#else
-typedef uint32 uintptr;
-#endif
 
 class Stream
 {

tests/gl/Makefile

@@ -3,10 +3,13 @@ SRC = main.cpp glshader.cpp math.cpp camera.cpp
 OBJ = $(patsubst %.cpp, $(BUILDDIR)/%.o, $(SRC))
 DEP = $(patsubst %.cpp, $(BUILDDIR)/%.d, $(SRC))
 RWDIR=$(HOME)/src/librw
+
 #LDLIBS=-pthread -lX11 -lXrandr -lXi -lXxf86vm -lGL -lGLEW -lm
 #STATICLIBS= $(RWDIR)/librw-opengl.a /usr/local/lib/libglfw3.a
+
 LDLIBS=-pthread -lGL -lGLEW -lglfw
 STATICLIBS=$(RWDIR)/librw-opengl.a
+
 CFLAGS=-g -I$(RWDIR) -Wall -Wextra
 
 rwtest: $(OBJ) $(STATICLIBS)