X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=Makefile;h=bf39c076ca72d15eb7ec572c346b4d06fecf31b9;hb=295b86a1a8efdfe4fb0d9dba6152eb956441603c;hp=e1332695c119bb6cfb3f0e98617868cd6ffa8974;hpb=ef6f5c2822eb91ea7df55e88018f566be04ad287;p=andemo

diff --git a/Makefile b/Makefile
index e133269..bf39c07 100644
--- a/Makefile
+++ b/Makefile
@@ -7,11 +7,15 @@ warn = -pedantic -Wall
 dbg = -g
 #opt = -O3 -ffast-math -fno-strict-aliasing
 def = -DMINIGLUT_USE_LIBC -DGLEW_STATIC
-incdir = -Isrc -Ilibs -Ilibs/imago/src -Ilibs/glew
-libdir = -Llibs/unix
+incdir = -Isrc -Ilibs -Ilibs/imago/src -Ilibs/treestore -Ilibs/glew
+libs_path = libs/unix
+libdir = -L$(libs_path)
+
+libs = $(libs_path)/libimago.a $(libs_path)/libtreestore.a $(libs_path)/libanim.a \
+	   $(libs_path)/libpsys.a
 
 CFLAGS = $(warn) $(dbg) $(opt) $(def) $(incdir) -fcommon -MMD
-LDFLAGS = $(libdir) $(libsys) $(libgl) -limago -lpsys -lanim $(libc)
+LDFLAGS = $(libdir) $(libsys) $(libgl) -limago -lpsys -lanim -ltreestore $(libc)
 
 sys ?= $(shell uname -s | sed 's/MINGW.*/mingw/')
 ifeq ($(sys), mingw)
@@ -19,14 +23,14 @@ ifeq ($(sys), mingw)
 	bin = demo.exe
 	libgl = -lopengl32
 	libsys = -lmingw32 -lgdi32 -lwinmm -mconsole
-	libdir = -Llibs/w32
+	libs_path = libs/w32
 	libc = -lm
 else
 	libgl = -lGL -lX11 -lXext
 	libc = -lm -ldl
 endif
 
-$(bin): $(obj) Makefile
+$(bin): $(obj) Makefile $(libs)
 	$(CC) -o $@ $(obj) $(LDFLAGS)
 
 -include $(dep)
@@ -34,6 +38,9 @@ $(bin): $(obj) Makefile
 %.w32.o: %.c
 	$(CC) -o $@ $(CFLAGS) -c $<
 
+$(libs_path)/%.a:
+	$(MAKE) -C libs
+
 .PHONY: clean
 clean:
 	rm -f $(obj) $(bin)
@@ -62,6 +69,10 @@ android-clean:
 android-libs:
 	$(MAKE) -f Makefile.android libs
 
+.PHONY: install
+install:
+	$(MAKE) -f Makefile.android install
+
 .PHONY: run
 run:
 	$(MAKE) -f Makefile.android install run