Skip to content

Commit

Permalink
feat: move glslang under extern
Browse files Browse the repository at this point in the history
Signed-off-by: Michael Pollind <[email protected]>
  • Loading branch information
pollend committed Jan 5, 2025
1 parent 535f92a commit cb05071
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 6 deletions.
6 changes: 3 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
[submodule "source/vcpkg"]
path = source/vcpkg
url = https://github.com/microsoft/vcpkg.git
[submodule "source/glslang"]
path = source/glslang
url = https://github.com/TeamForbiddenLLC/glslang.git
[submodule "source/extern/glslang"]
path = source/extern/glslang
url = https://github.com/KhronosGroup/glslang.git
3 changes: 1 addition & 2 deletions source/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,9 @@ set(NRI_INCLUDE_DIR ${CMAKE_HOME_DIRECTORY}/NRI/Include)

if (NOT GAME_MODULES_ONLY AND USE_GRAPHICS_NRI)
set(NRI_STATIC_LIBRARY ON)
set(IS_SUBMODULE ON)
set(NRI_ENABLE_D3D12_SUPPORT OFF)
set(NRI_ENABLE_D3D11_SUPPORT OFF)
add_subdirectory(NRI)
add_subdirectory(glslang)
endif()

# Windows specific settings
Expand Down Expand Up @@ -306,6 +304,7 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")

capitalize(QFUSION_CLIENT_NAME)
endif()
add_subdirectory(extern)

add_subdirectory(qcore)

Expand Down
11 changes: 11 additions & 0 deletions source/extern/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@

if (NOT GAME_MODULES_ONLY AND USE_GRAPHICS_NRI)
option(BUILD_EXTERNAL OFF)
option(ENABLE_SPVREMAPPER OFF)
option(ENABLE_HLSL OFF)
option(ENABLE_OPT OFF)
option(ENABLE_PCH OFF)
option(ENABLE_CTEST OFF)

add_subdirectory(glslang)
endif()
1 change: 1 addition & 0 deletions source/extern/glslang
Submodule glslang added at f754c8
1 change: 0 additions & 1 deletion source/glslang
Submodule glslang deleted from 76b52e

0 comments on commit cb05071

Please sign in to comment.