diff options
| author | withmorten <morten.with@gmail.com> | 2021-07-08 01:40:58 +0200 |
|---|---|---|
| committer | withmorten <morten.with@gmail.com> | 2021-07-08 01:40:58 +0200 |
| commit | f9a2f1daf75d5235742917359d3ec10395d46bbc (patch) | |
| tree | 00e4df185b9834b36a09fe22b6374854993e71b1 | |
| parent | dadc56ccf9c334b2c5408886a79ad4d8f8c52b1b (diff) | |
fix macro redefinition warnings on win-glfw build
| -rw-r--r-- | src/audio/sampman_miles.cpp | 1 | ||||
| -rw-r--r-- | src/control/Script.cpp | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/audio/sampman_miles.cpp b/src/audio/sampman_miles.cpp index 362da433..e820864c 100644 --- a/src/audio/sampman_miles.cpp +++ b/src/audio/sampman_miles.cpp @@ -1,3 +1,4 @@ +#define WITHWINDOWS #include "common.h" #ifdef AUDIO_MSS diff --git a/src/control/Script.cpp b/src/control/Script.cpp index 5598f3c9..1517ec52 100644 --- a/src/control/Script.cpp +++ b/src/control/Script.cpp @@ -1770,8 +1770,9 @@ void CRunningScript::Init() int scriptToLoad = 0; #ifdef _WIN32 -#include <Windows.h> +extern "C" __declspec(dllimport) short __stdcall GetAsyncKeyState(int); #endif + int open_script() { // glfwGetKey doesn't work because of CGame::Initialise is blocking |