Browse Source

Replace all windows.h by WinWrapped.h

1vanK 3 years ago
parent
commit
b951ecade8

+ 1 - 1
Source/Tools/AssetImporter/AssetImporter.cpp

@@ -26,7 +26,7 @@
 #include <Urho3D/Scene/Scene.h>
 
 #ifdef WIN32
-#include <windows.h>
+#include <Urho3D/Engine/WinWrapped.h>
 #endif
 
 #include <assimp/config.h>

+ 1 - 1
Source/Tools/PackageTool/PackageTool.cpp

@@ -9,7 +9,7 @@
 #include <Urho3D/IO/PackageFile.h>
 
 #ifdef WIN32
-#include <windows.h>
+#include <Urho3D/Engine/WinWrapped.h>
 #endif
 
 #include <LZ4/lz4.h>

+ 1 - 1
Source/Tools/RampGenerator/RampGenerator.cpp

@@ -9,7 +9,7 @@
 #include <Urho3D/Core/StringUtils.h>
 
 #ifdef WIN32
-#include <windows.h>
+#include <Urho3D/Engine/WinWrapped.h>
 #endif
 
 #include <STB/stb_image_write.h>

+ 1 - 1
Source/Tools/ScriptCompiler/ScriptCompiler.cpp

@@ -17,7 +17,7 @@
 #endif
 
 #ifdef WIN32
-#include <windows.h>
+#include <Urho3D/Engine/WinWrapped.h>
 #endif
 
 #include <Urho3D/DebugNew.h>

+ 1 - 1
Source/Tools/SpritePacker/SpritePacker.cpp

@@ -12,7 +12,7 @@
 #include <Urho3D/Resource/XMLFile.h>
 
 #ifdef WIN32
-#include <windows.h>
+#include <Urho3D/Engine/WinWrapped.h>
 #endif
 
 #define STBRP_LARGE_RECTS

+ 1 - 1
Source/Urho3D/Core/Condition.cpp

@@ -6,7 +6,7 @@
 #include "../Core/Condition.h"
 
 #ifdef _WIN32
-#include <windows.h>
+#include "../Engine/WinWrapped.h"
 #else
 #include <pthread.h>
 #endif

+ 1 - 1
Source/Urho3D/Core/MiniDump.cpp

@@ -7,12 +7,12 @@
 
 #include "../Core/MiniDump.h"
 #include "../Core/ProcessUtils.h"
+#include "../Engine/WinWrapped.h"
 
 #include <cstdio>
 #include <io.h>
 #include <fcntl.h>
 #include <time.h>
-#include <windows.h>
 #include <dbghelp.h>
 
 namespace Urho3D

+ 1 - 1
Source/Urho3D/Core/Mutex.cpp

@@ -6,7 +6,7 @@
 #include "../Core/Mutex.h"
 
 #ifdef _WIN32
-#include <windows.h>
+#include "../Engine/WinWrapped.h"
 #else
 #include <pthread.h>
 #endif

+ 1 - 1
Source/Urho3D/Core/ProcessUtils.cpp

@@ -23,7 +23,7 @@ extern "C" unsigned SDL_TVOS_GetActiveProcessorCount();
 #endif
 
 #if defined(_WIN32)
-#include <windows.h>
+#include "../Engine/WinWrapped.h"
 #include <io.h>
 #if defined(_MSC_VER)
 #include <float.h>

+ 1 - 1
Source/Urho3D/Core/Thread.cpp

@@ -6,7 +6,7 @@
 #include "../Core/Thread.h"
 
 #ifdef _WIN32
-#include <windows.h>
+#include "../Engine/WinWrapped.h"
 #else
 #include <pthread.h>
 #endif

+ 1 - 1
Source/Urho3D/Core/Timer.cpp

@@ -9,7 +9,7 @@
 #include <ctime>
 
 #ifdef _WIN32
-#include <windows.h>
+#include "../Engine/WinWrapped.h"
 #include <mmsystem.h>
 #elif __EMSCRIPTEN__
 #include <emscripten/emscripten.h>

+ 1 - 1
Source/Urho3D/Database/ODBC/ODBCConnection.cpp

@@ -9,7 +9,7 @@
 #ifdef _WIN32
 // Needs to be included above sql.h for windows
 #define NOMINMAX
-#include <windows.h>
+#include "../../Engine/WinWrapped.h"
 #endif
 
 #include <sqlext.h>

+ 1 - 1
Source/Urho3D/IO/FileSystem.cpp

@@ -29,7 +29,7 @@
 #ifndef _MSC_VER
 #define _WIN32_IE 0x501
 #endif
-#include <windows.h>
+#include "../Engine/WinWrapped.h"
 #include <shellapi.h>
 #include <direct.h>
 #include <shlobj.h>

+ 1 - 1
Source/Urho3D/IO/FileWatcher.cpp

@@ -10,7 +10,7 @@
 #include "../Core/Profiler.h"
 
 #ifdef _WIN32
-#include <windows.h>
+#include "../Engine/WinWrapped.h"
 #elif __linux__
 #include <sys/inotify.h>
 extern "C"

+ 1 - 1
Source/Urho3D/IO/NamedPipe.cpp

@@ -8,7 +8,7 @@
 #include "../IO/Log.h"
 
 #ifdef _WIN32
-#include <windows.h>
+#include "../Engine/WinWrapped.h"
 #else
 #include <fcntl.h>
 #include <sys/stat.h>