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

diff --git a/Makefile b/Makefile
index 4b65ac3..33b01ad 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,11 @@
-src = $(wildcard src/*.cc) $(wildcard src/machine/*.cc) $(wildcard src/blobs/*.cc)
-csrc = $(wildcard src/*.c) $(wildcard src/machine/*.c) $(wildcard src/blobs/*.c)
+src = $(wildcard src/*.cc) \
+	  $(wildcard src/audio/*.cc) \
+	  $(wildcard src/machine/*.cc) \
+	  $(wildcard src/blobs/*.cc) \
+	  $(wildcard src/imgui/*.cc)
+csrc = $(wildcard src/*.c) \
+	   $(wildcard src/machine/*.c) \
+	   $(wildcard src/blobs/*.c)
 obj = $(src:.cc=.o) $(csrc:.c=.o)
 dep = $(obj:.o=.d)
 bin = demo
@@ -8,24 +14,29 @@ bin = demo
 dbg = -g
 
 incpath = -Isrc -Isrc/machine -I/usr/local/include `pkg-config --cflags sdl2`
-libpath = -L/usr/local/lib
+#libpath = -L/usr/local/lib
 
 warn = -pedantic -Wall
 
-CFLAGS = $(warn) $(opt) $(dbg) $(incpath)
-CXXFLAGS = -std=c++11 $(warn) $(opt) $(dbg) $(incpath)
-LDFLAGS = $(libpath) -ldrawtext $(libgl_$(sys)) -lm -lgmath -lvmath -limago \
-		  -lresman -lpthread -lassimp -ltreestore -lgoatvr \
-		  -lz -lpng -ljpeg `pkg-config --libs sdl2 freetype2`
+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 -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
 #libgl_mingw = -lglu32 -Wl,-Bstatic -lglew32 -Wl,-Bdynamic -lopengl32
 
+libal_Linux = -lopenal
+libal_Darwin = -framework OpenAL
+libal_mingw = -lopenal
+
 ifeq ($(sys), mingw)
 	bin = demo.exe
+	LDFLAGS += -lmingw32 -lSDL2main -lSDL2 -lwinmm -mwindows
 	#CFLAGS += -DGLEW_STATIC
 	#CXXFLAGS += -DGLEW_STATIC
 endif
@@ -35,11 +46,12 @@ $(bin): .clang_complete $(obj)
 
 .PHONY: cross
 cross:
-	$(MAKE) CC=i686-w64-mingw32-gcc CXX=i686-w64-mingw32-g++
+	$(MAKE) CC=i686-w64-mingw32-gcc CXX=i686-w64-mingw32-g++ sys=mingw
 
 .PHONY: instalien
 instalien: demo.exe
 	cp $< /alien/demo/$<
+	mkdir -p /alien/demo/sdr && cp sdr/* /alien/demo/sdr/
 
 .clang_complete: Makefile
 	rm -f $@