Merge pull request #6 from Zegeri/clang-support

Fix clang compilation

Author: q4a

cmake/FindTBB.cmake

@@ -98,6 +98,13 @@ if (UNIX)
     # has itanium/*
     set(_TBB_COMPILER ${TBB_COMPILER})
     set(_TBB_ARCHITECTURE ${TBB_ARCHITECTURE})
+
+    # Fix for clang compiler
+    # https://www.threadingbuildingblocks.org/docs/help/reference/appendices/known_issues/linux_os.html
+    if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+      string(REPLACE "." "0" TBB_USE_GLIBCXX_VERSION ${CMAKE_CXX_COMPILER_VERSION})
+      add_definitions(-DTBB_USE_GLIBCXX_VERSION=${TBB_USE_GLIBCXX_VERSION})
+    endif()
   endif (APPLE)
 endif (UNIX)
 

src/Common/PlatformLinux.inl

@@ -115,7 +115,7 @@ inline void _splitpath (
 }
 
 #include <iostream>
-inline void OutputDebugString(char *str) // for linux debugger
+inline void OutputDebugString(const char *str) // for linux debugger
 {
     std::cerr << str;
 }
@@ -202,7 +202,7 @@ typedef struct _EXCEPTION_POINTERS {
 
 #ifdef XR_X64
 typedef int64_t INT_PTR;
-typedef uint16_t UINT_PTR;
+typedef uint64_t UINT_PTR;
 typedef int64_t LONG_PTR;
 #else
 typedef int INT_PTR;

src/utils/xrMiscMath/vector3d_ext.cpp

@@ -1,6 +1,6 @@
 #include "pch.hpp"
-#include "xrCore/_vector3d_ext.h"
 #include "xrCommon/math_funcs_inline.h"
+#include "xrCore/_vector3d_ext.h"
 
 float dotproduct(const Fvector& v1, const Fvector& v2)
 {

src/utils/xrQSlim/src/MxDynBlock.h

@@ -18,6 +18,8 @@ class MxDynBlock : public MxBlock<T>
 {
 private:
     int fill;
+    using MxBlock<T>::resize;
+    using MxBlock<T>::begin;
 
 public:
     MxDynBlock(int n = 2) : MxBlock<T>(n) { fill = 0; }

src/xrAICore/AISpaceBase.cpp

@@ -2,8 +2,8 @@
 #include "AISpaceBase.hpp"
 #include "Navigation/game_graph.h"
 #include "Navigation/level_graph.h"
-#include "Navigation/graph_engine.h"
 #include "Navigation/PatrolPath/patrol_path_storage.h"
+#include "Navigation/graph_engine.h"
 
 AISpaceBase::AISpaceBase() { GEnv.AISpace = this; }
 AISpaceBase::~AISpaceBase()

src/xrAICore/Components/problem_solver.h

@@ -11,8 +11,6 @@
 #include "xrCore/Containers/AssociativeVector.hpp"
 #include "Common/object_broker.h"
 
-class CGraphEngine;
-
 template <typename _operator_condition, typename _condition_state, typename _operator, typename _condition_evaluator,
     typename _operator_id_type, bool _reverse_search = false, typename _operator_ptr = _operator*,
     typename _condition_evaluator_ptr = _condition_evaluator*>

src/xrAICore/Components/problem_solver_inline.h

@@ -8,6 +8,10 @@
 
 #pragma once
 
+#ifndef AI_COMPILER
+#include "xrAICore/Navigation/graph_engine.h"
+#endif
+
 #define TEMPLATE_SPECIALIZATION                                                                                  \
     template <typename _operator_condition, typename _operator, typename _condition_state,                       \
         typename _condition_evaluator, typename _operator_id_type, bool _reverse_search, typename _operator_ptr, \

src/xrAICore/Navigation/ai_object_location_impl.h

@@ -12,19 +12,6 @@
 #include "xrAICore/Navigation/game_graph.h"
 #include "xrAICore/Navigation/level_graph.h"
 
-IC void CAI_ObjectLocation::init()
-{
-    if (ai().get_level_graph())
-        ai().level_graph().set_invalid_vertex(m_level_vertex_id);
-    else
-        m_level_vertex_id = u32(-1);
-
-    if (ai().get_game_graph())
-        ai().game_graph().set_invalid_vertex(m_game_vertex_id);
-    else
-        m_game_vertex_id = GameGraph::_GRAPH_ID(-1);
-}
-
 IC void CAI_ObjectLocation::game_vertex(CVertex const* game_vertex)
 {
     VERIFY(ai().game_graph().valid_vertex_id(ai().game_graph().vertex_id(game_vertex)));

src/xrAICore/Navigation/ai_object_location_inline.h

@@ -8,6 +8,21 @@
 
 #pragma once
 
+#include "xrAICore/Navigation/level_graph.h"
+
+IC void CAI_ObjectLocation::init()
+{
+    if (ai().get_level_graph())
+        ai().level_graph().set_invalid_vertex(m_level_vertex_id);
+    else
+        m_level_vertex_id = u32(-1);
+
+    if (ai().get_game_graph())
+        ai().game_graph().set_invalid_vertex(m_game_vertex_id);
+    else
+        m_game_vertex_id = GameGraph::_GRAPH_ID(-1);
+}
+
 IC CAI_ObjectLocation::CAI_ObjectLocation() { init(); }
 IC void CAI_ObjectLocation::reinit() { init(); }
 IC const GameGraph::_GRAPH_ID CAI_ObjectLocation::game_vertex_id() const { return (m_game_vertex_id); }

src/xrCore/FS.h

@@ -410,7 +410,11 @@ class XRCORE_API IReader : public IReaderBase<IReader>
 class XRCORE_API CVirtualFileRW : public IReader
 {
 private:
+#if defined(WINDOWS)
     void *hSrcFile, *hSrcMap;
+#elif defined(LINUX)
+    int hSrcFile;
+#endif
 
 public:
     CVirtualFileRW(const char* cFileName);