build: Add safe Windows.h include

DyssolTEC · Oct 31, 2023 · 4cfe4c2 · 4cfe4c2
1 parent a7e4ee0
commit 4cfe4c2
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 7 deletions.
diff --git a/SimulatorCore/ModelsManager.h b/SimulatorCore/ModelsManager.h
@@ -10,8 +10,7 @@
 #include <vector>
 
 #ifdef _MSC_VER
-#define NOMINMAX
-#include <Windows.h>
+#include "DyssolWindows.h"
 
 typedef HINSTANCE DYSSOL_LIBRARY_INSTANCE;
 typedef FARPROC DYSSOL_CREATE_FUNCTION_TYPE;

diff --git a/Utilities/DyssolSystemFunctions.h b/Utilities/DyssolSystemFunctions.h
@@ -7,7 +7,7 @@
 #include <string>
 #include <processthreadsapi.h>
 #include <handleapi.h>
-#include <Windows.h>
+#include "DyssolWindows.h"
 #include <tchar.h>
 #include <Psapi.h>
 #endif

diff --git a/Utilities/DyssolWindows.h b/Utilities/DyssolWindows.h
@@ -0,0 +1,24 @@
+/* Copyright (c) 2023, DyssolTEC GmbH.
+ * All rights reserved. This file is part of Dyssol. See LICENSE file for license information. */
+
+ /*
+  * Safely includes <Windows.h> un-defining some Windows defines.
+  */
+
+#pragma once
+
+#ifdef _WIN32
+	#ifdef NOMINMAX
+		#include <Windows.h>
+		#undef AddPort
+		#undef CreateFile
+		#undef GetObject
+	#else
+		#define NOMINMAX
+		#include <Windows.h>
+		#undef NOMINMAX
+		#undef AddPort
+		#undef CreateFile
+		#undef GetObject
+	#endif
+#endif
diff --git a/Utilities/FileSystem.cpp b/Utilities/FileSystem.cpp
@@ -6,7 +6,7 @@
 #ifdef _MSC_VER
 #include <corecrt_io.h>
 #include <direct.h>
-#include <Windows.h>
+#include "DyssolWindows.h"
 #else
 #include <locale>
 #include <codecvt>

diff --git a/Utilities/StringFunctions.cpp b/Utilities/StringFunctions.cpp
@@ -2,9 +2,7 @@
 
 #include "StringFunctions.h"
 #ifdef _MSC_VER
-#include <Windows.h>
-#undef AddPort
-#undef CreateFile
+#include "DyssolWindows.h"
 #else
 #include <codecvt>
 #endif

diff --git a/Utilities/Utilities.vcxproj b/Utilities/Utilities.vcxproj
@@ -127,6 +127,7 @@
     <ClInclude Include="DyssolTypes.h" />
     <ClInclude Include="DyssolDefines.h" />
     <ClInclude Include="DyssolUtilities.h" />
+    <ClInclude Include="DyssolWindows.h" />
     <ClInclude Include="FileSystem.h" />
     <ClInclude Include="StringFunctions.h" />
     <ClInclude Include="TaskFuture.h" />

diff --git a/Utilities/Utilities.vcxproj.filters b/Utilities/Utilities.vcxproj.filters
@@ -66,6 +66,9 @@
     <ClInclude Include="DyssolFilesystem.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="DyssolWindows.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="FileSystem.cpp">