From 32d7e487f9b74900081f23bb501b7f2c094160af Mon Sep 17 00:00:00 2001 From: Eleni Maria Stea Date: Tue, 1 Jan 2019 19:24:05 +0200 Subject: [PATCH] fixed Makefile (had forgotten glut debugging stuff) --- Makefile | 5 ++--- src/main.cc | 1 + 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 4ca72b2..8b94f2b 100644 --- a/Makefile +++ b/Makefile @@ -6,11 +6,10 @@ bin = hair dbg = -g opt = -O0 -inc = -Isrc -Isrc/shaders -Isrc/math -I/home/eleni/igalia/install/include - +inc = -Isrc -Isrc/shaders -Isrc/math CXX = g++ CXXFLAGS = -pedantic -Wall $(dbg) $(opt) $(inc) -LDFLAGS = -lGL -lGLU -lglut -lGLEW -limago -lassimp -lgmath -L/home/eleni/igalia/install/lib/libglut.so +LDFLAGS = -lGL -lGLU -lglut -lGLEW -limago -lassimp -lgmath $(bin): $(obj) $(CXX) -o $@ $(obj) $(LDFLAGS) diff --git a/src/main.cc b/src/main.cc index ef26c3c..307f647 100644 --- a/src/main.cc +++ b/src/main.cc @@ -138,6 +138,7 @@ static void display() meshes[i]->draw(); } + hair.set_transform(head_xform); hair.draw(); glutSwapBuffers(); -- 1.7.10.4