From fa09e930d06a2ddae2714b4b1e3a3c65dcede196 Mon Sep 17 00:00:00 2001 From: rjindael Date: Tue, 11 Jul 2023 23:48:51 -0700 Subject: [PATCH] remove cglm (use OgreMath) --- CMakeLists.txt | 1 - Projects/Engine/CMakeLists.txt | 2 +- Projects/Engine/Header/Rendering/Adorn.hpp | 2 -- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e2a0c97..84953c0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,7 +12,6 @@ set(DEPENDENCIES_DIR ${CMAKE_SOURCE_DIR}/Dependencies) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-attributes -Wno-return-type") # Ignore warnings generated by Luau and Qt find_package(Boost REQUIRED) -find_package(cglm REQUIRED CONFIG) find_package(OGRE REQUIRED COMPONENTS Bites CONFIG) add_subdirectory(Projects) \ No newline at end of file diff --git a/Projects/Engine/CMakeLists.txt b/Projects/Engine/CMakeLists.txt index 70059e6..697ccaf 100644 --- a/Projects/Engine/CMakeLists.txt +++ b/Projects/Engine/CMakeLists.txt @@ -29,7 +29,7 @@ add_library(Engine STATIC ) target_include_directories(Engine PUBLIC ${BOOST_INCLUDE_DIRS} Header/) -target_link_libraries(Engine PUBLIC ${BOOST_LIBRARIES} OgreBites cglm Luau.Analysis Luau.Ast Luau.Compiler Luau.VM) +target_link_libraries(Engine PUBLIC ${BOOST_LIBRARIES} OgreBites Luau.Analysis Luau.Ast Luau.Compiler Luau.VM) file(COPY ${OGRE_CONFIG_DIR}/plugins.cfg ${OGRE_CONFIG_DIR}/resources.cfg DESTINATION ${CMAKE_BINARY_DIR}) diff --git a/Projects/Engine/Header/Rendering/Adorn.hpp b/Projects/Engine/Header/Rendering/Adorn.hpp index e83f9ac..071ae97 100644 --- a/Projects/Engine/Header/Rendering/Adorn.hpp +++ b/Projects/Engine/Header/Rendering/Adorn.hpp @@ -2,8 +2,6 @@ #include -#include - #include namespace RNR