rooty/HLMetaModOfficial
1
0
Fork 0
mirror of https://github.com/alliedmodders/metamod-source.git synced 2025-02-26 19:54:14 +01:00
Code Issues Releases Activity

Load 64-bit plugins with an .x64 suffix.

Browse Source
This commit is contained in:
Scott Ehlert 2017-09-15 02:49:02 -05:00
parent 637725470c
commit 9e3cd1b824
1 changed files with 29 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
core/metamod.cpp
View File

@ -34,13 +34,20 @@
#include "metamod_util.h" #include "metamod_util.h"
#include "metamod_console.h" #include "metamod_console.h"
#include "provider/provider_ep2.h" #include "provider/provider_ep2.h"
#if defined __linux__
#include <sys/stat.h> #include <sys/stat.h>
#endif
#if SOURCE_ENGINE == SE_DOTA #if SOURCE_ENGINE == SE_DOTA
#include <iserver.h> #include <iserver.h>
#endif #endif
#define X64_SUFFIX ".x64"
#if defined(WIN32) || defined(_WIN32)
#define BINARY_EXT ".dll"
#elif defined(__linux__)
#define BINARY_EXT ".so"
#elif defined(__APPLE__)
#define BINARY_EXT ".dylib"
#endif
using namespace SourceMM; using namespace SourceMM;
using namespace SourceHook; using namespace SourceHook;
using namespace SourceHook::Impl; using namespace SourceHook::Impl;
@ -1235,12 +1242,24 @@ size_t MetamodSource::GetFullPluginPath(const char *plugin, char *buffer, size_t
/* Add an extension if there's none there */ /* Add an extension if there's none there */
if (!pext) if (!pext)
{ {
#if defined WIN32 || defined _WIN32 #if defined(WIN32) || defined(_WIN32)
ext = ".dll"; #if defined(WIN64) || defined(_WIN64)
#elif defined __APPLE__ ext = X64_SUFFIX BINARY_EXT;
ext = ".dylib";
#else #else
ext = "_i486.so"; ext = BINARY_EXT;
#endif
#elif defined __APPLE__
#if defined (__x86_64__)
ext = X64_SUFFIX BINARY_EXT;
#else
ext = BINARY_EXT;
#endif
#else
#if defined(__x86_64__)
ext = X64_SUFFIX BINARY_EXT;
#else
ext = "_i486" BINARY_EXT;
#endif
#endif #endif
} }
else else
@ -1251,12 +1270,12 @@ size_t MetamodSource::GetFullPluginPath(const char *plugin, char *buffer, size_t
/* Format the new path */ /* Format the new path */
num = PathFormat(buffer, len, "%s/%s%s", mod_path.c_str(), plugin, ext); num = PathFormat(buffer, len, "%s/%s%s", mod_path.c_str(), plugin, ext);
#if defined __linux__ /* If path was passed without extension and it doesn't exist with "<suffix>.<ext>" try ".<ext>" */
/* If path was passed without extension and it doesn't exist with "_i486.so" try ".so" */ #if defined(WIN64) || defined (_WIN64) || defined(__linux__) || defined(__x86_64__)
struct stat s; struct stat s;
if (!pext && stat(buffer, &s) != 0) if (!pext && stat(buffer, &s) != 0)
{ {
num = PathFormat(buffer, len, "%s/%s.so", mod_path.c_str(), plugin); num = PathFormat(buffer, len, "%s/%s" BINARY_EXT, mod_path.c_str(), plugin);
} }
#endif #endif