added cm_windows.manifest and updated submodules.

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

@ -1 +1 @@
Subproject commit 630770496d8d78dd6c06511ba180dbe4ddf14f94
Subproject commit b61ed5cbfad8b76339ef1b2564ca03ffe34de7cc

2
CMCore

@ -1 +1 @@
Subproject commit 9d0febc893996bae3fa3b9265fe1e5f960e03b6b
Subproject commit 9c5cb2dc4a946906be186e10a3c0a4fb67d2a912

@ -1 +1 @@
Subproject commit 9901f8ccc248852d4cd7c806358b2c27cdcd62ec
Subproject commit 7a5040224a162cd63f54e28d31eaf7eb710b48a0

View File

@ -31,8 +31,10 @@ if(CM_BUILD_TOOLS)
ENDIF()
if(WIN32)
include_directories("TexConv/DevIL Windows SDK/include")
link_directories("TexConv/DevIL Windows SDK/lib/x64/unicode/Release")
include_directories("${CMAKE_CURRENT_SOURCE_DIR}/TexConv/DevIL Windows SDK/include")
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)
set(TEX_CONV_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/TexConv)

@ -1 +1 @@
Subproject commit 85752d4ec3f9b2963fe07801e07e5ec8057132a5
Subproject commit aea2dd595e78ad28d4bea909b81cdea0241c604c

@ -1 +1 @@
Subproject commit 0be5ba9c1a1393429b65921e57501ed8e01d4bc4
Subproject commit a13e2e514856fe572f20a53e3184824f29f3ae0c

@ -1 +1 @@
Subproject commit 7b95e7e4dc1ff3fced2dcbdc7dfceb0c2fef5bcd
Subproject commit 10c8a551440e9a2ef20a218ce22aa877208d4f27