Force a double-buffered GL context.

[lugaru.git] / Source / Game.h

diff --git a/Source/Game.h b/Source/Game.h
index c4f033eb4c8e4cb7e81e6d74c5f563c7c1ef5960..65f6887d23b0249492e2183c91ecfff545b980e3 100644 (file)
--- a/Source/Game.h
+++ b/Source/Game.h
@@ -1,6 +1,12 @@
 #ifndef _GAME_H_
 #define _GAME_H_
 
+#if (defined(__APPLE__) && defined(__MACH__))
+#  ifdef PLATFORM_MACOSX
+#    error Do not define PLATFORM_MACOSX for new builds. It is for the old Carbonized build.
+#  endif
+#endif
+
 #ifdef PLATFORM_MACOSX
 #include <Carbon.h>
 #include "Quicktime.h"
@@ -10,14 +16,17 @@
 //#include <glut.h>
 
 #include "TGALoader.h"
-#ifdef WIN32
-#include "WinInput.h"
-#elif USE_SDL
+
+#if USE_SDL
 #include "SDL.h"
-#include "SDLInput.h"
+#endif
+
+#if !PLATFORM_MACOSX
+#include "WinInput.h"
 #else
 #include "Macinput.h"
 #endif
+
 #include "Terrain.h"
 #include "Skybox.h"
 #include "Skeleton.h"
@@ -220,7 +229,7 @@ public:
        void LoadingScreen();
        void FadeLoadingScreen(float howmuch);
        void Dispose();
-       int DrawGLScene(GLvoid);
+       int DrawGLScene(void);
        void Tick();
        void TickOnce();
        void TickOnceAfter();