Dynamitos/Seele
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Trying to fix build(again)

Browse Source
This commit is contained in:
Dynamitos
2024-01-19 22:57:45 +01:00
parent cb6b1815ee
commit 8dc52fa151
6 changed files with 27 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitmodules
-1
View File
@@ -5,5 +5,4 @@
path = external/vcpkg
url = https://github.com/Microsoft/vcpkg.git
[submodule "external/slang"]
path = external/slang
url = https://github.com/shader-slang/slang.git
.vscode/launch.json
Vendored
+6 -1
View File
@@ -32,7 +32,12 @@
"args": [],
"stopAtEntry": false,
"cwd": "${workspaceRoot}/bin",
"environment": [],
"environment": [
{
"name": "VK_LAYER_PATH",
"value": "/opt/homebrew/opt/vulkan-validationlayers/share/vulkan/explicit_layer.d"
}
],
"externalConsole": false,
"MIMode": "lldb",
"targetArchitecture": "arm64"
CMakeLists.txt
+5 -1
View File
@@ -50,6 +50,10 @@ find_package(nlohmann_json CONFIG REQUIRED)
find_package(fmt CONFIG REQUIRED)
find_package(VulkanMemoryAllocator CONFIG REQUIRED)
if(APPLE)
find_library(COCOA_LIBRARY Cocoa)
endif()
if(UNIX)
find_package(Threads REQUIRED)
endif()
@@ -71,9 +75,9 @@ target_link_libraries(Engine PUBLIC assimp::assimp)
target_link_libraries(Engine PUBLIC KTX::ktx)
target_link_libraries(Engine PUBLIC nlohmann_json::nlohmann_json)
target_link_libraries(Engine PUBLIC crcpp)
target_link_libraries(Engine PUBLIC shader-slang)
target_link_libraries(Engine PUBLIC fmt::fmt)
target_link_libraries(Engine PUBLIC GPUOpen::VulkanMemoryAllocator)
target_link_libraries(Engine PUBLIC shader-slang)
if(UNIX)
target_link_libraries(Engine PUBLIC Threads::Threads)
target_link_libraries(Engine PUBLIC dl)
cmake/SuperBuild.cmake
+15 -12
View File
@@ -68,28 +68,31 @@ include (ExternalProject)
add_library(shader-slang-glslang SHARED IMPORTED)
add_library(shader-slang SHARED IMPORTED)
if(WIN32)
set(SLANG_ROOT ${EXTERNAL_ROOT}/vcpkg/packages/shader-slang_x64-windows/)
set_target_properties(shader-slang-glslang PROPERTIES IMPORTED_LOCATION ${SLANG_ROOT}/bin/slang-glslang.dll)
set_target_properties(shader-slang-glslang PROPERTIES IMPORTED_IMPLIB ${SLANG_ROOT}/lib/slang.lib)
set_target_properties(shader-slang PROPERTIES IMPORTED_LOCATION ${SLANG_ROOT}/bin/slang.dll)
set_target_properties(shader-slang PROPERTIES IMPORTED_IMPLIB ${SLANG_ROOT}/lib/slang.lib)
set(SLANG_ROOT ${EXTERNAL_ROOT}/slang/bin/windows-x64/release)
set_target_properties(shader-slang-glslang PROPERTIES IMPORTED_LOCATION ${SLANG_ROOT}/slang-glslang.dll)
set_target_properties(shader-slang-glslang PROPERTIES IMPORTED_IMPLIB ${SLANG_ROOT}/slang.lib)
set_target_properties(shader-slang PROPERTIES IMPORTED_LOCATION ${SLANG_ROOT}/slang.dll)
set_target_properties(shader-slang PROPERTIES IMPORTED_IMPLIB ${SLANG_ROOT}/slang.lib)
target_link_libraries(shader-slang INTERFACE shader-slang-glslang)
install(FILES
${SLANG_ROOT}/bin/slang-glslang.dll
${SLANG_ROOT}/bin/slang.dll
${SLANG_ROOT}/slang-glslang.dll
${SLANG_ROOT}/slang.dll
DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
install(FILES
${SLANG_ROOT}/lib/slang.lib
${SLANG_ROOT}/slang.lib
DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
elseif(APPLE)
set(SLANG_ROOT ${EXTERNAL_ROOT}/vcpkg/packages/shader-slang_arm64-osx/)
set_target_properties(shader-slang PROPERTIES IMPORTED_LOCATION ${SLANG_ROOT}/bin/libslang.dylib)
set(SLANG_ROOT ${EXTERNAL_ROOT}/slang/bin/macosx-aarch64/release)
set_target_properties(shader-slang-glslang PROPERTIES IMPORTED_LOCATION ${SLANG_ROOT}/libslang-glslang.dylib)
set_target_properties(shader-slang PROPERTIES IMPORTED_LOCATION ${SLANG_ROOT}/libslang.dylib)
target_link_libraries(shader-slang INTERFACE shader-slang-glslang)
install(FILES
${SLANG_ROOT}/bin/libslang.dylib
${SLANG_ROOT}/libslang.dylib
${SLANG_ROOT}/libslang-glslang.dylib
DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
endif()
target_include_directories(shader-slang INTERFACE
$<BUILD_INTERFACE:${SLANG_ROOT}/include/>
$<BUILD_INTERFACE:${EXTERNAL_ROOT}/slang/>
$<INSTALL_INTERFACE:include>
)
#string(TOLOWER release_x64 SLANG_CONFIG)
src/Engine/Graphics/Vulkan/Graphics.cpp
+1
View File
@@ -373,6 +373,7 @@ Array<const char *> Graphics::getRequiredExtensions()
void Graphics::initInstance(GraphicsInitializer initInfo)
{
glfwInit();
assert(glfwVulkanSupported());
VkApplicationInfo appInfo = {
.sType = VK_STRUCTURE_TYPE_APPLICATION_INFO,
.pApplicationName = initInfo.applicationName,
vcpkg.json
-1
View File
@@ -10,7 +10,6 @@
"ktx",
"nlohmann-json",
"fmt",
"shader-slang",
"gtest",
"vulkan-memory-allocator"
]