From 2e8569a4723c71132deef6709655e199b4688458 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sun, 4 Feb 2018 15:56:50 +0100
Subject: [PATCH] Bake in spirv_msl as well - just use UINT32_MAX - max()
 numeric_limits was conflicting with Windows min/max macros

---
 Makefile.common                | 2 +-
 deps/SPIRV-Cross/spirv_msl.hpp | 2 +-
 griffin/griffin_cpp.cpp        | 2 --
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/Makefile.common b/Makefile.common
index 90ea670e95..fcf90a92d9 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -1361,7 +1361,7 @@ ifeq ($(HAVE_SPIRV_CROSS), 1)
    OBJ += $(DEPS_DIR)/SPIRV-Cross/spirv_cfg.o
    OBJ += $(DEPS_DIR)/SPIRV-Cross/spirv_glsl.o
    OBJ += $(DEPS_DIR)/SPIRV-Cross/spirv_hlsl.o
-   #OBJ += $(DEPS_DIR)/SPIRV-Cross/spirv_msl.o
+   OBJ += $(DEPS_DIR)/SPIRV-Cross/spirv_msl.o
 endif
 
 ifeq ($(WANT_WGL), 1)
diff --git a/deps/SPIRV-Cross/spirv_msl.hpp b/deps/SPIRV-Cross/spirv_msl.hpp
index 6f66f3122e..d91bca9e57 100644
--- a/deps/SPIRV-Cross/spirv_msl.hpp
+++ b/deps/SPIRV-Cross/spirv_msl.hpp
@@ -64,7 +64,7 @@ using MSLStructMemberKey = uint64_t;
 
 // Special constant used in a MSLResourceBinding desc_set
 // element to indicate the bindings for the push constants.
-static const uint32_t kPushConstDescSet = std::numeric_limits<uint32_t>::max();
+static const uint32_t kPushConstDescSet = UINT32_MAX;
 
 // Special constant used in a MSLResourceBinding binding
 // element to indicate the bindings for the push constants.
diff --git a/griffin/griffin_cpp.cpp b/griffin/griffin_cpp.cpp
index 4ec2e3349d..34ecbc4ccf 100644
--- a/griffin/griffin_cpp.cpp
+++ b/griffin/griffin_cpp.cpp
@@ -61,9 +61,7 @@ VIDEO DRIVER
 #include "../deps/SPIRV-Cross/spirv_cfg.cpp"
 #include "../deps/SPIRV-Cross/spirv_glsl.cpp"
 #include "../deps/SPIRV-Cross/spirv_hlsl.cpp"
-#if 0
 #include "../deps/SPIRV-Cross/spirv_msl.cpp"
-#endif
 #ifdef HAVE_SLANG
 #include "../gfx/drivers_shader/glslang_util.cpp"
 #include "../gfx/drivers_shader/slang_preprocess.cpp"