X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;ds=sidebyside;f=Source%2FGame.h;h=2765367b09ad231d679e46a094d366b77c60af3c;hb=65748e01b54fd8c4e1b5dd8de7d99f430d10870c;hp=ca3f194a4d6dcee78700d47daf73729eab766145;hpb=b37c82db3e3baee0425f35e2183c8ccff6e9ebe7;p=lugaru.git diff --git a/Source/Game.h b/Source/Game.h index ca3f194..2765367 100644 --- a/Source/Game.h +++ b/Source/Game.h @@ -1,5 +1,6 @@ /* Copyright (C) 2003, 2010 - Wolfire Games +Copyright (C) 2010-2016 - Lugaru contributors (see AUTHORS file) This file is part of Lugaru. @@ -22,21 +23,7 @@ along with Lugaru. If not, see . #include "SDL.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 -#include "Quicktime.h" -#endif - -//Jordan included glut.h -//#include - -#include "TGALoader.h" +#include "ImageIO.h" #include "Terrain.h" #include "Skybox.h" @@ -45,10 +32,8 @@ along with Lugaru. If not, see . #include "Lights.h" #include "Person.h" #include "Sprite.h" -//#include #include "Text.h" #include "Objects.h" -//#include #include "Weapons.h" #include "binio.h" #include