Fix wrong matchmaking_ds bin path being used in some instances.

This commit is contained in:
Nick Hastings
2018-05-06 10:26:43 -04:00
parent f6a64da672
commit 95dae67d5b
3 changed files with 28 additions and 39 deletions
+2 -19
View File
@@ -65,21 +65,6 @@
#include <bridge/include/IPlayerInfoBridge.h>
#include <bridge/include/IFileSystemBridge.h>
#if defined _WIN32
# define MATCHMAKINGDS_SUFFIX ""
# define MATCHMAKINGDS_EXT "dll"
#elif defined __APPLE__
# define MATCHMAKINGDS_SUFFIX ""
# define MATCHMAKINGDS_EXT "dylib"
#elif defined __linux__
#if SOURCE_ENGINE < SE_LEFT4DEAD2
# define MATCHMAKINGDS_SUFFIX "_i486"
#else
# define MATCHMAKINGDS_SUFFIX ""
#endif
# define MATCHMAKINGDS_EXT "so"
#endif
sm_logic_t logicore;
IThreader *g_pThreader = nullptr;
@@ -658,10 +643,8 @@ void CoreProviderImpl::InitializeBridge()
char path[PLATFORM_MAX_PATH];
ke::path::Format(path, sizeof(path),
"%s/bin/" PLATFORM_FOLDER "matchmaking_ds%s.%s",
g_SMAPI->GetBaseDir(),
MATCHMAKINGDS_SUFFIX,
MATCHMAKINGDS_EXT);
"%s/bin/" PLATFORM_FOLDER "matchmaking_ds" SOURCE_BIN_SUFFIX SOURCE_BIN_EXT,
g_SMAPI->GetBaseDir());
if (ke::RefPtr<ke::SharedLib> mmlib = ke::SharedLib::Open(path, NULL, 0)) {
this->matchmakingDSFactory =