joshua
/
re3-mirror
mirror of https://github.com/GTAmodding/re3.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix macro redefinition warnings on win-glfw build

This commit is contained in:
withmorten 2021-07-08 01:40:58 +02:00
parent dadc56ccf9
commit f9a2f1daf7
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/audio/sampman_miles.cpp
View File

@ -1,3 +1,4 @@
#define WITHWINDOWS
#include "common.h" #include "common.h"
#ifdef AUDIO_MSS #ifdef AUDIO_MSS

3
src/control/Script.cpp
View File

@ -1770,8 +1770,9 @@ void CRunningScript::Init()
int scriptToLoad = 0; int scriptToLoad = 0;
#ifdef _WIN32 #ifdef _WIN32
#include <Windows.h> extern "C" __declspec(dllimport) short __stdcall GetAsyncKeyState(int);
#endif #endif
int open_script() int open_script()
{ {
// glfwGetKey doesn't work because of CGame::Initialise is blocking // glfwGetKey doesn't work because of CGame::Initialise is blocking