Merge remote-tracking branch 'q4a/linux' into xd_dev

OpenXRay · Oct 10, 2018 · 4295a54 · 4295a54
2 parents b3507ae + e51ed07
commit 4295a54
Show file tree

Hide file tree

Showing 49 changed files with 212 additions and 142 deletions.
diff --git a/Externals/cximage/CMakeLists.txt b/Externals/cximage/CMakeLists.txt
@@ -40,6 +40,6 @@ include_directories(
 add_library(cximage STATIC ${SOURCES} ${HEADERS})
 
 set_target_properties(cximage PROPERTIES PREFIX "")
-target_link_libraries(cximage)
+target_link_libraries(cximage jpeg)
 set_property(TARGET ${PROJECT_NAME} PROPERTY POSITION_INDEPENDENT_CODE ON)
 
diff --git a/Externals/cximage/ximacfg.h b/Externals/cximage/ximacfg.h
@@ -4,13 +4,12 @@
 #include <cstddef>
 #endif
 
+#include "Common/Common.hpp"
 extern "C" void* cxalloc(size_t size);
 extern "C" void cxfree(void* ptr);
 extern "C" void* cxrealloc(void* ptr, size_t size);
 
 #ifdef CXIMAGE_AS_SHARED_LIBRARY //must be defined in Release_Shared configuration
-
-#include "Common/Common.hpp"
 // XXX: dirty hack.
 #undef max
 #undef min

diff --git a/Externals/cximage/ximajpg.cpp b/Externals/cximage/ximajpg.cpp
@@ -16,7 +16,7 @@
 #undef XMD_H
 
 #include "ximaiter.h"
- 
+#include "ximacfg.h"
 #include <setjmp.h>
 
 struct jpg_error_mgr {

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -1,7 +1,6 @@
 add_subdirectory(utils)
 add_subdirectory(Layers)
 add_subdirectory(xr_3da)
-#add_subdirectory(xrMisc)
 add_subdirectory(xrAICore)
 add_subdirectory(xrUICore)
 add_subdirectory(xrCDB)

diff --git a/src/Common/PlatformLinux.inl b/src/Common/PlatformLinux.inl
@@ -105,13 +105,31 @@ inline void _splitpath (
  strcpy(drive, "");
 
  if(dir) {
- strcpy(dir, dirname(tmp));
+ char tmp_dir[PATH_MAX] = {0};
+ strcpy(tmp_dir, tmp); // W/A for fname broking
+ strcpy(dir, dirname(tmp_dir)); // This eval modify dirname argument!!!
  if (dir[0] && dir[strlen(dir) - 1] != '/')
  strcat(dir, "/");
  }
 
  if(fname)
+ {
  strcpy(fname, basename(tmp));
+ char *pos = strrchr(fname, '.');
+ if(pos != NULL)
+ *pos = 0;
+ }
+
+ if(ext)
+ {
+ char tmp_ext[NAME_MAX] = { 0 };
+ strcpy(tmp_ext, basename(tmp));
+ char *pos = strrchr(fname, '.');
+ if(pos != NULL)
+ strcpy(ext, pos + 1);
+ else
+ strcpy(ext, "");
+ }
 }
 
 #include <iostream>

diff --git a/src/Layers/xrRender/FSkinned.cpp b/src/Layers/xrRender/FSkinned.cpp
@@ -1123,7 +1123,7 @@ BOOL CSkeletonX_ext::_PickBone(IKinematics::pick_result& r, float dist, const Fv
  default: NODEFAULT;
  }
  CHK_DX(V->p_rm_Indices->Unlock());
-#endif USE_DX10
+#endif // USE_DX10
 
  return result;
 }

diff --git a/src/Layers/xrRenderGL/glSH_Texture.cpp b/src/Layers/xrRenderGL/glSH_Texture.cpp
@@ -7,7 +7,9 @@
 #include "../../xrEngine/Render.h"
 #endif
 
+#ifdef WINDOWS // TODO
 #include "../../xrEngine/tntQAVI.h"
+#endif
 #include "../../xrEngine/xrTheora_Surface.h"
 
 #define PRIORITY_HIGH 12
@@ -106,6 +108,7 @@ void CTexture::apply_avi(u32 dwStage)
  CHK_GL(glActiveTexture(GL_TEXTURE0 + dwStage));
  CHK_GL(glBindTexture(desc, pSurface));
 
+#ifdef WINDOWS // TODO
  if (pAVI->NeedUpdate())
  {
  // AVI
@@ -114,6 +117,7 @@ void CTexture::apply_avi(u32 dwStage)
  CHK_GL(glTexSubImage2D(desc, 0, 0, 0, m_width, m_height,
  GL_RGBA, GL_UNSIGNED_BYTE, ptr));
  }
+#endif
 };
 
 void CTexture::apply_seq(u32 dwStage)
