From aca2af66f6fc501e14282139ac5653f0dd26adb1 Mon Sep 17 00:00:00 2001 From: Jack Andersen Date: Tue, 24 Nov 2015 16:15:47 -1000 Subject: [PATCH] Updated submodules --- .gitmodules | 3 --- CMakeLists.txt | 3 +-- MathLib | 1 - hecl | 2 +- libSpecter | 2 +- 5 files changed, 3 insertions(+), 8 deletions(-) delete mode 160000 MathLib diff --git a/.gitmodules b/.gitmodules index 5044f70dc..cef347526 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,9 +4,6 @@ [submodule "hecl"] path = hecl url = https://github.com/AxioDL/hecl.git -[submodule "MathLib"] - path = MathLib - url = https://github.com/AxioDL/MathLib.git [submodule "libSpecter"] path = libSpecter url = https://github.com/AxioDL/libSpecter.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 4c65dcb46..6f5023e48 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -38,8 +38,7 @@ set(SPECTER_INCLUDE_DIR libSpecter/include libSpecter/freetype2/include) add_subdirectory(NODLib) set(NODLIB_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/NODLib/include) add_definitions(-DZE_ATHENA_TYPES=1) -add_subdirectory(MathLib) -set(MATHLIB_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/MathLib/include) +set(MATHLIB_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/libSpecter/MathLib/include) include_directories(${ATHENA_INCLUDE_DIR} ${LOG_VISOR_INCLUDE_DIR} ${HECL_INCLUDE_DIR} ${NODLIB_INCLUDE_DIR} ${MATHLIB_INCLUDE_DIR} ${BOO_INCLUDE_DIR} ${SPECTER_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}) diff --git a/MathLib b/MathLib deleted file mode 160000 index 116afa6fc..000000000 --- a/MathLib +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 116afa6fc32d9423e4510bae1f3b17977350d66e diff --git a/hecl b/hecl index 82b624ee8..e6b2da35b 160000 --- a/hecl +++ b/hecl @@ -1 +1 @@ -Subproject commit 82b624ee8587f3e197a89573ef666e3e0ed61fe6 +Subproject commit e6b2da35bd713ce87cff07a1ddc16364e9fc3d6b diff --git a/libSpecter b/libSpecter index c3993c3de..5439312ef 160000 --- a/libSpecter +++ b/libSpecter @@ -1 +1 @@ -Subproject commit c3993c3de779c9a1f29db6978aa27b3dd4b095d6 +Subproject commit 5439312ef6ed189206080b7282fc91dcdaa2a1d8