summaryrefslogtreecommitdiff
path: root/main.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'main.cpp')
-rw-r--r--main.cpp13
1 files changed, 9 insertions, 4 deletions
diff --git a/main.cpp b/main.cpp
index 51ef1c2..9b9311e 100644
--- a/main.cpp
+++ b/main.cpp
@@ -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();