From f16e0cee1293233ff0b80354c8f49dda1488a483 Mon Sep 17 00:00:00 2001 From: CrazyRedMachine Date: Fri, 10 Feb 2023 00:49:10 +0100 Subject: [PATCH] MinGW32 fix compilation --- Makefile | 8 ++++---- Module.mk | 8 +------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index 9a45936..d9a06cb 100644 --- a/Makefile +++ b/Makefile @@ -232,8 +232,8 @@ $$(dll_$1_$2_$3) $$(implib_$1_$2_$3): $$(obj_$1_$2_$3) $$(abslib_$1_$2_$3) \ $(ccache) $$(toolchain_$1)gcc -shared $$(srcdir_$3)/$3.def \ -o $$(dll_$1_$2_$3) -Wl,--out-implib,$$(implib_$1_$2_$3) \ $$^ $$(ldflags_$3) $(optflags_$1) - $$(toolchain_$1)strip -s $$(dll_$1_$2_$3) - $$(toolchain_$1)ranlib $$(implib_$1_$2_$3) + strip -s $$(dll_$1_$2_$3) + ranlib $$(implib_$1_$2_$3) endef @@ -248,7 +248,7 @@ exe_$1_$2_$3 := $$(bindir_$1_$2)/$3.exe $$(exe_$1_$2_$3): $$(obj_$1_$2_$3) $$(abslib_$1_$2_$3) $$(absdpl_$1_$2_$3) \ | $$(bindir_$1_$2) $(ccache) $$(toolchain_$1)gcc -o $$@ $$^ $$(ldflags_$3) $(optflags_$1) - $$(toolchain_$1)strip -s $$@ + strip -s $$@ endef @@ -259,7 +259,7 @@ define t_import impdef_$1_$2_$3 ?= imports/import_$1_$2_$3.def $$(bindir_$1_$2)/lib$3.a: $$(impdef_$1_$2_$3) | $$(bindir_$1_$2) - $$(toolchain_$1)dlltool -l $$@ -d $$< + dlltool -l $$@ -d $$< endef diff --git a/Module.mk b/Module.mk index c4baf77..e0a1493 100644 --- a/Module.mk +++ b/Module.mk @@ -25,10 +25,4 @@ $(BUILDDIR)/popnhax.zip: \ echo ... $@ zip -j $@ $^ -$(BUILDDIR)/bemanihax.zip: \ - $(BUILDDIR)/popnhax.zip \ - | $(zipdir)/ - echo ... $@ - zip -9 -q -j $@ $^ - -all: $(BUILDDIR)/bemanihax.zip +all: $(BUILDDIR)/popnhax.zip