fix: windows.h include (#832)

* remove the windows.h includes so it doesn't conflict with other windows applications.  Or at least minimizes the potential conflicts

* style: pre-commit.ci fixes

* fix ordering of windows includes

* style: pre-commit.ci fixes

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

CLI11.hpp.in

@@ -40,8 +40,6 @@
 
 {macros_hpp}
 
-{slim_windows_h_hpp}
-
 {validators_hpp_filesystem}
 
 {encoding_includes}

include/CLI/impl/Argv_inl.hpp

@@ -19,14 +19,28 @@
 #include <vector>
 // [CLI11:public_includes:end]
 
-#ifdef _WIN32
-#include "SlimWindowsH.hpp"
-#endif  // _WIN32
-
 // [CLI11:argv_inl_includes:verbatim]
 #if defined(_WIN32)
-#include <processenv.h>
+#if !(defined(_AMD64_) || defined(_X86_) || defined(_ARM_))
+#if defined(__amd64__) || defined(__amd64) || defined(__x86_64__) || defined(__x86_64) || defined(_M_X64) ||           \
+    defined(_M_AMD64)
+#define _AMD64_
+#elif defined(i386) || defined(__i386) || defined(__i386__) || defined(__i386__) || defined(_M_IX86)
+#define _X86_
+#elif defined(__arm__) || defined(_M_ARM) || defined(_M_ARMT)
+#define _ARM_
+#endif
+#endif
+#define NOMINMAX
+// first
+#include <windef.h>
+// second
+#include <winbase.h>
+// third
+#include <processthreadsapi.h>
 #include <shellapi.h>
+
+#undef NOMINMAX
 #elif defined(__APPLE__)
 #include <crt_externs.h>
 #endif

src/CMakeLists.txt

@@ -28,8 +28,7 @@ set(CLI11_impl_headers
     ${CLI11_implLoc}/StringTools_inl.hpp
     ${CLI11_implLoc}/Validators_inl.hpp
     ${CLI11_implLoc}/Encoding_inl.hpp
-    ${CLI11_implLoc}/Argv_inl.hpp
-    ${CLI11_implLoc}/SlimWindowsH.hpp)
+    ${CLI11_implLoc}/Argv_inl.hpp)
 
 set(CLI11_library_headers ${CLI11_headerLoc}/CLI.hpp ${CLI11_headerLoc}/Timer.hpp)