X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=laserbrain_demo;a=blobdiff_plain;f=Makefile;h=33b01ad4d4bb1d08d5cbd7a431da01aba5589b76;hp=4002a6d736c6e27fdda5c790f959d6819d8c03f0;hb=d0e426c6c0856487332e67c787c35fd0e97c90ce;hpb=fb11663a3654acd0132e71e5652e35b0ea72d544

diff --git a/Makefile b/Makefile
index 4002a6d..33b01ad 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,8 @@
 src = $(wildcard src/*.cc) \
 	  $(wildcard src/audio/*.cc) \
 	  $(wildcard src/machine/*.cc) \
-	  $(wildcard src/blobs/*.cc)
+	  $(wildcard src/blobs/*.cc) \
+	  $(wildcard src/imgui/*.cc)
 csrc = $(wildcard src/*.c) \
 	   $(wildcard src/machine/*.c) \
 	   $(wildcard src/blobs/*.c)
@@ -17,13 +18,13 @@ 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/')
+sys ?= $(shell uname -s | sed 's/MINGW.*/mingw/')
 libgl_Linux = -lGL -lGLU -lGLEW
 libgl_Darwin = -framework OpenGL -lGLEW
 libgl_mingw = -lopengl32 -lglu32 -lglew32
@@ -31,7 +32,7 @@ libgl_mingw = -lopengl32 -lglu32 -lglew32
 
 libal_Linux = -lopenal
 libal_Darwin = -framework OpenAL
-libal_mingw = #?
+libal_mingw = -lopenal
 
 ifeq ($(sys), mingw)
 	bin = demo.exe
@@ -50,6 +51,7 @@ cross:
 .PHONY: instalien
 instalien: demo.exe
 	cp $< /alien/demo/$<
+	mkdir -p /alien/demo/sdr && cp sdr/* /alien/demo/sdr/
 
 .clang_complete: Makefile
 	rm -f $@