fix windows: ensure correct include order

- stdafx.h needs to be first - windows.h before winuser.h Fixes this error on Windows: fatal error C1189: #error: "No Target Architecture"
bkueng · Dec 18, 2023 · cf2bf90 · cf2bf90
1 parent d49ab8e
commit cf2bf90
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 8 deletions.
diff --git a/include/3rdparty/VirtualKeyCode.h b/include/3rdparty/VirtualKeyCode.h
@@ -21,8 +21,10 @@
  *
  */
 
-#include <WinUser.h>
+// clang-format off
 #include <windows.h>
+#include <WinUser.h>
+// clang-format on
 
 #if _MSC_VER > 1600
 enum class MouseButton

diff --git a/src/3rdparty/InputBuilder.cpp b/src/3rdparty/InputBuilder.cpp
@@ -1,8 +1,10 @@
-#include "InputBuilder.h"
+// clang-format off
+#include "stdafx.h"
+// clang-format on
 
-#include <Windef.h>
+#include "InputBuilder.h"
 
-#include "stdafx.h"
+#include <windows.h>
 
 /* Copyright(c) 1998-2012, Arnaud Colin
  * All rights reserved.

diff --git a/src/3rdparty/InputSimulator.cpp b/src/3rdparty/InputSimulator.cpp
@@ -1,9 +1,11 @@
+// clang-format off
+#include "stdafx.h"
+// clang-format on
 #include "InputSimulator.h"
 
 #include "KeyboardSimulator.h"
 #include "MouseSimulator.h"
 #include "WindowsInputDeviceStateAdaptor.h"
-#include "stdafx.h"
 /* Copyright(c) 1998-2012, Arnaud Colin
  * All rights reserved.
  *

diff --git a/src/3rdparty/KeyboardSimulator.cpp b/src/3rdparty/KeyboardSimulator.cpp
@@ -1,7 +1,9 @@
+// clang-format off
+#include "stdafx.h"
+// clang-format on
 #include "KeyboardSimulator.h"
 
 #include "InputBuilder.h"
-#include "stdafx.h"
 
 /* Copyright(c) 1998-2012, Arnaud Colin
  * All rights reserved.

diff --git a/src/3rdparty/MouseSimulator.cpp b/src/3rdparty/MouseSimulator.cpp
@@ -1,6 +1,8 @@
+// clang-format off
+#include "stdafx.h"
+// clang-format on
 #include "MouseSimulator.h"
 
-#include "stdafx.h"
 /* Copyright(c) 1998-2012, Arnaud Colin
  * All rights reserved.
  *

diff --git a/src/3rdparty/WindowsInputDeviceStateAdaptor.cpp b/src/3rdparty/WindowsInputDeviceStateAdaptor.cpp
@@ -1,6 +1,8 @@
+// clang-format off
+#include "stdafx.h"
+// clang-format on
 #include "WindowsInputDeviceStateAdaptor.h"
 
-#include "stdafx.h"
 /* Copyright(c) 1998-2012, Arnaud Colin
  * All rights reserved.
  *