diff options
| author | icculus <icculus@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2005-11-26 07:46:21 +0000 |
|---|---|---|
| committer | icculus <icculus@edf5b092-35ff-0310-97b2-ce42778d08ea> | 2005-11-26 07:46:21 +0000 |
| commit | 441c7633e0aa67faa91dc5896ee83e6c29de0ba6 (patch) | |
| tree | ed6f97f0be5940123e9e3f244ae91a475787ff64 /code/renderer/qgl.h | |
| parent | b0c6a473e2a34000db73c75bc0ff43bba45fddb2 (diff) | |
| download | ioquake3-aero-441c7633e0aa67faa91dc5896ee83e6c29de0ba6.tar.gz ioquake3-aero-441c7633e0aa67faa91dc5896ee83e6c29de0ba6.zip | |
Mac OS X work...lots of little changes that touch a lot of random places.
Still work to be done, but this at least matches the PowerPC Linux status
now.
MacOS-specific directory (and XCode project) is gone...this now uses SDL,
OpenAL, and the Unix Makefiles.
--ryan.
git-svn-id: svn://svn.icculus.org/quake3/trunk@373 edf5b092-35ff-0310-97b2-ce42778d08ea
Diffstat (limited to 'code/renderer/qgl.h')
| -rw-r--r-- | code/renderer/qgl.h | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/code/renderer/qgl.h b/code/renderer/qgl.h index 1db2dac..c1a2b1d 100644 --- a/code/renderer/qgl.h +++ b/code/renderer/qgl.h @@ -46,7 +46,22 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #elif defined(MACOS_X) -#include "macosx_glimp.h" +#include <OpenGL/OpenGL.h> +#include <OpenGL/gl.h> +#include <OpenGL/glu.h> +#ifndef GL_EXT_abgr +#include <OpenGL/glext.h> +#endif + +// This can be defined to use the CGLMacro.h support which avoids looking up +// the current context. +//#define USE_CGLMACROS + +#ifdef USE_CGLMACROS +#include "macosx_local.h" +#define cgl_ctx glw_state._cgl_ctx +#include <OpenGL/CGLMacro.h> +#endif #elif defined( __linux__ ) || defined(__FreeBSD__) @@ -164,7 +179,7 @@ extern void ( APIENTRY * qglUnlockArraysEXT) (void); #include "qgl_linked.h" -#elif defined(MACOS_X) +#elif (defined(MACOS_X) && !defined(USE_SDL_VIDEO)) // This includes #ifdefs for optional logging and GL error checking after every GL call as well as #defines to prevent incorrect usage of the non-'qgl' versions of the GL API. #include "macosx_qgl.h" |