Configure cmake (#8)

* Configure cmake * Make it parallel * Update readme
bilalkah · Aug 28, 2024 · 3a9297c · 3a9297c
1 parent cfeddd5
commit 3a9297c
Show file tree

Hide file tree

Showing 26 changed files with 55 additions and 183 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,26 +1,32 @@
 cmake_minimum_required(VERSION 3.5)  
-project(wolfenstein VERSION 1.0 LANGUAGES CXX)
+project(wolfenstein VERSION 1.0 LANGUAGES CXX C)
 add_definitions("-Wall" "-g")
+add_definitions("-Wno-dev")
 
+# Set the C++ standard to C++20
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
+# Set the output directory for the build executables and libraries
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
+
+# Set the executable name
 set(EXECUTABLE wolfenstein)
 set(PROJECT WOLFENSTEIN)
-set(RESOURCE_DIR ${PROJECT_SOURCE_DIR}/assets/)
 
+# Set the resource directory
+set(RESOURCE_DIR ${PROJECT_SOURCE_DIR}/assets/)
 add_definitions(
     -DRESOURCE_DIR="${RESOURCE_DIR}"
 )
-# define debug mode
-set(CMAKE_BUILD_TYPE Debug)
-# set(CMAKE_BUILD_TYPE Release)
-
 
+# Find Git
 find_package(Git QUIET)
+find_package(SDL2 REQUIRED)
 
 if(GIT_FOUND AND EXISTS "${PROJECT_SOURCE_DIR}/.git")
-# Update submodules as needed
+# Update submodules if any
     option(GIT_SUBMODULE "Check submodules during build" ON)
     if(GIT_SUBMODULE)
         message(STATUS "Submodule update")
@@ -41,7 +47,7 @@ if(NOT EXISTS "${PROJECT_SOURCE_DIR}/third-party/path-planning/CMakeLists.txt")
     message(FATAL_ERROR "The submodules were not downloaded! GIT_SUBMODULE was turned off or failed. Please update submodules and try again.")
 endif()
 
-# internal libraries
+# internal libraries/modules
 add_subdirectory(app)
 add_subdirectory(src/Animation)
 add_subdirectory(src/Camera)
@@ -57,27 +63,6 @@ add_subdirectory(src/TextureManager)
 add_subdirectory(src/TimeManager)
 add_subdirectory(src/Utility)
 
-# external libraries
+# external libraries/modules
 add_subdirectory(third-party/uuid_v4)
 add_subdirectory(third-party/path-planning)
-
-find_package(SDL2 REQUIRED)
-
-include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${PROJECT_SOURCE_DIR}
-    ${PROJECT_SOURCE_DIR}/third-party
-    ${SDL2_INCLUDE_DIRS}
-)
-
-link_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${PROJECT_SOURCE_DIR}
-    ${PROJECT_SOURCE_DIR}/third-party
-)
-set(LIBRARIES
-    ${SDL2_LIBRARIES}
-    SDL2_ttf
-    SDL2_image
-)
-
diff --git a/README.md b/README.md
@@ -1,6 +1,14 @@
 # Project-Wolfenstein
 
-## Installing dependencies
+## Views from the game
+
+![](images/screenshot1.png)
+![](images/screenshot2.png)
+![](images/screenshot3.png)
+![](images/minimap.png)
+
+## Install dependencies and build
 ```batch 
-bash install_deps.sh
+./scripts/install_deps.sh
+./scripts/compile.sh
 ```
diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
@@ -1,26 +1,6 @@
-include_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${PROJECT_SOURCE_DIR}
-    ${PROJECT_SOURCE_DIR}/include
-    ${SDL2_INCLUDE_DIRS}
-)
-
-link_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${PROJECT_SOURCE_DIR}
-    ${PROJECT_SOURCE_DIR}/include
-    ${SDL2_INCLUDE_DIRS}
-)
-set(LIBRARIES
-    ${SDL2_LIBRARIES}
-    SDL2_ttf
-    SDL2_image
-)
-
 add_executable(${EXECUTABLE} main.cpp)
 target_compile_definitions(${EXECUTABLE} PRIVATE DEBUG=1)
 target_link_libraries(
     ${EXECUTABLE} 
-    ${LIBRARIES}
     game
-)
+)
diff --git a/app/main.cpp b/app/main.cpp
@@ -9,7 +9,7 @@
  *
  */
 
-#include <Core/game.h>
+#include "Core/game.h"
 
 int main() {
 	using namespace wolfenstein;

diff --git a/images/minimap.png b/images/minimap.png
diff --git a/images/screenshot1.png b/images/screenshot1.png
diff --git a/images/screenshot2.png b/images/screenshot2.png
diff --git a/images/screenshot3.png b/images/screenshot3.png
diff --git a/scripts/compile.sh b/scripts/compile.sh
@@ -1,2 +1,2 @@
-cmake -S . -B build
-cmake --build build
+cmake -S . -B build -DCMAKE_BUILD_TYPE=Release
+cmake --build build --config Release --parallel 8
diff --git a/scripts/install_deps.sh b/scripts/install_deps.sh
diff --git a/src/Animation/CMakeLists.txt b/src/Animation/CMakeLists.txt
@@ -1,16 +1,9 @@
-link_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR}/include
-)
-
 add_library(
     animation
     STATIC
     src/time_based_single_animation.cpp
     src/walk_animation.cpp
 )
