diff options
| -rw-r--r-- | CMakeLists.txt | 15 | ||||
| -rw-r--r-- | include/YAGE/sprite.h | 5 | ||||
| -rw-r--r-- | lib/CMakeLists.txt | 21 | ||||
| -rw-r--r-- | src/sprite.cpp | 5 |
4 files changed, 32 insertions, 14 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 5bc84149..aad9ab05 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -49,20 +49,7 @@ set(YAGE_SOURCES ${PROJECT_SOURCE_DIR}/src/texturecache.cpp ${PROJECT_SOURCE_DIR}/src/window.cpp) -# Initializing google test -# prevents overriding the parent project's compiler/linter settings on windows -set(gtest_force_shared_crt ON CACHE BOOL "" FORCE) - -# Add googletest directly to our build. This defines -# the gtest and gtest_main targets. -add_subdirectory(${PROJECT_SOURCE_DIR}/googletest) - -# The gtest/gtest_main targets carry header search path -# dependencies automatically when using CMake 2.8.11 or -# later. Otherwise we have to add them here ourselves. -if (CMAKE_VERSION VERSION_LESS 2.8.11) - include_directories("${gtest_SOURCE_DIR}/include") -endif() +add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/lib) # find libraries find_package(OpenGL REQUIRED) diff --git a/include/YAGE/sprite.h b/include/YAGE/sprite.h index 0f5a0b8a..e8f88795 100644 --- a/include/YAGE/sprite.h +++ b/include/YAGE/sprite.h @@ -6,6 +6,11 @@ * ---------------------------------------------------------------------------- */ +/** @file @deprecated + * + * Use SpriteBatch instead + */ + #ifndef SPRITE_H #define SPRITE_H diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt new file mode 100644 index 00000000..1a413c1e --- /dev/null +++ b/lib/CMakeLists.txt @@ -0,0 +1,21 @@ +# ---------------------------------------------------------------------------- +# CMakeLists.txt +# +# Copyright (c) 2017 Yann Herklotz Grave <ymherklotz@gmail.com> -- MIT License +# See file LICENSE for more details +# ---------------------------------------------------------------------------- + +# Initializing google test +# prevents overriding the parent project's compiler/linter settings on windows +set(gtest_force_shared_crt ON CACHE BOOL "" FORCE) + +# Add googletest directly to our build. This defines +# the gtest and gtest_main targets. +add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/googletest) + +# The gtest/gtest_main targets carry header search path +# dependencies automatically when using CMake 2.8.11 or +# later. Otherwise we have to add them here ourselves. +if (CMAKE_VERSION VERSION_LESS 2.8.11) + include_directories("${gtest_SOURCE_DIR}/include") +endif() diff --git a/src/sprite.cpp b/src/sprite.cpp index 68e08e5d..debffdc5 100644 --- a/src/sprite.cpp +++ b/src/sprite.cpp @@ -6,6 +6,11 @@ * ---------------------------------------------------------------------------- */ +/** @file @deprecated + * + * Use SpriteBatch instead + */ + #include <YAGE/sprite.h> #include <YAGE/resourcemanager.h> #include <YAGE/vertex.h> |