From 5e7668c2cd7ef9d017536f1e2e4ec89708f5b74f 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/scriptjson.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'NorthstarDedicatedTest/scriptjson.cpp') diff --git a/NorthstarDedicatedTest/scriptjson.cpp b/NorthstarDedicatedTest/scriptjson.cpp index 1921a429..bc65a5c1 100644 --- a/NorthstarDedicatedTest/scriptjson.cpp +++ b/NorthstarDedicatedTest/scriptjson.cpp @@ -1,5 +1,5 @@ #include "pch.h" -#include "scriptJson.h" +#include "scriptjson.h" #include "rapidjson/document.h" #include "rapidjson/writer.h" #include "rapidjson/stringbuffer.h" @@ -606,4 +606,4 @@ void InitialiseClientSquirrelJson(HMODULE baseAddress) g_UISquirrelManager->AddFuncRegistration("table", "DecodeJSON", "string json", "", ClientSq_DecodeJSON); g_UISquirrelManager->AddFuncRegistration("string", "EncodeJSON", "table data", "", SQ_EncodeJSON); -} \ No newline at end of file +} -- cgit v1.2.3