File tree Expand file tree Collapse file tree 5 files changed +13
-4
lines changed Expand file tree Collapse file tree 5 files changed +13
-4
lines changed Original file line number Diff line number Diff line change @@ -36,7 +36,7 @@ class property_holder_holder
3636#if defined(WINDOWS)
3737 virtual ~property_holder_holder () = 0 {}
3838#elif defined(LINUX)
39- virtual ~property_holder_holder () = 0 ;
39+ virtual ~property_holder_holder () {}
4040#endif
4141};
4242
Original file line number Diff line number Diff line change @@ -19,7 +19,6 @@ add_dir("${DIRS}")
1919include_directories (
2020 ${CMAKE_CURRENT_SOURCE_DIR} /..
2121 ${CMAKE_CURRENT_SOURCE_DIR} /../../Externals/pugixml/src
22- ${CRYPTO++_INCLUDE_DIR}
2322 #${CMAKE_CURRENT_SOURCE_DIR}/../../sdk/include
2423 ${SDL_INCLUDE_DIR}
2524)
Original file line number Diff line number Diff line change @@ -64,7 +64,11 @@ struct PathIncludePred
6464 {
6565 if (!ignored)
6666 return true ;
67- return allow_to_include_path (*ignored, path);
67+ #if !defined(LINUX)
68+ return allow_to_include_path (*ignored, path); // TODO port xrNetServer to Linux
69+ #else
70+ return false ; // Noidea what happenning
71+ #endif
6872 }
6973};
7074}
@@ -80,7 +84,9 @@ ENGINE_API void InitSettings()
8084 CHECK_OR_EXIT (pSettings->section_count (),
8185 make_string (" Cannot find file %s.\n Reinstalling application may fix this problem." , fname));
8286 xr_auth_strings_t ignoredPaths, checkedPaths;
83- fill_auth_check_params (ignoredPaths, checkedPaths);
87+ #if !defined(LINUX)
88+ fill_auth_check_params (ignoredPaths, checkedPaths); // TODO port xrNetServer to Linux
89+ #endif
8490 PathIncludePred includePred (&ignoredPaths);
8591 CInifile::allow_include_func_t includeFilter;
8692 includeFilter.bind (&includePred, &PathIncludePred::IsIncluded);
Original file line number Diff line number Diff line change @@ -15,6 +15,9 @@ include_directories(
1515 /usr/include /SDL2
1616 )
1717
18+ list (APPEND ${PROJECT_NAME} __SOURCES "${CMAKE_CURRENT_SOURCE_DIR} /../xrServerEntities/PHNetState.cpp" )
19+ list (APPEND ${PROJECT_NAME} __INCLUDES "${CMAKE_CURRENT_SOURCE_DIR} /../xrServerEntities/PHNetState.h" )
20+
1821list (REMOVE_ITEM ${PROJECT_NAME} __SOURCES "${CMAKE_CURRENT_SOURCE_DIR} /tri-colliderknoopc/dcTriListCollider.cpp" )
1922#list(REMOVE_ITEM ${PROJECT_NAME}__INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/./xr_cda.h")
2023
Original file line number Diff line number Diff line change 2121#include " ExtendedGeom.h"
2222
2323#include " PHElement.h"
24+ #include " PHElementInline.h"
2425#include " PHShell.h"
2526void CPHShell::activate (bool disable)
2627{
You can’t perform that action at this time.
0 commit comments