diff options
author | Vegard Storheil Eriksen <zyp@jvnv.net> | 2010-05-17 00:35:21 +0200 |
---|---|---|
committer | Vegard Storheil Eriksen <zyp@jvnv.net> | 2010-05-17 00:35:21 +0200 |
commit | 69ba0b04619ca6e32517b52c120241ff7762fce2 (patch) | |
tree | f758ca10d9ffcb51b9d9ef03515e29033656a0cd /main.cpp | |
parent | ed802f4fa92e3107b362b8d0daa6394ebdcd6d52 (diff) |
Fixed OS X support.
Diffstat (limited to 'main.cpp')
-rw-r--r-- | main.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
@@ -1,13 +1,18 @@ #include <iostream> #include <fstream> #define GL_GLEXT_PROTOTYPES +#ifndef __APPLE__ #include <GL/gl.h> #include <GL/glu.h> +#else +#include <OpenGL/gl.h> +#include <OpenGL/glu.h> +#endif #include <math.h> #include <vector> #include <list> #include <queue> -#include "SDL.h" +#include <SDL/SDL.h> #include <FTGL/ftgl.h> #include "texturesdl.h" #include "shader.h" @@ -90,7 +95,7 @@ void create_bullets() { //create_pattern2_2(100); } -int main() { +int main(int, char**) { if(SDL_Init(SDL_INIT_VIDEO) < 0) { fprintf(stderr, "Failed to initialize SDL: %s\n", SDL_GetError()); return 1; @@ -137,7 +142,7 @@ int main() { program.attach(shader2); program.link(); - FTPixmapFont font("/usr/share/fonts/TTF/DejaVuSansMono.ttf"); + FTPixmapFont font("VeraMono.ttf"); font.FaceSize(12); float f = 0.0; @@ -280,7 +285,7 @@ int main() { SDL_GL_SwapBuffers(); - SDL_Delay(1); + SDL_Delay(10); } SDL_Quit(); |