Fix some MacOSX issues with order of include/defines, and required conditionals.

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@567 4a71c877-e1ca-e34f-864e-861f7616d084

lib/ivis_opengl/piedraw.c

@@ -76,7 +76,9 @@ BOOL stencil_one_pass() {
 	if (!initialised) {
 		return_value =    check_extension("GL_EXT_stencil_two_side")
 			       && check_extension("GL_EXT_stencil_wrap");
+#ifndef __APPLE__
 		glActiveStencilFaceEXT = (PFNGLACTIVESTENCILFACEEXTPROC) SDL_GL_GetProcAddress("glActiveStencilFaceEXT");
+#endif
 		initialised = TRUE;
 	}
 

lib/ivis_opengl/piematrix.c

@@ -12,7 +12,6 @@
 #include <windows.h>  //needed for gl.h!  --Qamly
 #endif
 #include <SDL/SDL_opengl.h>
-#include <GL/glu.h>
 
 #include "lib/ivis_common/piedef.h"
 #include "lib/ivis_common/pieclip.h"

lib/ivis_opengl/tex.c

@@ -1,5 +1,3 @@
-
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -8,7 +6,11 @@
 #include <windows.h>
 #endif
 #include <SDL/SDL_opengl.h>
+#ifdef __APPLE__
+#include <opengl/glu.h>
+#else
 #include <GL/glu.h>
+#endif
 
 #include "lib/framework/frame.h"
 #include "lib/ivis_common/ivisdef.h"

lib/sequence/sequence_stub.c

@@ -10,17 +10,17 @@
  */
 /***************************************************************************/
 
+// Standard include file
+#include "lib/framework/frame.h"
+#include "rpl_reader.h"
+#include "sequence.h"
+
 #ifdef WZ_OPENAL_MAC_H
 #include <openal/al.h>
 #else
 #include <AL/al.h>
 #endif
 
-// Standard include file
-#include "lib/framework/frame.h"
-#include "rpl_reader.h"
-#include "sequence.h"
-
 #define DUMMY_VIDEO
 
 RPL* current_sequence = NULL;