From 3ed0a214da8bfe5528f0364e5e5ca56de1a932f4 Mon Sep 17 00:00:00 2001 From: King_DuckZ Date: Fri, 25 Nov 2016 21:14:49 +0100 Subject: [PATCH] Split files in jumping into two libraries. Files in cloonelgraphics could be further split, but this should be enough for the time being. --- CMakeLists.txt | 1 + src/cloonelgraphics/CMakeLists.txt | 25 +++++++++++++++++++ src/{jumping => cloonelgraphics}/casts.hpp | 0 .../compatibility.h | 0 src/{jumping => cloonelgraphics}/inputbag.cpp | 0 src/{jumping => cloonelgraphics}/inputbag.hpp | 0 .../inputdevicetype.hpp | 0 src/{jumping => cloonelgraphics}/key.hpp | 0 .../observersmanager.hpp | 0 .../physicsfswrapper.cpp | 0 .../physicsfswrapper.hpp | 0 src/{jumping => cloonelgraphics}/sdlerror.cpp | 0 src/{jumping => cloonelgraphics}/sdlerror.hpp | 0 src/{jumping => cloonelgraphics}/sdlmain.cpp | 0 src/{jumping => cloonelgraphics}/sdlmain.hpp | 0 .../sizenotifiable.cpp | 0 .../sizenotifiable.hpp | 0 .../sizeratio.cpp | 0 .../sizeratio.hpp | 0 src/{jumping => cloonelgraphics}/texture.cpp | 0 src/{jumping => cloonelgraphics}/texture.hpp | 0 src/{jumping => cloonelgraphics}/vectypes.hpp | 0 src/jumping/CMakeLists.txt | 14 +---------- 23 files changed, 27 insertions(+), 13 deletions(-) create mode 100644 src/cloonelgraphics/CMakeLists.txt rename src/{jumping => cloonelgraphics}/casts.hpp (100%) rename src/{jumping => cloonelgraphics}/compatibility.h (100%) rename src/{jumping => cloonelgraphics}/inputbag.cpp (100%) rename src/{jumping => cloonelgraphics}/inputbag.hpp (100%) rename src/{jumping => cloonelgraphics}/inputdevicetype.hpp (100%) rename src/{jumping => cloonelgraphics}/key.hpp (100%) rename src/{jumping => cloonelgraphics}/observersmanager.hpp (100%) rename src/{jumping => cloonelgraphics}/physicsfswrapper.cpp (100%) rename src/{jumping => cloonelgraphics}/physicsfswrapper.hpp (100%) rename src/{jumping => cloonelgraphics}/sdlerror.cpp (100%) rename src/{jumping => cloonelgraphics}/sdlerror.hpp (100%) rename src/{jumping => cloonelgraphics}/sdlmain.cpp (100%) rename src/{jumping => cloonelgraphics}/sdlmain.hpp (100%) rename src/{jumping => cloonelgraphics}/sizenotifiable.cpp (100%) rename src/{jumping => cloonelgraphics}/sizenotifiable.hpp (100%) rename src/{jumping => cloonelgraphics}/sizeratio.cpp (100%) rename src/{jumping => cloonelgraphics}/sizeratio.hpp (100%) rename src/{jumping => cloonelgraphics}/texture.cpp (100%) rename src/{jumping => cloonelgraphics}/texture.hpp (100%) rename src/{jumping => cloonelgraphics}/vectypes.hpp (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index a4c164e..f570c11 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -98,6 +98,7 @@ endif(NOT PHYSFS_FOUND) add_subdirectory(src/jumping) add_subdirectory(src/clooneljump) +add_subdirectory(src/cloonelgraphics) if (BUILD_TESTING) add_subdirectory(test/unit) endif() diff --git a/src/cloonelgraphics/CMakeLists.txt b/src/cloonelgraphics/CMakeLists.txt new file mode 100644 index 0000000..d4a0c5e --- /dev/null +++ b/src/cloonelgraphics/CMakeLists.txt @@ -0,0 +1,25 @@ +project(cloonelgraphics CXX) + +add_library(${PROJECT_NAME} + texture.cpp + sdlerror.cpp + sdlmain.cpp + physicsfswrapper.cpp + sizeratio.cpp + sizenotifiable.cpp + inputbag.cpp +) + +target_link_libraries(${PROJECT_NAME} + PRIVATE ${SDL2_LIBRARIES} + PRIVATE ${PHYSFS_LIBRARY} + PRIVATE ${PNG_LIBRARIES} + PUBLIC CloonelJumpProject +) + +target_include_directories(${PROJECT_NAME} + PRIVATE ${SDL2_INCLUDE_DIR} + PRIVATE ${PNG_INCLUDE_DIRS} + PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} + PRIVATE ${PHYSFS_INCLUDE_DIR} +) diff --git a/src/jumping/casts.hpp b/src/cloonelgraphics/casts.hpp similarity index 100% rename from src/jumping/casts.hpp rename to src/cloonelgraphics/casts.hpp diff --git a/src/jumping/compatibility.h b/src/cloonelgraphics/compatibility.h similarity index 100% rename from src/jumping/compatibility.h rename to src/cloonelgraphics/compatibility.h diff --git a/src/jumping/inputbag.cpp b/src/cloonelgraphics/inputbag.cpp similarity index 100% rename from src/jumping/inputbag.cpp rename to src/cloonelgraphics/inputbag.cpp diff --git a/src/jumping/inputbag.hpp b/src/cloonelgraphics/inputbag.hpp similarity index 100% rename from src/jumping/inputbag.hpp rename to src/cloonelgraphics/inputbag.hpp diff --git a/src/jumping/inputdevicetype.hpp b/src/cloonelgraphics/inputdevicetype.hpp similarity index 100% rename from src/jumping/inputdevicetype.hpp rename to src/cloonelgraphics/inputdevicetype.hpp diff --git a/src/jumping/key.hpp b/src/cloonelgraphics/key.hpp similarity index 100% rename from src/jumping/key.hpp rename to src/cloonelgraphics/key.hpp diff --git a/src/jumping/observersmanager.hpp b/src/cloonelgraphics/observersmanager.hpp similarity index 100% rename from src/jumping/observersmanager.hpp rename to src/cloonelgraphics/observersmanager.hpp diff --git a/src/jumping/physicsfswrapper.cpp b/src/cloonelgraphics/physicsfswrapper.cpp similarity index 100% rename from src/jumping/physicsfswrapper.cpp rename to src/cloonelgraphics/physicsfswrapper.cpp diff --git a/src/jumping/physicsfswrapper.hpp b/src/cloonelgraphics/physicsfswrapper.hpp similarity index 100% rename from src/jumping/physicsfswrapper.hpp rename to src/cloonelgraphics/physicsfswrapper.hpp diff --git a/src/jumping/sdlerror.cpp b/src/cloonelgraphics/sdlerror.cpp similarity index 100% rename from src/jumping/sdlerror.cpp rename to src/cloonelgraphics/sdlerror.cpp diff --git a/src/jumping/sdlerror.hpp b/src/cloonelgraphics/sdlerror.hpp similarity index 100% rename from src/jumping/sdlerror.hpp rename to src/cloonelgraphics/sdlerror.hpp diff --git a/src/jumping/sdlmain.cpp b/src/cloonelgraphics/sdlmain.cpp similarity index 100% rename from src/jumping/sdlmain.cpp rename to src/cloonelgraphics/sdlmain.cpp diff --git a/src/jumping/sdlmain.hpp b/src/cloonelgraphics/sdlmain.hpp similarity index 100% rename from src/jumping/sdlmain.hpp rename to src/cloonelgraphics/sdlmain.hpp diff --git a/src/jumping/sizenotifiable.cpp b/src/cloonelgraphics/sizenotifiable.cpp similarity index 100% rename from src/jumping/sizenotifiable.cpp rename to src/cloonelgraphics/sizenotifiable.cpp diff --git a/src/jumping/sizenotifiable.hpp b/src/cloonelgraphics/sizenotifiable.hpp similarity index 100% rename from src/jumping/sizenotifiable.hpp rename to src/cloonelgraphics/sizenotifiable.hpp diff --git a/src/jumping/sizeratio.cpp b/src/cloonelgraphics/sizeratio.cpp similarity index 100% rename from src/jumping/sizeratio.cpp rename to src/cloonelgraphics/sizeratio.cpp diff --git a/src/jumping/sizeratio.hpp b/src/cloonelgraphics/sizeratio.hpp similarity index 100% rename from src/jumping/sizeratio.hpp rename to src/cloonelgraphics/sizeratio.hpp diff --git a/src/jumping/texture.cpp b/src/cloonelgraphics/texture.cpp similarity index 100% rename from src/jumping/texture.cpp rename to src/cloonelgraphics/texture.cpp diff --git a/src/jumping/texture.hpp b/src/cloonelgraphics/texture.hpp similarity index 100% rename from src/jumping/texture.hpp rename to src/cloonelgraphics/texture.hpp diff --git a/src/jumping/vectypes.hpp b/src/cloonelgraphics/vectypes.hpp similarity index 100% rename from src/jumping/vectypes.hpp rename to src/cloonelgraphics/vectypes.hpp diff --git a/src/jumping/CMakeLists.txt b/src/jumping/CMakeLists.txt index 3873132..ae2de8b 100644 --- a/src/jumping/CMakeLists.txt +++ b/src/jumping/CMakeLists.txt @@ -1,25 +1,18 @@ project(jumping CXX) add_library(${PROJECT_NAME} - texture.cpp - sdlerror.cpp - sdlmain.cpp gamebase.cpp character.cpp placeable.cpp - physicsfswrapper.cpp gameplayscene.cpp movers/mover.cpp movers/moveroneshot.cpp movers/moversine.cpp gameplaysceneclassic.cpp movers/moverrelative.cpp - inputbag.cpp movers/moverleftright.cpp tiledwallpaper.cpp drawable.cpp - sizeratio.cpp - sizenotifiable.cpp horzcollisionbar.cpp platform.cpp vectormath.cpp @@ -32,18 +25,13 @@ add_library(${PROJECT_NAME} ) target_link_libraries(${PROJECT_NAME} - PRIVATE ${SDL2_LIBRARIES} - PRIVATE ${PHYSFS_LIBRARY} - PRIVATE ${PNG_LIBRARIES} PUBLIC CloonelJumpProject + PUBLIC cloonelgraphics ) target_include_directories(${PROJECT_NAME} - PRIVATE ${SDL2_INCLUDE_DIR} - PRIVATE ${PNG_INCLUDE_DIRS} PRIVATE . PRIVATE movers - PRIVATE ${PHYSFS_INCLUDE_DIR} ) target_compile_definitions(${PROJECT_NAME}