From fab15edb53583cdc2af4bcb01f491253ce2ce069 Mon Sep 17 00:00:00 2001
From: JosJuice <josjuice@gmail.com>
Date: Thu, 20 Jun 2019 10:39:56 +0200
Subject: [PATCH] Replace <experimental/filesystem> includes with <filesystem>

https://bugs.dolphin-emu.org/issues/11770
---
 Readme.md                         | 2 +-
 Source/Core/Common/FileSearch.cpp | 4 ++--
 Source/Core/Core/Boot/Boot.cpp    | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Readme.md b/Readme.md
index 1ad0ae45ca..67eeb41359 100644
--- a/Readme.md
+++ b/Readme.md
@@ -39,7 +39,7 @@ Dolphin can only be installed on devices that satisfy the above requirements. At
 ## Building for Windows
 
 Use the solution file `Source/dolphin-emu.sln` to build Dolphin on Windows.
-Visual Studio 2017 is a hard requirement. Other compilers might be
+Visual Studio 2017 15.7 is a hard requirement. Other compilers might be
 able to build Dolphin on Windows but have not been tested and are not
 recommended to be used. Git and Windows 10 SDK 10.0.17134.0 must be installed when building.
 
diff --git a/Source/Core/Common/FileSearch.cpp b/Source/Core/Common/FileSearch.cpp
index 2994e00a74..561e1136e6 100644
--- a/Source/Core/Common/FileSearch.cpp
+++ b/Source/Core/Common/FileSearch.cpp
@@ -10,8 +10,8 @@
 
 #ifdef _MSC_VER
 #include <Windows.h>
-#include <experimental/filesystem>
-namespace fs = std::experimental::filesystem;
+#include <filesystem>
+namespace fs = std::filesystem;
 #define HAS_STD_FILESYSTEM
 #else
 #include <cstring>
diff --git a/Source/Core/Core/Boot/Boot.cpp b/Source/Core/Core/Boot/Boot.cpp
index 2a79213f3a..1f34b30ead 100644
--- a/Source/Core/Core/Boot/Boot.cpp
+++ b/Source/Core/Core/Boot/Boot.cpp
@@ -5,8 +5,8 @@
 #include "Core/Boot/Boot.h"
 
 #ifdef _MSC_VER
-#include <experimental/filesystem>
-namespace fs = std::experimental::filesystem;
+#include <filesystem>
+namespace fs = std::filesystem;
 #define HAS_STD_FILESYSTEM
 #endif
 
@@ -90,7 +90,7 @@ static std::vector<std::string> ReadM3UFile(const std::string& m3u_path,
 #ifdef HAS_STD_FILESYSTEM
       const fs::path path_line = fs::u8path(line);
       const std::string path_to_add =
-          path_line.is_relative() ? fs::u8path(folder_path).append(path_line).u8string() : line;
+          path_line.is_relative() ? (fs::u8path(folder_path) / path_line).u8string() : line;
 #else
       const std::string path_to_add = line.front() != '/' ? folder_path + line : line;
 #endif