# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1572353197 -7200
# Node ID 2239a5ccf827de1af79b7a2c53bdf517a5d4b464
# Parent  80e514ceb7ccb99eeba7b8cfa56a153c3c946ba1
Fixes to the build system (Makefile etc.)

diff -r 80e514ceb7cc -r 2239a5ccf827 Makefile
--- a/Makefile	Mon Apr 29 13:48:22 2019 +0300
+++ b/Makefile	Tue Oct 29 14:46:37 2019 +0200
@@ -2,35 +2,52 @@
 # Generic build target
 #
 include config.mak
+MAKEOPTS=-j4
 
 export DMLIB
 export BINPATH
 
 linux-bin:
-	$(MAKE) -f $(DMLIB)Makefile EXEEXT=-linux.bin
+	$(MAKE) $(MAKEOPTS) -f $(DMLIB)Makefile EXEEXT=-linux.bin
 
 mingw-win32:
-	$(MAKE) -f $(DMLIB)Makefile.cross-mingw \
+	$(MAKE) $(MAKEOPTS) -f $(DMLIB)Makefile.cross-mingw \
 	OBJPATH=$(BPATH)/obj/win32/ \
 	MINGW_PREFIX=i686-w64-mingw32- \
 	MINGW_PATH=/usr/i686-w64-mingw32
 
 mingw-win64:
-	$(MAKE) -f $(DMLIB)Makefile.cross-mingw \
+	$(MAKE) $(MAKEOPTS) -f $(DMLIB)Makefile.cross-mingw \
 	OBJPATH=$(BPATH)/obj/win64/ \
 	MINGW_PREFIX=x86_64-w64-mingw32- \
 	MINGW_PATH=/usr/x86_64-w64-mingw32
 
-$(DATA): $(wildcard $(BPATH)/data/*)
-	cd $(BPATH)/data && $(DMLIB)/tools/packed -p $@ -c -x \*~ -v *
+$(DATA_PKG): $(wildcard $(BPATH)/data/*)
+	cd $(BPATH)/data && $(TOOL_BINPATH)packed create $@ -x \*~ -v *
 
 tools:
-	@if test ! -e $(DMLIB)config.mak; then cp $(DMLIB)config.mak.in $(DMLIB)config.mak; fi
-	@cd $(DMLIB) && make -j4
+	$(MAKE) $(MAKEOPTS) -f $(DMLIB)Makefile \
+	DM_CONFIG=no \
+	TOOL_BINPATH=$(TOOL_BINPATH) \
+	OBJPATH=$(DMLIB)/obj/unix/ \
+	DM_BUILD_TESTS=no \
+	DM_BUILD_TOOLS=yes \
+	DM_USE_TIMELINE=no \
+	DM_BUILD_EDITOR=no \
+	DM_USE_C=yes \
+	DM_USE_SIMD=yes \
+	DM_USE_PACKFS=yes \
+	DM_USE_STDIO=yes \
+	DM_USE_MEMIO=yes \
+	JSS=yes \
+	JSS_SUP_XM=yes \
+	JSS_SUP_JSSMOD=yes \
+	JSSMOD_FLAGS="-DJM_SUP_PATMODE_ALL -DJM_SUP_EXT_INSTR -DJM_SUP_INSTR -DJM_SUP_SAMPLES" \
+	JSS_SUP_THREADS=yes
 
-data: tools $(DATA)
+data: tools $(DATA_PKG)
 
-package: linux-bin mingw-win32 $(DATA)
+package: linux-bin mingw-win32 $(DATA_PKG)
 	strip $(BINPATH)/*.bin $(BINPATH)/*.exe
 	$(RM) $(PACKAGE)
 	cp SDL.dll LICENSE.txt README.txt file_id.diz $(BINPATH)
@@ -38,7 +55,7 @@
 
 
 clean:
-	-$(RM) $(DATA)
+	-$(RM) $(DATA_PKG)
 	-$(MAKE) -f $(DMLIB)Makefile clean EXEEXT=-linux.bin
 	-$(MAKE) -f $(DMLIB)Makefile.cross-mingw clean
 	
\ No newline at end of file
diff -r 80e514ceb7cc -r 2239a5ccf827 config.mak
--- a/config.mak	Mon Apr 29 13:48:22 2019 +0300
+++ b/config.mak	Tue Oct 29 14:46:37 2019 +0200
@@ -1,3 +1,11 @@
+MAKEOPTS=-j4
+EXTRA_CFLAGS=-O3
+MAKE ?= make
+
+#DM_CFLAGS += -fopenmp
+#DM_LDFLAGS += -lgomp
+#DM_DEBUG=yes
+
 # Additional binaries (aka the demo)
 DEMO_BIN=demo
 DEMO_OBJS=demo.o dmsimple.o
@@ -6,18 +14,9 @@
 DMLIB := $(BPATH)/dmlib/
 PACKAGE = $(BPATH)/ap-bussi.zip
 BINPATH = $(BPATH)/bin/
-DATA = $(BINPATH)/bussi.dat
-MAKE ?= make
-
-EXTRA_CFLAGS=-O3
+DATA_PKG = $(BINPATH)/bussi.dat
+TOOL_BINPATH = $(DMLIB)tools/
 
-TOOL_BINPATH=bin/
-TESTS_BINPATH=$(TOOL_BINPATH)
-
-#DM_CFLAGS += -fopenmp
-#DM_LDFLAGS += -lgomp
-
-#DM_DEBUG=yes
 
 # Build engine tests and tools? (Please notice that what
 # actually gets built it also affected by other options)