Skip to content

Commit 6aa5610

Browse files
fix: correct UNICODE definition setting for Windows build
Signed-off-by: Mateusz Jablonski <[email protected]>
1 parent 7d354c0 commit 6aa5610

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -721,7 +721,6 @@ if(MSVC)
721721
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${LINKER_FLAGS}")
722722
set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${LINKER_FLAGS}")
723723
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${LINKER_FLAGS}")
724-
add_definitions(-DUNICODE -D_UNICODE)
725724
else()
726725
if(IGDRCL_GCOV)
727726
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fprofile-arcs -ftest-coverage --coverage")
@@ -744,7 +743,10 @@ else()
744743
set(TSAN_LIBS "tsan")
745744
endif()
746745
endif()
746+
endif()
747747

748+
if(WIN32)
749+
add_definitions(-DUNICODE -D_UNICODE)
748750
endif()
749751

750752
# increase the maximum number of sections in .obj files

level_zero/tools/source/sysman/memory/windows/os_memory_imp.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
#pragma clang diagnostic ignored "-Wpragma-pack"
1919
#pragma clang diagnostic ignored "-Wignored-attributes"
2020
#pragma clang diagnostic ignored "-Wmacro-redefined"
21-
#define UNICODE
2221
#endif
2322

2423
#include <Pdh.h>

shared/source/os_interface/windows/windows_wrapper.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
#pragma clang diagnostic ignored "-Wpragma-pack"
1414
#pragma clang diagnostic ignored "-Wignored-attributes"
1515
#pragma clang diagnostic ignored "-Wmacro-redefined"
16-
#define UNICODE
1716
#endif
1817

1918
#include <Windows.h>

0 commit comments

Comments
 (0)