CMake: reworked SDL2 lookup & update depended projects

OpenXRay · Aug 7, 2018 · 29bb39f · 29bb39f
1 parent d16dfa5
commit 29bb39f
Show file tree

Hide file tree

Showing 24 changed files with 91 additions and 67 deletions.
diff --git a/Externals/OPCODE/CMakeLists.txt b/Externals/OPCODE/CMakeLists.txt
@@ -8,7 +8,7 @@ set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
 include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}/../../src
     ${CMAKE_CURRENT_SOURCE_DIR}/../../sdk/include
-    ${SDL_INCLUDE_DIR}
+    ${SDL_INCLUDE_DIRS}
     )
 
 add_library(${PROJECT_NAME} SHARED ${${PROJECT_NAME}__SOURCES} ${${PROJECT_NAME}__INCLUDES})

diff --git a/Externals/cximage/CMakeLists.txt b/Externals/cximage/CMakeLists.txt
@@ -2,37 +2,39 @@ cmake_minimum_required(VERSION 2.8.0)
 project(cximage)
 
 set(SOURCES
-	ximacfg.cpp
-	ximaenc.cpp
-	ximaexif.cpp
-	ximage.cpp
-	ximainfo.cpp
-	ximaint.cpp
-	ximajpg.cpp
-	ximalpha.cpp
-	ximalyr.cpp
-	ximapal.cpp
-	ximasel.cpp
-	ximath.cpp
-	xmemfile.cpp
+    ximacfg.cpp
+    ximaenc.cpp
+    ximaexif.cpp
+    ximage.cpp
+    ximainfo.cpp
+    ximaint.cpp
+    ximajpg.cpp
+    ximalpha.cpp
+    ximalyr.cpp
+    ximapal.cpp
+    ximasel.cpp
+    ximath.cpp
+    xmemfile.cpp
 )
 
 set(HEADERS
-	xfile.h
-	ximacfg.h
-	ximadef.h
-	ximage.h
-	ximaiter.h
-	ximajpg.h
-	ximath.h
-	xiofile.h
-	xmemfile.h
+    xfile.h
+    ximacfg.h
+    ximadef.h
+    ximage.h
+    ximaiter.h
+    ximajpg.h
+    ximath.h
+    xiofile.h
+    xmemfile.h
 )
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive --std=c++14")
 add_definitions(-DCXIMAGE_BUILD)
 
-include_directories("." ${CMAKE_SOURCE_DIR})
+include_directories(
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    )
 
 add_library(cximage STATIC ${SOURCES} ${HEADERS})
 

diff --git a/cmake/FindSDL2.cmake b/cmake/FindSDL2.cmake
@@ -119,7 +119,7 @@ find_package_handle_standard_args(SDL REQUIRED_VARS SDL_LIBRARY SDL_INCLUDE_DIR
                                       VERSION_VAR SDL_VERSION)
 
 if(SDL_FOUND)
-    set(SDL_INCLUDE_DIRS ${SDL_INCLUDE_DIRS})
+    set(SDL_INCLUDE_DIRS ${SDL_INCLUDE_DIR})
 
     if(NOT SDL_LIBRARIES)
         set(SDL_LIBRARIES ${SDL_LIBRARY})
@@ -157,4 +157,4 @@ if(SDL_FOUND)
 
         add_dependencies(SDL::SDL SDL::main)
     endif()
-endif()
+endif()
diff --git a/src/Common/PlatformLinux.inl b/src/Common/PlatformLinux.inl
@@ -21,9 +21,6 @@
 #include <dirent.h>
 #include <utime.h>
 
-#include <SDL2/SDL.h>
-#define CONFIG_USE_SDL
-
 #define _LINUX // for GameSpy
 
 #if !defined(__INTEL_COMPILER)
@@ -85,11 +82,6 @@ inline pthread_t GetCurrentThreadId()
     return pthread_self();
 }
 
