Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
master
Per Inge Mathisen 2006-08-15 16:33:48 +00:00
parent e86f311e96
commit 2fe7d306ac
4 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/ivis_opengl/piedraw.c
View File

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

1
lib/ivis_opengl/piematrix.c
View File

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

6
lib/ivis_opengl/tex.c
View File

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

10
lib/sequence/sequence_stub.c
View File

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