Fixed linked lib issues.

OpenGL now loading correctly.
No longer segfaults, but hangs on "Disabled Audio"

Makefile

@@ -90,8 +90,12 @@ BASE_CFLAGS=-Wall $(BASE_DEFS) \
 	-DVERSION=\"\\\"$(NAME)-$(VERSION)-$(BUILD_ID)\\\"\" \
 	-DBUILD_HOST=\"\\\"$(BUILD_HOST)\\\"\"
 
-LD_FLAGS=-L/opt/X11/lib -L/opt/local/lib -lXmu -lXt -lSM -lICE -lXext -lX11 -lXi \
-	-lGL -lGLU -lm $(BASE_LIBS)
+LD_FLAGS=-L/opt/X11/lib -lXmu -lXt -lSM -lICE -lXext -lX11 -lXi \
+	 -lm $(BASE_LIBS)
+
+ifneq ($(UNAME),Darwin)
+LD_FLAGS+=-lGL -lGLU
+endif
 
 RELEASE_CFLAGS=$(BASE_CFLAGS) -ffast-math -funroll-loops \
 	-fomit-frame-pointer -fexpensive-optimizations -O2

src/Md3AnimModel.cpp

@@ -2107,7 +2107,7 @@ void shutdown_gl()
 void init_gl(unsigned int width, unsigned int height)
 {
 	// Print driver support information
-	printf("\n\n\t## GL Driver Info ##\n");
+	printf("\n\n\t## GL Driver Info 4 ##\n");
 	printf("\tVendor     : %s\n", glGetString(GL_VENDOR));
 	printf("\tRenderer   : %s\n", glGetString(GL_RENDERER));
 	printf("\tVersion    : %s\n", glGetString(GL_VERSION));

src/PSKModel.cpp

@@ -2342,7 +2342,7 @@ void shutdown_gl()
 void init_gl(unsigned int width, unsigned int height)
 {
 	// Print driver support information
-	printf("\n\n\t## GL Driver Info ##\n");
+	printf("\n\n\t## GL Driver Info 3 ##\n");
 	printf("\tVendor     : %s\n", glGetString(GL_VENDOR));
 	printf("\tRenderer   : %s\n", glGetString(GL_RENDERER));
 	printf("\tVersion    : %s\n", glGetString(GL_VERSION));

src/Render.cpp

@@ -486,13 +486,13 @@ void Render::Init(int width, int height, bool fast_card)
 	}
 
 	// Print driver support information
-	printf("\n\n\t## GL Driver Info ##\n");
+	printf("\n\n\t## GL Driver Info 2 ##\n");
 	printf("\tVendor     : %s\n", glGetString(GL_VENDOR));
 	printf("\tRenderer   : %s\n", glGetString(GL_RENDERER));
 	printf("\tVersion    : %s\n", glGetString(GL_VERSION));
 	printf("\tExtensions : %s\n\n\n", (char*)glGetString(GL_EXTENSIONS));
 
-	// Testing for goodies
+    // Testing for goodies
 	// Mongoose 2001.12.31, Fixed string use to check for bad strings
 	s = (char*)glGetString(GL_EXTENSIONS);
 
@@ -596,6 +596,8 @@ void Render::Init(int width, int height, bool fast_card)
 	glPolygonMode(GL_FRONT, GL_FILL);
 
 	glMatrixMode(GL_MODELVIEW);
+
+    printf("\nm O.o m\n");
 }
 
 

src/SDLSystem.cpp

@@ -36,13 +36,7 @@
 #endif
 
 #ifdef HAVE_OPENGL
-#ifdef __APPLE__
-#include <OpenGL/gl.h>
-#include <OpenGL/glu.h>
-#else
-#include <GL/gl.h>
-#include <GL/glu.h>
-#endif
+#include <SDL/SDL_opengl.h>
 #else
 #   error "SDLSystem requires -DHAVE_OPENGL"
 #endif
@@ -221,7 +215,7 @@ void SDLSystem::initVideo(unsigned int width, unsigned int height,
 
 	// Create GL context
 	SDL_Init(SDL_INIT_VIDEO);
-	printf("@Created OpenGL Context...\n");
+	printf("@ Created OpenGL Context...\n");
 	atexit(SDL_Quit);
 
 	m_width = width;

src/System.cpp

@@ -517,9 +517,8 @@ void System::initGL()
 {
 	char *s;
 
-
 	// Print driver support information
-	printf("\n\n\t## GL Driver Info ##\n");
+	printf("\n\n\t## GL Driver Info 1 ##\n");
 	printf("\tVendor     : %s\n", glGetString(GL_VENDOR));
 	printf("\tRenderer   : %s\n", glGetString(GL_RENDERER));
 	printf("\tVersion    : %s\n", glGetString(GL_VERSION));