Merge branch 'master' into draco_1.5.6

This commit is contained in:
Kim Kulling
2023-03-05 18:44:26 +01:00
committed by GitHub

View File

@@ -8,6 +8,9 @@ if ( MSVC )
ADD_DEFINITIONS( -D_SCL_SECURE_NO_WARNINGS )
ADD_DEFINITIONS( -D_CRT_SECURE_NO_WARNINGS )
REMOVE_DEFINITIONS( -DUNICODE -D_UNICODE )
if ( MSVC_VERSION GREATER_EQUAL 1930 )
ADD_DEFINITIONS( -D_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING=1 )
endif ()
endif ()
ADD_COMPILE_DEFINITIONS(SHADER_PATH="${CMAKE_CURRENT_SOURCE_DIR}/SimpleTexturedDirectx11/")