Skip to content

Commit b64ad18

Browse files
rurra-amddavidd-lunarg
rurra-amd
authored and
davidd-lunarg
committed
Add GFXR version to binary File Properties
1 parent 1359fe8 commit b64ad18

File tree

14 files changed

+62
-6
lines changed

14 files changed

+62
-6
lines changed

‎layer/CMakeLists.txt

+2-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,8 @@ target_sources(VkLayer_gfxreconstruct
5252
${CMAKE_CURRENT_LIST_DIR}/trace_layer.cpp
5353
${CMAKE_SOURCE_DIR}/framework/encode/custom_layer_func_table.h
5454
${CMAKE_SOURCE_DIR}/framework/generated/generated_layer_func_table.h
55-
$<$<BOOL:WIN32>:${CMAKE_CURRENT_LIST_DIR}/trace_layer.def>
55+
$<$<BOOL:WIN32>:${CMAKE_CURRENT_LIST_DIR}/trace_layer.def
56+
${CMAKE_SOURCE_DIR}/version.rc>
5657
)
5758

5859
target_include_directories(VkLayer_gfxreconstruct

‎layer/ags_capture/CMakeLists.txt

+2-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ target_sources(ags_capture PRIVATE
3030
${CMAKE_CURRENT_LIST_DIR}/dll_main.cpp
3131
${CMAKE_CURRENT_LIST_DIR}/amd_ags_x64.def
3232
${CMAKE_CURRENT_LIST_DIR}/hook_ags.h
33-
${CMAKE_CURRENT_LIST_DIR}/hook_ags.cpp)
33+
${CMAKE_CURRENT_LIST_DIR}/hook_ags.cpp
34+
${CMAKE_SOURCE_DIR}/version.rc)
3435
target_include_directories(ags_capture PUBLIC
3536
${CMAKE_BINARY_DIR}
3637
${CMAKE_SOURCE_DIR})

‎layer/d3d12/CMakeLists.txt

+2-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@ target_sources(d3d12 PRIVATE
3333
${CMAKE_CURRENT_LIST_DIR}/dll_main.cpp
3434
${CMAKE_CURRENT_LIST_DIR}/hook_d3d12.h
3535
${CMAKE_CURRENT_LIST_DIR}/hook_d3d12.cpp
36-
${CMAKE_CURRENT_LIST_DIR}/d3d12.def)
36+
${CMAKE_CURRENT_LIST_DIR}/d3d12.def
37+
${CMAKE_SOURCE_DIR}/version.rc)
3738

3839
target_include_directories(d3d12
3940
PUBLIC

‎layer/d3d12_capture/CMakeLists.txt

+2-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@
2929
add_library(d3d12_capture SHARED "")
3030
target_sources(d3d12_capture PRIVATE
3131
${CMAKE_CURRENT_LIST_DIR}/dll_main.cpp
32-
${CMAKE_CURRENT_LIST_DIR}/d3d12_capture.def)
32+
${CMAKE_CURRENT_LIST_DIR}/d3d12_capture.def
33+
${CMAKE_SOURCE_DIR}/version.rc)
3334

3435
target_include_directories(d3d12_capture
3536
PUBLIC

‎layer/dxgi/CMakeLists.txt

+2-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@ target_sources(dxgi PRIVATE
3333
${CMAKE_CURRENT_LIST_DIR}/dll_main.cpp
3434
${CMAKE_CURRENT_LIST_DIR}/hook_dxgi.h
3535
${CMAKE_CURRENT_LIST_DIR}/hook_dxgi.cpp
36-
${CMAKE_CURRENT_LIST_DIR}/dxgi.def)
36+
${CMAKE_CURRENT_LIST_DIR}/dxgi.def
37+
${CMAKE_SOURCE_DIR}/version.rc)
3738
target_include_directories(dxgi PUBLIC ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR})
3839
target_link_libraries(dxgi gfxrecon_encode gfxrecon_util ${LINK_DXGI_OUTPUT})
3940
common_build_directives(dxgi)

‎layer/gfxrecon_interceptor/CMakeLists.txt

+2-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@
2828

2929
add_library(gfxrecon_interceptor SHARED "")
3030
target_sources(gfxrecon_interceptor PRIVATE
31-
${CMAKE_CURRENT_LIST_DIR}/dll_main.cpp)
31+
${CMAKE_CURRENT_LIST_DIR}/dll_main.cpp
32+
${CMAKE_SOURCE_DIR}/version.rc)
3233
target_include_directories(gfxrecon_interceptor PUBLIC ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR})
3334
target_link_libraries(gfxrecon_interceptor gfxrecon_util)
3435

‎tools/compress/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ target_sources(gfxrecon-compress
3434
${CMAKE_CURRENT_LIST_DIR}/compression_converter.h
3535
${CMAKE_CURRENT_LIST_DIR}/compression_converter.cpp
3636
${CMAKE_CURRENT_LIST_DIR}/../platform_debug_helper.cpp
37+
${CMAKE_SOURCE_DIR}/version.rc
3738
)
3839

