From a68ec8e5410a6809efac1f9cbbf316e5f43c77d5 Mon Sep 17 00:00:00 2001 From: Elinvention Date: Tue, 13 Sep 2016 11:20:56 +0200 Subject: [PATCH 1/2] Fix missing #endif (#1) On Linux the compiler was complaining about a missing #endif. I don't know if this is the right place, but now it compiles, at least. --- Sources/Engine/Engine.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/Sources/Engine/Engine.cpp b/Sources/Engine/Engine.cpp index 8bb493611..e6d22663c 100755 --- a/Sources/Engine/Engine.cpp +++ b/Sources/Engine/Engine.cpp @@ -224,6 +224,7 @@ static void DetectCPU(void) sys_iCPUMHz = INDEX(_pTimer->tm_llCPUSpeedHZ/1E6); if( !bMMX) FatalError( TRANS("MMX support required but not present!")); +#endif } static void DetectCPUWrapper(void) From d46c9e41928cd2ff6d6b5e284fb92db00513cc54 Mon Sep 17 00:00:00 2001 From: Elinvention Date: Tue, 13 Sep 2016 11:21:31 +0200 Subject: [PATCH 2/2] Fix build error on Linux (#2) --- Sources/Engine/Base/SDL/SDLInput.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sources/Engine/Base/SDL/SDLInput.cpp b/Sources/Engine/Base/SDL/SDLInput.cpp index 17ebefa7e..8886e325d 100755 --- a/Sources/Engine/Base/SDL/SDLInput.cpp +++ b/Sources/Engine/Base/SDL/SDLInput.cpp @@ -724,7 +724,7 @@ void CInput::GetInput(BOOL bPreScan) // clear button's buffer memset( inp_ubButtonsBuffer, 0, sizeof( inp_ubButtonsBuffer)); - Uint8 *keystate = SDL_GetKeyboardState(NULL); + const Uint8 *keystate = SDL_GetKeyboardState(NULL); // for each Key for (INDEX iKey=0; iKey