CMake, SDL2: remove unnesesary SDL.h includes

OpenXRay · Aug 8, 2018 · f5e1f6c · f5e1f6c
1 parent 2e06299
commit f5e1f6c
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 16 deletions.
diff --git a/src/Common/PlatformLinux.inl b/src/Common/PlatformLinux.inl
@@ -82,6 +82,11 @@ inline pthread_t GetCurrentThreadId()
     return pthread_self();
 }
 
+inline void Sleep(int ms)
+{
+    usleep(ms * 1000);
+}
+
 inline void _splitpath (
         const char* path,  // Path Input
         char* drive,       // Drive     : Output
@@ -230,6 +235,10 @@ typedef dirent DirEntryType;
 #define O_SEQUENTIAL 0
 #define SH_DENYWR 0
 
+
+#define itoa SDL_itoa
+#define _itoa_s SDL_itoa
+
 #define _stricmp stricmp
 #define strcmpi stricmp
 #define lstrcpy strcpy

diff --git a/src/utils/xrLCUtil/xrThread.cpp b/src/utils/xrLCUtil/xrThread.cpp
@@ -1,6 +1,5 @@
 #include "pch.hpp"
 #include "xrThread.hpp"
-#include "SDL.h"
 
 void CThread::StubLog(const char*, ...) {}
 void CThread::startup(void* P)
@@ -31,7 +30,7 @@ void CThreadManager::wait(u32 sleep_time)
         return;
     for (;;)
     {
-        SDL_Delay(sleep_time);
+        Sleep(sleep_time);
 
         perf[0] = 0;
         float sumProgress = 0;

diff --git a/src/xrCore/FS.cpp b/src/xrCore/FS.cpp
@@ -13,7 +13,6 @@
 #endif
 #include <sys/stat.h>
 #include <fcntl.h>
-#include "SDL.h"
 
 #pragma warning(pop)
 
@@ -122,7 +121,7 @@ bool file_handle_internal(LPCSTR file_name, u32& size, int& file_handle)
 {
     if (open_internal(file_name, file_handle))
     {
-        SDL_Delay(1);
+        Sleep(1);
         if (open_internal(file_name, file_handle))
             return (false);
     }

diff --git a/src/xrCore/_std_extensions.h b/src/xrCore/_std_extensions.h
@@ -6,7 +6,6 @@
 #include <float.h>
 #include <stdio.h>
 #include "xrCommon/math_funcs_inline.h"
-#include "SDL.h"
 //#include "xr_token.h"
 
 #ifdef abs
@@ -258,17 +257,6 @@ inline int xr_strcat(char(&destination)[count], LPCSTR source)
 }
 //#endif // #ifndef _EDITOR
 
-#if defined(LINUX)
-
-#define itoa SDL_itoa
-#define _itoa_s(value, buffer, radix) SDL_itoa(value, buffer, radix)
-
-inline void Sleep(int ms)
-{
-    SDL_Delay(ms);
-}
-#endif
-
 inline void MemFill32(void* dst, u32 value, size_t dstSize)
 {
     u32* ptr = static_cast<u32*>(dst);

diff --git a/src/xrScriptEngine/script_lua_helper.cpp b/src/xrScriptEngine/script_lua_helper.cpp
@@ -1,6 +1,9 @@
 #include "pch.hpp"
 #include "script_lua_helper.hpp"
 #include "script_debugger.hpp"
+#if defined(LINUX)
+#include "SDL.h" // for xr_itoa
+#endif
 
 CDbgLuaHelper* CDbgLuaHelper::m_pThis = nullptr;
 lua_State* CDbgLuaHelper::L = nullptr;