hyzboy/ULRE
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

改为直接使用glslang,SPIRV,OGLCompilers工程文件，避免造成glslang/MathGeoLib配置冲突

Browse Source
This commit is contained in:
hyzboy 2019-08-19 10:32:25 +08:00
parent fc440bc4d4
commit 747ab8b391
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
CMakeLists.txt
View File

@ -44,11 +44,11 @@ SET(ULRE ULRE.Base
MathGeoLib MathGeoLib
spirv-cross-core spirv-cross-core
SPIRV SPIRV
glslang
jsoncpp_lib jsoncpp_lib
${RENDER_LIBRARY} ${RENDER_LIBRARY}
${Vulkan_LIBRARIES}) ${Vulkan_LIBRARIES})
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/3rdpty/glslang)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/3rdpty/assimp/include) include_directories(${CMAKE_CURRENT_SOURCE_DIR}/3rdpty/assimp/include)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/3rdpty/MathGeoLib/src) include_directories(${CMAKE_CURRENT_SOURCE_DIR}/3rdpty/MathGeoLib/src)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/3rdpty/NvTriStrip) include_directories(${CMAKE_CURRENT_SOURCE_DIR}/3rdpty/NvTriStrip)
@ -60,6 +60,20 @@ SET(SPIRV_CROSS_PATH ${CMAKE_CURRENT_SOURCE_DIR}/3rdpty/SPIRV-Cross)
include_directories(${SPIRV_CROSS_PATH}) include_directories(${SPIRV_CROSS_PATH})
add_subdirectory(${SPIRV_CROSS_PATH}) add_subdirectory(${SPIRV_CROSS_PATH})
macro(glslang_pch SRCS PCHCPP)
message("use null [glslang_pch] macro")
endmacro()
include_directories(${SPIRV_CROSS_PATH}/external/glslang/glslang/Public)
add_subdirectory(${SPIRV_CROSS_PATH}/external/glslang/glslang)
include_directories(${SPIRV_CROSS_PATH}/external/glslang)
add_subdirectory(${SPIRV_CROSS_PATH}/external/glslang/SPIRV)
if(WIN32)
add_subdirectory(${SPIRV_CROSS_PATH}/external/glslang/OGLCompilersDLL)
endif()
SET(ULRE_RUNTIME_PATH ${CMAKE_CURRENT_SOURCE_DIR}) SET(ULRE_RUNTIME_PATH ${CMAKE_CURRENT_SOURCE_DIR})
add_subdirectory(3rdpty/MathGeoLib) add_subdirectory(3rdpty/MathGeoLib)