From f13a890f45d8fc157784094d64ed876ff59b04eb Mon Sep 17 00:00:00 2001
From: Brad Parker <cbparker@gmail.com>
Date: Thu, 14 Sep 2017 13:34:21 -0700
Subject: [PATCH] fix non-360 MSVC builds and add generic DEBUG handling for
 msvc and non-msvc

---
 Makefile.libretro | 45 +++++++++++++++++++++++++++++++++++++--------
 1 file changed, 37 insertions(+), 8 deletions(-)

diff --git a/Makefile.libretro b/Makefile.libretro
index 11a0f91..8ca6c3a 100644
--- a/Makefile.libretro
+++ b/Makefile.libretro
@@ -422,16 +422,17 @@ LDFLAGS += -DLL
 else ifeq ($(platform), xbox360_msvc2010)
 TARGET := $(TARGET_NAME)_libretro_xdk360.lib
 MSVCBINDIRPREFIX = $(XEDK)/bin/win32
-CC  = "$(MSVCBINDIRPREFIX)/cl.exe"
-CXX = "$(MSVCBINDIRPREFIX)/cl.exe"
+CC  = cl.exe
+CXX = cl.exe
 
+PATH := $(shell IFS=$$'\n'; cygpath "$(MSVCBINDIRPREFIX)"):$(PATH)
 INCLUDE := $(shell IFS=$$'\n'; cygpath "$(VS100COMNTOOLS)../../VC/include")
 
 export INCLUDE := $(INCLUDE)
 export LIB := $(XEDK)/lib/xbox
 PSS_STYLE :=2
-CFLAGS   += -D_XBOX -D_XBOX360 -MT
-CXXFLAGS += -D_XBOX -D_XBOX360 -MT
+CFLAGS   += -D_XBOX -D_XBOX360
+CXXFLAGS += -D_XBOX -D_XBOX360
 STATIC_LINKING=1
 # Windows MSVC 2005 x86
 else ifeq ($(platform), windows_msvc2005_x86)
@@ -480,9 +481,37 @@ else
 endif
 
 ifeq ($(DEBUG), 1)
-	CFLAGS += -O0 -g -DDEBUG
+	ifneq (,$(findstring msvc,$(platform)))
+		ifeq ($(STATIC_LINKING),1)
+			CFLAGS += -MTd
+			CXXFLAGS += -MTd
+		else
+			CFLAGS += -MDd
+			CXXFLAGS += -MDd
+		endif
+
+		CFLAGS += -Od -Zi -DDEBUG -D_DEBUG
+		CXXFLAGS += -Od -Zi -DDEBUG -D_DEBUG
+	else
+		CFLAGS += -O0 -g -DDEBUG
+		CXXFLAGS += -O0 -g -DDEBUG
+	endif
 else
-	CFLAGS += -O2 -DNDEBUG
+	ifneq (,$(findstring msvc,$(platform)))
+		ifeq ($(STATIC_LINKING),1)
+			CFLAGS += -MT
+			CXXFLAGS += -MT
+		else
+			CFLAGS += -MD
+			CXXFLAGS += -MD
+		endif
+
+		CFLAGS += -O2 -DNDEBUG
+		CXXFLAGS += -O2 -DNDEBUG
+	else
+		CFLAGS += -O2 -DNDEBUG
+		CXXFLAGS += -O2 -DNDEBUG
+	endif
 endif
 
 ifeq ($(EXTERNAL_ZLIB), 1)
@@ -524,10 +553,10 @@ ifneq (,$(findstring msvc,$(platform)))
 	OBJOUT = -Fo
 	LINKOUT = -out:
 ifeq ($(STATIC_LINKING),1)
-	LD = "$(MSVCBINDIRPREFIX)/lib.exe"
+	LD = lib.exe
 	STATIC_LINKING=0
 else
-	LD = "$(MSVCBINDIRPREFIX)/link.exe"
+	LD = link.exe
 endif
 else
 	OBJOUT   = -o