From 16532cbf2a360b8ffa47d7b72dab2b204a912153 Mon Sep 17 00:00:00 2001
From: Ralph Amissah <ralph.amissah@gmail.com>
Date: Mon, 6 May 2024 14:14:49 -0400
Subject: work on more generic install + instructions

---
 makefile | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

(limited to 'makefile')

diff --git a/makefile b/makefile
index 3573b4c..59651de 100644
--- a/makefile
+++ b/makefile
@@ -77,7 +77,7 @@ flake-check:
 	echo -e '❯❯ nix build ".#spine-ldc" --print-build-logs |& nom\n❯❯ nix build ".#spine-dmd" --print-build-logs |& nom\n'; \
 	echo -e '❯❯ make -s\n❯❯ make -s nix-build-ldc\n❯❯ make -s nix-build-dmd\n'; \
 	echo -e '❯❯ make -s ldc\n❯❯ make -s dmd\n'; \
-	echo -e '❯❯ $(DUB) --compiler=ldc2 --build=ldc2\n❯❯ $(DUB) --compiler=dmd --build=dmd\n';
+	echo -e '❯❯ $(DUB) --compiler=ldmd2 --build=ldmd2\n❯❯ $(DUB) --compiler=dmd --build=dmd\n';
 
 nix-devshell:
 	echo -ne '\n❯❯ nix flake update && nix flake check --show-trace && nix flake show && nix develop ".#devShell"\n\n❯❯ nix build ".#default" --print-build-logs\n❯❯ nix build ".#spine-dmd" --print-build-logs\n❯❯ nix build ".#spine-ldc" --print-build-logs\n❯❯ nix build ".#spine-gdc" --print-build-logs\n\n'; \
@@ -113,7 +113,6 @@ buildPhase:
 	  exit 1; \
 	fi; \
 	echo "$${DC_} used as D compiler to build $${pname}"; \
-	export DFLAGS="-O2 -inline"; \
 	dub build --compiler=$${DC} --build=$${DC_} --combined --skip-registry=all;
 
 checkPhase:
@@ -572,7 +571,7 @@ all_clean: clean tangle dmd ldc gdc
 all_ver_clean: clean tangle dmd_ver ldc_ver gdc_ver
 
 dmd: dub_upgrade
-	$(DUB) --compiler=dmd --build=dmd --build=release-nobounds
+	$(DUB) --compiler=dmd --build=dmd
 	notify-send -t 0 'D dmd compiled test release executable ready' 'spine-dmd'
 
 # assumes git tags with program version
@@ -612,22 +611,26 @@ gdc_rel_tangle: tangle
 gdc_rel_expunge_tangle: expunge skel tangle gdc_rel_tangle
 
 ldc: dub_upgrade
-	$(DUB) --compiler=ldc2 --build=ldc2 --build=release
+	$(DUB) --compiler=ldmd2 --build=ldmd2
 	notify-send -t 0 'D ldc compiled test release executable ready' 'spine-ldc'
 
+#ldc: dub_upgrade
+#	$(DUB) --compiler=ldc2 --build=ldc2
+#	notify-send -t 0 'D ldc compiled test release executable ready' 'spine-ldc'
+
 # assumes git tags with program version
 ldc_ver: dub_upgrade
-	$(DUB) --compiler=ldc2 --config=ldc-version
+	$(DUB) --compiler=ldmd2 --config=ldc-version
 	mv bin/spine-ldc-ver bin-archive/spine-$(PROG_VER_DECLARED)-tag-$(PROG_VER_GIT)-ldc
-	notify-send -t 0 'D ldc2 compiled test release executable ready' 'spine-$(PROG_VER_DECLARED)-tag-$(PROG_VER_GIT)-ldc'
+	notify-send -t 0 'D ldc2 (ldmd2) compiled test release executable ready' 'spine-$(PROG_VER_DECLARED)-tag-$(PROG_VER_GIT)-ldc'
 
 ldc_clean_ver: clean tangle ldc_ver
 
 ldc_rel: expunge skel tangle
-	$(DUB) --compiler=ldc2 --config=spine-release
+	$(DUB) --compiler=ldmd2 --config=ldmd2
 
 ldc_rel_tangle: tangle
-	$(DUB) --compiler=ldc2 --config=spine-ldc
+	$(DUB) --compiler=ldmd2 --config=ldmd2
 
 ldc_rel_expunge_tangle: expunge skel tangle ldc_rel_tangle
 
-- 
cgit v1.2.3