From 79c010f08275a7152e920bd0a9e3dbf6493f5b4c Mon Sep 17 00:00:00 2001 From: withmorten Date: Thu, 8 Jul 2021 01:44:55 +0200 Subject: [PATCH] fix macro redefinition warnings on win-glfw build --- src/audio/sampman_miles.cpp | 1 + src/control/Script.cpp | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/audio/sampman_miles.cpp b/src/audio/sampman_miles.cpp index e8c28dc4..49f2f10f 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 4b70a678..1eee1c9e 100644 --- a/src/control/Script.cpp +++ b/src/control/Script.cpp @@ -2209,8 +2209,9 @@ int scriptToLoad = 0; const char *scriptfile = "main.scm"; #ifdef _WIN32 -#include +extern "C" __declspec(dllimport) short __stdcall GetAsyncKeyState(int); #endif + int open_script() { // glfwGetKey doesn't work because of CGame::Initialise is blocking