[Windows] DLL.hpp で <Windows.h> をインクルードする前に # define NOGDI #1120

Siv3D · Nov 13, 2023 · 0c69f58 · 0c69f58
1 parent 11a69d9
commit 0c69f58
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/Siv3D/include/Siv3D/DLL.hpp b/Siv3D/include/Siv3D/DLL.hpp
@@ -15,6 +15,7 @@
 
 # if SIV3D_PLATFORM(WINDOWS)
 
+# define NOGDI
 # include <Siv3D/Windows/Windows.hpp>
 
 namespace s3d

diff --git a/Siv3D/src/Siv3D-Platform/WindowsDesktop/Siv3D/AudioCodec/CAudioCodec.cpp b/Siv3D/src/Siv3D-Platform/WindowsDesktop/Siv3D/AudioCodec/CAudioCodec.cpp
@@ -10,7 +10,6 @@
 //-----------------------------------------------
 
 # include <Siv3D/Error.hpp>
-# include <Siv3D/DLL.hpp>
 # include <Siv3D/EngineLog.hpp>
 # include "CAudioCodec.hpp"
 # include "MFRenderStream.hpp"

diff --git a/Siv3D/src/Siv3D-Platform/WindowsDesktop/Siv3D/Renderer/D3D11/SwapChain/D3D11SwapChain.cpp b/Siv3D/src/Siv3D-Platform/WindowsDesktop/Siv3D/Renderer/D3D11/SwapChain/D3D11SwapChain.cpp
@@ -9,11 +9,11 @@
 //
 //-----------------------------------------------
 
-# include <Siv3D/DLL.hpp>
 # include <Siv3D/Window.hpp>
 # include <Siv3D/WindowState.hpp>
 # include <Siv3D/EngineLog.hpp>
 # include "D3D11SwapChain.hpp"
+# include <Siv3D/DLL.hpp>
 # include <dwmapi.h>
 # include <VersionHelpers.h>