-
 target_include_directories(animation PUBLIC
-    ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}/include
 )
diff --git a/src/Camera/CMakeLists.txt b/src/Camera/CMakeLists.txt
@@ -1,37 +1,26 @@
-link_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR}/include
-    ${PROJECT_SOURCE_DIR}
-)
-
-# Ray library
 add_library(
     ray
     STATIC
     src/ray.cpp
 )
 target_include_directories(ray PUBLIC
-    ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}/include
-    ${PROJECT_SOURCE_DIR}
 )
 target_link_libraries(
     ray
     PUBLIC
     vector
 )
 
-# camera library
+
 add_library(
     camera
     STATIC
     src/camera.cpp
     src/raycaster.cpp
 )
 target_include_directories(camera PUBLIC
-    ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}/include
-    ${PROJECT_SOURCE_DIR}
 )
 target_link_libraries(
     camera

diff --git a/src/Characters/CMakeLists.txt b/src/Characters/CMakeLists.txt
@@ -4,23 +4,16 @@ add_library(
     src/player.cpp
     src/enemy.cpp
 )
-
 target_include_directories(character PUBLIC
-    ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}/include
 )
-
-target_link_directories(character PUBLIC
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR}/include
-)
-
 target_link_libraries(
     character
     PUBLIC
     game_object
     vector
     collision_manager
     animation
+    SDL2
 )
 
diff --git a/src/CollisionManager/CMakeLists.txt b/src/CollisionManager/CMakeLists.txt
@@ -1,23 +1,15 @@
-link_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR}/include
-)
-
 add_library(
     collision_manager
     STATIC
     src/collision_manager.cpp
 )
-
 target_include_directories(collision_manager PUBLIC
-    ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}/include
 )
-
 target_link_libraries(
     collision_manager
     PUBLIC
     map
     vector
     game_object
-)
+)
diff --git a/src/Core/CMakeLists.txt b/src/Core/CMakeLists.txt
@@ -1,20 +1,11 @@
-link_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR}/include
-)
-
-
 add_library(
     game
     STATIC
     src/game.cpp
 )
-
 target_include_directories(game PUBLIC
-    ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}/include
 )
-
 target_link_libraries(
     game
     PUBLIC
@@ -30,4 +21,6 @@ target_link_libraries(
     texture_manager
     navigation_manager
     SDL2
-)
+    SDL2_image
+    SDL2_ttf
+)
diff --git a/src/GameObjects/CMakeLists.txt b/src/GameObjects/CMakeLists.txt
@@ -1,27 +1,16 @@
-link_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR}/include
-    ${PROJECT_SOURCE_DIR}
-)
-
 add_library(
     game_object
     STATIC
     src/static_object.cpp
     src/dynamic_object.cpp
 )
-
 target_include_directories(game_object PUBLIC
-    ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}/include
-    ${PROJECT_SOURCE_DIR}
 )
-
 target_link_libraries(
     game_object
     PUBLIC
     vector
-    character
     uuid_generator
     animation
 )
diff --git a/src/GameObjects/include/GameObjects/dynamic_object.h b/src/GameObjects/include/GameObjects/dynamic_object.h
@@ -12,9 +12,8 @@
 #ifndef GAME_OBJECTS_INCLUDE_DYNAMIC_OBJECT_H
 #define GAME_OBJECTS_INCLUDE_DYNAMIC_OBJECT_H
 
-#include "Animation/time_based_single_animation.h"
+#include "Animation/animation.h"
 #include "GameObjects/game_object.h"
-#include "Utility/uuid_generator.h"
 #include <memory>
 
 namespace wolfenstein {

diff --git a/src/GameObjects/include/GameObjects/static_object.h b/src/GameObjects/include/GameObjects/static_object.h
@@ -12,7 +12,6 @@
 #ifndef GAME_OBJECTS_INCLUDE_STATIC_OBJECT_H
 #define GAME_OBJECTS_INCLUDE_STATIC_OBJECT_H
 
-#include "Characters/character.h"
 #include "GameObjects/game_object.h"
 #include "Math/vector.h"
 

diff --git a/src/GameObjects/src/static_object.cpp b/src/GameObjects/src/static_object.cpp
@@ -1,5 +1,4 @@
 #include "GameObjects/static_object.h"
-#include "GameObjects/game_object.h"
 #include "Utility/uuid_generator.h"
 
 namespace wolfenstein {

diff --git a/src/Graphics/CMakeLists.txt b/src/Graphics/CMakeLists.txt
@@ -1,19 +1,11 @@
-link_directories(
-    ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR}/include
-)
-
 add_library(
     scene
     STATIC
     src/scene.cpp
 )
-
 target_include_directories(scene PUBLIC
-    ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}/include
 )
-
 target_link_libraries(
     scene
     PUBLIC
@@ -27,16 +19,17 @@ add_library(
     STATIC
     src/renderer.cpp
 )
-
 target_include_directories(renderer PUBLIC
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_CURRENT_SOURCE_DIR}/include
 )
-
 target_link_libraries(
     renderer
     PUBLIC
     camera
     texture_manager
     navigation_manager
-)
+    SDL2
+    SDL2_image
+    SDL2_ttf
+)