From a7dc00db87ed8a3799eb77bbad5c0838435a5e57 Mon Sep 17 00:00:00 2001
From: Jan Lindemann <jan@janware.com>
Date: Wed, 9 Nov 2016 14:03:37 +0000
Subject: [PATCH] defs-dev.mk, defs.mk, run.mk: Fix mingw32 build

Signed-off-by: Jan Lindemann <jan@janware.com>
---
 make/defs-dev.mk | 4 ++++
 make/defs.mk     | 9 ++-------
 make/run.mk      | 9 ++++++++-
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/make/defs-dev.mk b/make/defs-dev.mk
index 5dc2d443..96ac1570 100644
--- a/make/defs-dev.mk
+++ b/make/defs-dev.mk
@@ -275,7 +275,11 @@ COMPILE_DEBUG_CODE             ?= true
 #COMPILE_DEBUG_LOG              ?= true
 USE_COMPILER_DEBUG_OPTS        ?= true
 #USE_COMPILER_OPTIMIZATION_OPTS ?= true
+ifeq ($(TARGET),mingw)
+USE_STACK_PROTECTOR            ?= false
+else
 USE_STACK_PROTECTOR            ?= true
+endif
 #USE_STACK_CHECKER              ?= true
 
 #USE_FUSE                       ?= true
diff --git a/make/defs.mk b/make/defs.mk
index 91469d31..c179ca6a 100644
--- a/make/defs.mk
+++ b/make/defs.mk
@@ -113,13 +113,6 @@ MINOR_VERSION          = $(shell echo $(MAJOR_MINOR_RELEASE) | cut -d. -f2)
 RELEASE_VERSION        = $(shell echo $(MAJOR_MINOR_RELEASE) | cut -d. -f3)
 BUILD_NUMBER           = $(shell echo $(DIST_VERSION) | cut -d- -f2)
 CVS_RSH               ?= /usr/bin/ssh
-ifneq ($(EXE_BASENAME),)
-ifneq ($(TARGET),mingw)
-EXE                   ?= $(EXE_BASENAME)
-else
-EXE                   ?= $(EXE_BASENAME).exe
-endif
-endif
 
 # ----- input dirs
 YTOOLS_DIR             = $(MODDIR)
@@ -170,8 +163,10 @@ USE_YTOOLS            ?= true
 USE_EXCEPTIONS_IN_C   ?= true
 REENTRANT             ?= true
 ifneq ($(wildcard /usr/include/systemd/sd-daemon.h),)
+ifneq ($(TARGET),mingw)
 USE_SYSTEMD           ?= true
 endif
+endif
 
 export REENTRANT
 
diff --git a/make/run.mk b/make/run.mk
index 9480ba2b..d03a8443 100644
--- a/make/run.mk
+++ b/make/run.mk
@@ -13,7 +13,14 @@ ifeq ($(EXE_BASENAME),)
   endif
 endif
 
-EXE ?= $(EXE_BASENAME)
+ifneq ($(EXE_BASENAME),)
+ifneq ($(TARGET),mingw)
+EXE                   ?= $(EXE_BASENAME)
+else
+EXE                   ?= $(EXE_BASENAME).exe
+endif
+endif
+
 EXE_PATH ?= ./$(EXE)
 
 LOCAL_CFLAGS   += -DEXE_NAME=\"$(EXE)\"