diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/Model/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | src/main.cpp | 4 |
5 files changed, 9 insertions, 10 deletions
@@ -6,3 +6,4 @@ Makefile CMakeCache.txt *.app 2P11 +clear.sh diff --git a/CMakeLists.txt b/CMakeLists.txt index c822dc4..4ab2346 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,5 +14,5 @@ set(VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_REV}") cmake_minimum_required(VERSION 2.6) #Add source directory -add_subdirectory(src) +add_subdirectory(./src) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a946644..89e46d5 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -12,6 +12,6 @@ set_property(GLOBAL PROPERTY SFML_INCLUDE_DIR "${SFML_INCLUDE_DIR}") #Include "Includes" and "Libraries" include_directories(${SFML_INCLUDE_DIR}) -target_link_libraries(2P11 ${SFML_LIBRARIES}) +target_link_libraries(2P11 ${SFML_LIBRARIES} Model) add_subdirectory(./Model) diff --git a/src/Model/CMakeLists.txt b/src/Model/CMakeLists.txt index c9cfb6e..c685c7a 100644 --- a/src/Model/CMakeLists.txt +++ b/src/Model/CMakeLists.txt @@ -1,8 +1,2 @@ -#Retrieve crypto++ libraries -get_property(SFML_LIBRARIES GLOBAL PROPERTY SFML_LIBRARIES) - -#Make CryptClass lib -add_library(Model ./Cell.cpp ./Game.cpp ./Grid.cpp) - -#Add crypto++ to CryptClass -target_link_libraries(Model ${SFML_LIBRARIES}) +#Make Model lib +add_library(Model Grid.cpp Cell.cpp Game.cpp) diff --git a/src/main.cpp b/src/main.cpp index 9006fcd..206b47a 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -2,7 +2,11 @@ #include <string> #include <time.h> +<<<<<<< HEAD +#include "./Model/Grid.hpp" +======= #include "CTController/CTConsole.hpp" +>>>>>>> 71ebf1235ed023425c2539eabf1d15ba922c1dda int main() { |