From f49044c9886accc91dfd29056241da3b48324640 Mon Sep 17 00:00:00 2001
From: Yann Herklotz <ymherklotz@gmail.com>
Date: Tue, 31 Oct 2017 22:18:25 +0000
Subject: Moving to core, fixing errors

---
 CMakeLists.txt                |  6 +++---
 yage/CMakeLists.txt           |  4 ++--
 yage/core/imageloader.cpp     |  4 ++--
 yage/core/inputmanager.cpp    |  2 +-
 yage/core/iomanager.cpp       |  2 +-
 yage/core/resourcemanager.cpp |  2 +-
 yage/core/sprite.cpp          |  6 +++---
 yage/core/spritebatch.cpp     |  2 +-
 yage/core/spritesheet.cpp     |  2 +-
 yage/core/texturecache.cpp    |  4 ++--
 yage/yage.h                   | 24 ++++++++++++------------
 11 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 75379d19..7a3abb66 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,10 +23,10 @@ find_package(OpenGL REQUIRED)
 include(${CMAKE_CURRENT_SOURCE_DIR}/lib/CMakeLists.txt)
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/yage)
 
-add_executable(simplegame tests/simplegame.cpp)
-target_link_libraries(simplegame yage)
-
 if($ENV{UNIT_TESTS})
+  add_executable(simplegame tests/simplegame.cpp)
+  target_link_libraries(simplegame yage)
+
   # enable tests
   enable_testing()
   set(SIMULATION_RUNS 1000)
diff --git a/yage/CMakeLists.txt b/yage/CMakeLists.txt
index d7df4a94..e89cebd8 100644
--- a/yage/CMakeLists.txt
+++ b/yage/CMakeLists.txt
@@ -1,12 +1,12 @@
 cmake_policy(SET CMP0048 NEW)
 
-include(base/CMakeLists.txt)
+include(core/CMakeLists.txt)
 include(physics/CMakeLists.txt)
 include(math/CMakeLists.txt)
 
 set(YAGE_SOURCES
   yage.cpp
-  ${YAGE_BASE_SOURCES}
+  ${YAGE_CORE_SOURCES}
   ${YAGE_PHYSICS_SOURCES}
   ${YAGE_MATH_SOURCES})
 
diff --git a/yage/core/imageloader.cpp b/yage/core/imageloader.cpp
index e1d54dc1..89aeb067 100644
--- a/yage/core/imageloader.cpp
+++ b/yage/core/imageloader.cpp
@@ -12,8 +12,8 @@
 #include <glad/glad.h>
 #endif
 
-#include <yage/base/iomanager.h>
-#include <yage/base/picopng.h>
+#include <yage/core/iomanager.h>
+#include <yage/core/picopng.h>
 
 #include <iostream>
 #include <stdexcept>
diff --git a/yage/core/inputmanager.cpp b/yage/core/inputmanager.cpp
index 15ff374b..391c9931 100644
--- a/yage/core/inputmanager.cpp
+++ b/yage/core/inputmanager.cpp
@@ -6,7 +6,7 @@
  * ----------------------------------------------------------------------------
  */
 
-#include <yage/base/inputmanager.h>
+#include <yage/core/inputmanager.h>
 
 namespace yage
 {
diff --git a/yage/core/iomanager.cpp b/yage/core/iomanager.cpp
index d5b950d6..6bb083ab 100644
--- a/yage/core/iomanager.cpp
+++ b/yage/core/iomanager.cpp
@@ -6,7 +6,7 @@
  * ----------------------------------------------------------------------------
  */
 
-#include <yage/base/iomanager.h>
+#include <yage/core/iomanager.h>
 
 #include <fstream>
 #include <stdexcept>
diff --git a/yage/core/resourcemanager.cpp b/yage/core/resourcemanager.cpp
index f3f9aa20..cf70eae8 100644
--- a/yage/core/resourcemanager.cpp
+++ b/yage/core/resourcemanager.cpp
@@ -6,7 +6,7 @@
  * ----------------------------------------------------------------------------
  */
 
-#include <yage/base/resourcemanager.h>
+#include <yage/core/resourcemanager.h>
 
 namespace yage
 {
diff --git a/yage/core/sprite.cpp b/yage/core/sprite.cpp
index 9ac4dc55..769c8b81 100644
--- a/yage/core/sprite.cpp
+++ b/yage/core/sprite.cpp
@@ -6,9 +6,9 @@
  * ----------------------------------------------------------------------------
  */
 
-#include <yage/base/sprite.h>
-#include <yage/base/resourcemanager.h>
-#include <yage/base/vertex.h>
+#include <yage/core/sprite.h>
+#include <yage/core/resourcemanager.h>
+#include <yage/core/vertex.h>
 
 #include <cstddef>
 
diff --git a/yage/core/spritebatch.cpp b/yage/core/spritebatch.cpp
index aaeec32f..ad6feeab 100644
--- a/yage/core/spritebatch.cpp
+++ b/yage/core/spritebatch.cpp
@@ -6,7 +6,7 @@
  * ----------------------------------------------------------------------------
  */
 
-#include <yage/base/spritebatch.h>
+#include <yage/core/spritebatch.h>
 
 #include <algorithm>
 #include <stdexcept>
diff --git a/yage/core/spritesheet.cpp b/yage/core/spritesheet.cpp
index 5c3499cc..09c344e3 100644
--- a/yage/core/spritesheet.cpp
+++ b/yage/core/spritesheet.cpp
@@ -17,7 +17,7 @@
 #include <stdexcept>
 
 #include <rapidjson/document.h>
-#include <yage/base/imageloader.h>
+#include <yage/core/imageloader.h>
 
 using namespace std;
 using namespace rapidjson;
diff --git a/yage/core/texturecache.cpp b/yage/core/texturecache.cpp
index 628f3604..af22c93e 100644
--- a/yage/core/texturecache.cpp
+++ b/yage/core/texturecache.cpp
@@ -6,8 +6,8 @@
  * ----------------------------------------------------------------------------
  */
 
-#include <yage/base/texturecache.h>
-#include <yage/base/imageloader.h>
+#include <yage/core/texturecache.h>
+#include <yage/core/imageloader.h>
 
 namespace yage
 {
diff --git a/yage/yage.h b/yage/yage.h
index 920652c1..e6d64a28 100644
--- a/yage/yage.h
+++ b/yage/yage.h
@@ -14,18 +14,18 @@
 #ifndef YAGE_YAGE_H
 #define YAGE_YAGE_H
 
-#include "base/camera2d.h"
-#include "base/glslprogram.h"
-#include "base/imageloader.h"
-#include "base/inputmanager.h"
-#include "base/iomanager.h"
-#include "base/picopng.h"
-#include "base/resourcemanager.h"
-#include "base/spritebatch.h"
-#include "base/spritesheet.h"
-#include "base/texture.h"
-#include "base/vertex.h"
-#include "base/window.h"
+#include "core/camera2d.h"
+#include "core/glslprogram.h"
+#include "core/imageloader.h"
+#include "core/inputmanager.h"
+#include "core/iomanager.h"
+#include "core/picopng.h"
+#include "core/resourcemanager.h"
+#include "core/spritebatch.h"
+#include "core/spritesheet.h"
+#include "core/texture.h"
+#include "core/vertex.h"
+#include "core/window.h"
 
 #include "physics/body.h"
 #include "physics/particlebody.h"
-- 
cgit