From 7a1c31375d849f1387f8b26d2c4da465ced78d26 Mon Sep 17 00:00:00 2001 From: SeanOMik Date: Thu, 2 Jul 2020 22:53:28 -0500 Subject: [PATCH] Move headers into `simpleengine` directory. --- CMakeLists.txt | 10 +++++----- examples/first/CMakeLists.txt | 4 ++-- examples/first/src/main.cpp | 6 +++--- include/{gameengine => simpleengine}/entity.h | 0 include/{gameengine => simpleengine}/event.h | 0 include/{gameengine => simpleengine}/game.h | 0 6 files changed, 10 insertions(+), 10 deletions(-) rename include/{gameengine => simpleengine}/entity.h (100%) rename include/{gameengine => simpleengine}/event.h (100%) rename include/{gameengine => simpleengine}/game.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5c6c773..b194354 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required (VERSION 3.6) set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMake;${CMAKE_MODULE_PATH}") -project(GameEngine) +project(SimpleEngine) # Add some CMake options: option(BUILD_EXAMPLES "Build example projects" ON) @@ -14,13 +14,13 @@ find_package(SFML REQUIRED COMPONENTS system main window graphics audio) # Link sources file(GLOB_RECURSE source_list src/*.cpp) -add_library(gameengine STATIC ${source_list}) +add_library(simpleengine STATIC ${source_list}) # Link headers -target_include_directories(gameengine PUBLIC include PRIVATE include/gameengine) +target_include_directories(simpleengine PUBLIC include PRIVATE include/simpleengine) # Link dependencies -target_link_libraries(gameengine PUBLIC sfml-system sfml-main sfml-window OpenGL sfml-network sfml-graphics Freetype OpenAL Vorbis FLAC sfml-audio) +target_link_libraries(simpleengine PUBLIC sfml-system sfml-main sfml-window OpenGL sfml-network sfml-graphics Freetype OpenAL Vorbis FLAC sfml-audio) # Add examples as a target if the user has them enabled if (BUILD_EXAMPLES) @@ -28,4 +28,4 @@ if (BUILD_EXAMPLES) endif() # Set C++ standard to C++17 -set_target_properties(gameengine PROPERTIES CXX_STANDARD 17 CXX_EXTENSIONS OFF) \ No newline at end of file +set_target_properties(simpleengine PROPERTIES CXX_STANDARD 17 CXX_EXTENSIONS OFF) \ No newline at end of file diff --git a/examples/first/CMakeLists.txt b/examples/first/CMakeLists.txt index bf4abcd..6c2cb0f 100644 --- a/examples/first/CMakeLists.txt +++ b/examples/first/CMakeLists.txt @@ -8,8 +8,8 @@ file(GLOB_RECURSE source_list src/*.cpp) target_sources(first_example PRIVATE ${source_list}) target_include_directories(first_example PUBLIC include) -# Link gameengine -target_link_libraries(first_example PUBLIC gameengine) +# Link simpleengine +target_link_libraries(first_example PUBLIC simpleengine) # Set standard to C++17 set_target_properties(first_example PROPERTIES CXX_STANDARD 17 CXX_EXTENSIONS OFF) \ No newline at end of file diff --git a/examples/first/src/main.cpp b/examples/first/src/main.cpp index afe30ea..efe1374 100644 --- a/examples/first/src/main.cpp +++ b/examples/first/src/main.cpp @@ -6,9 +6,9 @@ #include -#include -#include -#include +#include +#include +#include class PlayerEntity : public simpleengine::Entity { private: diff --git a/include/gameengine/entity.h b/include/simpleengine/entity.h similarity index 100% rename from include/gameengine/entity.h rename to include/simpleengine/entity.h diff --git a/include/gameengine/event.h b/include/simpleengine/event.h similarity index 100% rename from include/gameengine/event.h rename to include/simpleengine/event.h diff --git a/include/gameengine/game.h b/include/simpleengine/game.h similarity index 100% rename from include/gameengine/game.h rename to include/simpleengine/game.h