From 7298cd69404e04d2c46abb45954b16ff3d68eba4 Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Fri, 23 Jun 2017 10:54:31 -0700
Subject: [PATCH 1/3] Add support for vs2015 and vs2017 FBX libs

---
 cmake/modules/FindFBX.cmake | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/cmake/modules/FindFBX.cmake b/cmake/modules/FindFBX.cmake
index 2e84d1ea19..b362d93cd3 100644
--- a/cmake/modules/FindFBX.cmake
+++ b/cmake/modules/FindFBX.cmake
@@ -56,6 +56,14 @@ elseif (${CMAKE_CXX_COMPILER_ID} MATCHES "GNU")
 endif()
 
 function(_fbx_find_library _name _lib _suffix)
+  if (MSVC15)
+    set(VS_PREFIX vs2017)
+  endif()
+
+  if (MSVC14)
+    set(VS_PREFIX vs2015)
+  endif()
+
   if (MSVC12)
     set(VS_PREFIX vs2013)
   endif()

From b12018ccf3f7cb2dd5e76cbf05ccb7a1e6d91fbc Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Fri, 23 Jun 2017 10:54:48 -0700
Subject: [PATCH 2/3] Fix Oven not properly handling native separators

---
 tools/oven/src/Oven.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tools/oven/src/Oven.cpp b/tools/oven/src/Oven.cpp
index dc763cc82d..d0b8c3cd65 100644
--- a/tools/oven/src/Oven.cpp
+++ b/tools/oven/src/Oven.cpp
@@ -61,7 +61,9 @@ Oven::Oven(int argc, char* argv[]) :
     if (parser.isSet(CLI_INPUT_PARAMETER) || parser.isSet(CLI_OUTPUT_PARAMETER)) {
         if (parser.isSet(CLI_INPUT_PARAMETER) && parser.isSet(CLI_OUTPUT_PARAMETER)) {
             BakerCLI* cli = new BakerCLI(this);
-            cli->bakeFile(parser.value(CLI_INPUT_PARAMETER), parser.value(CLI_OUTPUT_PARAMETER));
+            QUrl inputUrl(QDir::fromNativeSeparators(parser.value(CLI_INPUT_PARAMETER)));
+            QUrl outputUrl(QDir::fromNativeSeparators(parser.value(CLI_OUTPUT_PARAMETER)));
+            cli->bakeFile(inputUrl, outputUrl.toString());
         } else {
             parser.showHelp();
             QApplication::quit();

From 5f92c1adc09abb7c332a300c40fc1b352c1c6257 Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Mon, 26 Jun 2017 09:40:07 -0700
Subject: [PATCH 3/3] Update FindFBX to use newer MSVC_VERSION

---
 cmake/modules/FindFBX.cmake | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/cmake/modules/FindFBX.cmake b/cmake/modules/FindFBX.cmake
index b362d93cd3..9a1d08a010 100644
--- a/cmake/modules/FindFBX.cmake
+++ b/cmake/modules/FindFBX.cmake
@@ -56,27 +56,17 @@ elseif (${CMAKE_CXX_COMPILER_ID} MATCHES "GNU")
 endif()
 
 function(_fbx_find_library _name _lib _suffix)
-  if (MSVC15)
+  if (MSVC_VERSION EQUAL 1910)
     set(VS_PREFIX vs2017)
-  endif()
-
-  if (MSVC14)
+  elseif (MSVC_VERSION EQUAL 1900)
     set(VS_PREFIX vs2015)
-  endif()
-
-  if (MSVC12)
+  elseif (MSVC_VERSION EQUAL 1800)
     set(VS_PREFIX vs2013)
-  endif()
-
-  if (MSVC11)
+  elseif (MSVC_VERSION EQUAL 1700)
     set(VS_PREFIX vs2012)
-  endif()
-
-  if (MSVC10)
+  elseif (MSVC_VERSION EQUAL 1600)
     set(VS_PREFIX vs2010)
-  endif()
-
-  if (MSVC90)
+  elseif (MSVC_VERSION EQUAL 1500)
     set(VS_PREFIX vs2008)
   endif()