Makefile

libretro · Jan 11, 2018 · 274c4fa · 274c4fa
1 parent 069f2d3
commit 274c4fa
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -316,7 +316,7 @@ endif
 else ifneq (,$(findstring windows_msvc2017,$(platform)))
 
     NO_GCC := 1
-    FLAGS += -DHAVE__MKDIR
+    FLAGS += -DHAVE__MKDIR -DNOMINMAX
 
 	PlatformSuffix = $(subst windows_msvc2017_,,$(platform))
 	ifneq (,$(findstring desktop,$(PlatformSuffix)))
@@ -332,7 +332,7 @@ else ifneq (,$(findstring windows_msvc2017,$(platform)))
 	endif
 
 	CFLAGS += $(MSVC2017CompileFlags)
-	CXXFLAGS += $(MSVC2017CompileFlags)
+	CXXFLAGS += $(MSVC2017CompileFlags) -EHsc
 
 	TargetArchMoniker = $(subst $(WinPartition)_,,$(PlatformSuffix))
 
@@ -458,9 +458,13 @@ ifeq ($(HAVE_JIT),1)
    LDFLAGS += -ljit
 endif
 
-CXXFLAGS += $(FLAGS) -std=c++11
+CXXFLAGS += $(FLAGS)
 CFLAGS   += $(FLAGS)
 
+ifeq (,$(findstring msvc,$(platform)))
+    CXXFLAGS += -std=c++11
+endif
+
 OBJOUT   = -o
 LINKOUT  = -o