From 9551b612a5f923bd05f3caaa1729672fa43136ab Mon Sep 17 00:00:00 2001 From: Brett Date: Mon, 15 Jul 2024 12:59:46 -0400 Subject: [PATCH] allow usage in projects with multiple BLTs --- CMakeLists.txt | 4 +++- libraries/BLT | 2 +- libraries/imgui | 2 +- libraries/openal-soft | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 73ea275..2c943a9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.25) -set(BLT_GRAPHICS_VERSION 0.13.19) +set(BLT_GRAPHICS_VERSION 0.13.20) set(BLT_GRAPHICS_TEST_VERSION 0.0.1) project(BLT_WITH_GRAPHICS VERSION ${BLT_GRAPHICS_VERSION}) @@ -28,7 +28,9 @@ else () add_subdirectory(libraries/openal-soft) endif () +if (NOT TARGET BLT) add_subdirectory(libraries/BLT) +endif () add_subdirectory(libraries/freetype-2.13.2) list(APPEND IMGUI_SOURCE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/libraries/imgui/imgui.cpp") diff --git a/libraries/BLT b/libraries/BLT index a8b2bc2..60f7796 160000 --- a/libraries/BLT +++ b/libraries/BLT @@ -1 +1 @@ -Subproject commit a8b2bc2d010480544c3162daa7384a252946bda1 +Subproject commit 60f77961fbbd4a1a06adbef984d838c5b49b3718 diff --git a/libraries/imgui b/libraries/imgui index a1b0682..46691d1 160000 --- a/libraries/imgui +++ b/libraries/imgui @@ -1 +1 @@ -Subproject commit a1b06823fe2d964a62fda99385499b218cf5cea5 +Subproject commit 46691d172ec65915b6a1e14dd9ae2c0a49dd15c4 diff --git a/libraries/openal-soft b/libraries/openal-soft index 6675317..0ee47a1 160000 --- a/libraries/openal-soft +++ b/libraries/openal-soft @@ -1 +1 @@ -Subproject commit 6675317107257c2cc16c947b359d557821d85bf2 +Subproject commit 0ee47a1ef91e6e887fa2e7eeeb10efcff9bbdb34