X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=laserbrain_demo;a=blobdiff_plain;f=Makefile;h=a3e49a2411af828fb14deed7f5bb987dfd343c35;hp=00e0559c0b4ba4ba357b6a11c5729606ceb38e86;hb=044b45b0360db25ad673c8a9b209046df7b60216;hpb=1acecbdaaccffe30ae7d564e1e01fd834c8618c9

diff --git a/Makefile b/Makefile
index 00e0559..a3e49a2 100644
--- a/Makefile
+++ b/Makefile
@@ -18,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
@@ -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
@@ -51,6 +54,11 @@ cross:
 .PHONY: instalien
 instalien: demo.exe
 	cp $< /alien/demo/$<
+	mkdir -p /alien/demo/sdr && cp sdr/* /alien/demo/sdr/
+
+.PHONY: run
+run: instalien
+	rsh alien 'cd C:\Users\nuclear\Desktop\samba\demo && demo.exe'
 
 .clang_complete: Makefile
 	rm -f $@
@@ -64,6 +72,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)