diff --git a/CMakeLists.txt b/CMakeLists.txt index f17c74e5..3fad7b28 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -57,7 +57,7 @@ set(SOURCE_FILES MobileGL/MG_State/GLState/TextureState/TextureObject.cpp MobileGL/MG_State/GLState/TextureState/TextureUnit.cpp MobileGL/MG_State/GLState/TextureState/TextureState.cpp - ) +) add_library(${CMAKE_PROJECT_NAME} SHARED ${SOURCE_FILES} diff --git a/MobileGL/MG_State/GLState/TextureState/TextureState.h b/MobileGL/MG_State/GLState/TextureState/TextureState.h index 0d143113..33264659 100644 --- a/MobileGL/MG_State/GLState/TextureState/TextureState.h +++ b/MobileGL/MG_State/GLState/TextureState/TextureState.h @@ -8,7 +8,6 @@ namespace MobileGL { namespace MG_State { namespace GLState { - class TextureState { public: static constexpr int MAX_TEXTURE_IMAGE_UNITS = 32; @@ -32,4 +31,4 @@ namespace MobileGL { }; } // namespace GLState } // namespace MG_State -} // namespace MobileGL \ No newline at end of file +} // namespace MobileGL diff --git a/MobileGL/MG_Test/Buffer/CMakeLists.txt b/MobileGL/MG_Test/Buffer/CMakeLists.txt index 7fd71009..957730c4 100644 --- a/MobileGL/MG_Test/Buffer/CMakeLists.txt +++ b/MobileGL/MG_Test/Buffer/CMakeLists.txt @@ -9,6 +9,9 @@ add_executable( ${MGL_ROOT}/MobileGL/MG_State/GLState/BufferState/BufferObject.cpp ${MGL_ROOT}/MobileGL/MG_State/GLState/VertexArrayState/VertexArrayObject.cpp ${MGL_ROOT}/MobileGL/MG_State/GLState/VertexArrayState/VertexArrayState.cpp + ${MGL_ROOT}/MobileGL/MG_State/GLState/TextureState/TextureObject.cpp + ${MGL_ROOT}/MobileGL/MG_State/GLState/TextureState/TextureUnit.cpp + ${MGL_ROOT}/MobileGL/MG_State/GLState/TextureState/TextureState.cpp ${MGL_ROOT}/MobileGL/MG_State/GLState/ErrorState/Error.cpp ${MGL_ROOT}/MobileGL/MG_Impl/GLImpl/Buffer/GL_Buffer.cpp ${MGL_ROOT}/MobileGL/MG_Impl/GLImpl/Getter/GL_Getter.cpp @@ -40,4 +43,4 @@ target_link_libraries( ) include(GoogleTest) -gtest_discover_tests(BufferTest) \ No newline at end of file +gtest_discover_tests(BufferTest) diff --git a/MobileGL/MG_Test/VertexArray/CMakeLists.txt b/MobileGL/MG_Test/VertexArray/CMakeLists.txt index 529fb40e..ff4b9e5c 100644 --- a/MobileGL/MG_Test/VertexArray/CMakeLists.txt +++ b/MobileGL/MG_Test/VertexArray/CMakeLists.txt @@ -9,6 +9,9 @@ add_executable( ${MGL_ROOT}/MobileGL/MG_State/GLState/BufferState/BufferObject.cpp ${MGL_ROOT}/MobileGL/MG_State/GLState/VertexArrayState/VertexArrayObject.cpp ${MGL_ROOT}/MobileGL/MG_State/GLState/VertexArrayState/VertexArrayState.cpp + ${MGL_ROOT}/MobileGL/MG_State/GLState/TextureState/TextureObject.cpp + ${MGL_ROOT}/MobileGL/MG_State/GLState/TextureState/TextureUnit.cpp + ${MGL_ROOT}/MobileGL/MG_State/GLState/TextureState/TextureState.cpp ${MGL_ROOT}/MobileGL/MG_State/GLState/ErrorState/Error.cpp ${MGL_ROOT}/MobileGL/MG_Impl/GLImpl/Buffer/GL_Buffer.cpp ${MGL_ROOT}/MobileGL/MG_Impl/GLImpl/Getter/GL_Getter.cpp @@ -40,4 +43,4 @@ target_link_libraries( ) include(GoogleTest) -gtest_discover_tests(VertexArrayTest) \ No newline at end of file +gtest_discover_tests(VertexArrayTest)