Yidhra/DirectXTex
2
0
Fork 0
mirror of https://github.com/microsoft/DirectXTex.git synced 2026-02-11 15:16:14 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Update build switches for latest SDL recommendations

Browse Source
This commit is contained in:
Chuck Walbourn
2022-03-18 13:51:50 -07:00
parent acbd901f3a
commit df039e9236
15 changed files with 116 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
CMakeLists.txt
View File

@@ -1,7 +1,7 @@
# Copyright (c) Microsoft Corporation.
# Licensed under the MIT License.
cmake_minimum_required (VERSION 3.11)
cmake_minimum_required (VERSION 3.13)
set(DIRECTXTEX_VERSION 1.9.5)
@@ -281,6 +281,15 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
endif()
endif()
if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.24)
target_compile_options(${PROJECT_NAME} PRIVATE /ZH:SHA_256)
if(BUILD_TOOLS AND WIN32 AND (NOT WINDOWS_STORE))
target_compile_options(texassemble PRIVATE /ZH:SHA_256)
target_compile_options(texconv PRIVATE /ZH:SHA_256)
target_compile_options(texdiag PRIVATE /ZH:SHA_256)
endif()
endif()
if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.26)
target_compile_options(${PROJECT_NAME} PRIVATE /Zc:preprocessor /wd5105)
if(BUILD_TOOLS AND WIN32 AND (NOT WINDOWS_STORE))
@@ -290,6 +299,14 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
endif()
endif()
if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 19.27)
if(BUILD_TOOLS AND WIN32 AND (NOT WINDOWS_STORE))
target_link_options(texassemble PRIVATE /CETCOMPAT)
target_link_options(texconv PRIVATE /CETCOMPAT)
target_link_options(texdiag PRIVATE /CETCOMPAT)
endif()
endif()
if(BC_USE_OPENMP)
target_compile_options(${PROJECT_NAME} PRIVATE /openmp /Zc:twoPhase-)
if(BUILD_TOOLS AND WIN32 AND (NOT WINDOWS_STORE))