diff --git a/.gitmodules b/.gitmodules index 2d58b39..fe97d46 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ -[submodule "vcpkg"] - path = vcpkg - url = https://github.com/Microsoft/vcpkg.git +[submodule "external/Seele"] + path = external/Seele + url = git@github.com:Dynamitos/Seele.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 3a0a6b8..d4c6bf5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,11 +6,14 @@ endif() set(CMAKE_CXX_STANDARD 23) set(VCPKG_INSTALL_OPTIONS "--allow-unsupported") -set(CMAKE_TOOLCHAIN_FILE ${CMAKE_CURRENT_SOURCE_DIR}/vcpkg/scripts/buildsystems/vcpkg.cmake) +set(CMAKE_TOOLCHAIN_FILE ${CMAKE_CURRENT_SOURCE_DIR}/external/Seele/external/vcpkg/scripts/buildsystems/vcpkg.cmake) project(MeshShadingDemo) +add_subdirectory(external/Seele) + set(CMAKE_DEBUG_POSTFIX "") +set(CMAKE_SHARED_LIBRARY_PREFIX "") set(CMAKE_BINARY_DIR ${CMAKE_CURRENT_SOURCE_DIR}/bin) set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_DEBUG ${CMAKE_CURRENT_SOURCE_DIR}/bin) set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE ${CMAKE_CURRENT_SOURCE_DIR}/bin) @@ -21,25 +24,8 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_CURRENT_SOURCE_DIR}/bin) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO ${CMAKE_CURRENT_SOURCE_DIR}/bin) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL ${CMAKE_CURRENT_SOURCE_DIR}/bin) -find_package(Seele REQUIRED) -find_package(Vulkan REQUIRED) -find_package(assimp CONFIG REQUIRED) -find_package(Stb REQUIRED) -find_package(EnTT CONFIG REQUIRED) -find_package(FreeType CONFIG REQUIRED) -find_package(harfbuzz CONFIG REQUIRED) -find_package(glfw3 CONFIG REQUIRED) -find_package(glm CONFIG REQUIRED) -find_package(Ktx CONFIG REQUIRED) -find_package(nlohmann_json CONFIG REQUIRED) -find_package(fmt CONFIG REQUIRED) -find_package(lunasvg CONFIG REQUIRED) -find_package(metis CONFIG REQUIRED) -find_package(meshoptimizer CONFIG REQUIRED) -find_package(VulkanMemoryAllocator CONFIG REQUIRED) - add_library(MeshShadingDemo SHARED "") -target_link_libraries(MeshShadingDemo PUBLIC Seele::Engine) +target_link_libraries(MeshShadingDemo PUBLIC Engine) target_include_directories(MeshShadingDemo PRIVATE src/) diff --git a/external/Seele b/external/Seele new file mode 160000 index 0000000..59b7342 --- /dev/null +++ b/external/Seele @@ -0,0 +1 @@ +Subproject commit 59b73420d6560bb368763504222ae6ae93fc4188