diff --git a/.gitmodules b/.gitmodules index c8821a5d7..ff1efd421 100644 --- a/.gitmodules +++ b/.gitmodules @@ -63,6 +63,6 @@ url = ../freetype2 branch = master [submodule "zeus"] - path = specter/zeus + path = zeus url = ../zeus.git branch = master diff --git a/CMakeLists.txt b/CMakeLists.txt index 7cbea5661..f2b0160b2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -374,6 +374,7 @@ include(hecl/ApplicationTools.cmake) add_subdirectory(specter/shaders) add_subdirectory(Shaders) add_subdirectory(hecl) +add_subdirectory(zeus) target_include_directories(hecl-full PRIVATE ${CMAKE_SOURCE_DIR}) target_include_directories(hecl-light PRIVATE ${CMAKE_SOURCE_DIR}) 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.hlsl.cpp CModelShaders.vert.hlsl.cpp CModelShaders.frag.hlsl.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) if(NOT TARGET atdna) diff --git a/specter/CMakeLists.txt b/specter/CMakeLists.txt index 276fff7b8..307ee50e6 100644 --- a/specter/CMakeLists.txt +++ b/specter/CMakeLists.txt @@ -3,9 +3,6 @@ if (NOT MSVC) target_compile_options(freetype PRIVATE -Wno-implicit-fallthrough) endif() -add_subdirectory(zeus) -set(ZEUS_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/zeus/include) - add_subdirectory(resources/fonts) add_library(specter diff --git a/specter/zeus b/zeus similarity index 100% rename from specter/zeus rename to zeus