From adba73a6d8bdbefbba9d1a2ca3f9c81e1237c1af Mon Sep 17 00:00:00 2001 From: Brues <5278969+brues-code@users.noreply.github.com> Date: Fri, 17 Jul 2026 15:39:04 -0500 Subject: [PATCH] build: stamp PE version resource on the DLL Wire a Windows VERSIONINFO resource to the existing CLASSICAPI_TAG so the DLL's file/product version (Explorer -> Properties -> Details, and GetFileVersionInfo) matches the CLASSIC_API_VERSION Lua global. Both derive from the vMAJOR.MINOR.PATCH tag; an untagged dev build gets the 9999.99.99 "newer than everything" sentinel. Enables the RC language, keeps the tag's major/minor/patch components that were previously discarded after the integer math, and configure_file's a version.rc into the build. The resource lands in .rsrc, untouched by the .rdata/.pdata section merges. --- CMakeLists.txt | 26 +++++++++++++++++++++----- cmake/version.rc.in | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 5 deletions(-) create mode 100644 cmake/version.rc.in diff --git a/CMakeLists.txt b/CMakeLists.txt index 6970aaab..9636620d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.10) -project(ClassicAPI LANGUAGES CXX) +project(ClassicAPI LANGUAGES CXX RC) set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) @@ -77,17 +77,20 @@ add_library(${PROJECT_NAME} SHARED # `CLASSIC_API_VERSION >= X` always pass during local development; # CI release builds overwrite it via `-DCLASSICAPI_TAG=vX.Y.Z`. set(CLASSICAPI_VERSION_VALUE 99999999) +set(CLASSICAPI_VER_MAJOR 9999) +set(CLASSICAPI_VER_MINOR 99) +set(CLASSICAPI_VER_PATCH 99) set(CLASSICAPI_TAG "" CACHE STRING "Release tag like v1.2.3") if(CLASSICAPI_TAG MATCHES "^v([0-9]+)\\.([0-9]+)\\.([0-9]+)$") - set(_MAJOR "${CMAKE_MATCH_1}") - set(_MINOR "${CMAKE_MATCH_2}") - set(_PATCH "${CMAKE_MATCH_3}") + set(CLASSICAPI_VER_MAJOR "${CMAKE_MATCH_1}") + set(CLASSICAPI_VER_MINOR "${CMAKE_MATCH_2}") + set(CLASSICAPI_VER_PATCH "${CMAKE_MATCH_3}") math(EXPR CLASSICAPI_VERSION_VALUE - "${_MAJOR} * 10000 + ${_MINOR} * 100 + ${_PATCH}") + "${CLASSICAPI_VER_MAJOR} * 10000 + ${CLASSICAPI_VER_MINOR} * 100 + ${CLASSICAPI_VER_PATCH}") elseif(CLASSICAPI_TAG) message( FATAL_ERROR @@ -99,6 +102,19 @@ target_compile_definitions( ${PROJECT_NAME} PRIVATE CLASSICAPI_VERSION_VALUE=${CLASSICAPI_VERSION_VALUE}) +# Stamp the PE VERSIONINFO resource from the same version components, so the +# DLL's file/product version (Explorer -> Properties -> Details) matches the +# CLASSIC_API_VERSION Lua global. The .rsrc section the resource lands in is +# untouched by the .rdata/.pdata section merges below. +set(CLASSICAPI_VER_STRING + "${CLASSICAPI_VER_MAJOR}.${CLASSICAPI_VER_MINOR}.${CLASSICAPI_VER_PATCH}.0") +set(CLASSICAPI_VERSION_RC "${CMAKE_BINARY_DIR}/generated/version.rc") +configure_file( + "${CMAKE_CURRENT_SOURCE_DIR}/cmake/version.rc.in" + "${CLASSICAPI_VERSION_RC}" + @ONLY) +target_sources(${PROJECT_NAME} PRIVATE "${CLASSICAPI_VERSION_RC}") + # ole32: COM (CoInitializeEx / CoCreateInstance / CoTaskMemFree) for the # SAPI text-to-speech backend in src/voicechat/Tts.cpp. The SAPI GUIDs are # instantiated in that TU via , so no sapi.lib is needed. diff --git a/cmake/version.rc.in b/cmake/version.rc.in new file mode 100644 index 00000000..d7f43a9b --- /dev/null +++ b/cmake/version.rc.in @@ -0,0 +1,38 @@ +// Generated from cmake/version.rc.in by CMake configure_file(). +// Stamps the PE VERSIONINFO resource so Explorer -> Properties -> Details +// and GetFileVersionInfo() report the same version as the CLASSIC_API_VERSION +// Lua global. Both derive from the CLASSICAPI_TAG (vMAJOR.MINOR.PATCH) cache +// var; an untagged dev build gets the 9999.99.99 "newer than everything" +// sentinel. + +#include + +VS_VERSION_INFO VERSIONINFO + FILEVERSION @CLASSICAPI_VER_MAJOR@,@CLASSICAPI_VER_MINOR@,@CLASSICAPI_VER_PATCH@,0 + PRODUCTVERSION @CLASSICAPI_VER_MAJOR@,@CLASSICAPI_VER_MINOR@,@CLASSICAPI_VER_PATCH@,0 + FILEFLAGSMASK VS_FFI_FILEFLAGSMASK + FILEFLAGS 0x0L + FILEOS VOS_NT_WINDOWS32 + FILETYPE VFT_DLL + FILESUBTYPE VFT2_UNKNOWN +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "CompanyName", "ClassicAPI Team" + VALUE "FileDescription", "ClassicAPI - modern WoW API backport for 1.12.1" + VALUE "FileVersion", "@CLASSICAPI_VER_STRING@" + VALUE "InternalName", "ClassicAPI" + VALUE "LegalCopyright", "Licensed under GPLv3" + VALUE "OriginalFilename", "ClassicAPI.dll" + VALUE "ProductName", "ClassicAPI" + VALUE "ProductVersion", "@CLASSICAPI_VER_STRING@" + END + END + BLOCK "VarFileInfo" + BEGIN + // 0x0409 = U.S. English, 1200 = Unicode codepage. + VALUE "Translation", 0x409, 1200 + END +END