# HG changeset patch
# User John Tsiombikas <nuclear@member.fsf.org>
# Date 1446331896 -7200
# Node ID 5ae5fd3626faf723302690e8d496f285b1fa0282
# Parent  c3f5c32cb210245a0cecc555bff594550705afc5
macosx port works

diff -r c3f5c32cb210 -r 5ae5fd3626fa Makefile
--- a/Makefile	Sun Nov 01 00:36:56 2015 +0200
+++ b/Makefile	Sun Nov 01 00:51:36 2015 +0200
@@ -19,18 +19,20 @@
 
 inc = -Isrc -Ilibs/libjpeg -Ilibs/zlib -Ilibs/libpng -Ilibs/imago \
 	  -Ilibs/ogg -Ilibs/vorbis
+warn = -pedantic -Wall
 
-CFLAGS = -pedantic -Wall -g $(opt) $(inc)
-CXXFLAGS = -pedantic -Wall -g $(opt) $(inc)
+CFLAGS = $(warn) -g $(opt) $(inc)
+CXXFLAGS = $(warn) -g $(opt) $(inc)
 LDFLAGS = $(libgl) $(libal) -lm -ldl -lpthread
 
 sys = $(shell uname -s)
 ifeq ($(sys), Darwin)
+	libgl = -framework OpenGL -framework GLUT -lGLEW
+	libal = -framework OpenAL
+	warn += -Wno-deprecated-declarations
+else
 	libgl = -lGL -lGLU -lglut -lGLEW
 	libal = -lopenal
-else
-	libgl = -framework OpenGL -framework GLUT -lGLEW
-	libal = -framework OpenAL
 endif
 
 $(bin): $(obj) Makefile
diff -r c3f5c32cb210 -r 5ae5fd3626fa src/main.cc
--- a/src/main.cc	Sun Nov 01 00:36:56 2015 +0200
+++ b/src/main.cc	Sun Nov 01 00:51:36 2015 +0200
@@ -3,7 +3,11 @@
 #include <assert.h>
 #include <vector>
 #include "opengl.h"
+#ifdef __APPLE__
+#include <GLUT/glut.h>
+#else
 #include <GL/glut.h>
+#endif
 #include "scene.h"
 #include "meshgen.h"
 #include "pnoise.h"