Skip to content

Commit 3e03f86

Browse files
Merge vulkan_1_3 into blit.
2 parents d4c9bad + 7b6a5ef commit 3e03f86

File tree

1,123 files changed

+482171
-277995
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,123 files changed

+482171
-277995
lines changed

.gitmodules

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,6 @@
7878
path = 3rdparty/dxc/dxc
7979
url = [email protected]:Devsh-Graphics-Programming/DirectXShaderCompiler.git
8080
branch = devshFixes
81-
[submodule "3rdparty/tcpp"]
82-
path = 3rdparty/tcpp
83-
url = [email protected]:Erfan-Ahmadi/tcpp.git
8481
[submodule "3rdparty/imgui"]
8582
path = 3rdparty/imgui
8683
url = [email protected]:Devsh-Graphics-Programming/imgui.git

3rdparty/boost/CMakeLists.txt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ set(BOOST_PREPROCESSOR_INCLUDE "${CMAKE_CURRENT_SOURCE_DIR}/superproject/libs/pr
33
get_filename_component(_BOOST_PREPROCESSOR_BR_BUNDLE_SEARCH_DIRECTORY_ "${BOOST_PREPROCESSOR_INCLUDE}" ABSOLUTE)
44
get_filename_component(_BOOST_PREPROCESSOR_BR_OUTPUT_DIRECTORY_SOURCE_ "${CMAKE_CURRENT_BINARY_DIR}/src" ABSOLUTE)
55
get_filename_component(_BOOST_PREPROCESSOR_BR_OUTPUT_DIRECTORY_HEADER_ "${CMAKE_CURRENT_BINARY_DIR}/include" ABSOLUTE)
6-
set(BOOST_BUILTIN_RESOURCES_DIRECTORY_PATH "${_BOOST_PREPROCESSOR_BR_BUNDLE_SEARCH_DIRECTORY_}" CACHE INTERNAL "" FORCE)
6+
set(BOOST_BUILTIN_RESOURCES_DIRECTORY_PATH "${_BOOST_PREPROCESSOR_BR_BUNDLE_SEARCH_DIRECTORY_}/boost" CACHE INTERNAL "" FORCE)
77

88
if(NBL_EMBED_BUILTIN_RESOURCES)
99
include("${NBL_ROOT_PATH}/src/nbl/builtin/utils.cmake")
1010

11-
file(GLOB_RECURSE BOOST_HEADERS_REC_REL RELATIVE "${BOOST_PREPROCESSOR_INCLUDE}/boost" "${BOOST_PREPROCESSOR_INCLUDE}/*")
11+
file(GLOB_RECURSE BOOST_HEADERS_REC_REL RELATIVE "${BOOST_BUILTIN_RESOURCES_DIRECTORY_PATH}" "${BOOST_PREPROCESSOR_INCLUDE}/*")
1212

1313
foreach(BOOST_HEADER_REL IN LISTS BOOST_HEADERS_REC_REL)
1414
LIST_BUILTIN_RESOURCE(BOOST_RESOURCES_TO_EMBED "${BOOST_HEADER_REL}")
@@ -32,8 +32,9 @@ endforeach()
3232

3333
add_subdirectory(superproject/libs/wave EXCLUDE_FROM_ALL)
3434

35+
list(APPEND NBL_BOOST_TARGETS boost_wave) # wave
3536
foreach(BOOST_LIB IN LISTS NBL_BOOST_LIBS)
36-
if(TARGET boost_${BOOST_LIB})
37+
if(TARGET boost_${BOOST_LIB}) # wave's deps
3738
list(APPEND NBL_BOOST_TARGETS boost_${BOOST_LIB})
3839
endif()
3940
endforeach()

3rdparty/bullet3/src/Bullet3Collision/BroadPhaseCollision/b3BroadphaseCallback.h

Lines changed: 0 additions & 38 deletions
This file was deleted.

0 commit comments

Comments
 (0)