preserve-emulation/RMG
1
0
Fork 0
mirror of https://github.com/Rosalie241/RMG.git synced 2026-07-11 01:24:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

work

Browse Source
This commit is contained in:
Rosalie Wanders
2020-10-02 13:49:28 +02:00
parent 64a57ead2e
commit c2d8b4b91e
3 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/3rdParty/CMakeLists.txt
Vendored
+6 -3
View File
@@ -87,18 +87,20 @@ ExternalProject_Add(mupen64plus-input-raphnetraw
DEPENDS mupen64plus-core
)
set(GLIDEN64_BUILD_DIR "${THIRDPARTY_DIR}/mupen64plus-video-GLideN64/projects/cmake")
set(GLIDEN64_DIR "${THIRDPARTY_DIR}/mupen64plus-video-GLideN64")
set(GLIDEN64_BUILD_DIR "${GLIDEN64_DIR}/projects/cmake")
if (MSYS)
set(GLIDEN64_LIB "${GLIDEN64_BUILD_DIR}/mupen64plus-video-GLideN64.${SO_EXT}")
else()
set(GLIDEN64_LIB "${GLIDEN64_BUILD_DIR}/plugin/${CMAKE_BUILD_TYPE}/mupen64plus-video-GLideN64.${SO_EXT}")
endif()
file(GLOB GLIDENUI_TRANSLATIONS "${GLIDEN64_DIR}/translations/release/*.qm")
ExternalProject_Add(mupen64plus-video-GLideN64
SOURCE_DIR mupen64plus-video-GLideN64
GIT_REPOSITORY https://github.com/gonetz/GLideN64
GIT_TAG 4f5a76366663fb4cab5ad1878af29dc1009b7793
GIT_TAG 00dac336f897828b542e66aca74f6755d689e195
INSTALL_COMMAND ""
@@ -109,7 +111,8 @@ ExternalProject_Add(mupen64plus-video-GLideN64
BINARY_DIR ${GLIDEN64_BUILD_DIR}
BUILD_BYPRODUCTS ${GLIDEN64_LIB}
BUILD_BYPRODUCTS ${THIRDPARTY_DIR}/mupen64plus-video-GLideN64/ini/GLideN64.custom.ini
BUILD_BYPRODUCTS ${GLIDEN64_DIR}/ini/GLideN64.custom.ini
BUILD_BYPRODUCTS ${GLIDENUI_TRANSLATIONS}
)
ExternalProject_Get_property(mupen64plus-core BUILD_BYPRODUCTS)
Source/RMG/Config.hpp.in
+5 -4
View File
@@ -27,9 +27,10 @@
#endif
#define MUPEN_CONFIG_DIR "Config"
#define MUPEN_DATA_DIR "Data"
#define MUPEN_PLUGIN_RSP "Plugin/RSP/mupen64plus-rsp-hle.""" SO_EXT
#define MUPEN_PLUGIN_GFX "Plugin/GFX/mupen64plus-video-GLideN64.""" SO_EXT
#define MUPEN_PLUGIN_AUDIO "Plugin/Audio/mupen64plus-audio-sdl.""" SO_EXT
#define MUPEN_PLUGIN_INPUT "Plugin/Input/mupen64plus-input-raphnetraw.""" SO_EXT
#define MUPEN_DIR_RSP "Plugin/RSP"
#define MUPEN_DIR_GFX "Plugin/GFX"
#define MUPEN_DIR_AUDIO "Plugin/Audio"
#define MUPEN_DIR_INPUT "Plugin/Input"
#endif // CONFIG_HPP
Source/RMG/M64P/Wrapper/Core.cpp
+5 -6
View File
@@ -130,16 +130,16 @@ QList<Plugin_t> Core::GetPlugins(PluginType type)
switch (type)
{
case PluginType::Gfx:
dir = "Plugin/GFX";
dir = MUPEN_DIR_GFX;
break;
case PluginType::Rsp:
dir = "Plugin/RSP";
dir = MUPEN_DIR_RSP;
break;
case PluginType::Audio:
dir = "Plugin/Audio";
dir = MUPEN_DIR_AUDIO;
break;
case PluginType::Input:
dir = "Plugin/Input";
dir = MUPEN_DIR_INPUT;
break;
}
@@ -148,8 +148,7 @@ QList<Plugin_t> Core::GetPlugins(PluginType type)
QDir qDir(dir);
QStringList filter;
filter << "*.so";
filter << "*.dll";
filter << "*." SO_EXT;
QFileInfoList fileList = qDir.entryInfoList(filter);
Plugin p;