Skip to content

Commit 8d73e16

Browse files
krystian-andrzejewskiigcbot
authored andcommitted
Refactor in igc.rc
The change is to pass the library name into igc.rc via compile definitions.
1 parent cf7fe37 commit 8d73e16

File tree

2 files changed

+3
-7
lines changed

2 files changed

+3
-7
lines changed

IGC/CMakeLists.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1508,17 +1508,14 @@ endif()
15081508

15091509
add_subdirectory(VISALinkerDriver)
15101510
igc_sg_define(IGC__VISALinkerDriver)
1511-
15121511
if(MSVC)
15131512
set(IGC_BUILD__RES__IGC__igc_common
15141513
"${CMAKE_CURRENT_SOURCE_DIR}/igc.rc"
15151514
)
15161515
igc_rc_register_resource(IGC__igc_dll RESOURCES DriverInterface__igc_dll FILE "${IGC_BUILD__RES__IGC__igc_common}") # [WA#2]
1517-
igc_rc_register_resource(IGC__igc_lib RESOURCES DriverInterface__igc_dll FILE "${IGC_BUILD__RES__IGC__igc_common}") # [WA#2]
15181516

15191517
igc_rc_get_resource(IGC_BUILD__RES__IGC__igc_dll IGC__igc_dll)
15201518
# Static libraries on Windows cannot pass resources to final libraries.
1521-
set(IGC_BUILD__RES__IGC__igc_lib)
15221519
source_group("Resources" FILES
15231520
${IGC_BUILD__RES__IGC__igc_dll}
15241521
)
@@ -1590,6 +1587,7 @@ add_library("${IGC_BUILD__PROJ__igc_dll}" SHARED
15901587
${IGC_BUILD__HDR__IGC__igc_dll}
15911588
${IGC_BUILD__RES__IGC__igc_dll}
15921589
)
1590+
target_compile_definitions(${IGC_BUILD__PROJ__igc_dll} PRIVATE VER_ORIGINALNAME="$<TARGET_FILE_NAME:${IGC_BUILD__PROJ__igc_dll}>")
15931591

15941592

15951593
if(IGC_OPTION__LINK_KHRONOS_SPIRV_TRANSLATOR)

IGC/igc.rc

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,8 @@ SPDX-License-Identifier: MIT
1111
#include <winver.h>
1212
#include "..\install\intcver.h"
1313

14-
#if defined(_WIN64)
15-
#define VER_ORIGINALNAME "igc64.dll"
16-
#else
17-
#define VER_ORIGINALNAME "igc32.dll"
14+
#if !defined(VER_ORIGINALNAME)
15+
#error VER_ORIGINALNAME is missing
1816
#endif
1917
#define VER_FILETYPE VFT_DLL
2018
#define VER_FILESUBTYPE VFT2_DRV_INSTALLABLE

0 commit comments

Comments
 (0)