Skip to content

Commit 37e0c78

Browse files
krystian-andrzejewskiigcbot
authored andcommitted
[Autobackout][FuncReg]Revert of change: 5310374
Refactor in igc.rc The change is to pass the library name into igc.rc via compile definitions.
1 parent 5103715 commit 37e0c78

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

IGC/CMakeLists.txt

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

15091509
add_subdirectory(VISALinkerDriver)
15101510
igc_sg_define(IGC__VISALinkerDriver)
1511+
15111512
if(MSVC)
15121513
set(IGC_BUILD__RES__IGC__igc_common
15131514
"${CMAKE_CURRENT_SOURCE_DIR}/igc.rc"
15141515
)
15151516
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]
15161518

15171519
igc_rc_get_resource(IGC_BUILD__RES__IGC__igc_dll IGC__igc_dll)
15181520
# Static libraries on Windows cannot pass resources to final libraries.
1521+
set(IGC_BUILD__RES__IGC__igc_lib)
15191522
source_group("Resources" FILES
15201523
${IGC_BUILD__RES__IGC__igc_dll}
15211524
)
@@ -1587,7 +1590,6 @@ add_library("${IGC_BUILD__PROJ__igc_dll}" SHARED
15871590
${IGC_BUILD__HDR__IGC__igc_dll}
15881591
${IGC_BUILD__RES__IGC__igc_dll}
15891592
)
1590-
target_compile_definitions(${IGC_BUILD__PROJ__igc_dll} PRIVATE VER_ORIGINALNAME="$<TARGET_FILE_NAME:${IGC_BUILD__PROJ__igc_dll}>")
15911593

15921594

15931595
if(IGC_OPTION__LINK_KHRONOS_SPIRV_TRANSLATOR)

IGC/igc.rc

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

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

0 commit comments

Comments
 (0)