From 6b7d93e957a2bfeac1d6ada923460ae9f9eb39f1 Mon Sep 17 00:00:00 2001 From: darealshinji Date: Mon, 16 Oct 2023 15:28:41 +0200 Subject: [PATCH 1/3] Update Makefile Update to reflect changes to newer Lazarus version --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 0b3546b..ef58ba4 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ BIN = quickhash QHARCH ?= x64 LIBEWF = libewf-Linux-$(QHARCH).so -LAZARUSDIR ?= /usr/share/lazarus/2.0.12/ +LAZARUSDIR ?= /usr/share/lazarus/2.2.4/ LAZBUILD := $(LAZARUSDIR)lazbuild LAZRES := $(LAZARUSDIR)tools/lazres From 3c050a8dafcded26fd473f4b67da86c0757bab35 Mon Sep 17 00:00:00 2001 From: darealshinji Date: Thu, 19 Oct 2023 16:11:17 +0200 Subject: [PATCH 2/3] figure out Lazarus version automatically --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index ef58ba4..ed3baa1 100644 --- a/Makefile +++ b/Makefile @@ -5,8 +5,8 @@ BIN = quickhash QHARCH ?= x64 LIBEWF = libewf-Linux-$(QHARCH).so -LAZARUSDIR ?= /usr/share/lazarus/2.2.4/ -LAZBUILD := $(LAZARUSDIR)lazbuild +LAZBUILD ?= lazbuild +LAZARUSDIR ?= /usr/share/lazarus/$(shell $(LAZBUILD) --version)/ LAZRES := $(LAZARUSDIR)tools/lazres RESFILES = dbases_sqlite.lrs frmaboutunit.lrs udisplaygrid.lrs unit2.lrs udisplaygrid3.lrs uenvironmentchecker.lrs From d4dcecd126a4ad298856352bc6ea31c44c764e96 Mon Sep 17 00:00:00 2001 From: darealshinji Date: Thu, 19 Oct 2023 16:36:31 +0200 Subject: [PATCH 3/3] assume default paths on Ubuntu/Debian --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index ed3baa1..90502fb 100644 --- a/Makefile +++ b/Makefile @@ -6,8 +6,8 @@ QHARCH ?= x64 LIBEWF = libewf-Linux-$(QHARCH).so LAZBUILD ?= lazbuild -LAZARUSDIR ?= /usr/share/lazarus/$(shell $(LAZBUILD) --version)/ -LAZRES := $(LAZARUSDIR)tools/lazres +LAZRES ?= lazres +LAZARUSDIR ?= /usr/lib/lazarus/default/ RESFILES = dbases_sqlite.lrs frmaboutunit.lrs udisplaygrid.lrs unit2.lrs udisplaygrid3.lrs uenvironmentchecker.lrs