projects
/
laserbrain_demo
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- fixed bug in mirror matching
[laserbrain_demo]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
d0e1784
..
33b01ad
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-24,7
+24,7
@@
LDFLAGS = $(libpath) -ldrawtext $(libgl_$(sys)) $(libal_$(sys)) -lm -lgmath -lvm
-limago -lresman -lpthread -lassimp -ltreestore -lgoatvr \
`pkg-config --libs sdl2 freetype2` -lpng -ljpeg -lz -lvorbisfile -lgomp
-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_Linux = -lGL -lGLU -lGLEW
libgl_Darwin = -framework OpenGL -lGLEW
libgl_mingw = -lopengl32 -lglu32 -lglew32
@@
-32,7
+32,7
@@
libgl_mingw = -lopengl32 -lglu32 -lglew32
libal_Linux = -lopenal
libal_Darwin = -framework OpenAL
libal_Linux = -lopenal
libal_Darwin = -framework OpenAL
-libal_mingw = #?
+libal_mingw = -lopenal
ifeq ($(sys), mingw)
bin = demo.exe
ifeq ($(sys), mingw)
bin = demo.exe
@@
-51,6
+51,7
@@
cross:
.PHONY: instalien
instalien: demo.exe
cp $< /alien/demo/$<
.PHONY: instalien
instalien: demo.exe
cp $< /alien/demo/$<
+ mkdir -p /alien/demo/sdr && cp sdr/* /alien/demo/sdr/
.clang_complete: Makefile
rm -f $@
.clang_complete: Makefile
rm -f $@