From cede6e5263b356415be35a02a8aa8b8ed272b20f Mon Sep 17 00:00:00 2001 From: tobil4sk Date: Tue, 3 Sep 2024 18:47:28 +0100 Subject: [PATCH 1/3] Add "hashlink" library to make release script --- Makefile | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 1f7209853..71bab1ef5 100644 --- a/Makefile +++ b/Makefile @@ -235,20 +235,25 @@ mesa: release: release_prepare release_$(RELEASE_NAME) release_haxelib: + ${MAKE} HLIB=hashlink release_haxelib_package ${MAKE} HLIB=directx release_haxelib_package ${MAKE} HLIB=sdl release_haxelib_package ${MAKE} HLIB=openal release_haxelib_package +HLPACK=$(HLIB) +HLDIR=libs/$(HLIB) + ifeq ($(HLIB),directx) HLPACK=dx -else -HLPACK=$(HLIB) +else ifeq ($(HLIB),hashlink) +HLDIR=other/haxelib +HLPACK=templates endif release_haxelib_package: rm -rf $(HLIB)_release mkdir $(HLIB)_release - (cd libs/$(HLIB) && cp -R $(HLPACK) *.h *.c* haxelib.json ../../$(HLIB)_release | true) + (cd $(HLDIR) && cp -R $(HLPACK) *.h *.c* *.hx haxelib.json $(CURDIR)/$(HLIB)_release | true) zip -r $(HLIB).zip $(HLIB)_release haxelib submit $(HLIB).zip rm -rf $(HLIB)_release From 50502742e55ede71db9cf9ba29a93e5aabc547c9 Mon Sep 17 00:00:00 2001 From: Tobiasz Laskowski Date: Wed, 11 Sep 2024 08:26:36 +0100 Subject: [PATCH 2/3] Include hlmem when packaging hashlink library --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 71bab1ef5..bd9d060f5 100644 --- a/Makefile +++ b/Makefile @@ -247,13 +247,13 @@ ifeq ($(HLIB),directx) HLPACK=dx else ifeq ($(HLIB),hashlink) HLDIR=other/haxelib -HLPACK=templates +HLPACK=templates hlmem memory.hxml Run.hx endif release_haxelib_package: rm -rf $(HLIB)_release mkdir $(HLIB)_release - (cd $(HLDIR) && cp -R $(HLPACK) *.h *.c* *.hx haxelib.json $(CURDIR)/$(HLIB)_release | true) + (cd $(HLDIR) && cp -R $(HLPACK) *.h *.c* haxelib.json $(CURDIR)/$(HLIB)_release | true) zip -r $(HLIB).zip $(HLIB)_release haxelib submit $(HLIB).zip rm -rf $(HLIB)_release From 4b5ede37e98b8338586e39e28977ec56b962f0dc Mon Sep 17 00:00:00 2001 From: Tobiasz Laskowski Date: Wed, 11 Sep 2024 09:27:04 +0100 Subject: [PATCH 3/3] Avoid cp warning when packaging hashlink library --- Makefile | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index bd9d060f5..9717f5aae 100644 --- a/Makefile +++ b/Makefile @@ -240,20 +240,22 @@ release_haxelib: ${MAKE} HLIB=sdl release_haxelib_package ${MAKE} HLIB=openal release_haxelib_package -HLPACK=$(HLIB) -HLDIR=libs/$(HLIB) - -ifeq ($(HLIB),directx) -HLPACK=dx -else ifeq ($(HLIB),hashlink) +ifeq ($(HLIB),hashlink) HLDIR=other/haxelib HLPACK=templates hlmem memory.hxml Run.hx +else +HLDIR=libs/$(HLIB) +ifeq ($(HLIB),directx) +HLPACK=dx *.h *.c *.cpp +else +HLPACK=$(HLIB) *.h *.c +endif endif release_haxelib_package: rm -rf $(HLIB)_release mkdir $(HLIB)_release - (cd $(HLDIR) && cp -R $(HLPACK) *.h *.c* haxelib.json $(CURDIR)/$(HLIB)_release | true) + (cd $(HLDIR) && cp -R $(HLPACK) haxelib.json $(CURDIR)/$(HLIB)_release | true) zip -r $(HLIB).zip $(HLIB)_release haxelib submit $(HLIB).zip rm -rf $(HLIB)_release