Mercurial > hg > demos > bussi

changeset 26:288e688aaac3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Build system improvements.
author Matti Hamalainen <ccr@tnsp.org>
date Sat, 19 Aug 2017 15:46:11 +0300
parents 9830a8be6eba
children 8a604636b077
files Makefile config.mak
diffstat 2 files changed, 10 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Thu May 19 13:21:09 2016 +0300
+++ b/Makefile	Sat Aug 19 15:46:11 2017 +0300
@@ -1,12 +1,7 @@
 #
 # Generic build target
 #
-BPATH := $(shell pwd)
-DMLIB := $(BPATH)/dmlib/
-PACKAGE = $(BPATH)/ap-bussi.zip
-BINPATH = $(BPATH)/bin/
-DATA = $(BINPATH)/bussi.dat
-MAKE ?= make
+include config.mak
 
 export DMLIB
 export BINPATH
@@ -29,10 +24,10 @@
 $(DATA):
 	cd $(BPATH)/data && $(DMLIB)/tools/packed -p $@ -c -x \*~ -v *
 
-package: linux-bin mingw-win32 $(BINPATH)/bussi.dat
+package: linux-bin mingw-win32 $(DATA)
 	strip $(BINPATH)/*.bin $(BINPATH)/*.exe
 	$(RM) $(PACKAGE)
-	@cp README.txt file_id.diz $(BINPATH)
+	@cp LICENSE.txt README.txt file_id.diz $(BINPATH)
 	cd $(BINPATH) && zip -x "*~" -9 $(PACKAGE) *
 
 
--- a/config.mak	Thu May 19 13:21:09 2016 +0300
+++ b/config.mak	Sat Aug 19 15:46:11 2017 +0300
@@ -2,6 +2,13 @@
 DEMO_BIN=demo
 DEMO_OBJS=demo.o dmsimple.o
 
+BPATH := $(shell pwd)
+DMLIB := $(BPATH)/dmlib/
+PACKAGE = $(BPATH)/ap-bussi.zip
+BINPATH = $(BPATH)/bin/
+DATA = $(BINPATH)/bussi.dat
+MAKE ?= make
+
 EXTRA_CFLAGS=-O3
 
 TOOL_BINPATH=bin/