diff options
| author | Pär Björklund <per.bjorklund@gmail.com> | 2017-02-22 20:27:39 +0100 |
|---|---|---|
| committer | Pär Björklund <per.bjorklund@gmail.com> | 2017-03-01 18:13:29 +0100 |
| commit | 7070d1cb0dbc7d53079a8612cb4553a9ea2f4622 (patch) | |
| tree | 898b3d6325a4f08a419d0d625379b0b6b92be8bd /cmake/scripts/windows | |
| parent | 78d6cdd5ae3c1b3b0829fd86a65c1aa57f4dd60c (diff) | |
Move to using unicode win32 api methods
This should have been done a long time ago but
with UWP no longer supporting the ascii versions it's
time to get it done.
The changes in UnrarXLib isn't really tested but it's
about to get dropped from our tree anyway.
Diffstat (limited to 'cmake/scripts/windows')
| -rw-r--r-- | cmake/scripts/windows/ArchSetup.cmake | 1 | ||||
| -rw-r--r-- | cmake/scripts/windows/CFlagOverrides.cmake | 2 | ||||
| -rw-r--r-- | cmake/scripts/windows/CXXFlagOverrides.cmake | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/cmake/scripts/windows/ArchSetup.cmake b/cmake/scripts/windows/ArchSetup.cmake index 9d781645ce..bf85e15fbf 100644 --- a/cmake/scripts/windows/ArchSetup.cmake +++ b/cmake/scripts/windows/ArchSetup.cmake @@ -27,6 +27,7 @@ set(SYSTEM_DEFINES -DNOMINMAX -DHAS_DX -D__STDC_CONSTANT_MACROS -DTAGLIB_STATIC -DNPT_CONFIG_ENABLE_LOGGING -DPLT_HTTP_DEFAULT_USER_AGENT="UPnP/1.0 DLNADOC/1.50 Kodi" -DPLT_HTTP_DEFAULT_SERVER="UPnP/1.0 DLNADOC/1.50 Kodi" + -DUNICODE -D_UNICODE $<$<CONFIG:Debug>:-DD3D_DEBUG_INFO -D_ITERATOR_DEBUG_LEVEL=0>) # Make sure /FS is set for Visual Studio in order to prevent simultaneous access to pdb files. diff --git a/cmake/scripts/windows/CFlagOverrides.cmake b/cmake/scripts/windows/CFlagOverrides.cmake index 00f4e22af4..1c796fda25 100644 --- a/cmake/scripts/windows/CFlagOverrides.cmake +++ b/cmake/scripts/windows/CFlagOverrides.cmake @@ -1,5 +1,5 @@ if(MSVC) - set(CMAKE_C_FLAGS "/MP /DWIN32 /D_WINDOWS /W3 /Zi /arch:SSE2") + set(CMAKE_C_FLAGS "/D_UNICODE /DUNICODE /DRPC_USE_NATIVE_WCHAR /MP /DWIN32 /D_WINDOWS /W3 /Zi /arch:SSE2") set(CMAKE_C_FLAGS_DEBUG "/D_DEBUG /MDd /Ob0 /Od /RTC1 /D_ITERATOR_DEBUG_LEVEL=0") set(CMAKE_C_FLAGS_RELEASE "/MD /Ox /Ob2 /Oi /Ot /Oy /GL /DNDEBUG") endif() diff --git a/cmake/scripts/windows/CXXFlagOverrides.cmake b/cmake/scripts/windows/CXXFlagOverrides.cmake index 3c4d6c410a..44ae602bfe 100644 --- a/cmake/scripts/windows/CXXFlagOverrides.cmake +++ b/cmake/scripts/windows/CXXFlagOverrides.cmake @@ -1,5 +1,5 @@ if(MSVC) - set(CMAKE_CXX_FLAGS "/MP /DWIN32 /D_WINDOWS /W3 /GR /Zi /EHsc /arch:SSE2") + set(CMAKE_CXX_FLAGS "/D_UNICODE /DUNICODE /DRPC_USE_NATIVE_WCHAR /MP /DWIN32 /D_WINDOWS /W3 /GR /Zi /EHsc /arch:SSE2") set(CMAKE_CXX_FLAGS_DEBUG "/D_DEBUG /MDd /Ob0 /Od /RTC1 /D_ITERATOR_DEBUG_LEVEL=0") set(CMAKE_CXX_FLAGS_RELEASE "/MD /Ox /Ob2 /Oi /Ot /Oy /GL /DNDEBUG") endif() |