From e62817b8252974b8a98393275874ee303840bf13 Mon Sep 17 00:00:00 2001
From: LaG1924 <12997935+LaG1924@users.noreply.github.com>
Date: Fri, 12 May 2017 18:49:50 +0500
Subject: 2017-05-12

---
 CMakeLists.txt | 65 +++++++++++++++++++++++++++++++++++++++++++---------------
 1 file changed, 48 insertions(+), 17 deletions(-)

(limited to 'CMakeLists.txt')

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2ea7965..545ecbb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,13 +4,57 @@ set(CMAKE_CXX_STANDARD 14)
 set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules)
 
 if (CMAKE_COMPILER_IS_GNUCXX)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic-errors -w -Werror")
-    set(CMAKE_CXX_FLASG "${CMAKE_CXX_FLAGS} -g -O0")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -w -Werror")
+    #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3")
+    #set(CMAKE_CXX_FLASG "${CMAKE_CXX_FLAGS} -g -O0")
     #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address")
     #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -pg")
     set(PLATFORM_LIBRARIES "pthread")
 endif ()
 
+set(SOURCE_FILES main.cpp Field.hpp utility.cpp Packet.hpp FieldParser.hpp Network.hpp Network.cpp NetworkClient.cpp
+        NetworkClient.hpp json.hpp PacketBuilder.cpp PacketBuilder.hpp Packet.cpp FieldParser.cpp Field.cpp
+        PacketParser.cpp PacketParser.hpp PositionF.cpp PositionF.hpp PositionI.cpp PositionI.hpp Game.cpp
+        Game.hpp World.cpp World.hpp Block.cpp Block.hpp Section.cpp Section.hpp Nbt.hpp graphics/AssetManager.cpp
+        graphics/AssetManager.hpp graphics/Display.cpp graphics/Display.hpp graphics/Camera3D.hpp graphics/Camera3D.cpp
+        graphics/Shader.hpp graphics/Shader.cpp graphics/Texture.hpp graphics/Texture.cpp Debug.cpp Debug.hpp)
+
+add_executable(AltCraft ${SOURCE_FILES})
+target_link_libraries(AltCraft ${PLATFORM_LIBRARIES})
+
+add_subdirectory(depedencies)
+target_include_directories(AltCraft PUBLIC ./depedencies/include)
+target_link_libraries(AltCraft deps)
+
+#Setup SFML
+find_package(SFML 2 COMPONENTS system window graphics network REQUIRED)
+if (SFML_FOUND)
+    target_link_libraries(AltCraft ${SFML_LIBRARIES})
+    target_include_directories(AltCraft PUBLIC ${SFML_INCLUDE_DIR})
+else ()
+    message(FATAL_ERROR "SFML not found!")
+endif ()
+
+#Setup OpenGL
+find_package(OpenGL REQUIRED)
+if (OPENGL_FOUND)
+    target_link_libraries(AltCraft ${OPENGL_LIBRARIES})
+    target_include_directories(AltCraft PUBLIC ${OPENGL_INCLUDE_DIRS})
+else ()
+    message(FATAL_ERROR "OpenGL not found!")
+endif ()
+
+#Setup Zlib
+find_package(ZLIB REQUIRED)
+if (ZLIB_FOUND)
+    target_link_libraries(AltCraft ${ZLIB_LIBRARIES})
+    target_include_directories(AltCraft PUBLIC ${ZLIB_INCLUDE_DIR})
+else ()
+    message(FATAL_ERROR "Zlib not found!")
+endif ()
+
+
+#[[
 #Setup SFML
 find_package(SFML 2 COMPONENTS system network graphics window REQUIRED)
 include_directories(${SFML_INCLUDE_DIR})
@@ -25,20 +69,6 @@ if (NOT ZLIB_FOUND)
     message(FATAL_ERROR "Zlib not found!")
 endif ()
 
-#Setup SOIL
-find_package(SOIL REQUIRED)
-include_directories(${SOIL_INCLUDE_DIRS})
-if (NOT SOIL_FOUND)
-    message(FATAL_ERROR "SOIL not found!")
-endif ()
-
-#Setup GLFW3
-find_package(GLFW REQUIRED)
-include_directories(${GLFW_INCLUDE_DIRS})
-if (NOT GLFW_FOUND)
-    message(FATAL_ERROR "GLFW3 not found!")
-endif ()
-
 #Setup GLEW
 find_package(GLEW REQUIRED)
 include_directories(${GLEW_INCLUDE_DIRS})
@@ -57,8 +87,9 @@ set(SOURCE_FILES main.cpp Field.hpp utility.cpp Packet.hpp FieldParser.hpp Netwo
         NetworkClient.hpp json.hpp PacketBuilder.cpp PacketBuilder.hpp Packet.cpp FieldParser.cpp Field.cpp
         PacketParser.cpp PacketParser.hpp PositionF.cpp PositionF.hpp PositionI.cpp PositionI.hpp Game.cpp
         Game.hpp World.cpp World.hpp Block.cpp Block.hpp Section.cpp Section.hpp Nbt.hpp graphics/AssetManager.cpp
-        graphics/AssetManager.hpp graphics/Display.cpp graphics/Display.hpp graphics/Shader.cpp graphics/Shader.hpp)
+        graphics/AssetManager.hpp)
 
 add_executable(AltCraft ${SOURCE_FILES})
 target_link_libraries(AltCraft ${PLATFORM_LIBRARIES} ${SFML_LIBRARIES} ${ZLIB_LIBRARIES} ${SOIL_LIBRARY}
         ${GLFW_LIBRARIES} ${OPENGL_LIBRARIES} ${GLEW_LIBRARIES})
+]]
\ No newline at end of file
-- 
cgit v1.2.3