--- a/Makefile.cross-mingw	Thu Dec 05 16:48:46 2019 +0200
+++ b/Makefile.cross-mingw	Thu Dec 05 18:24:43 2019 +0200
@@ -28,7 +28,7 @@
 DM_CFLAGS += -DDM_HAVE_MEMSET=1
 DMLIB ?= ./
 BINPATH ?= ./exe/
-EXEEXT ?= .exe
+BINEXT ?= .exe
 CC = $(BINTOOL_PREFIX)gcc
 AR = $(BINTOOL_PREFIX)ar
 RANLIB = $(BINTOOL_PREFIX)ranlib

--- a/Makefile.gen	Thu Dec 05 16:48:46 2019 +0200
+++ b/Makefile.gen	Thu Dec 05 18:24:43 2019 +0200
@@ -264,10 +264,10 @@
 TESTS_BINARIES += vecmattest fptest dzlibtest encbr1test
 endif
 
-FONTCONV_BIN=$(TOOL_BINPATH)fontconv$(EXEEXT)
-DATA2INC_BIN=$(TOOL_BINPATH)data2inc$(EXEEXT)
+FONTCONV_BIN=$(TOOL_BINPATH)fontconv$(BINEXT)
+DATA2INC_BIN=$(TOOL_BINPATH)data2inc$(BINEXT)
 
-ifeq ($(EXEEXT),.exe)
+ifeq ($(BINEXT),.exe)
 # Cross-building Windows binaries requires locally installed utilities
 FONTCONV_DEP=
 DATA2INC_DEP=
@@ -312,10 +312,11 @@
 	dmimage.o dmengine.o dmfft.o dmzlib.o
 
 
-TESTS_TARGETS = $(addprefix $(TESTS_BINPATH),$(addsuffix $(EXEEXT),$(TESTS_BINARIES)))
-TOOL_TARGETS = $(addprefix $(TOOL_BINPATH),$(addsuffix $(EXEEXT),$(TOOL_BINARIES)))
-TARGETS += $(DMLIB_A) $(addprefix $(BINPATH),$(addsuffix $(EXEEXT),$(BINARIES))) \
-	$(TOOL_TARGETS) $(TESTS_TARGETS)
+TARGETS += \
+	$(DMLIB_A) \
+	$(addprefix $(BINPATH),$(addsuffix $(BINEXT),$(BINARIES))) \
+	$(addprefix $(TOOL_BINPATH),$(addsuffix $(BINEXT),$(TOOL_BINARIES))) \
+	$(addprefix $(TESTS_BINPATH),$(addsuffix $(BINEXT),$(TESTS_BINARIES)))
 
 NOBUILD_TARGETS +=
 NOINST_TARGETS += 
@@ -439,59 +440,59 @@
 ###
 ### Tests
 ###
-$(TESTS_BINPATH)blittest$(EXEEXT): $(OBJPATH)blittest.o $(DMLIB_A)
+$(TESTS_BINPATH)blittest$(BINEXT): $(OBJPATH)blittest.o $(DMLIB_A)
 	$(LINK_C_BIN) $(SDL_LDFLAGS) $(SDL_TTF_LDFLAGS) -lm
 
-$(TESTS_BINPATH)dzlibtest$(EXEEXT): $(OBJPATH)dzlibtest.o $(DMLIB_A)
+$(TESTS_BINPATH)dzlibtest$(BINEXT): $(OBJPATH)dzlibtest.o $(DMLIB_A)
 	$(LINK_C_BIN) $(DM_LDFLAGS) $(SDL_LDFLAGS) $(ZLIB_LDFLAGS)
 
-$(TESTS_BINPATH)plrtest$(EXEEXT): $(OBJPATH)plrtest.o $(DMLIB_A)
+$(TESTS_BINPATH)plrtest$(BINEXT): $(OBJPATH)plrtest.o $(DMLIB_A)
 	$(LINK_C_BIN) $(DM_LDFLAGS) $(SDL_LDFLAGS) $(ZLIB_LDFLAGS) -lm
 
