xrCore: remove unused include from CMakeLists.txt

xrEngine: hide network calls under defines xrPhysics: add nesessary cpp in CMakeLists.txt, add include
OpenXRay · Jul 29, 2018 · f1085c2 · f1085c2
1 parent b6800aa
commit f1085c2
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 4 deletions.
diff --git a/src/Include/editor/property_holder_base.hpp b/src/Include/editor/property_holder_base.hpp
@@ -36,7 +36,7 @@ class property_holder_holder
 #if defined(WINDOWS)
     virtual ~property_holder_holder() = 0 {}
 #elif defined(LINUX)
-    virtual ~property_holder_holder() = 0;
+    virtual ~property_holder_holder() {}
 #endif
 };
 

diff --git a/src/xrCore/CMakeLists.txt b/src/xrCore/CMakeLists.txt
@@ -19,7 +19,6 @@ add_dir("${DIRS}")
 include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}/..
     ${CMAKE_CURRENT_SOURCE_DIR}/../../Externals/pugixml/src
-    ${CRYPTO++_INCLUDE_DIR}
     #${CMAKE_CURRENT_SOURCE_DIR}/../../sdk/include
     ${SDL_INCLUDE_DIR}
 )

diff --git a/src/xrEngine/main.cpp b/src/xrEngine/main.cpp
@@ -64,7 +64,11 @@ struct PathIncludePred
     {
         if (!ignored)
             return true;
-        return allow_to_include_path(*ignored, path);
+#if !defined(LINUX)
+        return allow_to_include_path(*ignored, path);  //TODO port xrNetServer to Linux
+#else
+        return false; // Noidea what happenning
+#endif
     }
 };
 }
@@ -80,7 +84,9 @@ ENGINE_API void InitSettings()
     CHECK_OR_EXIT(pSettings->section_count(),
         make_string("Cannot find file %s.\nReinstalling application may fix this problem.", fname));
     xr_auth_strings_t ignoredPaths, checkedPaths;
-    fill_auth_check_params(ignoredPaths, checkedPaths);
+#if !defined(LINUX)
+    fill_auth_check_params(ignoredPaths, checkedPaths); //TODO port xrNetServer to Linux
+#endif
     PathIncludePred includePred(&ignoredPaths);
     CInifile::allow_include_func_t includeFilter;
     includeFilter.bind(&includePred, &PathIncludePred::IsIncluded);

diff --git a/src/xrPhysics/CMakeLists.txt b/src/xrPhysics/CMakeLists.txt
@@ -15,6 +15,9 @@ include_directories(
     /usr/include/SDL2
     )
 
+list(APPEND ${PROJECT_NAME}__SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/../xrServerEntities/PHNetState.cpp")
+list(APPEND ${PROJECT_NAME}__INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/../xrServerEntities/PHNetState.h")
+
 list(REMOVE_ITEM ${PROJECT_NAME}__SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/tri-colliderknoopc/dcTriListCollider.cpp")
 #list(REMOVE_ITEM ${PROJECT_NAME}__INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/./xr_cda.h")
 

diff --git a/src/xrPhysics/PHShellActivate.cpp b/src/xrPhysics/PHShellActivate.cpp
@@ -21,6 +21,7 @@
 #include "ExtendedGeom.h"
 
 #include "PHElement.h"
+#include "PHElementInline.h"
 #include "PHShell.h"
 void CPHShell::activate(bool disable)
 {