xrRender: rename linux dll to xrRender_GL, fix windows build, fixed l…

…inux error while dll loading
OpenXRay · Sep 29, 2018 · 6ac703d · 6ac703d
1 parent cb86246
commit 6ac703d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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);
     }