Fixing MAC build

This commit is contained in:
Raydelto Hernandez 2019-03-09 02:26:34 -04:00
parent 25d7c4f2c9
commit cfed6d4cd8
7 changed files with 43 additions and 19 deletions

View file

@ -5,7 +5,7 @@
#include <SDL/SDL.h>
#include <stdio.h>
#include <stdlib.h>
#include <TinyXML/tinyxml.h>
#include <tinyxml.h>
#include "room.h"
#include "shader.h"
@ -25,7 +25,7 @@ static const int defaultY = 50;
static const float kd = .060f; // frame-rate dependent
static bool run = true;
static bool fullScreen = false;
static bool fullScreen = true;
static World* world = NULL;
static bool wireframe = false;
@ -194,6 +194,10 @@ static void eventLoop() {
int main(int argc, char** argv) {
SDL_Init(SDL_INIT_VIDEO | SDL_INIT_AUDIO);
SDL_PumpEvents();
SDL_GL_SetAttribute(SDL_GL_SWAP_CONTROL, 1);
SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 24);

View file

@ -1,7 +1,7 @@
// -*- C++ -*-
#include <SDL/SDL_error.h>
#include <SDL_mixer/SDL_mixer.h>
#include <SDL/SDL_mixer.h>
#include <iostream>
#include <string>
#include <vector>

View file

@ -3,7 +3,7 @@
#include <OpenGL/gl.h>
#include <OpenGL/glu.h>
#include <SDL/sdl.h>
#include <SDL_image/SDL_image.h>
#include <SDL/SDL_image.h>
#include <iostream>
#include <string>
#include <vector>

View file

@ -1,4 +1,4 @@
#include <TinyXML/tinyxml.h>
#include <tinyxml.h>
#include <iostream>
#include <list>
#include <map>