reintroducing vulkan
This commit is contained in:
@@ -43,9 +43,7 @@ find_package(lunasvg CONFIG REQUIRED)
|
|||||||
find_package(slang CONFIG REQUIRED)
|
find_package(slang CONFIG REQUIRED)
|
||||||
find_package(metis CONFIG REQUIRED)
|
find_package(metis CONFIG REQUIRED)
|
||||||
find_package(meshoptimizer CONFIG REQUIRED)
|
find_package(meshoptimizer CONFIG REQUIRED)
|
||||||
if(NOT APPLE)
|
|
||||||
find_package(VulkanMemoryAllocator CONFIG REQUIRED)
|
find_package(VulkanMemoryAllocator CONFIG REQUIRED)
|
||||||
endif()
|
|
||||||
|
|
||||||
if(UNIX)
|
if(UNIX)
|
||||||
find_package(Threads REQUIRED)
|
find_package(Threads REQUIRED)
|
||||||
@@ -58,11 +56,9 @@ endif()
|
|||||||
add_library(Engine SHARED "")
|
add_library(Engine SHARED "")
|
||||||
|
|
||||||
target_include_directories(Engine PRIVATE src/Engine)
|
target_include_directories(Engine PRIVATE src/Engine)
|
||||||
if(NOT APPLE)
|
|
||||||
target_link_libraries(Engine PUBLIC Vulkan::Vulkan)
|
target_link_libraries(Engine PUBLIC Vulkan::Vulkan)
|
||||||
target_link_libraries(Engine PUBLIC GPUOpen::VulkanMemoryAllocator)
|
target_link_libraries(Engine PUBLIC GPUOpen::VulkanMemoryAllocator)
|
||||||
target_link_libraries(Engine PUBLIC slang::slang-glslang)
|
target_link_libraries(Engine PUBLIC slang::slang-glslang)
|
||||||
endif()
|
|
||||||
target_link_libraries(Engine PUBLIC EnTT::EnTT)
|
target_link_libraries(Engine PUBLIC EnTT::EnTT)
|
||||||
target_link_libraries(Engine PUBLIC glfw)
|
target_link_libraries(Engine PUBLIC glfw)
|
||||||
target_link_libraries(Engine PUBLIC glm::glm)
|
target_link_libraries(Engine PUBLIC glm::glm)
|
||||||
|
|||||||
Vendored
+1
-1
Submodule external/vcpkg updated: f9a99aa79c...365f6444ab
@@ -8,6 +8,7 @@
|
|||||||
#include "Asset/TextureLoader.h"
|
#include "Asset/TextureLoader.h"
|
||||||
#include "Graphics/Initializer.h"
|
#include "Graphics/Initializer.h"
|
||||||
#include "Material/Material.h"
|
#include "Material/Material.h"
|
||||||
|
#include "Graphics/Vulkan/Graphics.h"
|
||||||
#include "Graphics/StaticMeshVertexData.h"
|
#include "Graphics/StaticMeshVertexData.h"
|
||||||
#include "Window/PlayView.h"
|
#include "Window/PlayView.h"
|
||||||
#include "Window/WindowManager.h"
|
#include "Window/WindowManager.h"
|
||||||
|
|||||||
+2
-4
@@ -1,12 +1,10 @@
|
|||||||
{
|
{
|
||||||
"dependencies": [
|
"dependencies": [
|
||||||
{
|
{
|
||||||
"name": "vulkan",
|
"name": "vulkan"
|
||||||
"platform": "!osx"
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "vulkan-memory-allocator",
|
"name": "vulkan-memory-allocator"
|
||||||
"platform": "!osx"
|
|
||||||
},
|
},
|
||||||
"assimp",
|
"assimp",
|
||||||
"stb",
|
"stb",
|
||||||
|
|||||||
Reference in New Issue
Block a user