From d89c35ed0091d508add132c74f1404ce4d74c49c Mon Sep 17 00:00:00 2001
From: Ilya Orlov <eagleivg@mail.ru>
Date: Fri, 28 Sep 2018 09:22:35 +0300
Subject: [PATCH] xrRenderPC_GL: fix some compilation error

---
 src/Common/PlatformLinux.inl                 | 1 +
 src/Layers/xrRender/SkeletonCustom.h         | 1 +
 src/Layers/xrRenderPC_GL/CMakeLists.txt      | 1 +
 src/Layers/xrRenderPC_GL/blender_combine.cpp | 2 +-
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Common/PlatformLinux.inl b/src/Common/PlatformLinux.inl
index 0f39d066519..2d663d5da0a 100644
--- 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
index 956db3877f4..5ed227a8ece 100644
--- 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
index 2b307b4afe9..1cd1d18f936 100644
--- 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
index 4db7fd15459..ccb22dd2ad7 100644
--- 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() { }