xrRenderPC_GL: fix some compilation error

OpenXRay · Sep 29, 2018 · d89c35e · d89c35e
1 parent 14ad749
commit d89c35e
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 1 deletion.
diff --git a/src/Common/PlatformLinux.inl b/src/Common/PlatformLinux.inl
@@ -275,6 +275,7 @@ inline bool strncpy_s(char * dest, size_t, const char * source, size_t num) {
 inline bool strncpy_s(char * dest, const char * source, size_t num) {
     return NULL == strncpy(dest, source, num);
 }
+#define strcpy_s(dest, source) (NULL == strcpy(dest, source))
 #define strcpy_s(dest, num, source) (NULL == strcpy(dest, source))
 #define strcat_s(dest, num, source) (dest == strcat(dest, source))
 #define _vsnprintf vsnprintf

diff --git a/src/Layers/xrRender/SkeletonCustom.h b/src/Layers/xrRender/SkeletonCustom.h
@@ -5,6 +5,7 @@
 #include "FHierrarhyVisual.h"
 #include "xrCore/Animation/Bone.hpp"
 #include "Include/xrRender/Kinematics.h"
+#include "SkeletonX.h"
 
 // consts
 extern Lock UCalc_Mutex;

diff --git a/src/Layers/xrRenderPC_GL/CMakeLists.txt b/src/Layers/xrRenderPC_GL/CMakeLists.txt
@@ -12,6 +12,7 @@ add_dir("${DIRS}")
 include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}/../..
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../Externals/luabind
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../../Externals/gli
     ${CMAKE_CURRENT_SOURCE_DIR}/../../../sdk/include
     ${SDL_INCLUDE_DIRS}
     )

diff --git a/src/Layers/xrRenderPC_GL/blender_combine.cpp b/src/Layers/xrRenderPC_GL/blender_combine.cpp
@@ -1,7 +1,7 @@
 #include "stdafx.h"
 #pragma hdrstop
 
-#include "Blender_combine.h"
+#include "blender_combine.h"
 
 CBlender_combine::CBlender_combine() { description.CLS = 0; }
 CBlender_combine::~CBlender_combine() { }