-$(TESTS_BINPATH)%test$(EXEEXT): $(OBJPATH)%test.o $(DMLIB_A)
+$(TESTS_BINPATH)%test$(BINEXT): $(OBJPATH)%test.o $(DMLIB_A)
 	$(LINK_C_BIN) $(DM_LDFLAGS) $(TOOL_LDFLAGS) -lm
 
 
 ###
 ### Tools
 ###
-$(TOOL_BINPATH)fontconv$(EXEEXT): $(OBJPATH)fontconv.o $(DMLIB_A)
+$(TOOL_BINPATH)fontconv$(BINEXT): $(OBJPATH)fontconv.o $(DMLIB_A)
 	$(LINK_C_BIN) $(DM_LDFLAGS) $(TOOL_LDFLAGS) $(SDL_LDFLAGS) $(SDL_TTF_LDFLAGS) $(ZLIB_LDFLAGS) -lm
 
-$(TOOL_BINPATH)data2inc$(EXEEXT): $(OBJPATH)data2inc.o $(DMLIB_A)
+$(TOOL_BINPATH)data2inc$(BINEXT): $(OBJPATH)data2inc.o $(DMLIB_A)
 	$(LINK_C_BIN) $(DM_LDFLAGS) $(TOOL_LDFLAGS)
 
-$(TOOL_BINPATH)packed$(EXEEXT): $(OBJPATH)packed.o $(DMLIB_A)
+$(TOOL_BINPATH)packed$(BINEXT): $(OBJPATH)packed.o $(DMLIB_A)
 	$(LINK_C_BIN) $(DM_LDFLAGS) $(TOOL_LDFLAGS) $(ZLIB_LDFLAGS)
 
-$(TOOL_BINPATH)mod2wav$(EXEEXT): $(OBJPATH)mod2wav.o $(DMLIB_A)
+$(TOOL_BINPATH)mod2wav$(BINEXT): $(OBJPATH)mod2wav.o $(DMLIB_A)
 	$(LINK_C_BIN) $(DM_LDFLAGS) $(TOOL_LDFLAGS) $(ZLIB_LDFLAGS) -lm
 
-$(TOOL_BINPATH)xm2jss$(EXEEXT): $(OBJPATH)xm2jss.o $(DMLIB_A)
+$(TOOL_BINPATH)xm2jss$(BINEXT): $(OBJPATH)xm2jss.o $(DMLIB_A)
 	$(LINK_C_BIN) $(DM_LDFLAGS) $(TOOL_LDFLAGS) $(ZLIB_LDFLAGS)
 
-$(TOOL_BINPATH)dumpmod$(EXEEXT): $(OBJPATH)dumpmod.o $(DMLIB_A)
+$(TOOL_BINPATH)dumpmod$(BINEXT): $(OBJPATH)dumpmod.o $(DMLIB_A)
 	$(LINK_C_BIN) $(DM_LDFLAGS) $(TOOL_LDFLAGS) $(ZLIB_LDFLAGS)
 
 
-$(TOOL_BINPATH)ppl$(EXEEXT): $(OBJPATH)ppl.o $(OBJPATH)libgutil.o $(DMLIB_A)
+$(TOOL_BINPATH)ppl$(BINEXT): $(OBJPATH)ppl.o $(OBJPATH)libgutil.o $(DMLIB_A)
 	$(LINK_C_BIN) $(DM_LDFLAGS) $(ZLIB_LDFLAGS) $(SDL_LDFLAGS) -lm
 
-$(TOOL_BINPATH)objlink$(EXEEXT): $(OBJPATH)objlink.o $(DMLIB_A)
+$(TOOL_BINPATH)objlink$(BINEXT): $(OBJPATH)objlink.o $(DMLIB_A)
 	$(LINK_C_BIN) $(DM_LDFLAGS) $(TOOL_LDFLAGS)
 
