xrCore: fix Linux build

Author: eagleivg

src/Common/PlatformLinux.inl

@@ -202,7 +202,7 @@ typedef dirent DirEntryType;
 #define _alloca alloca
 #define _snprintf snprintf
 #define sprintf_s(buffer, buffer_size, stringbuffer, ...) sprintf(buffer, stringbuffer, ##__VA_ARGS__)
-#define GetProcAddress(handle, name) dlsym(handle, name)
+//#define GetProcAddress(handle, name) dlsym(handle, name)
 #define _chdir chdir
 #define _strnicmp strnicmp
 #define strnicmp strncasecmp
@@ -217,6 +217,8 @@ typedef dirent DirEntryType;
 #define _open open
 #define _close close
 #define _sopen open
+#define _utime utime
+#define _utimbuf utimbuf
 #define _sopen_s(handle, filename, ...) open(filename, O_RDONLY)
 inline int _filelength(int fd)
 {
@@ -238,8 +240,6 @@ inline int _filelength(int fd)
 #undef max
 #define __max(a, b) std::max(a, b)
 #define __min(a, b) std::min(a, b)
-#define _utime utime
-#define _utimbuf utimbuf
 
 #define xr_itoa SDL_itoa
 

src/xrCore/ModuleLookup.cpp

@@ -1,6 +1,9 @@
 #include "stdafx.h"
 
 #include "ModuleLookup.hpp"
+#ifdef LINUX
+#include <dlfcn.h>
+#endif
 
 namespace XRay
 {
@@ -13,20 +16,20 @@ ModuleHandle::ModuleHandle(pcstr moduleName, bool dontUnload /*= false*/) : hand
 
 ModuleHandle::~ModuleHandle()
 {
-    Сlose();
+    Close();
 }
 
 void* ModuleHandle::Open(pcstr moduleName)
 {
     if (IsLoaded())
-        Сlose();
+        Close();
 
     Log("Loading DLL:", moduleName);
 
 #ifdef WINDOWS
     handle = LoadLibraryA(moduleName);
 #elif defined(LINUX)
-    handle = dlopen(name, RTLD_LAZY);
+    handle = dlopen(moduleName, RTLD_LAZY);
 #endif
     if (handle == nullptr)
     {
@@ -40,7 +43,7 @@ void* ModuleHandle::Open(pcstr moduleName)
     return handle;
 }
 
-void ModuleHandle::Сlose()
+void ModuleHandle::Close()
 {
     if (dontUnload)
         return;
@@ -49,7 +52,7 @@ void ModuleHandle::Сlose()
 
 #ifdef WINDOWS
     closed = FreeLibrary(static_cast<HMODULE>(handle)) != 0;
-defined(LINUX)
+#elif defined(LINUX)
     closed = dlclose(handle) == 0;
 #endif
 
@@ -82,7 +85,7 @@ void* ModuleHandle::GetProcAddress(pcstr procName) const
 #ifdef WINDOWS
     proc = ::GetProcAddress(static_cast<HMODULE>(handle), procName);
 #elif defined(LINUX)
-    proc = dlsym(handle, procedure);
+    proc = dlsym(handle, procName);
 #endif
 
     if (proc == nullptr)

src/xrCore/ModuleLookup.hpp

@@ -14,7 +14,7 @@ class XRCORE_API ModuleHandle
     ~ModuleHandle();
 
     void* Open(pcstr moduleName);
-    void Сlose();
+    void Close();
 
     bool IsLoaded() const;