From c0e8e576df16171da6f0e68cbfa18123e8d1e7e0 Mon Sep 17 00:00:00 2001
From: pg9182 <96569817+pg9182@users.noreply.github.com>
Date: Mon, 8 Aug 2022 06:12:11 -0400
Subject: Fix most clang/mingw issues (#226)

- Fix include case.
- Replace MSVC-specific align with standard alignas.
- Type fixes.
- Delete operator noexcept.
- A few other minor issues.
- clang-format everything.
- Use c++20 instead of c++17.
- Rewrite ERROR macro for launcher_wsock32_proxy.
- Use a plain ifstream for the audio.cpp wavStream.

Note: When compiling with clang, you'll need -municode.

Related to #212.
---
 NorthstarDedicatedTest/dllmain.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'NorthstarDedicatedTest/dllmain.cpp')

diff --git a/NorthstarDedicatedTest/dllmain.cpp b/NorthstarDedicatedTest/dllmain.cpp
index d64cc34f..6d32034f 100644
--- a/NorthstarDedicatedTest/dllmain.cpp
+++ b/NorthstarDedicatedTest/dllmain.cpp
@@ -53,7 +53,7 @@
 #include "rapidjson/error/en.h"
 #include "ExploitFixes.h"
 
-typedef void (*initPluginFuncPtr)(void* getPluginObject);
+typedef void (*initPluginFuncPtr)(void* (*getPluginObject)(PluginObject));
 
 bool initialised = false;
 
@@ -128,7 +128,7 @@ bool LoadPlugins()
 			spdlog::info("Failed to load library {}: ", std::system_category().message(GetLastError()));
 			continue;
 		}
-		HRSRC manifestResource = FindResourceW(datafile, MAKEINTRESOURCE(101), MAKEINTRESOURCE(RT_RCDATA));
+		HRSRC manifestResource = FindResourceW(datafile, MAKEINTRESOURCEW(101), MAKEINTRESOURCEW(RT_RCDATA));
 
 		if (manifestResource == NULL)
 		{
@@ -302,4 +302,4 @@ bool InitialiseNorthstar()
 	CallAllPendingDLLLoadCallbacks();
 
 	return true;
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3