-$(TOOL_BINPATH)fanalyze$(EXEEXT): $(OBJPATH)fanalyze.o $(DMLIB_A)
+$(TOOL_BINPATH)fanalyze$(BINEXT): $(OBJPATH)fanalyze.o $(DMLIB_A)
 	$(LINK_C_BIN) $(DM_LDFLAGS) $(TOOL_LDFLAGS)
 
-$(TOOL_BINPATH)gfxconv$(EXEEXT): $(OBJPATH)gfxconv.o $(OBJPATH)lib64gfx.o \
+$(TOOL_BINPATH)gfxconv$(BINEXT): $(OBJPATH)gfxconv.o $(OBJPATH)lib64gfx.o \
 	$(OBJPATH)lib64fmts.o $(OBJPATH)lib64util.o $(OBJPATH)libgfx.o $(DMLIB_A)
 	$(LINK_C_BIN) $(DM_LDFLAGS) $(TOOL_LDFLAGS) $(LIBPNG_LDFLAGS) $(ZLIB_LDFLAGS)
 
-$(TOOL_BINPATH)64vw$(EXEEXT): $(OBJPATH)64vw.o $(OBJPATH)lib64gfx.o \
+$(TOOL_BINPATH)64vw$(BINEXT): $(OBJPATH)64vw.o $(OBJPATH)lib64gfx.o \
 	$(OBJPATH)lib64fmts.o $(OBJPATH)lib64util.o $(OBJPATH)libgfx.o $(DMLIB_A)
 	$(LINK_C_BIN) $(DM_LDFLAGS) $(LIBPNG_LDFLAGS) $(ZLIB_LDFLAGS) $(SDL_LDFLAGS)
 
-$(TOOL_BINPATH)gentab$(EXEEXT): $(OBJPATH)gentab.o $(DMLIB_A)
+$(TOOL_BINPATH)gentab$(BINEXT): $(OBJPATH)gentab.o $(DMLIB_A)
 	$(LINK_C_BIN) $(DM_LDFLAGS) $(TOOL_LDFLAGS) -lm
 
 
@@ -499,7 +500,7 @@
 ### Demo binary
 ###
 ifneq ($(DEMO_BIN),)
-$(BINPATH)$(DEMO_BIN)$(EXEEXT): $(addprefix $(OBJPATH),$(DEMO_OBJS)) $(DMLIB_A)
+$(BINPATH)$(DEMO_BIN)$(BINEXT): $(addprefix $(OBJPATH),$(DEMO_OBJS)) $(DMLIB_A)
 	$(LINK_C_BIN) $(DM_LDFLAGS) $(SDL_LDFLAGS) $(DEMO_LDFLAGS) -lm
 endif
 
@@ -517,7 +518,7 @@
 	@echo "MAKEFILE = $(EDITOR_MAKEFILE)" >> $@
 	@echo "CONFIG += debug" >> $@
 	@echo "QT += core gui opengl" >> $@
-	@echo "TARGET = $(BINPATH)ed_$(DEMO_BIN)$(EXEEXT)" >> $@
+	@echo "TARGET = $(BINPATH)ed_$(DEMO_BIN)$(BINEXT)" >> $@
 	@echo "TEMPLATE = app" >> $@
 	@echo "SOURCES = $(addprefix $(DMLIB),$(EDITOR_SOURCES))" >> $@
 	@echo "HEADERS = $(addprefix $(DMLIB),$(EDITOR_HEADERS))" >> $@
@@ -527,7 +528,7 @@
 	@echo " QMAKE $+"
 	@qmake -Wall $<
 
-$(BINPATH)ed_$(DEMO_BIN)$(EXEEXT): $(EDITOR_MAKEFILE)
+$(BINPATH)ed_$(DEMO_BIN)$(BINEXT): $(EDITOR_MAKEFILE)
 	@$(MAKE) -f $<