Skip to content
Snippets Groups Projects
Commit 81b1136f authored by Trevor Hollmann's avatar Trevor Hollmann
Browse files

Merge branch '26-asset-loading' of unigit:vulkan2021/vkcv-framework into 26-asset-loading

parents d7c421d3 b2070feb
Branches
Tags
1 merge request!19Resolve "Asset Loading"
...@@ -7,3 +7,6 @@ ...@@ -7,3 +7,6 @@
[submodule "modules/asset_loader/lib/json"] [submodule "modules/asset_loader/lib/json"]
path = modules/asset_loader/lib/json path = modules/asset_loader/lib/json
url = https://github.com/nlohmann/json.git url = https://github.com/nlohmann/json.git
[submodule "modules/asset_loader/lib/stb"]
path = modules/asset_loader/lib/stb
url = https://github.com/nothings/stb.git
...@@ -27,8 +27,14 @@ include(config/NLOHMANN_JSON.cmake) ...@@ -27,8 +27,14 @@ include(config/NLOHMANN_JSON.cmake)
# Check and load FX-GLTF # Check and load FX-GLTF
include(config/FX_GLTF.cmake) include(config/FX_GLTF.cmake)
# Check and load STB
include(config/STB.cmake)
# link the required libraries to the module # link the required libraries to the module
target_link_libraries(vkcv_asset_loader ${vkcv_asset_loader_libraries}) target_link_libraries(vkcv_asset_loader ${vkcv_asset_loader_libraries})
# including headers of dependencies and the VkCV framework
target_include_directories(vkcv_asset_loader SYSTEM BEFORE PRIVATE ${vkcv_asset_loader_includes})
# add the own include directory for public headers # add the own include directory for public headers
target_include_directories(vkcv_asset_loader BEFORE PUBLIC ${vkcv_asset_loader_include}) target_include_directories(vkcv_asset_loader BEFORE PUBLIC ${vkcv_asset_loader_include})
if (EXISTS "${vkcv_asset_loader_lib_path}/stb")
list(APPEND vkcv_asset_loader_includes ${vkcv_asset_loader_lib}/stb)
else()
message(WARNING "STB is required..! Update the submodules!")
endif ()
Subproject commit c9064e317699d2e495f36ba4f9ac037e88ee371a
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment