From f6a02dc8500b6e999b0a97d9d21f51e48858a897 Mon Sep 17 00:00:00 2001
From: Tiberiu Chibici <chibicitiberiu@gmail.com>
Date: Sat, 10 Dec 2016 14:12:23 +0200
Subject: [PATCH] Changed build system to CMake

---
 .cproject                                     |   8 +++-
 .../CMake Project Generator.launch            |  11 ++++++
 .externalToolBuilders/Prepare Assets.launch   |   9 -----
 .project                                      |   6 +--
 .sconsign.dblite                              | Bin 0 -> 11369 bytes
 CMakeLists.txt                                |  35 ++++++++++++++++++
 build/prepareAssets.py                        |   3 +-
 7 files changed, 54 insertions(+), 18 deletions(-)
 create mode 100644 .externalToolBuilders/CMake Project Generator.launch
 delete mode 100644 .externalToolBuilders/Prepare Assets.launch
 create mode 100644 .sconsign.dblite
 create mode 100644 CMakeLists.txt

diff --git a/.cproject b/.cproject
index 3ff248b..e214799 100644
--- a/.cproject
+++ b/.cproject
@@ -9,6 +9,8 @@
 					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
@@ -16,7 +18,7 @@
 					<folderInfo id="cdt.managedbuild.config.gnu.exe.debug.1767279125." name="/" resourcePath="">
 						<toolChain id="cdt.managedbuild.toolchain.gnu.exe.debug.263074825" name="Linux GCC" superClass="cdt.managedbuild.toolchain.gnu.exe.debug">
 							<targetPlatform id="cdt.managedbuild.target.gnu.platform.exe.debug.361182110" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.exe.debug"/>
-							<builder autoBuildTarget="" buildPath="${workspace_loc:/Farmlands}/Debug" cleanBuildTarget="" enableAutoBuild="false" enableCleanBuild="true" enabledIncrementalBuild="true" id="org.eclipse.cdt.build.core.internal.builder.1184678368" incrementalBuildTarget="" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="CDT Internal Builder" parallelBuildOn="true" parallelizationNumber="optimal" stopOnErr="false" superClass="org.eclipse.cdt.build.core.internal.builder"/>
+							<builder arguments="-C ${workspace_loc:/Farmlands}/build/Debug" autoBuildTarget="" buildPath="${workspace_loc:/Farmlands}/Debug" cleanBuildTarget="clean" command="make" id="cdt.managedbuild.target.gnu.builder.exe.debug.1757627442" incrementalBuildTarget="all" keepEnvironmentInBuildfile="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" stopOnErr="false" superClass="cdt.managedbuild.target.gnu.builder.exe.debug"/>
 							<tool id="cdt.managedbuild.tool.gnu.archiver.base.1607221000" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/>
 							<tool command="g++" commandLinePattern="${COMMAND} ${FLAGS} ${OUTPUT_FLAG} ${OUTPUT_PREFIX}${OUTPUT} ${INPUTS}" id="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.1808198807" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug">
 								<option id="gnu.cpp.compiler.exe.debug.option.optimization.level.593370343" name="Optimization Level" superClass="gnu.cpp.compiler.exe.debug.option.optimization.level" useByScannerDiscovery="false" value="gnu.cpp.compiler.optimization.level.none" valueType="enumerated"/>
@@ -83,6 +85,8 @@
 					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
@@ -90,7 +94,7 @@
 					<folderInfo id="cdt.managedbuild.config.gnu.exe.release.1609929883." name="/" resourcePath="">
 						<toolChain id="cdt.managedbuild.toolchain.gnu.exe.release.2003855563" name="Linux GCC" nonInternalBuilderId="cdt.managedbuild.target.gnu.builder.exe.release" superClass="cdt.managedbuild.toolchain.gnu.exe.release">
 							<targetPlatform id="cdt.managedbuild.target.gnu.platform.exe.release.2010013881" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.exe.release"/>
-							<builder autoBuildTarget="all" buildPath="${workspace_loc:/Farmlands}/Release" cleanBuildTarget="clean" enableAutoBuild="false" enableCleanBuild="true" enabledIncrementalBuild="true" id="org.eclipse.cdt.build.core.internal.builder.2098680958" incrementalBuildTarget="all" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="CDT Internal Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="org.eclipse.cdt.build.core.internal.builder"/>
+							<builder arguments="-C ${workspace_loc:/Farmlands}/build/Release" buildPath="${workspace_loc:/Farmlands}/Release" cleanBuildTarget="clean" command="make" id="cdt.managedbuild.target.gnu.builder.exe.release.11977805" keepEnvironmentInBuildfile="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="cdt.managedbuild.target.gnu.builder.exe.release"/>
 							<tool id="cdt.managedbuild.tool.gnu.archiver.base.1727165317" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/>
 							<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.exe.release.1249722811" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.exe.release">
 								<option id="gnu.cpp.compiler.exe.release.option.optimization.level.1342166702" name="Optimization Level" superClass="gnu.cpp.compiler.exe.release.option.optimization.level" useByScannerDiscovery="false" value="gnu.cpp.compiler.optimization.level.most" valueType="enumerated"/>
