Move zeus to root

This commit is contained in:
Luke Street 2021-04-06 13:19:02 -04:00
parent 7469f6aed7
commit be0319820c
4 changed files with 3 additions and 4 deletions

2
.gitmodules vendored
View File

@ -63,6 +63,6 @@
url = ../freetype2 url = ../freetype2
branch = master branch = master
[submodule "zeus"] [submodule "zeus"]
path = specter/zeus path = zeus
url = ../zeus.git url = ../zeus.git
branch = master branch = master

View File

@ -374,6 +374,7 @@ include(hecl/ApplicationTools.cmake)
add_subdirectory(specter/shaders) add_subdirectory(specter/shaders)
add_subdirectory(Shaders) add_subdirectory(Shaders)
add_subdirectory(hecl) add_subdirectory(hecl)
add_subdirectory(zeus)
target_include_directories(hecl-full PRIVATE ${CMAKE_SOURCE_DIR}) target_include_directories(hecl-full PRIVATE ${CMAKE_SOURCE_DIR})
target_include_directories(hecl-light PRIVATE ${CMAKE_SOURCE_DIR}) target_include_directories(hecl-light PRIVATE ${CMAKE_SOURCE_DIR})
target_link_libraries(hecl-full PRIVATE zeus nod) target_link_libraries(hecl-full PRIVATE zeus nod)
@ -397,6 +398,7 @@ add_library(CModelShaders
CModelShaders.common.glsl.cpp CModelShaders.vert.glsl.cpp CModelShaders.frag.glsl.cpp CModelShaders.common.glsl.cpp CModelShaders.vert.glsl.cpp CModelShaders.frag.glsl.cpp
CModelShaders.common.hlsl.cpp CModelShaders.vert.hlsl.cpp CModelShaders.frag.hlsl.cpp CModelShaders.common.hlsl.cpp CModelShaders.vert.hlsl.cpp CModelShaders.frag.hlsl.cpp
CModelShaders.common.metal.cpp CModelShaders.vert.metal.cpp CModelShaders.frag.metal.cpp) CModelShaders.common.metal.cpp CModelShaders.vert.metal.cpp CModelShaders.frag.metal.cpp)
target_link_libraries(CModelShaders PUBLIC zeus)
target_link_libraries(shader_CModelShaders PUBLIC CModelShaders) target_link_libraries(shader_CModelShaders PUBLIC CModelShaders)
if(NOT TARGET atdna) if(NOT TARGET atdna)

View File

@ -3,9 +3,6 @@ if (NOT MSVC)
target_compile_options(freetype PRIVATE -Wno-implicit-fallthrough) target_compile_options(freetype PRIVATE -Wno-implicit-fallthrough)
endif() endif()
add_subdirectory(zeus)
set(ZEUS_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/zeus/include)
add_subdirectory(resources/fonts) add_subdirectory(resources/fonts)
add_library(specter add_library(specter

View File