From 5f1803ab2903d85854a99c3d1e2218d5407efd9b Mon Sep 17 00:00:00 2001 From: Rosalie Wanders Date: Fri, 13 Nov 2020 14:47:51 +0100 Subject: [PATCH] Introduce pluginNameWithRevision --- src/GLideN64.cpp | 2 ++ src/GLideN64.h | 1 + src/mupenplus/MupenPlusAPIImpl.cpp | 2 +- src/windows/ZilmarAPIImpl_windows.cpp | 2 +- 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/GLideN64.cpp b/src/GLideN64.cpp index 0944364b..d1b2645f 100644 --- a/src/GLideN64.cpp +++ b/src/GLideN64.cpp @@ -1,3 +1,5 @@ +#include "Revision.h" char pluginName[] = "GLideN64"; +char pluginNameWithRevision[] = "GLideN64 rev." PLUGIN_REVISION; wchar_t pluginNameW[] = L"GLideN64"; void (*CheckInterrupts)( void ); diff --git a/src/GLideN64.h b/src/GLideN64.h index cbed962f..0b0471f6 100644 --- a/src/GLideN64.h +++ b/src/GLideN64.h @@ -2,6 +2,7 @@ #define GLIDEN64_H extern char pluginName[]; +extern char pluginNameWithRevision[]; extern wchar_t pluginNameW[]; extern void (*CheckInterrupts)( void ); diff --git a/src/mupenplus/MupenPlusAPIImpl.cpp b/src/mupenplus/MupenPlusAPIImpl.cpp index b8a54550..f814d389 100644 --- a/src/mupenplus/MupenPlusAPIImpl.cpp +++ b/src/mupenplus/MupenPlusAPIImpl.cpp @@ -145,7 +145,7 @@ m64p_error PluginAPI::PluginGetVersion( *_APIVersion = VIDEO_PLUGIN_API_VERSION; if (_PluginNamePtr != nullptr) - *_PluginNamePtr = pluginName; + *_PluginNamePtr = pluginNameWithRevision; if (_Capabilities != nullptr) { diff --git a/src/windows/ZilmarAPIImpl_windows.cpp b/src/windows/ZilmarAPIImpl_windows.cpp index 4722ab81..b82c0bfd 100644 --- a/src/windows/ZilmarAPIImpl_windows.cpp +++ b/src/windows/ZilmarAPIImpl_windows.cpp @@ -28,7 +28,7 @@ void PluginAPI::GetDllInfo(PLUGIN_INFO * PluginInfo) { PluginInfo->Version = 0x103; PluginInfo->Type = PLUGIN_TYPE_GFX; - sprintf(PluginInfo->Name, "%s rev.%s", pluginName, PLUGIN_REVISION); + sprintf(PluginInfo->Name, "%s", pluginNameWithRevision); PluginInfo->NormalMemory = FALSE; PluginInfo->MemoryBswaped = TRUE; }