Skip to content

Commit

Permalink
Vulkan: use upstream volk instead of bundling
Browse files Browse the repository at this point in the history
  • Loading branch information
paroj committed Aug 11, 2024
1 parent bf585ac commit f89a5b5
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5,264 deletions.
8 changes: 4 additions & 4 deletions RenderSystems/Vulkan/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

file(GLOB HEADER_FILES "${CMAKE_CURRENT_SOURCE_DIR}/include/*.h")
list(APPEND HEADER_FILES ${PROJECT_BINARY_DIR}/include/OgreVulkanExports.h)
file(GLOB SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/src/volk.c")
file(GLOB SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/src/volk_impl.c")

set( HEADER_FILES ${HEADER_FILES})
set( SOURCE_FILES ${SOURCE_FILES})
Expand All @@ -24,13 +24,13 @@ if(DEFINED ENV{VULKAN_SDK})
endif()

if(WIN32)
set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/src/volk.c"
set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/src/volk_impl.c"
PROPERTIES COMPILE_DEFINITIONS VK_USE_PLATFORM_WIN32_KHR)
elseif(ANDROID)
set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/src/volk.c"
set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/src/volk_impl.c"
PROPERTIES COMPILE_DEFINITIONS VK_USE_PLATFORM_ANDROID_KHR)
else()
set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/src/volk.c"
set_source_files_properties("${CMAKE_CURRENT_SOURCE_DIR}/src/volk_impl.c"
PROPERTIES COMPILE_DEFINITIONS VK_USE_PLATFORM_XLIB_KHR)
target_link_libraries(RenderSystem_Vulkan PRIVATE ${X11_LIBRARIES})
endif()
Expand Down
Loading

0 comments on commit f89a5b5

Please sign in to comment.