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

修改VULKAN库链接

Browse Source
This commit is contained in:
hyzboy 2019-05-07 03:29:44 +08:00
parent 40b57bf7a7
commit d229912b5b
5 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -31,8 +31,6 @@ else()
message(FATAL_ERROR "Unsupported Platform!") message(FATAL_ERROR "Unsupported Platform!")
ENDIF() ENDIF()
SET(VULKAN_LIB ${Vulkan_LIBRARIES})
add_definitions(-DMATH_USE_OPENGL) add_definitions(-DMATH_USE_OPENGL)
add_definitions(-DMATH_RIGHTHANDED_CAMERA) add_definitions(-DMATH_RIGHTHANDED_CAMERA)
add_definitions(-DMATH_AVX) add_definitions(-DMATH_AVX)
@ -57,9 +55,9 @@ SET(ULRE ULRE.Base
ULRE.RenderDevice.Vulkan ULRE.RenderDevice.Vulkan
ULRE.Platform ULRE.Platform
MathGeoLib MathGeoLib
${RENDER_LIBRARY}
spirv-cross-core spirv-cross-core
${Vulkan_LIBRARY}) ${RENDER_LIBRARY}
${Vulkan_LIBRARIES})
add_subdirectory(example) add_subdirectory(example)
# add_executable(WIP WIP.cpp) # add_executable(WIP WIP.cpp)

0
res/shader/shader_compile.bat → res/shader/shader_compile.sh Normal file → Executable file
View File

2
src/Base/CMakeLists.txt
View File

@ -46,7 +46,7 @@ SET(BASE_PLUG_IN_SOURCE
SOURCE_GROUP("PlugIn" FILES ${BASE_PLUG_IN_SOURCE}) SOURCE_GROUP("PlugIn" FILES ${BASE_PLUG_IN_SOURCE})
add_library(ULRE.Base STATIC #${SYSTEM_INFO_SOURCE} add_library(ULRE.Base SHARED #${SYSTEM_INFO_SOURCE}
${BASE_TYPE_SOURCE} ${BASE_TYPE_SOURCE}
${BASE_IO_SOURCE} ${BASE_IO_SOURCE}
${BASE_FILE_SYSTEM_SOURCE} ${BASE_FILE_SYSTEM_SOURCE}

2
src/Platform/CMakeLists.txt
View File

@ -124,4 +124,4 @@ SET(PLATFORM_SOURCE ${PLATFORM_SOURCE}
${PLATFORM_WINDOW_SOURCE} ${PLATFORM_WINDOW_SOURCE}
) )
add_library(ULRE.Platform STATIC ${PLATFORM_SOURCE}) add_library(ULRE.Platform SHARED ${PLATFORM_SOURCE})

2
src/RenderDevice/Vulkan/CMakeLists.txt
View File

@ -55,6 +55,6 @@ SOURCE_GROUP("Header Files" FILES ${RENDER_DEVICE_VULKAN_HEADER})
SOURCE_GROUP("Source Files" FILES ${RENDER_DEVICE_VULKAN_SOURCE}) SOURCE_GROUP("Source Files" FILES ${RENDER_DEVICE_VULKAN_SOURCE})
#SOURCE_GROUP("JSON Source Files" FILES ${RENDER_DEVICE_VULKAN_JSON_SOURCE}) #SOURCE_GROUP("JSON Source Files" FILES ${RENDER_DEVICE_VULKAN_JSON_SOURCE})
add_library(ULRE.RenderDevice.Vulkan STATIC ${RENDER_DEVICE_VULKAN_HEADER} add_library(ULRE.RenderDevice.Vulkan SHARED ${RENDER_DEVICE_VULKAN_HEADER}
${RENDER_DEVICE_VULKAN_SOURCE} ${RENDER_DEVICE_VULKAN_SOURCE}
${RENDER_DEVICE_VULKAN_JSON_SOURCE}) ${RENDER_DEVICE_VULKAN_JSON_SOURCE})