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

diff --git a/Makefile b/Makefile
index 163f01f..0d965ed 100644
--- a/Makefile
+++ b/Makefile
@@ -5,10 +5,14 @@ bin = demo
 
 warn = -pedantic -Wall
 dbg = -g
-#opt = -O3 -ffast-math -fno-strict-aliasing
+#opt = -O3 -ffast-math -fno-strict-aliasing -DNDEBUG
 def = -DMINIGLUT_USE_LIBC -DGLEW_STATIC
 incdir = -Isrc -Ilibs -Ilibs/imago/src -Ilibs/treestore -Ilibs/glew
-libdir = -Llibs/unix
+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 -ltreestore $(libc)
@@ -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