diff options
| author | pg9182 <96569817+pg9182@users.noreply.github.com> | 2022-08-08 06:12:11 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-08 11:12:11 +0100 |
| commit | 5e7668c2cd7ef9d017536f1e2e4ec89708f5b74f (patch) | |
| tree | 6c55b909fd258251c238bfad9caf83113fd88f33 /NorthstarDedicatedTest/dllmain.cpp | |
| parent | 286cea5f6280e568f5cb4c953d93993c98625ce4 (diff) | |
| download | NorthstarLauncher-5e7668c2cd7ef9d017536f1e2e4ec89708f5b74f.tar.gz NorthstarLauncher-5e7668c2cd7ef9d017536f1e2e4ec89708f5b74f.zip | |
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.
Diffstat (limited to 'NorthstarDedicatedTest/dllmain.cpp')
| -rw-r--r-- | NorthstarDedicatedTest/dllmain.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/NorthstarDedicatedTest/dllmain.cpp b/NorthstarDedicatedTest/dllmain.cpp index 41236506..3954991b 100644 --- a/NorthstarDedicatedTest/dllmain.cpp +++ b/NorthstarDedicatedTest/dllmain.cpp @@ -52,9 +52,9 @@ #include "rapidjson/writer.h" #include "rapidjson/error/en.h" #include "ExploitFixes.h" -#include "scriptJson.h" +#include "scriptjson.h" -typedef void (*initPluginFuncPtr)(void* getPluginObject); +typedef void (*initPluginFuncPtr)(void* (*getPluginObject)(PluginObject)); bool initialised = false; @@ -129,7 +129,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) { @@ -305,4 +305,4 @@ bool InitialiseNorthstar() CallAllPendingDLLLoadCallbacks(); return true; -}
\ No newline at end of file +} |