used vcpkg instead of sub-modules.
This commit is contained in:
3
.gitmodules
vendored
3
.gitmodules
vendored
@@ -37,6 +37,3 @@
|
|||||||
[submodule "TextEncodeConvert"]
|
[submodule "TextEncodeConvert"]
|
||||||
path = TextEncodeConvert
|
path = TextEncodeConvert
|
||||||
url = https://github.com/hyzboy/TextEncodeConvert.git
|
url = https://github.com/hyzboy/TextEncodeConvert.git
|
||||||
[submodule "glm"]
|
|
||||||
path = glm
|
|
||||||
url = https://github.com/g-truc/glm.git
|
|
||||||
|
Submodule CMCMakeModule updated: e78ebebee1...78046ef7e5
2
CMCore
2
CMCore
Submodule CMCore updated: 021df224d0...1cefb338da
Submodule CMSceneGraph updated: b5b673f8a6...7c8a5888a7
2
CMUtil
2
CMUtil
Submodule CMUtil updated: be9122db80...2c5a81b32b
@@ -9,9 +9,8 @@ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/CMCMakeModule)
|
|||||||
|
|
||||||
include(vulkan)
|
include(vulkan)
|
||||||
include(math)
|
include(math)
|
||||||
use_glm(${CMAKE_CURRENT_SOURCE_DIR}/glm)
|
|
||||||
|
|
||||||
include(use_cm_module)
|
include(use_cm_module)
|
||||||
|
|
||||||
use_cm_module(Core)
|
use_cm_module(Core)
|
||||||
use_cm_module(Platform)
|
use_cm_module(Platform)
|
||||||
#use_cm_module(2D)
|
#use_cm_module(2D)
|
||||||
@@ -30,12 +29,9 @@ if(CM_BUILD_TOOLS)
|
|||||||
include(QtCommon)
|
include(QtCommon)
|
||||||
ENDIF()
|
ENDIF()
|
||||||
|
|
||||||
if(WIN32)
|
if(WIN32)
|
||||||
include_directories("${CMAKE_CURRENT_SOURCE_DIR}/TexConv/DevIL Windows SDK/include")
|
set(CM_MANIFEST ${CMAKE_CURRENT_SOURCE_DIR}/CMCMakeModule/cm_windows.manifest)
|
||||||
link_directories("${CMAKE_CURRENT_SOURCE_DIR}/TexConv/DevIL Windows SDK/lib/x64/unicode/Release")
|
endif(WIN32)
|
||||||
|
|
||||||
set(CM_MANIFEST ${CMAKE_CURRENT_SOURCE_DIR}/CMCMakeModule/cm_windows.manifest)
|
|
||||||
endif(WIN32)
|
|
||||||
|
|
||||||
set(TEX_CONV_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/TexConv)
|
set(TEX_CONV_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/TexConv)
|
||||||
|
|
||||||
|
2
MeshConv
2
MeshConv
Submodule MeshConv updated: 2f13c57348...fcbdf1941c
Submodule ShaderMaker updated: b82dade250...f4d0557184
2
TexConv
2
TexConv
Submodule TexConv updated: 1a9631dae9...afe3dee96f
1
glm
1
glm
Submodule glm deleted from 6ad79aae3e
Reference in New Issue
Block a user