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

diff --git a/Makefile b/Makefile
index 33b01ad..a7334ee 100644
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,7 @@ obj = $(src:.cc=.o) $(csrc:.c=.o)
 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`
@@ -21,7 +21,7 @@ warn = -pedantic -Wall
 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 \
+		  -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/')
@@ -35,6 +35,9 @@ libal_Darwin = -framework OpenAL
 libal_mingw = -lopenal
 
 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
@@ -48,10 +51,15 @@ $(bin): .clang_complete $(obj)
 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/$<
 	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 $@
@@ -65,6 +73,12 @@ instalien: demo.exe
 %.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)