projects
/
laserbrain_demo
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of goat:git/laserbrain_demo
[laserbrain_demo]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
4002a6d
..
a7334ee
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-1,7
+1,8
@@
src = $(wildcard src/*.cc) \
$(wildcard src/audio/*.cc) \
$(wildcard src/machine/*.cc) \
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)
csrc = $(wildcard src/*.c) \
$(wildcard src/machine/*.c) \
$(wildcard src/blobs/*.c)
@@
-9,7
+10,7
@@
obj = $(src:.cc=.o) $(csrc:.c=.o)
dep = $(obj:.o=.d)
bin = demo
dep = $(obj:.o=.d)
bin = demo
-#opt = -O3 -ffast-math
+opt = -O3 -ffast-math
dbg = -g
incpath = -Isrc -Isrc/machine -I/usr/local/include `pkg-config --cflags sdl2`
dbg = -g
incpath = -Isrc -Isrc/machine -I/usr/local/include `pkg-config --cflags sdl2`
@@
-17,13
+18,13
@@
incpath = -Isrc -Isrc/machine -I/usr/local/include `pkg-config --cflags sdl2`
warn = -pedantic -Wall
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 \
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
+ -limago -lresman -lpthread -lassimp -ltreestore -lgoatvr -lassman \
+ `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
@@
-31,9
+32,12
@@
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)
ifeq ($(sys), mingw)
+ obj = $(src:.cc=.w32.o) $(csrc:.c=.w32.o)
+ dep = $(obj:.o=.d)
+
bin = demo.exe
LDFLAGS += -lmingw32 -lSDL2main -lSDL2 -lwinmm -mwindows
#CFLAGS += -DGLEW_STATIC
bin = demo.exe
LDFLAGS += -lmingw32 -lSDL2main -lSDL2 -lwinmm -mwindows
#CFLAGS += -DGLEW_STATIC
@@
-47,9
+51,15
@@
$(bin): .clang_complete $(obj)
cross:
$(MAKE) CC=i686-w64-mingw32-gcc CXX=i686-w64-mingw32-g++ sys=mingw
cross:
$(MAKE) CC=i686-w64-mingw32-gcc CXX=i686-w64-mingw32-g++ sys=mingw
+.PHONY: cross-clean
+cross-clean:
+ $(MAKE) CC=i686-w64-mingw32-gcc CXX=i686-w64-mingw32-g++ sys=mingw clean
+
.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/
+ for i in `tools/dlldepends | grep -v '++'`; do echo $$i; rsync $$i /alien/demo; done
.clang_complete: Makefile
rm -f $@
.clang_complete: Makefile
rm -f $@
@@
-63,6
+73,12
@@
instalien: demo.exe
%.d: %.cc
@$(CPP) $(CXXFLAGS) $< -MM -MT $(@:.d=.o) >$@
%.d: %.cc
@$(CPP) $(CXXFLAGS) $< -MM -MT $(@:.d=.o) >$@
+%.w32.o: %.c
+ $(CC) -o $@ $(CFLAGS) -c $<
+
+%.w32.o: %.cc
+ $(CC) -o $@ $(CXXFLAGS) -c $<
+
.PHONY: clean
clean:
rm -f $(obj) $(bin)
.PHONY: clean
clean:
rm -f $(obj) $(bin)