RetroAchievements/RAIntegration
1
0
Fork 0
mirror of https://github.com/RetroAchievements/RAIntegration.git synced 2026-10-12 02:09:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

change output filename to RA_Integration-x64.dll for x64 builds (#1247)

Browse Source
This commit is contained in:
Jamiras
2025-10-25 09:06:40 -06:00
committed by GitHub
parent f7f8c3d2a7
commit 7c27adca13
4 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
RAInterface
+1 -1
Submodule RAInterface updated: f2da3205b9...1ff52caf30
src/RA_Integration.vcxproj
+3 -2
View File
@@ -405,7 +405,7 @@
<ResourceCompile Include="RA_Shared.rc" />
<ResourceCompile Include="RA_Version.rc">
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">_DEBUG;_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">_USING_V110_SDK71_;_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release-xp|x64'">_USING_V110_SDK71_;_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release-vista|x64'">_USING_V110_SDK71_;_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ResourceCompile>
@@ -425,7 +425,8 @@
<PropertyGroup Label="Globals">
<ProjectName>RA_Integration</ProjectName>
<ProjectGuid>{825CB292-F069-4B27-82CF-3417746ACDF3}</ProjectGuid>
<TargetName>RA_Integration</TargetName>
<TargetName Condition="'$(Platform)'!='x64'">RA_Integration</TargetName>
<TargetName Condition="'$(Platform)'=='x64'">RA_Integration-x64</TargetName>
<RootNamespace>RA_Integration</RootNamespace>
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
src/RA_Version.rc
+3 -1
View File
@@ -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
tests/RA_Interface_Tests.cpp
+3 -3
View File
@@ -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)