Skip to content

Commit 496dffa

Browse files
committed
project updates/cleanup
1 parent c198bb4 commit 496dffa

File tree

8 files changed

+20
-16
lines changed

8 files changed

+20
-16
lines changed

.cruft.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"template": "git@github.com:bl-sdk/common_dotfiles.git",
3-
"commit": "597ec422d3b5692927f325b9b5c2ae42288e8cc5",
3+
"commit": "91563903c1b88e5cc2363d448e62180fdb318382",
44
"checkout": null,
55
"context": {
66
"cookiecutter": {
@@ -15,7 +15,8 @@
1515
"__project_slug": "pluginloader",
1616
"include_cpp": true,
1717
"include_py": false,
18-
"_template": "git@github.com:bl-sdk/common_dotfiles.git"
18+
"_template": "git@github.com:bl-sdk/common_dotfiles.git",
19+
"_commit": "91563903c1b88e5cc2363d448e62180fdb318382"
1920
}
2021
},
2122
"directory": null

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
.vs
22
.vscode
33
.idea
4+
.nvim.lua
45

56
# C/C++ excludes
67
.cache/clangd

CMakePresets.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{
1+
{
22
"version": 3,
33
"configurePresets": [
44
{

common_cmake

src/console.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,11 @@ void create_if_needed(void) {
1616
SetConsoleTitleA("Plugin Loader Debug Console");
1717

1818
// All of this is necessary so that way we can properly use the output of the console
19+
// NOLINTBEGIN(misc-const-correctness) - clang tidy 21.1.x false positive
1920
FILE* new_stdin = nullptr;
2021
FILE* new_stdout = nullptr;
2122
FILE* new_stderr = nullptr;
23+
// NOLINTEND(misc-const-correctness)
2224
freopen_s(&new_stdin, "CONIN$", "r", stdin);
2325
freopen_s(&new_stdout, "CONOUT$", "w", stdout);
2426
freopen_s(&new_stderr, "CONOUT$", "w", stderr);

src/proxy/d3d11.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@ FARPROC d3d11_on_12_create_device_ptr = nullptr;
2020

2121
// NOLINTBEGIN(readability-identifier-naming, readability-identifier-length)
2222

23-
#if defined(__MINGW32__)
23+
#ifdef __MINGW32__
2424
#pragma GCC diagnostic push
2525
#pragma GCC diagnostic ignored "-Wcast-function-type"
2626
#endif
27-
#if defined(__clang__)
27+
#ifdef __clang__
2828
#pragma clang diagnostic push
2929
#pragma clang diagnostic ignored "-Wcast-function-type-mismatch"
3030
#endif
@@ -85,10 +85,10 @@ DLL_EXPORT HRESULT D3D11On12CreateDevice(void* pDevice,
8585
ppDevice, ppImmediateContext, pChosenFeatureLevel);
8686
}
8787

88-
#if defined(__clang__)
88+
#ifdef __clang__
8989
#pragma clang diagnostic pop
9090
#endif
91-
#if defined(__MINGW32__)
91+
#ifdef __MINGW32__
9292
#pragma GCC diagnostic pop
9393
#endif
9494

src/proxy/dsound.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ FARPROC direct_sound_capture_create_8_ptr = nullptr;
2626

2727
// NOLINTBEGIN(readability-identifier-naming)
2828

29-
#if defined(__MINGW32__)
29+
#ifdef __MINGW32__
3030
#pragma GCC diagnostic push
3131
#pragma GCC diagnostic ignored "-Wcast-function-type"
3232
#endif
33-
#if defined(__clang__)
33+
#ifdef __clang__
3434
#pragma clang diagnostic push
3535
#pragma clang diagnostic ignored "-Wcast-function-type-mismatch"
3636
#endif
@@ -110,10 +110,10 @@ DLL_EXPORT HRESULT WINAPI DirectSoundCaptureCreate8(LPCGUID pcGuidDevice,
110110
direct_sound_capture_create_8_ptr)(pcGuidDevice, ppDSC8, pUnkOuter);
111111
}
112112

113-
#if defined(__clang__)
113+
#ifdef __clang__
114114
#pragma clang diagnostic pop
115115
#endif
116-
#if defined(__MINGW32__)
116+
#ifdef __MINGW32__
117117
#pragma GCC diagnostic pop
118118
#endif
119119

src/proxy/xinput1_3.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ FARPROC xinput_power_off_controller_ptr = nullptr;
3030

3131
// NOLINTBEGIN(readability-identifier-naming)
3232

33-
#if defined(__MINGW32__)
33+
#ifdef __MINGW32__
3434
#pragma GCC diagnostic push
3535
#pragma GCC diagnostic ignored "-Wcast-function-type"
3636
#endif
37-
#if defined(__clang__)
37+
#ifdef __clang__
3838
#pragma clang diagnostic push
3939
#pragma clang diagnostic ignored "-Wcast-function-type-mismatch"
4040
#endif
@@ -97,10 +97,10 @@ DLL_EXPORT DWORD XInputPowerOffController(DWORD dwUserIndex) {
9797
dwUserIndex);
9898
}
9999

100-
#if defined(__clang__)
100+
#ifdef __clang__
101101
#pragma clang diagnostic pop
102102
#endif
103-
#if defined(__MINGW32__)
103+
#ifdef __MINGW32__
104104
#pragma GCC diagnostic pop
105105
#endif
106106

0 commit comments

Comments
 (0)