# HG changeset patch # User Matti Hamalainen # Date 1432348630 -10800 # Node ID da7ac3f7d014fd35da04428295be7a1f1c705f4e # Parent 8398461ccd0fd8e9fa0fbcf86f31ed3970c8a575 Work on build process. diff -r 8398461ccd0f -r da7ac3f7d014 Makefile --- a/Makefile Sat May 23 05:03:15 2015 +0300 +++ b/Makefile Sat May 23 05:37:10 2015 +0300 @@ -1,29 +1,42 @@ # # Generic build target # -DMLIB = ./dmlib/ +BPATH := /home/ccr/bussi +DMLIB := $(BPATH)/dmlib/ +PACKAGE = $(BPATH)/ap-bussi.zip +BINPATH = $(BPATH)/bin/ +DATA = $(BINPATH)/bussi.dat MAKE ?= make export DMLIB +export BINPATH -unix: - $(MAKE) -f $(DMLIB)Makefile EXEEXT=.bin +linux-bin: + $(MAKE) -f $(DMLIB)Makefile EXEEXT=-linux.bin mingw-win32: $(MAKE) -f $(DMLIB)Makefile.cross-mingw \ - OBJPATH=./obj/win32/ \ - BINPATH=./bin/ \ + OBJPATH=$(BPATH)/obj/win32/ \ MINGW_PREFIX=i686-w64-mingw32- \ MINGW_PATH=/usr/i686-w64-mingw32 mingw-win64: $(MAKE) -f $(DMLIB)Makefile.cross-mingw \ - OBJPATH=./obj/win64/ \ - BINPATH=./bin/ \ + OBJPATH=$(BPATH)/obj/win64/ \ MINGW_PREFIX=x86_64-w64-mingw32- \ MINGW_PATH=/usr/x86_64-w64-mingw32 +$(DATA): + cd $(BPATH)/data && $(DMLIB)/tools/packed -p $@ -c -v * + +package: linux-bin mingw-win32 $(BINPATH)/bussi.dat + $(RM) $(PACKAGE) + @cp README.txt file_id.diz $(BINPATH) + cd $(BINPATH) && zip -x\*~ -9 $(PACKAGE) * + + clean: - -$(MAKE) -f $(DMLIB)Makefile clean EXEEXT=.bin + -$(RM) $(DATA) + -$(MAKE) -f $(DMLIB)Makefile clean EXEEXT=-linux.bin -$(MAKE) -f $(DMLIB)Makefile.cross-mingw clean \ No newline at end of file diff -r 8398461ccd0f -r da7ac3f7d014 README.txt --- a/README.txt Sat May 23 05:03:15 2015 +0300 +++ b/README.txt Sat May 23 05:37:10 2015 +0300 @@ -4,5 +4,5 @@ gfx & code by ccr musics by fgcl -maybe works on linux and win32. source code provided for -educational purposes and laughs. for license see LICENSE.txt +maybe works on linux and win32. +for license see LICENSE.txt diff -r 8398461ccd0f -r da7ac3f7d014 demo.c --- a/demo.c Sat May 23 05:03:15 2015 +0300 +++ b/demo.c Sat May 23 05:37:10 2015 +0300 @@ -17,7 +17,8 @@ engine->optPackFilename = "bussi.dat"; engine->optDataPath = NULL; - engine->optResFlags = DRF_USE_PACK | DRF_PRELOAD_RES | DRF_USE_STDIO; + + engine->optResFlags = DRF_USE_PACK | DRF_PRELOAD_RES;// | DRF_USE_STDIO; engine->optAudioSetup = DM_ASETUP_JSS; diff -r 8398461ccd0f -r da7ac3f7d014 file_id.diz --- a/file_id.diz Sat May 23 05:03:15 2015 +0300 +++ b/file_id.diz Sat May 23 05:37:10 2015 +0300 @@ -1,5 +1,5 @@ anciat productionz B U S S I @ simulaatio 6 @ - win32/linux/src - bussilla pääsee + win32 / linux + bussilla pääsee