From 890f19c20ad1d1a658240bf9339e6019056fa3a0 Mon Sep 17 00:00:00 2001 From: Nemirtingas Date: Thu, 1 Aug 2019 15:58:24 +0200 Subject: [PATCH] Fixing cross compiling with clang-cl --- overlay_experimental/DX10_Hook.h | 2 +- overlay_experimental/DX11_Hook.h | 2 +- overlay_experimental/DX12_Hook.h | 2 +- overlay_experimental/DX9_Hook.h | 2 +- overlay_experimental/OpenGL_Hook.h | 10 +++++----- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/overlay_experimental/DX10_Hook.h b/overlay_experimental/DX10_Hook.h index 35d6b68..c345bb6 100644 --- a/overlay_experimental/DX10_Hook.h +++ b/overlay_experimental/DX10_Hook.h @@ -8,7 +8,7 @@ class DX10_Hook : public Base_Hook { public: - static constexpr const char DLL_NAME[] = "d3d10.dll"; + static constexpr const char *DLL_NAME = "d3d10.dll"; private: // Variables diff --git a/overlay_experimental/DX11_Hook.h b/overlay_experimental/DX11_Hook.h index 5f44f7d..cf39514 100644 --- a/overlay_experimental/DX11_Hook.h +++ b/overlay_experimental/DX11_Hook.h @@ -8,7 +8,7 @@ class DX11_Hook : public Base_Hook { public: - static constexpr const char DLL_NAME[] = "d3d11.dll"; + static constexpr const char *DLL_NAME = "d3d11.dll"; private: // Variables diff --git a/overlay_experimental/DX12_Hook.h b/overlay_experimental/DX12_Hook.h index 5851bbd..a449101 100644 --- a/overlay_experimental/DX12_Hook.h +++ b/overlay_experimental/DX12_Hook.h @@ -8,7 +8,7 @@ class DX12_Hook : public Base_Hook { public: - static constexpr const char DLL_NAME[] = "d3d12.dll"; + static constexpr const char *DLL_NAME = "d3d12.dll"; private: // Variables diff --git a/overlay_experimental/DX9_Hook.h b/overlay_experimental/DX9_Hook.h index 8a98404..e81d844 100644 --- a/overlay_experimental/DX9_Hook.h +++ b/overlay_experimental/DX9_Hook.h @@ -8,7 +8,7 @@ class DX9_Hook : public Base_Hook { public: - static constexpr const char DLL_NAME[] = "d3d9.dll"; + static constexpr const char *DLL_NAME = "d3d9.dll"; private: // Variables diff --git a/overlay_experimental/OpenGL_Hook.h b/overlay_experimental/OpenGL_Hook.h index ae3df16..1eacc9f 100644 --- a/overlay_experimental/OpenGL_Hook.h +++ b/overlay_experimental/OpenGL_Hook.h @@ -7,10 +7,10 @@ class OpenGL_Hook : public Base_Hook { public: - static constexpr const char DLL_NAME[] = "opengl32.dll"; + static constexpr const char *DLL_NAME = "opengl32.dll"; - using wglSwapBuffers_t = BOOL(WINAPI)(HDC); - using wglMakeCurrent_t = BOOL(WINAPI)(HDC, HGLRC); + using wglSwapBuffers_t = BOOL(WINAPI*)(HDC); + using wglMakeCurrent_t = BOOL(WINAPI*)(HDC, HGLRC); private: // Variables @@ -27,12 +27,12 @@ private: // Hook to render functions static BOOL WINAPI MywglSwapBuffers(HDC hDC); - wglSwapBuffers_t* wglSwapBuffers; + wglSwapBuffers_t wglSwapBuffers; // Hook functions so we know we use OGL static BOOL WINAPI MywglMakeCurrent(HDC hDC, HGLRC hGLRC); - wglMakeCurrent_t* wglMakeCurrent; + wglMakeCurrent_t wglMakeCurrent; public: static void Create(); // Initialize OGL Hook.