@@ -212,6 +216,7 @@ void CTexture::Load()
  }
  else if (FS.exist(fn, "$game_textures$", *cName, ".avi"))
  {
+#ifdef WINDOWS // TODO
  // AVI
  pAVI = new CAviPlayerCustom();
 
@@ -244,6 +249,7 @@ void CTexture::Load()
  pSurface = 0;
  }
  }
+#endif
  }
  else if (FS.exist(fn, "$game_textures$", *cName, ".seq"))
  {

diff --git a/src/Layers/xrRenderPC_GL/CMakeLists.txt b/src/Layers/xrRenderPC_GL/CMakeLists.txt
@@ -40,9 +40,10 @@ list(REMOVE_ITEM ${PROJECT_NAME}__INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/../xrRen
 list(REMOVE_ITEM ${PROJECT_NAME}__INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/../xrRender/r__pixel_calculator.h")
 
 add_definitions(-DXRLCUTIL_EXPORTS -D_USRDLL -DXRRENDER_GL_EXPORTS -DUSE_OGL -DNO_XR_VDECLARATOR)
+
 add_library(${PROJECT_NAME} SHARED ${${PROJECT_NAME}__SOURCES} ${${PROJECT_NAME}__INCLUDES})
 
 set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "")
-target_link_libraries(${PROJECT_NAME} xrCore xrCDB xrEngine xrParticles xrScriptEngine xrAPI GLEW luabind ${LUA_LIBRARIES})
+target_link_libraries(${PROJECT_NAME} xrCore xrCDB xrEngine xrParticles xrScriptEngine xrAPI GL GLEW luabind ${LUA_LIBRARIES})
 xr_install(${PROJECT_NAME})
 
diff --git a/src/Layers/xrRenderPC_GL/gl_R_render.cpp b/src/Layers/xrRenderPC_GL/gl_R_render.cpp
@@ -471,7 +471,7 @@ void CRender::Render()
  Target->mark_msaa_edges();
  }
 
- // TODO: DX10: Implement DX10 rain.
+#ifdef WINDOWS// TODO: DX10: Implement DX10 rain.
  if (ps_r2_ls_flags.test(R3FLAG_DYN_WET_SURF))
  {
  PIX_EVENT(DEFER_RAIN);
@@ -493,6 +493,7 @@ void CRender::Render()
  }
  Target->accum_direct_blend();
  }
