From 13022c79bf123b325cb708507b999921c37d5021 Mon Sep 17 00:00:00 2001 From: Swung0x48 Date: Sat, 17 May 2025 22:11:38 +0800 Subject: [PATCH] [Misc]: add DiligentCore as submodule --- .gitmodules | 3 +++ 3rdparty/DiligentCore | 1 + CMakeLists.txt | 11 +++++++++-- 3 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 .gitmodules create mode 160000 3rdparty/DiligentCore diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 00000000..69311e33 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "3rdparty/DiligentCore"] + path = 3rdparty/DiligentCore + url = https://github.com/DiligentGraphics/DiligentCore.git diff --git a/3rdparty/DiligentCore b/3rdparty/DiligentCore new file mode 160000 index 00000000..f36e6388 --- /dev/null +++ b/3rdparty/DiligentCore @@ -0,0 +1 @@ +Subproject commit f36e63880566649d9d8b2336a7c5aa9c8ddb174b diff --git a/CMakeLists.txt b/CMakeLists.txt index 485bc8d9..06d12a30 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -85,7 +85,7 @@ add_library(${CMAKE_PROJECT_NAME} SHARED target_include_directories(${CMAKE_PROJECT_NAME} PRIVATE ./includes) -target_link_libraries(${CMAKE_PROJECT_NAME} +target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE ${CMAKE_SOURCE_DIR}/library/arm64-v8a/libglslang.a ${CMAKE_SOURCE_DIR}/library/arm64-v8a/libspirv-cross-c-shared.so #${CMAKE_SOURCE_DIR}/library/arm64-v8a/libshaderconv.so @@ -111,11 +111,18 @@ target_include_directories(MobileGL PUBLIC ${CMAKE_SOURCE_DIR}/include ) +add_subdirectory(3rdparty/DiligentCore) + +target_link_libraries(MobileGL + PRIVATE + Diligent-Common + Diligent-GraphicsEngineOpenGL-static +) if (PROFILING) find_package(Threads) include_directories(${CMAKE_SOURCE_DIR}/3rdparty/perfetto/sdk) add_library(perfetto STATIC ${CMAKE_SOURCE_DIR}/3rdparty/perfetto/sdk/perfetto.cc) - target_link_libraries(MobileGL perfetto ${CMAKE_THREAD_LIBS_INIT}) + target_link_libraries(MobileGL PRIVATE perfetto ${CMAKE_THREAD_LIBS_INIT}) target_compile_definitions(MobileGL PUBLIC PROFILING=1) endif()