From 651bdf3931c5df3992384376f6c2968f1a291a6d Mon Sep 17 00:00:00 2001
From: OBattler <oubattler@gmail.com>
Date: Mon, 5 Mar 2018 20:47:48 +0100
Subject: [PATCH] Fixed the makefile so Dev builds are compiled correctly.

---
 src/win/Makefile.mingw | 172 +++++++++++++++++++++--------------------
 1 file changed, 87 insertions(+), 85 deletions(-)

diff --git a/src/win/Makefile.mingw b/src/win/Makefile.mingw
index a758a0cc6..8636989da 100644
--- a/src/win/Makefile.mingw
+++ b/src/win/Makefile.mingw
@@ -8,7 +8,7 @@
 #
 #		Makefile for Win32 (MinGW32) environment.
 #
-# Version:	@(#)Makefile.mingw	1.0.107	2018/03/05
+# Version:	@(#)Makefile.mingw	1.0.108	2018/03/05
 #
 # Authors:	Miran Grca, <mgrca8@gmail.com>
 #               Fred N. van Kempen, <decwiz@yahoo.com>
@@ -24,13 +24,96 @@ ifndef EXTRAS
 EXTRAS		:=
 endif
 
+ifndef DEV_BUILD
+DEV_BUILD	:= n
+endif
+
+ifeq ($(DEV_BUILD), y)
+ ifndef DEBUG
+  DEBUG		:= y
+ endif
+ ifndef DEV_BRANCH
+  DEV_BRANCH	:= y
+ endif
+ ifndef AMD_K
+  AMD_K		:= y
+ endif
+ ifndef CRASHDUMP
+  CRASHDUMP	:= y
+ endif
+ ifndef GREENB
+  GREENB	:= y
+ endif
+ ifndef I686
+  I686		:= y
+ endif
+ ifndef LASERXT
+  LASERXT	:= y
+ endif
+ ifndef NV_RIVA
+  NV_RIVA	:= y
+ endif
+ ifndef PAS16
+  PAS16		:= y
+ endif
+ ifndef PORTABLE3
+  PORTABLE3	:= y
+ endif
+ ifndef STEALTH32
+  STEALTH32	:= y
+ endif
+ ifndef VNC
+  VNC		:= y
+ endif
+ ifndef XL24
+  XL24		:= y
+ endif
+else
+ ifndef DEBUG
+  DEBUG		:= n
+ endif
+ ifndef DEV_BRANCH
+  DEV_BRANCH	:= n
+ endif
+ ifndef AMD_K
+  AMD_K		:= n
+ endif
+ ifndef CRASHDUMP
+  CRASHDUMP	:= n
+ endif
+ ifndef GREENB
+  GREENB	:= n
+ endif
+ ifndef I686
+  I686		:= n
+ endif
+ ifndef LASERXT
+  LASERXT	:= n
+ endif
+ ifndef NV_RIVA
+  NV_RIVA	:= n
+ endif
+ ifndef PAS16
+  PAS16		:= n
+ endif
+ ifndef PORTABLE3
+  PORTABLE3	:= n
+ endif
+ ifndef STEALTH32
+  STEALTH32	:= n
+ endif
+ ifndef VNC
+  VNC		:= n
+ endif
+ ifndef XL24
+  XL24		:= n
+ endif
+endif
+
 # Defaults for several build options (possibly defined in a chained file.)
 ifndef AUTODEP
 AUTODEP		:= n
 endif
-ifndef DEBUG
-DEBUG		:= n
-endif
 ifndef OPTIM
 OPTIM		:= n
 endif
@@ -46,57 +129,18 @@ endif
 ifndef USB
 USB		:= n
 endif
-ifndef VNC
-VNC		:= n
-endif
 ifndef RDP
 RDP		:= n
 endif
-ifndef DEV_BUILD
-DEV_BUILD	:= n
-endif
-ifndef DEV_BRANCH
-DEV_BRANCH	:= n
-endif
-ifndef AMD_K
-AMD_K		:= n
-endif
-ifndef CRASHDUMP
-CRASHDUMP	:= n
-endif
-ifndef GREENB
-GREENB		:= n
-endif
-ifndef I686
-I686		:= n
-endif
-ifndef LASERXT
-LASERXT		:= n
-endif
-ifndef NV_RIVA
-NV_RIVA		:= n
-endif
 ifndef OPENAL
 OPENAL		:= y
 endif
-ifndef PORTABLE3
-PORTABLE3	:= n
-endif
 ifndef FLUIDSYNTH
 FLUIDSYNTH	:= y
 endif
 ifndef MUNT
 MUNT		:= y
 endif
-ifndef PAS16
-PAS16		:= n
-endif
-ifndef STEALTH32
-STEALTH32	:= n
-endif
-ifndef XL24
-XL24		:= n
-endif
 ifndef DYNAREC
 DYNAREC		:= y
 endif
@@ -111,48 +155,6 @@ ifndef PROG
  endif
 endif
 
-ifeq ($(DEV_BUILD), y)
- ifneq ($(DEBUG), n)
-  DEBUG		:= y
- endif
- ifneq ($(DEV_BRANCH), n)
-  DEV_BRANCH	:= y
- endif
- ifneq ($(AMD_K), n)
-  AMD_K		:= y
- endif
- ifneq ($(CRASHDUMP), n)
-  CRASHDUMP	:= y
- endif
- ifneq ($(GREENB), n)
-  GREENB		:= y
- endif
- ifneq ($(I686), n)
-  I686		:= y
- endif
- ifneq ($(LASERXT), n)
-  LASERXT		:= y
- endif
- ifneq ($(NV_RIVA), n)
-  NV_RIVA		:= y
- endif
- ifneq ($(PAS16), n)
-  PAS16		:= y
- endif
- ifneq ($(PORTABLE3), n)
-  PORTABLE3	:= y
- endif
- ifneq ($(STEALTH32), n)
-  STEALTH32	:= y
- endif
- ifneq ($(VNC), n)
-  VNC		:= y
- endif
- ifneq ($(XL24), n)
-  XL24		:= y
- endif
-endif
-
 # WxWidgets basic info. Extract using the config program.
 ifneq ($(WX), n)
  EXPATH		+= wx