a8a7d65

5 files changed, 11 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6cfed16d6230..deb04decc4d6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 pkgbase = slitherling
 	pkgdesc = A simple snake game. Feed your snake with fruit. Arrow keys, VIM keys, or spacebar (easy mode).
-	pkgver = 90ad00d
+	pkgver = 21a329f
 	pkgrel = 1
-	epoch = 1583638953
+	epoch = 1584243336
 	arch = i686
 	arch = x86_64
 	license = GPL-3.0
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b539857c351c..7a7ae4bed90b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,23 +1,9 @@
 cmake_minimum_required(VERSION 3.11)
 project(slitherling)
+include(CTest)
 
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} /usr/share/SFML/cmake/Modules/)
-find_package(SFML REQUIRED COMPONENTS system graphics window)
+add_subdirectory(src/main)
 
-set(EXECUTABLE_NAME "slitherling")
-add_compile_options(-std=c++17 -Wall -Wextra -pedantic -Werror)
-include_directories(${SFML_INCLUDE_DIRS} ${SFMLsystem_INCLUDE_DIRS} ${SFMLwindow_INCLUDE_DIRS} ${SFMLgraphics_INCLUDE_DIRS} src/main/headers/)
-add_executable(${EXECUTABLE_NAME})
-target_sources(${EXECUTABLE_NAME} PRIVATE
-src/main/cpp/info-board.cpp
-src/main/cpp/version-provider.cpp
-src/main/cpp/path-finder.cpp
-src/main/cpp/slitherling.cpp
-src/main/cpp/apple-texture.cpp
-src/main/cpp/gulp-sound.cpp
-src/main/cpp/infect-sound.cpp
-src/main/cpp/spawn-sound.cpp
-src/main/cpp/cycle-time.cpp
-src/main/cpp/font-provider.cpp
-)
-target_link_libraries(${EXECUTABLE_NAME} sfml-graphics sfml-audio ${SFML_LIBRARIES})
+if(BUILD_TESTING)
+add_subdirectory(src/test)
+endif()
diff --git a/PKGBUILD b/PKGBUILD
index 327ddddb3365..5a296376e765 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,13 +1,13 @@
 # Maintainer: Tyler Johnson <tejohnso2 at popular google mail domain>
 pkgname=slitherling
-pkgver=90ad00d
+pkgver=21a329f
 pkgrel=1
 pkgdesc="A simple snake game. Feed your snake with fruit. Arrow keys, VIM keys, or spacebar (easy mode)."
 arch=('i686' 'x86_64')
 license=('GPL-3.0')
 depends=('sfml')
 makedepends=('gcc>=9.0.0' 'cmake>=3.11' 'ninja>=1.10')
-epoch=1583638953
+epoch=1584243336
 build() {
         cd ..
 	mkdir -p build
@@ -19,7 +19,7 @@ build() {
 package() {
         cd ..
         install -m 755 -d "${pkgdir}/usr/bin"
-        install -m 755 -t "${pkgdir}/usr/bin/" "build/slitherling"
+        install -m 755 -t "${pkgdir}/usr/bin/" "build/src/main/slitherling"
 
         install -m 755 -d "${pkgdir}/usr/share/${pkgname}"
         install -m 755 -t "${pkgdir}/usr/share/${pkgname}" "slitherling_font.ttf"
diff --git a/SLITHERLING_VERSION b/SLITHERLING_VERSION
index f81ffe99bfd6..c8e2d14e4c0e 100644
--- a/SLITHERLING_VERSION
+++ b/SLITHERLING_VERSION
@@ -1 +1 @@
-90ad00d
+21a329f
diff --git a/src.tar.gz b/src.tar.gz
index 2f8bc3fe6bec..43d21e195377 100644
--- a/src.tar.gz
+++ b/src.tar.gz