Merge branch 'master' of goat:git/antikythera

diff --git a/Makefile b/Makefile
index 616c71b..228e095 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,9 +4,9 @@ obj = $(src:.cc=.o) $(csrc:.c=.o)
 dep = $(obj:.o=.d)
 bin = anti
 
-CFLAGS = -pedantic -Wall -g
-CXXFLAGS = -std=c++11 -pedantic -Wall -g
-LDFLAGS = $(libgl_$(sys)) -lm -lgmath -lvmath -limago -lresman -lpthread
+CFLAGS = -pedantic -Wall -g -I/usr/local/include
+CXXFLAGS = -std=c++11 -pedantic -Wall -g -I/usr/local/include
+LDFLAGS = -L/usr/local/lib $(libgl_$(sys)) -lm -lgmath -lvmath -limago -lresman -lpthread
 
 sys = $(shell uname -s)
 libgl_Linux = -lGL -lGLU -lglut -lGLEW

diff --git a/src/gear.cc b/src/gear.cc
index 44c04d3..6a34815 100644 (file)
--- a/src/gear.cc
+++ b/src/gear.cc
@@ -1,3 +1,4 @@
+#include <stdlib.h>
 #include <GL/glew.h>
 #include "gear.h"
 #include "meshgen.h"