Skip to content

Commit 375036a

Browse files
committed
Add DLL name and 64bit OS config check
define GMM_ENTRY_NAME and DLL name based on 32/64 bit OS check add DLL name for linux clients (neo) - could be temporary until clients use generated header Change-Id: I4e1438cb3989ed6efcd4859e4676150e747ddd84 Signed-off-by: drprajap <[email protected]>
1 parent b20e484 commit 375036a

File tree

3 files changed

+19
-9
lines changed

3 files changed

+19
-9
lines changed

Source/GmmLib/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -551,7 +551,7 @@ if(NOT DEFINED RUN_TEST_SUITE OR RUN_TEST_SUITE)
551551
add_subdirectory(ULT)
552552
endif()
553553

554-
set (IGDGMM_LIBRARY_NAME "igdgmm")
554+
set (GMM_UMD_DLL "igdgmm")
555555

556556
include(os_release_info.cmake)
557557

Source/GmmLib/igdgmm.h.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@
2323
#ifndef IGDGMM_H
2424
#define IGDGMM_H
2525

26-
#cmakedefine IGDGMM_LIBRARY_NAME "${CMAKE_SHARED_LIBRARY_PREFIX}${IGDGMM_LIBRARY_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}"
26+
#cmakedefine GMM_UMD_DLL "${CMAKE_SHARED_LIBRARY_PREFIX}${GMM_UMD_DLL}${CMAKE_SHARED_LIBRARY_SUFFIX}"
2727

2828
#endif /* IGDGMM_H */

Source/GmmLib/inc/External/Common/GmmLibDllName.h

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,20 @@ OTHER DEALINGS IN THE SOFTWARE.
2121
============================================================================*/
2222
#pragma once
2323

24-
#ifdef _X64
25-
#define GMM_UMD_DLL "igdgmm64.dll"
26-
#define GMM_ENTRY_NAME "OpenGmm"
27-
#else
28-
#define GMM_UMD_DLL "igdgmm32.dll"
29-
#define GMM_ENTRY_NAME "_OpenGmm@4"
30-
#endif
24+
#if defined(_WIN64 ) || defined(__x86_64__) || defined(__LP64__)
25+
#define GMM_ENTRY_NAME "OpenGmm"
26+
27+
#if defined(_WIN64 )
28+
#define GMM_UMD_DLL "igdgmm64.dll"
29+
#else
30+
#define GMM_UMD_DLL "libigdgmm.so"
31+
#endif
32+
#else
33+
#define GMM_ENTRY_NAME "_OpenGmm@4"
34+
35+
#if defined(_WIN32)
36+
#define GMM_UMD_DLL "igdgmm32.dll"
37+
#else
38+
#define GMM_UMD_DLL "libigdgmm.so"
39+
#endif
40+
#endif

0 commit comments

Comments
 (0)