From 7c27adca13c82d42b1b1e564e4e5a085a641ef42 Mon Sep 17 00:00:00 2001
From: Jamiras <32680403+Jamiras@users.noreply.github.com>
Date: Sat, 25 Oct 2025 09:06:40 -0600
Subject: [PATCH] change output filename to RA_Integration-x64.dll for x64
builds (#1247)
---
RAInterface | 2 +-
src/RA_Integration.vcxproj | 5 +++--
src/RA_Version.rc | 4 +++-
tests/RA_Interface_Tests.cpp | 6 +++---
4 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/RAInterface b/RAInterface
index f2da3205..1ff52caf 160000
--- a/RAInterface
+++ b/RAInterface
@@ -1 +1 @@
-Subproject commit f2da3205b94a7a32a71c099fddea571248f22774
+Subproject commit 1ff52caf30fb4f61570dd02bdfe5ee0296f5be2c
diff --git a/src/RA_Integration.vcxproj b/src/RA_Integration.vcxproj
index 44bb478a..cfd3896c 100644
--- a/src/RA_Integration.vcxproj
+++ b/src/RA_Integration.vcxproj
@@ -405,7 +405,7 @@
_DEBUG;_WIN64;%(PreprocessorDefinitions)
- _USING_V110_SDK71_;_WIN64;%(PreprocessorDefinitions)
+ _WIN64;%(PreprocessorDefinitions)
_USING_V110_SDK71_;_WIN64;%(PreprocessorDefinitions)
_USING_V110_SDK71_;_WIN64;%(PreprocessorDefinitions)
@@ -425,7 +425,8 @@
RA_Integration
{825CB292-F069-4B27-82CF-3417746ACDF3}
- RA_Integration
+ RA_Integration
+ RA_Integration-x64
RA_Integration
DynamicLibrary
Unicode
diff --git a/src/RA_Version.rc b/src/RA_Version.rc
index cb67dec8..4c5e4085 100644
--- a/src/RA_Version.rc
+++ b/src/RA_Version.rc
@@ -10,8 +10,10 @@
#ifdef _WIN64
#define RA_INTEGRATION_VERSION_PRODUCT_ARCH RA_INTEGRATION_VERSION_PRODUCT " (x64)"
+#define RA_INTEGRATION_ORIGINAL_FILENAME "RA_Integration-x64.dll"
#else
#define RA_INTEGRATION_VERSION_PRODUCT_ARCH RA_INTEGRATION_VERSION_PRODUCT " (x86)"
+#define RA_INTEGRATION_ORIGINAL_FILENAME "RA_Integration.dll"
#endif
#define APSTUDIO_READONLY_SYMBOLS
@@ -78,7 +80,7 @@ BEGIN
VALUE "FileVersion", RA_INTEGRATION_VERSION_MAJOR, RA_INTEGRATION_VERSION_MINOR, RA_INTEGRATION_VERSION_PATCH, RA_INTEGRATION_VERSION_REVISION
VALUE "InternalName", "RA_Integration"
VALUE "LegalCopyright", "Copyright (C) 2025 retroachievements.org"
- VALUE "OriginalFilename", "RA_Integration.dll"
+ VALUE "OriginalFilename", RA_INTEGRATION_ORIGINAL_FILENAME
VALUE "ProductName", "RetroAchievements Integration Toolkit"
VALUE "ProductVersion", RA_INTEGRATION_VERSION_PRODUCT_ARCH
END
diff --git a/tests/RA_Interface_Tests.cpp b/tests/RA_Interface_Tests.cpp
index 6171d767..c8140449 100644
--- a/tests/RA_Interface_Tests.cpp
+++ b/tests/RA_Interface_Tests.cpp
@@ -10,7 +10,7 @@ struct IUnknown;
// file via a "#ifndef RA_UTEST".
// these functions are redefined for the unit tests
-static std::wstring GetIntegrationPath();
+static std::wstring GetIntegrationPath(const wchar_t* sFilename);
// ALSO NOTE: the cpp file is pulled in directly, instead of using the header file so we
// can access the file-scoped methods and variables. The cpp file will include the header
@@ -21,7 +21,7 @@ static std::wstring GetIntegrationPath();
using namespace Microsoft::VisualStudio::CppUnitTestFramework;
-static std::wstring GetIntegrationPath()
+static std::wstring GetIntegrationPath(const wchar_t* sFilename)
{
// attempt to locate the DLL. assume it lives in a folder above the test folder:
// - bin/release/RA_Integration.dll
@@ -43,7 +43,7 @@ static std::wstring GetIntegrationPath()
{
while (iIndex > 0 && sBuffer[iIndex - 1] != '\\' && sBuffer[iIndex - 1] != '/')
--iIndex;
- wcscpy_s(&sBuffer[iIndex], sizeof(sBuffer) / sizeof(sBuffer[0]) - iIndex, L"RA_Integration.dll");
+ wcscpy_s(&sBuffer[iIndex], sizeof(sBuffer) / sizeof(sBuffer[0]) - iIndex, sFilename);
DWORD dwAttrib = GetFileAttributesW(sBuffer);
if (dwAttrib != INVALID_FILE_ATTRIBUTES)