diff --git a/CMCMakeModule b/CMCMakeModule index 6307704..b61ed5c 160000 --- a/CMCMakeModule +++ b/CMCMakeModule @@ -1 +1 @@ -Subproject commit 630770496d8d78dd6c06511ba180dbe4ddf14f94 +Subproject commit b61ed5cbfad8b76339ef1b2564ca03ffe34de7cc diff --git a/CMCore b/CMCore index 9d0febc..9c5cb2d 160000 --- a/CMCore +++ b/CMCore @@ -1 +1 @@ -Subproject commit 9d0febc893996bae3fa3b9265fe1e5f960e03b6b +Subproject commit 9c5cb2dc4a946906be186e10a3c0a4fb67d2a912 diff --git a/CMPlatform b/CMPlatform index 9901f8c..7a50402 160000 --- a/CMPlatform +++ b/CMPlatform @@ -1 +1 @@ -Subproject commit 9901f8ccc248852d4cd7c806358b2c27cdcd62ec +Subproject commit 7a5040224a162cd63f54e28d31eaf7eb710b48a0 diff --git a/CMakeLists.txt b/CMakeLists.txt index 4849d92..31209be 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) diff --git a/Examples b/Examples index 85752d4..aea2dd5 160000 --- a/Examples +++ b/Examples @@ -1 +1 @@ -Subproject commit 85752d4ec3f9b2963fe07801e07e5ec8057132a5 +Subproject commit aea2dd595e78ad28d4bea909b81cdea0241c604c diff --git a/ShaderMaker b/ShaderMaker index 0be5ba9..a13e2e5 160000 --- a/ShaderMaker +++ b/ShaderMaker @@ -1 +1 @@ -Subproject commit 0be5ba9c1a1393429b65921e57501ed8e01d4bc4 +Subproject commit a13e2e514856fe572f20a53e3184824f29f3ae0c diff --git a/TexConv b/TexConv index 7b95e7e..10c8a55 160000 --- a/TexConv +++ b/TexConv @@ -1 +1 @@ -Subproject commit 7b95e7e4dc1ff3fced2dcbdc7dfceb0c2fef5bcd +Subproject commit 10c8a551440e9a2ef20a218ce22aa877208d4f27