added cm_windows.manifest and updated submodules.

This commit is contained in:
2021-09-09 18:06:38 +08:00
parent beac800ba8
commit 200102705c
7 changed files with 10 additions and 8 deletions

2
CMCore

Submodule CMCore updated: 9d0febc893...9c5cb2dc4a

View File

@@ -31,8 +31,10 @@ if(CM_BUILD_TOOLS)
ENDIF() ENDIF()
if(WIN32) if(WIN32)
include_directories("TexConv/DevIL Windows SDK/include") include_directories("${CMAKE_CURRENT_SOURCE_DIR}/TexConv/DevIL Windows SDK/include")
link_directories("TexConv/DevIL Windows SDK/lib/x64/unicode/Release") link_directories("${CMAKE_CURRENT_SOURCE_DIR}/TexConv/DevIL Windows SDK/lib/x64/unicode/Release")
set(CM_MANIFEST ${CMAKE_CURRENT_SOURCE_DIR}/CMCMakeModule/cm_windows.manifest)
endif(WIN32) endif(WIN32)
set(TEX_CONV_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/TexConv) set(TEX_CONV_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/TexConv)

Submodule TexConv updated: 7b95e7e4dc...10c8a55144