Many fixes (credits Nuclear)

[hair] / Makefile

diff --git a/Makefile b/Makefile
index 660400a..3792df5 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -7,9 +7,10 @@ bin = hair
 dbg = -g
 opt = -O0
 inc = -Isrc -Isrc/shaders -Isrc/math
-
 CXX = g++
+CC = gcc
 CXXFLAGS = -pedantic -Wall $(dbg) $(opt) $(inc)
+CFLAGS = -pedantic -Wall $(dbg) $(opt) $(inc)
 LDFLAGS = -lGL -lGLU -lglut -lGLEW -limago -lassimp -lgmath
 
 $(bin): $(obj)