diff --git a/Makefile b/Makefile index 84add82..d3c0dd5 100755 --- a/Makefile +++ b/Makefile @@ -10,16 +10,15 @@ FRAMEWORKS += -framework AGL FRAMEWORKS += -framework Carbon LINKFLAGS += -L vecmath/lib/ -lvecmath +LINKFLAGS += -lfltk -lfltk_gl else INCFLAGS = -I /usr/include/GL INCFLAGS += -I /mit/6.837/public/include/vecmath -LINKFLAGS = -lglut -lGL -lGLU +LINKFLAGS = -lglut $(shell fltk-config --use-gl --ldflags) LINKFLAGS += -L /mit/6.837/public/lib -lvecmath endif -LINKFLAGS += -lfltk -lfltk_gl - CFLAGS = -g CFLAGS += -DSOLN CC = g++ diff --git a/vecmath b/vecmath index 0b074cb..b79bde6 160000 --- a/vecmath +++ b/vecmath @@ -1 +1 @@ -Subproject commit 0b074cb47503c6c216fcd4b4b214e7c04e6804c4 +Subproject commit b79bde621ddcd6e2acf611286256521af39a33e6