diff --git a/.externalToolBuilders/CMake Project Generator.launch b/.externalToolBuilders/CMake Project Generator.launch
new file mode 100644
index 0000000..f60fdce
--- /dev/null
+++ b/.externalToolBuilders/CMake Project Generator.launch	
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.ui.externaltools.ProgramBuilderLaunchConfigurationType">
+<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;resources&gt;&#10;&lt;item path=&quot;/Farmlands/build/Debug&quot; type=&quot;2&quot;/&gt;&#10;&lt;item path=&quot;/Farmlands/build/Release&quot; type=&quot;2&quot;/&gt;&#10;&lt;/resources&gt;}"/>
+<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_BUILD_SCOPE" value="${working_set:&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#10;&lt;resources&gt;&#10;&lt;item path=&quot;/Farmlands/CMakeLists.txt&quot; type=&quot;1&quot;/&gt;&#10;&lt;/resources&gt;}"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="/usr/bin/cmake"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-DCMAKE_BUILD_TYPE=${config_name:Farmlands} ../.."/>
+<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc}/Farmlands/build/${config_name:Farmlands}"/>
+</launchConfiguration>
diff --git a/.externalToolBuilders/Prepare Assets.launch b/.externalToolBuilders/Prepare Assets.launch
deleted file mode 100644
index bdff3f5..0000000
--- a/.externalToolBuilders/Prepare Assets.launch	
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.ui.externaltools.ProgramBuilderLaunchConfigurationType">
-<stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${workspace}"/>
-<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="true"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/Farmlands/build/prepareAssets.py}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="incremental,"/>
-<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/Farmlands}"/>
-</launchConfiguration>
diff --git a/.project b/.project
index fb6c5a9..6caaf41 100644
--- a/.project
+++ b/.project
@@ -16,11 +16,7 @@
 			<arguments>
 				<dictionary>
 					<key>LaunchConfigHandle</key>
-					<value>&lt;project&gt;/.externalToolBuilders/Prepare Assets.launch</value>
-				</dictionary>
-				<dictionary>
-					<key>incclean</key>
-					<value>true</value>
+					<value>&lt;project&gt;/.externalToolBuilders/CMake Project Generator.launch</value>
 				</dictionary>
 			</arguments>
 		</buildCommand>
diff --git a/.sconsign.dblite b/.sconsign.dblite
new file mode 100644
index 0000000000000000000000000000000000000000..58a65c80b14df560cf01d172451958ced38d7b25
GIT binary patch
literal 11369
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

literal 0
HcmV?d00001

diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644
index 0000000..7c26b7f
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,35 @@
+cmake_minimum_required (VERSION 2.6)
+project (Farmlands)
+
+set (SRC_DIR "src")
+set (ASSET_DIR "assets")
+set (BUILD_DIR "build")
+set (LIBS "SDL2" "SDL2_image" "SDL2_ttf" "boost_filesystem" "boost_system")
+set (TARGET "Farmlands")
+
+file (GLOB_RECURSE FILES_CPP "${SRC_DIR}/*.cpp")
+file (GLOB_RECURSE FILES_ASSETS "${ASSET_DIR}/*")
+
+add_executable(${TARGET} ${FILES_CPP})
+target_link_libraries(${TARGET} ${LIBS})
+set_property(TARGET ${TARGET} PROPERTY CXX_STANDARD 11)
+set_property(TARGET ${TARGET} PROPERTY CXX_STANDARD_REQUIRED ON)
+
+include_directories ( ${SRC_DIR} )
+
+add_custom_target (
+	PREPARE_ASSETS
+	COMMAND python3 "${BUILD_DIR}/prepareAssets.py" 
+	WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
+
+add_dependencies(${TARGET} PREPARE_ASSETS)
+
+# Eclipse related configuration
+if (CMAKE_COMPILER_IS_GNUCC)
+  set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fmessage-length=0")
+endif (CMAKE_COMPILER_IS_GNUCC)
+if (CMAKE_COMPILER_IS_GNUCXX)
+  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fmessage-length=0")
+endif (CMAKE_COMPILER_IS_GNUCXX)
+
+set (CMAKE_VERBOSE_MAKEFILE ON)
\ No newline at end of file
diff --git a/build/prepareAssets.py b/build/prepareAssets.py
index 2bc6011..49fa849 100755
--- a/build/prepareAssets.py
+++ b/build/prepareAssets.py
@@ -5,7 +5,6 @@ import sys
 #
 # Constants
 #
-
 ASSETS_DIR="assets"
 RESOURCES_FILE="src/resources/Resources.g.h"
 
@@ -147,4 +146,4 @@ if __name__ == '__main__':
     f = open(RESOURCES_FILE, "w")
     f.write(resFile)
     f.close()
-    
\ No newline at end of file
+