Changed Fixed some apple stuff glGenTextures is still generating a bus error because we don't have a gl context yet.

src/Makefile.macosx

@@ -3,29 +3,30 @@ CPP = g++ -g
 INCLUDES = 
 LD = g++
 INCLUDEPATH = ../include
-INCLUDE_DIRS = -I/System/Library/Frameworks/OpenGL.framework/Headers
-LIBRARY_DIRS = -L/System/Library/Frameworks/OpenGL.framework/Libraries -L/usr/X11R6/lib
+X11INCLUDEDIR = /usr/X11R6/include
+X11LIBDIR = /usr/X11R6/lib
+INCLUDE_DIRS = -I$(X11INCLUDEDIR)
+LIBRARY_DIRS = -L$(X11LIBDIR)
 OBJECTS = screen.o bmp.o camera.o ctrls.o level.o mygl.o myglFont.o myglTexture.o physics.o player.o strmanip.o tga.o vector.o window.o keys.o main.o
-LIBS = -L/usr/X11R6/lib -lGL -lGLU -lXxf86vm $(INCLUDE_DIRS)
+LIBS = $(LIBRARY_DIRS) -lGL -lGLU -lXxf86vm -lX11
 LIBRARIES = 
 SO_LIBS = 
 SO_LIBRARIES = oa_game.so oa_audio.so oa_net.so oa_video.so oa_input.so
-FRAMEWORK_DIR = /System/Library/Frameworks/
-CPPFLAGS = 
+CPPFLAGS = $(INCLUDE_DIRS)
 LDFLAGS = $(LIBS)
 .Phony: all clean install
 
-all: ../OpenArena/OA 
+all: ../OpenArena/OpenArena
 
 clean: 
 	rm -f *.o
-	rm -f ../OpenArena/OA
+	if [ -f ../OpenArena/OpenArena ]; then rm ../OpenArena/OpenArena; fi
 	
 install:
 
 #Executables
-../OpenArena/OA: $(OBJECTS)
-	$(LD) $(LDFLAGS) $(INCLUDE_DIRS) -o ../OpenArena/OA $(OBJECTS)
+../OpenArena/OpenArena: $(OBJECTS)
+	$(LD) $(LDFLAGS) $(INCLUDE_DIRS) -o ../OpenArena/OpenArena $(OBJECTS)
 
 #Dynamic Libraries
 oa_game.so:
@@ -84,5 +85,5 @@ window.o: window.cpp $(INCLUDEPATH)/window.h
 keys.o: keys.cpp $(INCLUDEPATH)/keys.h
 	$(CPP) -c $(INCLUDE_DIRS) -o keys.o keys.cpp
 
-main.o: linux.cpp $(INCLUDEPATH)/main.h
-	$(CPP) -c $(INCLUDE_DIRS) -o main.o linux.cpp
+main.o: macosx.cpp $(INCLUDEPATH)/main.h
+	$(CPP) -c $(INCLUDE_DIRS) -o main.o macosx.cpp