-inline void Sleep(int ms)
-{
-    SDL_Delay(ms);
-}
-
 inline void _splitpath (
         const char* path,  // Path Input
         char* drive,       // Drive     : Output
@@ -196,8 +188,7 @@ typedef LONG_PTR LPARAM;
 typedef long HRESULT;
 typedef long LRESULT;
 typedef long _W64;
-//typedef void* HWND;
-typedef SDL_Window* HWND;
+typedef void* HWND;
 typedef void* HDC;
 typedef float FLOAT;
 typedef unsigned char UINT8;
@@ -291,8 +282,6 @@ inline int _filelength(int fd)
 #define __max(a, b) std::max(a, b)
 #define __min(a, b) std::min(a, b)
 
-#define itoa SDL_itoa
-#define _itoa_s(value, buffer, radix) SDL_itoa(value, buffer, radix)
 #define _locale_t locale_t
 #define _isalpha_l isalpha_l
 #define _create_locale(category, arg) newlocale(category, arg, (locale_t) 0)

diff --git a/src/utils/xrLCUtil/CMakeLists.txt b/src/utils/xrLCUtil/CMakeLists.txt
@@ -1,15 +1,16 @@
 project(xrLCUtil)
 
 list(APPEND DIRS
-	"."
-	)
+    "."
+    )
 
 add_dir("${DIRS}")
 
 include_directories(
-	${CMAKE_CURRENT_SOURCE_DIR}/../.. 
-	${CMAKE_CURRENT_SOURCE_DIR}/../../../sdk/include
-	)
+    ${CMAKE_CURRENT_SOURCE_DIR}/../..
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../../sdk/include
+    ${SDL_INCLUDE_DIRS}
+    )
 
 list(REMOVE_ITEM ${PROJECT_NAME}__SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/./LevelCompilerLoggerWindow.cpp")
 list(REMOVE_ITEM ${PROJECT_NAME}__INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/./LevelCompilerLoggerWindow.hpp")

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

diff --git a/src/utils/xrMiscMath/CMakeLists.txt b/src/utils/xrMiscMath/CMakeLists.txt
@@ -9,6 +9,7 @@ add_dir("${DIRS}")
 include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}/../..
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../sdk/include
+    ${SDL_INCLUDE_DIRS}
     )
 
 #list(REMOVE_ITEM ${PROJECT_NAME}__SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/./LevelCompilerLoggerWindow.cpp")

diff --git a/src/utils/xrQSlim/CMakeLists.txt b/src/utils/xrQSlim/CMakeLists.txt
@@ -1,15 +1,16 @@
 project(xrQSlim)
 
 list(APPEND DIRS
-	"src"
-	)
+    "src"
+    )
 
 add_dir("${DIRS}")
 
 include_directories(
-	${CMAKE_CURRENT_SOURCE_DIR}/../.. 
-	${CMAKE_CURRENT_SOURCE_DIR}/../../../sdk/include
-	)
+    ${CMAKE_CURRENT_SOURCE_DIR}/../..
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../../sdk/include
+    ${SDL_INCLUDE_DIRS}
+    )
 
 #list(REMOVE_ITEM ${PROJECT_NAME}__SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/./LevelCompilerLoggerWindow.cpp")
 #ist(REMOVE_ITEM ${PROJECT_NAME}__INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/./LevelCompilerLoggerWindow.hpp")

diff --git a/src/xrAICore/CMakeLists.txt b/src/xrAICore/CMakeLists.txt
@@ -14,6 +14,7 @@ include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}/..
     ${CMAKE_CURRENT_SOURCE_DIR}/../../Externals/luabind
     ${CMAKE_CURRENT_SOURCE_DIR}/../../sdk/include
+    ${SDL_INCLUDE_DIRS}
     )
 
 #foreach(header ${${PROJECT_NAME}__INCLUDES})

diff --git a/src/xrCDB/CMakeLists.txt b/src/xrCDB/CMakeLists.txt
@@ -9,7 +9,7 @@ add_dir("${DIRS}")
 include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}/..
     ${CMAKE_CURRENT_SOURCE_DIR}/../../sdk/include
-    ${SDL_INCLUDE_DIR}
+    ${SDL_INCLUDE_DIRS}
     )
 
 add_library(${PROJECT_NAME} SHARED ${${PROJECT_NAME}__SOURCES} ${${PROJECT_NAME}__INCLUDES})

diff --git a/src/xrCore/Animation/Motion.cpp b/src/xrCore/Animation/Motion.cpp
@@ -3,6 +3,7 @@
 
 #include "Motion.hpp"
 #include "xrCore/Animation/Envelope.hpp"
+#include "SDL.h"
 
 #define EOBJ_OMOTION 0x1100
 #define EOBJ_SMOTION 0x1200

diff --git a/src/xrCore/CMakeLists.txt b/src/xrCore/CMakeLists.txt
@@ -20,7 +20,7 @@ include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}/..
     ${CMAKE_CURRENT_SOURCE_DIR}/../../Externals/pugixml/src
     #${CMAKE_CURRENT_SOURCE_DIR}/../../sdk/include
-    ${SDL_INCLUDE_DIR}
+    ${SDL_INCLUDE_DIRS}
     ${TBB_INCLUDE_DIRS}
 )
 

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

diff --git a/src/xrCore/FileSystem.cpp b/src/xrCore/FileSystem.cpp
@@ -111,12 +111,15 @@ void MakeFilter(string1024& dest, LPCSTR info, LPCSTR ext)
 // start_flt_ext = -1-all 0..n-indices
 //------------------------------------------------------------------------------
 
+#if defined(WINDOWS)
+
 // Vista uses this hook for old-style save dialog
 UINT_PTR CALLBACK OFNHookProcOldStyle(HWND, UINT, WPARAM, LPARAM)
 {
     // let default hook work on this message
     return 0;
 }
+#endif
 
 bool EFS_Utils::GetOpenNameInternal(
     LPCSTR initial, LPSTR buffer, int sz_buf, bool bMulti, LPCSTR offset, int start_flt_ext)

