From 04a02c1865822cdd8d7efb8f059ef73343e78fde Mon Sep 17 00:00:00 2001
From: JackCarterSmith <jackcartersmith@jcsmith.fr>
Date: Sun, 10 Jan 2021 03:03:22 +0100
Subject: [PATCH] CMake fix #3

---
 CMakeLists.txt           | 24 ++++++++++++------------
 makefile => Makefile.old |  0
 src/IAEngine.h           |  2 +-
 src/arenaEngine.h        |  4 ++--
 src/arenaGUI.h           |  4 ++--
 src/fileHandler.c        |  3 ---
 src/fileHandler.h        |  2 ++
 src/main.c               | 10 +++++-----
 src/menuGUI.c            |  2 +-
 src/menuGUI.h            |  2 ++
 10 files changed, 27 insertions(+), 26 deletions(-)
 rename makefile => Makefile.old (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3c50426..ac933ff 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,27 +2,19 @@
 
 # Written by JackCarterSmith, 2021
 # This code is released under the AST license.
-set(CMAKE_VERBOSE_MAKEFILE ON)
-list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/sdl2)
 
-cmake_minimum_required(VERSION 3.1)
-cmake_policy(VERSION 3.1)
+cmake_minimum_required(VERSION 3.5.1)
 
 # define project
+list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/sdl2)
 project(AST VERSION 1.0.0 DESCRIPTION "Arena Survival Tournament" LANGUAGES C)
 set(AST_NAME AST-${PROJECT_VERSION})
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/config.h.in ${CMAKE_CURRENT_SOURCE_DIR}/src/config.h @ONLY)
 
+include(FindPkgConfig)
 include(CheckIncludeFile)
 include(CheckCSourceCompiles)
 
-# needed packages
-
-find_package(SDL2 REQUIRED)
-include_directories(${SDL2_INCLUDE_DIR})
-find_package(SDL2_image REQUIRED)
-include_directories(${SDL2_IMAGE_INCLUDE_DIR})
-
 # define src/headers files
 
 FILE(GLOB AST_SCRS src/*.c)
@@ -42,7 +34,15 @@ if(MSVC)
 	set_target_properties(AST PROPERTIES PREFIX "lib")
 	set_target_properties(AST PROPERTIES IMPORT_PREFIX "lib")
 endif()
-target_link_libraries(AST ${SDL2_LIBRARIES} ${SDL2_IMAGE_LIBRARIES})
+
+target_include_directories(${PROJECT_NAME} PRIVATE include)
+
+# Find SDL2, SDL2_image and SDL2_gfx libraries
+find_package(SDL2 REQUIRED)
+find_package(SDL2_image REQUIRED)
+
+# Link SDL2::Main, SDL2::Image and SDL2::GFX to our project
+target_link_libraries(${PROJECT_NAME} SDL2::Main SDL2::Image)
 
 # install executable
 
diff --git a/makefile b/Makefile.old
similarity index 100%
rename from makefile
rename to Makefile.old
diff --git a/src/IAEngine.h b/src/IAEngine.h
index 5dc69d0..b458332 100644
--- a/src/IAEngine.h
+++ b/src/IAEngine.h
@@ -1,6 +1,6 @@
 #include "main.h"
 #include "arenaEngine.h"
-#include <SDL2/SDL.h>
+#include <SDL.h>
 
 #ifndef IAENGINE_H_
 #define IAENGINE_H_
diff --git a/src/arenaEngine.h b/src/arenaEngine.h
index 0f25154..e2c88e8 100644
--- a/src/arenaEngine.h
+++ b/src/arenaEngine.h
@@ -1,6 +1,6 @@
 #include "main.h"
-#include <SDL2/SDL.h>
-#include <SDL2/SDL_image.h>
+#include <SDL.h>
+#include <SDL_image.h>
 #include "fileHandler.h"
 #include "logHelper.h"
 
diff --git a/src/arenaGUI.h b/src/arenaGUI.h
index 8f53145..56e67aa 100644
--- a/src/arenaGUI.h
+++ b/src/arenaGUI.h
@@ -2,8 +2,8 @@
 #include "arenaEngine.h"
 #include "logHelper.h"
 #include "IAEngine.h"
-#include <SDL2/SDL.h>
-#include <SDL2/SDL_image.h>
+#include <SDL.h>
+#include <SDL_image.h>
 //#include <SDL2/SDL_ttf.h>
 
 #ifndef ARENAGUI_H_
diff --git a/src/fileHandler.c b/src/fileHandler.c
index 55cbc25..aa33642 100644
--- a/src/fileHandler.c
+++ b/src/fileHandler.c
@@ -1,8 +1,5 @@
 #include <stdlib.h>
 #include <stdio.h>
-#include "SDL2/SDL.h"
-#include "SDL2/SDL_image.h"
-
 #include "fileHandler.h"
 
 /*
diff --git a/src/fileHandler.h b/src/fileHandler.h
index 2eb23d5..63d44d7 100644
--- a/src/fileHandler.h
+++ b/src/fileHandler.h
@@ -1,4 +1,6 @@
 #include "main.h"
+#include <SDL.h>
+#include <SDL_image.h>
 
 #ifndef FILEHANDLER_H_
 #define FILEHANDLER_H_
diff --git a/src/main.c b/src/main.c
index 6782413..6f98dc6 100644
--- a/src/main.c
+++ b/src/main.c
@@ -3,11 +3,11 @@
 #include <stdlib.h>
 #include <time.h>
 #include "logHelper.h"
-#include <SDL2/SDL.h>
-#include <SDL2/SDL_image.h>
-//#include <SDL2/SDL_ttf.h>
-//#include <SDL2/SDL_thread.h>
-//#include <SDL2/SDL_mutex.h>
+#include <SDL.h>
+#include <SDL_image.h>
+//#include <SDL_ttf.h>
+//#include <SDL_thread.h>
+//#include <SDL_mutex.h>
 #include "arenaEngine.h"
 #include "arenaGUI.h"
 #include "IAEngine.h"
diff --git a/src/menuGUI.c b/src/menuGUI.c
index f40249e..97013cf 100644
--- a/src/menuGUI.c
+++ b/src/menuGUI.c
@@ -1,6 +1,6 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <SDL2/SDL.h>
+#include "menuGUI.h"
 
 int createGameMenuWindows() {
 	if (SDL_Init(SDL_INIT_VIDEO) != 0) {
diff --git a/src/menuGUI.h b/src/menuGUI.h
index 2ac4eaa..fe55a7d 100644
--- a/src/menuGUI.h
+++ b/src/menuGUI.h
@@ -1,3 +1,5 @@
+#include <SDL.h>
+
 #ifndef MENUGUI_H_
 #define MENUGUI_H_