Fixing fun windows.h include issue

ValveSoftware · Jul 16, 2024 · 51b8f42 · 51b8f42
1 parent 62295da
commit 51b8f42
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 23 deletions.
diff --git a/Providers/UserProjectSettings.cpp b/Providers/UserProjectSettings.cpp
@@ -2,28 +2,6 @@
 
 #include "UserProjectSettings.h"
 
-using namespace std;
-using namespace std::string_view_literals;
-using namespace std::string_literals;
-
-#ifdef _WIN32
-#include <windows.h>    //GetModuleFileNameW
-#include <direct.h>
-#include <comdef.h> 
-#else
-#include <limits.h>
-#include <unistd.h>     //readlink
-#include <string.h>
-#include <libgen.h>
-#endif
-#include <sys/stat.h>
-#include <algorithm>
-
-#include <locale>
-#include <codecvt>        
-#include <cstdint>      
-#include <sstream>   
-
 #ifdef __linux__
 #define MAX_PATH PATH_MAX
 #define _getcwd getcwd

diff --git a/Providers/UserProjectSettings.h b/Providers/UserProjectSettings.h
@@ -1,11 +1,34 @@
 #pragma once
 
+#ifdef _WIN32
+#define WIN32_LEAN_AND_MEAN 
+#include <windows.h>    //GetModuleFileNameW
+#include <direct.h>
+#include <comdef.h> 
+#else
+#include <limits.h>
+#include <unistd.h>     //readlink
+#include <string.h>
+#include <libgen.h>
+#endif  
+
 #include <string>
 #include <cassert>
 #include <iostream>
 #include <iomanip>
 #include <fstream>
-#include <string>
+#include <sys/stat.h>
+#include <algorithm>
+
+#include <locale>
+#include <codecvt>        
+#include <cstdint>      
+#include <sstream> 
+
+using namespace std;
+using namespace std::string_view_literals;
+using namespace std::string_literals;
+
 
 #include "OpenVR/openvr.h"
 #include "UnityInterfaces.h"