foo

[andemo] / Makefile

diff --git a/Makefile b/Makefile
index 21c5164..e133269 100644 (file)
--- 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/glew
 libdir = -Llibs/unix
 
 CFLAGS = $(warn) $(dbg) $(opt) $(def) $(incdir) -fcommon -MMD
-LDFLAGS = $(libsys) $(libgl) -lm -limago
+LDFLAGS = $(libdir) $(libsys) $(libgl) -limago -lpsys -lanim $(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)
@@ -59,6 +62,14 @@ android-clean:
 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:
        $(MAKE) CC=i686-w64-mingw32-gcc sys=mingw