CrazyRedMachine/popnhax
1
0
Fork 0
forked from Popn_Tools/popnhax
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MinGW32 fix compilation

Browse Source
This commit is contained in:
CrazyRedMachine 2023-02-10 00:49:10 +01:00
parent 698e9c5476
commit f16e0cee12
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -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 \ $(ccache) $$(toolchain_$1)gcc -shared $$(srcdir_$3)/$3.def \
-o $$(dll_$1_$2_$3) -Wl,--out-implib,$$(implib_$1_$2_$3) \ -o $$(dll_$1_$2_$3) -Wl,--out-implib,$$(implib_$1_$2_$3) \
$$^ $$(ldflags_$3) $(optflags_$1) $$^ $$(ldflags_$3) $(optflags_$1)
$$(toolchain_$1)strip -s $$(dll_$1_$2_$3) strip -s $$(dll_$1_$2_$3)
$$(toolchain_$1)ranlib $$(implib_$1_$2_$3) ranlib $$(implib_$1_$2_$3)
endef 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) \ $$(exe_$1_$2_$3): $$(obj_$1_$2_$3) $$(abslib_$1_$2_$3) $$(absdpl_$1_$2_$3) \
| $$(bindir_$1_$2) | $$(bindir_$1_$2)
$(ccache) $$(toolchain_$1)gcc -o $$@ $$^ $$(ldflags_$3) $(optflags_$1) $(ccache) $$(toolchain_$1)gcc -o $$@ $$^ $$(ldflags_$3) $(optflags_$1)
$$(toolchain_$1)strip -s $$@ strip -s $$@
endef endef
@ -259,7 +259,7 @@ define t_import
impdef_$1_$2_$3 ?= imports/import_$1_$2_$3.def impdef_$1_$2_$3 ?= imports/import_$1_$2_$3.def
$$(bindir_$1_$2)/lib$3.a: $$(impdef_$1_$2_$3) | $$(bindir_$1_$2) $$(bindir_$1_$2)/lib$3.a: $$(impdef_$1_$2_$3) | $$(bindir_$1_$2)
$$(toolchain_$1)dlltool -l $$@ -d $$< dlltool -l $$@ -d $$<
endef endef

8
Module.mk
View File

@ -25,10 +25,4 @@ $(BUILDDIR)/popnhax.zip: \
echo ... $@ echo ... $@
zip -j $@ $^ zip -j $@ $^
$(BUILDDIR)/bemanihax.zip: \ all: $(BUILDDIR)/popnhax.zip
$(BUILDDIR)/popnhax.zip \
| $(zipdir)/
echo ... $@
zip -9 -q -j $@ $^
all: $(BUILDDIR)/bemanihax.zip