+#endif
 
  {
  PIX_EVENT(DEFER_SELF_ILLUM);

diff --git a/src/xrCore/CMakeLists.txt b/src/xrCore/CMakeLists.txt
@@ -39,13 +39,13 @@ execute_process(COMMAND git rev-parse --abbrev-ref HEAD
 
 message( "branch: " ${GIT_BRANCH} )
 
-add_definitions(-DXRCORE_EXPORTS -DGIT_INFO_CURRENT_COMMIT="${GIT_SHA1}" -DGIT_INFO_CURRENT_BRANCH="${GIT_BRANCH}")
+add_definitions(-DXRCORE_EXPORTS -DGIT_INFO_CURRENT_COMMIT=${GIT_SHA1} -DGIT_INFO_CURRENT_BRANCH=${GIT_BRANCH})
 add_library(${PROJECT_NAME} SHARED ${${PROJECT_NAME}__SOURCES} ${${PROJECT_NAME}__INCLUDES})
 
 set_target_properties(${PROJECT_NAME} PROPERTIES COTIRE_CXX_PREFIX_HEADER_INIT "stdafx.h")
 cotire(${PROJECT_NAME})
 
 set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "")
 
-target_link_libraries(${PROJECT_NAME} xrMiscMath ${SDL_LIBRARIES} ${LZO_LIBRARIES} ${CRYPTO++_LIBRARIES} ${PUGIXML_LIBRARY} ${TBB_LIBRARIES})
+target_link_libraries(${PROJECT_NAME} xrMiscMath dl pthread ${SDL_LIBRARIES} ${LZO_LIBRARIES} ${CRYPTO++_LIBRARIES} ${PUGIXML_LIBRARY} ${TBB_LIBRARIES})
 xr_install(${PROJECT_NAME})
diff --git a/src/xrCore/FS.h b/src/xrCore/FS.h
@@ -12,7 +12,6 @@
 #include "_vector3d.h"
 #include "_vector4.h"
 #include "_color.h"
-#include "xrstring.h"
 #include "xrCommon/math_funcs.h"
 #include "xrCommon/xr_stack.h"
 

diff --git a/src/xrCore/XML/XMLDocument.cpp b/src/xrCore/XML/XMLDocument.cpp
@@ -22,6 +22,9 @@ void ParseFile(pcstr path, CMemoryWriter& W, IReader* F, XMLDocument* xml)
  string256 inc_name;
  if (_GetItem(str, 1, inc_name, '"'))
  {
+#if defined(LINUX)
+ while (char* sep = strchr(inc_name, '\\')) *sep = '/';
+#endif
  IReader* I = nullptr;
  if (inc_name == strstr(inc_name, "ui" DELIMITER ))
  {

diff --git a/src/xrCore/_math.cpp b/src/xrCore/_math.cpp
@@ -356,7 +356,11 @@ struct THREAD_STARTUP
  char* name;
  void* args;
 };
+#if defined(WINDOWS)
 void __cdecl thread_entry(void* _params)
+#elif defined(LINUX)
+void *__cdecl thread_entry(void* _params)
+#endif
 {
  // initialize
  THREAD_STARTUP* startup = (THREAD_STARTUP*)_params;
@@ -384,7 +388,8 @@ void thread_spawn(thread_t* entry, const char* name, unsigned stack, void* argli
  pthread_t handle;
  pthread_attr_t attr;
  pthread_attr_init(&attr);
- pthread_create(&handle, &attr, NULL, arglist); //TODO convert entry
+ pthread_attr_setstacksize(&attr, stack);
+ pthread_create(&handle, &attr, &thread_entry, startup);
  pthread_attr_destroy(&attr);
 #endif
 }

diff --git a/src/xrCore/net_utils.h b/src/xrCore/net_utils.h
@@ -3,7 +3,6 @@
 #define _INCDEF_NETUTILS_H_
 #include <string.h>
 #include "xrCore/_types.h"
-#include "xrCore/_matrix.h"
 #include "client_id.h"
 #include "xrCommon/xr_string.h"
 
@@ -14,6 +13,7 @@ template <class T> struct _vector4;
 typedef _vector4<float> Fvector4;
 class shared_str;
 
+
 #pragma pack(push, 1)
 
 const u32 NET_PacketSizeLimit = 16 * 1024;

diff --git a/src/xrCore/xrMemory.h b/src/xrCore/xrMemory.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "Common/Common.hpp"
 #include "_types.h"
 
 #include <tbb/tbb_allocator.h>

diff --git a/src/xrEngine/thunderbolt.cpp b/src/xrEngine/thunderbolt.cpp
@@ -62,7 +62,12 @@ void SThunderboltDesc::load(CInifile& pIni, shared_str const& sect)
 
  // models
  LPCSTR m_name = pIni.r_string(sect, "lightning_model");
- m_pRender->CreateModel(m_name);
+ string_path tmp;
+ xr_strcpy(tmp, m_name);
+#if defined(LINUX)
+ while (char* sep = strchr(tmp, '\\')) *sep = '/';
+#endif
+ m_pRender->CreateModel(tmp);
 
  /*
  IReader* F = 0;
@@ -73,8 +78,12 @@ void SThunderboltDesc::load(CInifile& pIni, shared_str const& sect)
 
  // sound
  m_name = pIni.r_string(sect, "sound");
+ xr_strcpy(tmp, m_name);
+#if defined(LINUX)
+ while (char* sep = strchr(tmp, '\\')) *sep = '/';
+#endif
  if (m_name && m_name[0])
- snd.create(m_name, st_Effect, sg_Undefined);
+ snd.create(tmp, st_Effect, sg_Undefined);
 }
 
 //----------------------------------------------------------------------------------------------

diff --git a/src/xrGame/CMakeLists.txt b/src/xrGame/CMakeLists.txt
@@ -68,6 +68,8 @@ list(REMOVE_ITEM ${PROJECT_NAME}__SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/./stalker
 list(REMOVE_ITEM ${PROJECT_NAME}__SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/./static_cast_checked_test.cpp")
 list(REMOVE_ITEM ${PROJECT_NAME}__SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/./xr_Client_BattlEye.cpp")
 list(REMOVE_ITEM ${PROJECT_NAME}__SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/./xr_Server_BattlEye.cpp")
+list(REMOVE_ITEM ${PROJECT_NAME}__SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/./best_scores_store.cpp")
+list(REMOVE_ITEM ${PROJECT_NAME}__SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/./stats_submitter.cpp")
 list(REMOVE_ITEM ${PROJECT_NAME}__SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/ai/monsters/rats/ai_rat_fsm.cpp")
 list(REMOVE_ITEM ${PROJECT_NAME}__SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/ui/CExtraContentFilter.cpp")
 list(REMOVE_ITEM ${PROJECT_NAME}__SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/ui/UIDebugFonts.cpp")
@@ -81,6 +83,7 @@ list(REMOVE_ITEM ${PROJECT_NAME}__SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/ui/UIList
 list(REMOVE_ITEM ${PROJECT_NAME}__SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/ui/UIListWnd.cpp")
 list(REMOVE_ITEM ${PROJECT_NAME}__SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/ui/UIListWnd_script.cpp")
 list(REMOVE_ITEM ${PROJECT_NAME}__SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/ui/UITextBanner.cpp")
+list(REMOVE_ITEM ${PROJECT_NAME}__SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/../xrServerEntities/PHNetState.cpp")
 
 list(REMOVE_ITEM ${PROJECT_NAME}__INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/./atlas_stalkercs_v1.h")
 list(REMOVE_ITEM ${PROJECT_NAME}__INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/./battleye.h")