From: John Tsiombikas Date: Tue, 11 Oct 2016 13:06:16 +0000 (+0300) Subject: Merge branch 'master' of goat:git/antikythera X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=antikythera;a=commitdiff_plain;h=403be7663d7412d0937b1f611b63363213bb3766;hp=caee16904b985501cff521557c9ab487d2d96a91 Merge branch 'master' of goat:git/antikythera --- diff --git a/Makefile b/Makefile index 616c71b..228e095 100644 --- 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 --- a/src/gear.cc +++ b/src/gear.cc @@ -1,3 +1,4 @@ +#include #include #include "gear.h" #include "meshgen.h"