Merge remote-tracking branch 'origin/master' into project_setup_refactor

# Conflicts:
#	CMakeLists.txt
This commit is contained in:
Georg Hagen
2024-08-14 22:47:19 +02:00
61 changed files with 2489 additions and 96 deletions

View File

@@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 3.28 FATAL_ERROR)
include(SetupVulkan)
include(Utils)
include(CopyResourcesToExe)
file(GLOB_RECURSE SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/ExampleApps/*.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/*.h" "${CMAKE_CURRENT_SOURCE_DIR}/*.hpp")
if (IOS)
@@ -33,7 +34,8 @@ if(APPLE)
LinkAppleFrameworks(OpenVulkano_Examples)
endif ()
CopyResourcesToExe(openVulkanoCpp "${CMAKE_CURRENT_SOURCE_DIR}/../fonts" ".ttf")
CopyResourcesToExe(openVulkanoCpp "${CMAKE_CURRENT_SOURCE_DIR}/ExampleSources" "*")
target_include_directories(OpenVulkano_Examples PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
target_include_directories(OpenVulkano_Examples PRIVATE openVulkanoCpp)