From 6ac703dd1d4190fa8696142e7fa2e81f36de4f88 Mon Sep 17 00:00:00 2001 From: Ilya Orlov Date: Sat, 29 Sep 2018 20:10:47 +0300 Subject: [PATCH] xrRender: rename linux dll to xrRender_GL, fix windows build, fixed linux error while dll loading --- src/Layers/xrRenderPC_GL/CMakeLists.txt | 2 +- src/xrCore/ModuleLookup.cpp | 4 ++-- src/xrEngine/xrSASH.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Layers/xrRenderPC_GL/CMakeLists.txt b/src/Layers/xrRenderPC_GL/CMakeLists.txt index 33bdd4fa7e3..5d26e41d33c 100644 --- a/src/Layers/xrRenderPC_GL/CMakeLists.txt +++ b/src/Layers/xrRenderPC_GL/CMakeLists.txt @@ -1,4 +1,4 @@ -project(xrRenderPC_GL) +project(xrRender_GL) list(APPEND DIRS "." diff --git a/src/xrCore/ModuleLookup.cpp b/src/xrCore/ModuleLookup.cpp index 6aed67e9b54..df1f331db76 100644 --- a/src/xrCore/ModuleLookup.cpp +++ b/src/xrCore/ModuleLookup.cpp @@ -23,7 +23,7 @@ void* ModuleHandle::Open(pcstr moduleName) { if (IsLoaded()) Close(); - + Log("Loading DLL:", moduleName); #ifdef WINDOWS @@ -36,7 +36,7 @@ void* ModuleHandle::Open(pcstr moduleName) #ifdef WINDOWS Msg("! Failed to load DLL: 0x%d", GetLastError()); #elif defined(LINUX) - Msg("! Failed to load DLL: 0x%d", dlerror()); + Msg("! Failed to load DLL: %s", dlerror()); #endif } diff --git a/src/xrEngine/xrSASH.cpp b/src/xrEngine/xrSASH.cpp index b63a7a7fae6..8f836115524 100644 --- a/src/xrEngine/xrSASH.cpp +++ b/src/xrEngine/xrSASH.cpp @@ -644,7 +644,7 @@ void xrSASH::GetOption(pcstr pszOptionName) else if (pToken) { IConsole_Command::TStatus stat; - pToken->Status(stat); + pToken->getStatus(stat); Val.Enum = stat; oaAddOptionValue(pszOptionName, OA_TYPE_ENUM, &Val); }