diff options
| author | tx00100xt | 2022-07-01 15:35:02 +0300 |
|---|---|---|
| committer | tx00100xt | 2022-07-01 15:35:02 +0300 |
| commit | 9f6ede143fec2ad2d64d33846f85448724efa778 (patch) | |
| tree | 2cbe2c95ce6333b6d0a6804be943534c496cfcdc | |
| parent | aeca727aa3411f6cdae1639b82ce970dac36cbc3 (diff) | |
| download | aur-9f6ede143fec2ad2d64d33846f85448724efa778.tar.gz | |
Fixed Timer.cpp source code for gcc 11.3
| -rwxr-xr-x | .SRCINFO | 2 | ||||
| -rwxr-xr-x | gcc-11.3_Timer.patch | 112 |
2 files changed, 113 insertions, 1 deletions
@@ -1,5 +1,5 @@ pkgbase = serioussam - pkgdesc = Serious Sam Classic native Linux version with XPLUS Modification. + pkgdesc = Serious Sam Classic native Linux version with XPLUS Modification pkgver = 1.10.2 pkgrel = 2 url = https://github.com/tx00100xt/SeriousSamClassic diff --git a/gcc-11.3_Timer.patch b/gcc-11.3_Timer.patch new file mode 100755 index 000000000000..26483ddbb360 --- /dev/null +++ b/gcc-11.3_Timer.patch @@ -0,0 +1,112 @@ +--- a/SamTFE/Sources/Engine/Base/Timer.cpp 2022-07-01 10:37:28.221379472 +0300 ++++ b/SamTFE/Sources/Engine/Base/Timer.cpp 2022-07-01 12:13:20.798118894 +0300 +@@ -359,7 +359,7 @@ + CTimer_TimerFunc_internal(); + } + #elif (defined PLATFORM_UNIX) +-/* ++ + #include "SDL.h" + Uint32 CTimer_TimerFunc_SDL(Uint32 interval, void* param) + { +@@ -370,7 +370,7 @@ + CTimer_TimerFunc_internal(); + return(interval); + } +-*/ ++/* + void *CTimer_TimerMain(void *input) { + while(true) { + // sleep +@@ -387,7 +387,7 @@ + // handle all timers + CTimer_TimerFunc_internal(); + } +-} ++}*/ + + #endif + #endif +@@ -570,7 +570,7 @@ + if( tm_TimerID==NULL) FatalError(TRANS("Cannot initialize multimedia timer!")); + + #else +-/* ++ + if (SDL_Init(SDL_INIT_TIMER) == -1) FatalError(TRANS("Cannot initialize multimedia timer!")); + tm_TimerID = SDL_AddTimer(ULONG(TickQuantum*1000.0f), CTimer_TimerFunc_SDL, NULL); + if( tm_TimerID==NULL) FatalError(TRANS("Cannot initialize multimedia timer!")); +@@ -589,7 +589,7 @@ + // report fatal + if( iTry>3) FatalError(TRANS("Problem with initializing multimedia timer - please try again.")); + } +-*/ ++/* + int ret = pthread_create(&g_timerMainThread, 0, &CTimer_TimerMain, nullptr); + if (ret != 0) { + const char *err; +@@ -611,7 +611,7 @@ + if (iTry > 3) { + FatalError(TRANS("Problem with initializing multimedia timer - please try again.")); + } +- } ++ }*/ + #endif // !defined SINGLE_THREADED + } + +--- a/SamTSE/Sources/Engine/Base/Timer.cpp 2022-07-01 10:37:28.221379472 +0300 ++++ b/SamTSE/Sources/Engine/Base/Timer.cpp 2022-07-01 12:13:20.798118894 +0300 +@@ -359,7 +359,7 @@ + CTimer_TimerFunc_internal(); + } + #elif (defined PLATFORM_UNIX) +-/* ++ + #include "SDL.h" + Uint32 CTimer_TimerFunc_SDL(Uint32 interval, void* param) + { +@@ -370,7 +370,7 @@ + CTimer_TimerFunc_internal(); + return(interval); + } +-*/ ++/* + void *CTimer_TimerMain(void *input) { + while(true) { + // sleep +@@ -387,7 +387,7 @@ + // handle all timers + CTimer_TimerFunc_internal(); + } +-} ++}*/ + + #endif + #endif +@@ -570,7 +570,7 @@ + if( tm_TimerID==NULL) FatalError(TRANS("Cannot initialize multimedia timer!")); + + #else +-/* ++ + if (SDL_Init(SDL_INIT_TIMER) == -1) FatalError(TRANS("Cannot initialize multimedia timer!")); + tm_TimerID = SDL_AddTimer(ULONG(TickQuantum*1000.0f), CTimer_TimerFunc_SDL, NULL); + if( tm_TimerID==NULL) FatalError(TRANS("Cannot initialize multimedia timer!")); +@@ -589,7 +589,7 @@ + // report fatal + if( iTry>3) FatalError(TRANS("Problem with initializing multimedia timer - please try again.")); + } +-*/ ++/* + int ret = pthread_create(&g_timerMainThread, 0, &CTimer_TimerMain, nullptr); + if (ret != 0) { + const char *err; +@@ -611,7 +611,7 @@ + if (iTry > 3) { + FatalError(TRANS("Problem with initializing multimedia timer - please try again.")); + } +- } ++ }*/ + #endif // !defined SINGLE_THREADED + } + |