X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=Makefile;h=163f01fbc6b19875bfe77f0e0002aad618d31e5f;hb=313480bbe9994a200ed9a4355d97a033bf0d6151;hp=c42664e93a33713d5767baf81654b0275a18d391;hpb=6c206da1b97ad86e095d383f4ebd3d8f332ad416;p=andemo

diff --git a/Makefile b/Makefile
index c42664e..163f01f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-src = $(wildcard src/*.c) $(wildcard src/pc/*.c) libs/glew/glew.c
+src = $(wildcard src/*.c) $(wildcard src/scr/*.c) $(wildcard src/pc/*.c) libs/glew/glew.c
 obj = $(src:.c=.o)
 dep = $(src:.c=.d)
 bin = demo
@@ -7,11 +7,11 @@ warn = -pedantic -Wall
 dbg = -g
 #opt = -O3 -ffast-math -fno-strict-aliasing
 def = -DMINIGLUT_USE_LIBC -DGLEW_STATIC
-incdir = -Isrc -Ilibs/imago/src -Ilibs/glew
+incdir = -Isrc -Ilibs -Ilibs/imago/src -Ilibs/treestore -Ilibs/glew
 libdir = -Llibs/unix
 
 CFLAGS = $(warn) $(dbg) $(opt) $(def) $(incdir) -fcommon -MMD
-LDFLAGS = $(libsys) $(libgl) -lm -limago
+LDFLAGS = $(libdir) $(libsys) $(libgl) -limago -lpsys -lanim -ltreestore $(libc)
 
 sys ?= $(shell uname -s | sed 's/MINGW.*/mingw/')
 ifeq ($(sys), mingw)
@@ -19,11 +19,14 @@ ifeq ($(sys), mingw)
 	bin = demo.exe
 	libgl = -lopengl32
 	libsys = -lmingw32 -lgdi32 -lwinmm -mconsole
+	libdir = -Llibs/w32
+	libc = -lm
 else
 	libgl = -lGL -lX11 -lXext
+	libc = -lm -ldl
 endif
 
-$(bin): $(obj)
+$(bin): $(obj) Makefile
 	$(CC) -o $@ $(obj) $(LDFLAGS)
 
 -include $(dep)
@@ -47,6 +50,25 @@ libs:
 clean-libs:
 	$(MAKE) -C libs clean
 
+.PHONY: android
+android:
+	$(MAKE) -f Makefile.android
+
+.PHONY: android-clean
+android-clean:
+	$(MAKE) -f Makefile.android clean
+
+.PHONY: android-libs
+android-libs:
+	$(MAKE) -f Makefile.android libs
+
+.PHONY: run
+run:
+	$(MAKE) -f Makefile.android install run
+
+.PHONY: stop
+stop:
+	$(MAKE) -f Makefile.android stop
 
 .PHONY: cross
 cross: