Merge branch 'master' of /home/nuclear/code/laserbrain/demo

[laserbrain_demo] / Makefile

diff --git a/Makefile b/Makefile
index 7f0d74c..b2011c5 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -18,11 +18,11 @@ incpath = -Isrc -Isrc/machine -I/usr/local/include `pkg-config --cflags sdl2`
 
 warn = -pedantic -Wall
 
-CFLAGS = $(warn) $(opt) $(dbg) $(incpath)
-CXXFLAGS = -std=c++11 $(warn) $(opt) $(dbg) $(incpath)
+CFLAGS = $(warn) $(opt) $(dbg) $(incpath) -fopenmp
+CXXFLAGS = -std=c++11 $(warn) $(opt) $(dbg) $(incpath) -fopenmp
 LDFLAGS = $(libpath) -ldrawtext $(libgl_$(sys)) $(libal_$(sys)) -lm -lgmath -lvmath \
                  -limago -lresman -lpthread -lassimp -ltreestore -lgoatvr \
-                 `pkg-config --libs sdl2 freetype2` -lpng -ljpeg -lz -lvorbisfile
+                 `pkg-config --libs sdl2 freetype2` -lpng -ljpeg -lz -lvorbisfile -lgomp
 
 sys = $(shell uname -s | sed 's/MINGW.*/mingw/')
 libgl_Linux = -lGL -lGLU -lGLEW
@@ -32,7 +32,7 @@ libgl_mingw = -lopengl32 -lglu32 -lglew32
 
 libal_Linux = -lopenal
 libal_Darwin = -framework OpenAL
-libal_mingw = #?
+libal_mingw = -lOpenAL32
 
 ifeq ($(sys), mingw)
        bin = demo.exe