From 8375af0b2854ef743ab6ef0d1daafe8cc2371afa Mon Sep 17 00:00:00 2001 From: Albert Graef <aggraef@gmail.com> Date: Mon, 29 Mar 2021 23:51:39 +0200 Subject: [PATCH] mingw: handle Lua updates. Our inno Makefile assumed lua53, but lua54 is the version that msys2 has after a recent update. So we now use a glob pattern in the Makefile to catch any version of the lua dll that msys2 currently has. --- packages/win32_inno/Makefile | 2 +- packages/win64_inno/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/win32_inno/Makefile b/packages/win32_inno/Makefile index 12b2f93c0..7a262d237 100755 --- a/packages/win32_inno/Makefile +++ b/packages/win32_inno/Makefile @@ -115,7 +115,7 @@ ifneq ($(LIGHT),yes) install -p $(bin_src)/libreadline8.dll $(DESTDIR)$(bindir)/ install -p $(bin_src)/libtermcap-0.dll $(DESTDIR)$(bindir)/ # For other external libs - install -p $(bin_src)/lua53.dll $(DESTDIR)$(bindir)/ + install -p $(bin_src)/lua*.dll $(DESTDIR)$(bindir)/ #install -p $(bin_src)/pthreadGC2.dll $(DESTDIR)$(bindir)/ #install -p $(bin_src)/libdl.dll $(DESTDIR)$(bindir)/ install -p $(bin_src)/libportaudio-2.dll $(DESTDIR)$(bindir)/ diff --git a/packages/win64_inno/Makefile b/packages/win64_inno/Makefile index c95c8a7a1..aa32645c4 100644 --- a/packages/win64_inno/Makefile +++ b/packages/win64_inno/Makefile @@ -115,7 +115,7 @@ ifneq ($(LIGHT),yes) install -p $(bin_src)/libreadline8.dll $(DESTDIR)$(bindir)/ install -p $(bin_src)/libtermcap-0.dll $(DESTDIR)$(bindir)/ # For other external libs - install -p $(bin_src)/lua53.dll $(DESTDIR)$(bindir)/ + install -p $(bin_src)/lua*.dll $(DESTDIR)$(bindir)/ #install -p $(bin_src)/pthreadGC2.dll $(DESTDIR)$(bindir)/ install -p $(bin_src)/libdl.dll $(DESTDIR)$(bindir)/ install -p $(bin_src)/libportaudio-2.dll $(DESTDIR)$(bindir)/ -- GitLab