3940
if (MSVC)

‎tools/convert/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ target_sources(gfxrecon-convert
3030
${CMAKE_CURRENT_LIST_DIR}/../tool_settings.h
3131
${CMAKE_CURRENT_LIST_DIR}/main.cpp
3232
${CMAKE_CURRENT_LIST_DIR}/../platform_debug_helper.cpp
33+
${CMAKE_SOURCE_DIR}/version.rc
3334
)
3435

3536
if (MSVC)

‎tools/extract/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ target_sources(gfxrecon-extract
3232
PRIVATE
3333
${CMAKE_CURRENT_LIST_DIR}/main.cpp
3434
${CMAKE_CURRENT_LIST_DIR}/../platform_debug_helper.cpp
35+
${CMAKE_SOURCE_DIR}/version.rc
3536
)
3637

3738
if (MSVC)

‎tools/info/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ target_sources(gfxrecon-info
3232
PRIVATE
3333
${CMAKE_CURRENT_LIST_DIR}/main.cpp
3434
${CMAKE_CURRENT_LIST_DIR}/../platform_debug_helper.cpp
35+
${CMAKE_SOURCE_DIR}/version.rc
3536
)
3637

3738
if (MSVC)

‎tools/launcher/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ if(BUILD_LAUNCHER_AND_INTERCEPTOR)
3333
target_sources(gfxrecon-launcher
3434
PRIVATE
3535
${CMAKE_CURRENT_LIST_DIR}/desktop_main.cpp
36+
${CMAKE_SOURCE_DIR}/version.rc
3637
)
3738

3839
target_include_directories(gfxrecon-launcher PUBLIC ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/layer/d3d12_hook ${CMAKE_SOURCE_DIR}/framework/util ${CMAKE_SOURCE_DIR}/framework/interception_util)

‎tools/optimize/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ target_sources(gfxrecon-optimize
4242
$<$<BOOL:${D3D12_SUPPORT}>:${CMAKE_CURRENT_LIST_DIR}/block_skipping_file_processor.h>
4343
$<$<BOOL:${D3D12_SUPPORT}>:${CMAKE_CURRENT_LIST_DIR}/block_skipping_file_processor.cpp>
4444
${CMAKE_CURRENT_LIST_DIR}/../platform_debug_helper.cpp
45+
${CMAKE_SOURCE_DIR}/version.rc
4546
)
4647

4748
if (MSVC)

‎tools/replay/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ target_sources(gfxrecon-replay
3434
${CMAKE_CURRENT_LIST_DIR}/replay_settings.h
3535
${CMAKE_CURRENT_LIST_DIR}/desktop_main.cpp
3636
${CMAKE_CURRENT_LIST_DIR}/../platform_debug_helper.cpp
37+
${CMAKE_SOURCE_DIR}/version.rc
3738
)
3839

3940
target_include_directories(gfxrecon-replay PUBLIC ${CMAKE_BINARY_DIR})

‎version.rc

+43
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
/*
2+
** Copyright (c) 2023 Advanced Micro Devices, Inc.
3+
**
4+
** Permission is hereby granted, free of charge, to any person obtaining a
5+
** copy of this software and associated documentation files (the "Software"),
6+
** to deal in the Software without restriction, including without limitation
7+
** the rights to use, copy, modify, merge, publish, distribute, sublicense,
8+
** and/or sell copies of the Software, and to permit persons to whom the
9+
** Software is furnished to do so, subject to the following conditions:
10+
**
11+
** The above copyright notice and this permission notice shall be included in
12+
** all copies or substantial portions of the Software.
13+
**
14+
** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
15+
** IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
16+
** FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
17+
** AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
18+
** LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
19+
** FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20+
** DEALINGS IN THE SOFTWARE.
21+
*/
22+
23+
#include "project_version.h"
24+
#include "winres.h"
25+
26+
VS_VERSION_INFO VERSIONINFO
27+
FILEVERSION GFXRECON_PROJECT_VERSION_MAJOR,GFXRECON_PROJECT_VERSION_MINOR,GFXRECON_PROJECT_VERSION_PATCH
28+
BEGIN
29+
BLOCK "StringFileInfo"
30+
BEGIN
31+
BLOCK "040904b0"
32+
BEGIN
33+
VALUE "FileDescription", GFXRECON_PROJECT_NAME
34+
VALUE "ProductName", GFXRECON_PROJECT_NAME
35+
VALUE "ProductVersion", GFXRECON_PROJECT_VERSION_STRING
36+
VALUE "LegalCopyright", "Copyright (C) 2023"
37+
END
38+
END
39+
BLOCK "VarFileInfo"
40+
BEGIN
41+
VALUE "Translation", 0x409, 1200
42+
END
43+
END

0 commit comments

Comments
 (0)