diff --git a/src/xrCore/LocatorAPI.cpp b/src/xrCore/LocatorAPI.cpp
@@ -19,6 +19,7 @@
 #include "file_stream_reader.h"
 #include "xrCore/Threading/Lock.hpp"
 #if defined(LINUX)
+#include "SDL.h"
 #include "xrstring.h"
 #include <glob.h>
 #endif
@@ -179,7 +180,7 @@ CLocatorAPI::~CLocatorAPI()
 {
     VERIFY(0 == m_iLockRescan);
     _dump_open_files(1);
-	delete m_auth_lock;
+    delete m_auth_lock;
 }
 
 const CLocatorAPI::file* CLocatorAPI::RegisterExternal(pcstr name)
@@ -629,7 +630,7 @@ bool CLocatorAPI::Recurse(pcstr path)
     while (done != -1)
     {
 #if defined(LINUX)
-    	xr_strcpy(findData.name, sizeof globbuf.gl_pathv[handle - done], globbuf.gl_pathv[handle - done]);
+        xr_strcpy(findData.name, sizeof globbuf.gl_pathv[handle - done], globbuf.gl_pathv[handle - done]);
         struct stat fi;
         stat(findData.name, &fi);
         findData.size = fi.st_size;

diff --git a/src/xrCore/_std_extensions.h b/src/xrCore/_std_extensions.h
@@ -6,6 +6,7 @@
 #include <float.h>
 #include <stdio.h>
 #include "xrCommon/math_funcs_inline.h"
+#include "SDL.h"
 //#include "xr_token.h"
 
 #ifdef abs
@@ -257,6 +258,17 @@ 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/xrCore/ppmd_compressor.cpp b/src/xrCore/ppmd_compressor.cpp
@@ -1,9 +1,11 @@
 #include "stdafx.h"
 #include "ppmd_compressor.h"
 #include "PPMd.h"
+#include "SDL.h"
 
 #if defined(LINUX)
 
+
 LONG InterlockedExchange(LONG volatile *dest, LONG val)
 {
        LONG ret;
@@ -26,7 +28,7 @@ static LONG PPMd_Locked = 0;
 static inline void PPMd_Lock()
 {
     while (::InterlockedExchange(&PPMd_Locked, 1))
-        ::Sleep(0);
+        SDL_Delay(0);
 }
 
 static inline void PPMd_Unlock() { ::InterlockedExchange(&PPMd_Locked, 0); }

diff --git a/src/xrCore/xrstring.cpp b/src/xrCore/xrstring.cpp
@@ -6,6 +6,7 @@
 #include "xrCore/_std_extensions.h"
 
 #include "FS_impl.h"
+#include "SDL.h"
 
 XRCORE_API str_container* g_pStringContainer = NULL;
 

diff --git a/src/xrEngine/CMakeLists.txt b/src/xrEngine/CMakeLists.txt
@@ -11,7 +11,7 @@ include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}/../../Externals/OpenAutomate/inc
     ${CMAKE_CURRENT_SOURCE_DIR}/../../sdk/include
     ${CMAKE_CURRENT_SOURCE_DIR}/../../Externals/luabind
-    ${SDL_INCLUDE_DIR}
+    ${SDL_INCLUDE_DIRS}
     ${FREEIMAGE_INCLUDE_PATH}
     ${LOCKFILE_INCLUDE_DIR}
     )

diff --git a/src/xrEngine/device.h b/src/xrEngine/device.h
@@ -164,7 +164,6 @@ class ENGINE_API CRenderDevice : public CRenderDeviceBase
 
 public:
     SDL_Window* m_sdlWnd;
-    LRESULT MsgProc(HWND, UINT, WPARAM, LPARAM);
 
     // u32 dwFrame;
     // u32 dwPrecacheFrame;

diff --git a/src/xrParticles/CMakeLists.txt b/src/xrParticles/CMakeLists.txt
@@ -9,6 +9,7 @@ add_dir("${DIRS}")
 include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}/..
     ${CMAKE_CURRENT_SOURCE_DIR}/../../sdk/include
+    ${SDL_INCLUDE_DIRS}
     )
 
 #list(REMOVE_ITEM ${PROJECT_NAME}__SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/./xr_cda.cpp")

diff --git a/src/xrScriptEngine/CMakeLists.txt b/src/xrScriptEngine/CMakeLists.txt
@@ -1,13 +1,18 @@
 project(xrScriptEngine)
 
 list(APPEND DIRS
-	"."
-	"LuaStudio"
-	)
+    "."
+    "LuaStudio"
+    )
 
 add_dir("${DIRS}")
 
-include_directories(${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/../../Externals/luabind ${CMAKE_CURRENT_SOURCE_DIR}/../../sdk/include )
+include_directories(
+    ${CMAKE_CURRENT_SOURCE_DIR}/..
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../Externals/luabind
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../sdk/include
+    ${SDL_INCLUDE_DIRS}
+    )
 
 add_library(${PROJECT_NAME} SHARED ${${PROJECT_NAME}__SOURCES} ${${PROJECT_NAME}__INCLUDES})