From 206b0d5c8a0b32417ab4d37d29c4cd89896daeee Mon Sep 17 00:00:00 2001
From: jsrobson10 <jsrobson10@gmail.com>
Date: Sat, 25 May 2019 14:42:53 +1000
Subject: [PATCH] Fixed mainloop issues

---
 Makefile          | 14 +++++++-------
 blockracer.cpp    |  2 +-
 blocks.cpp        |  2 +-
 clouds.cpp        |  2 +-
 graphics.cpp      |  2 +-
 input.cpp         |  2 +-
 libs/mainloop-api |  2 +-
 player.cpp        |  2 +-
 8 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/Makefile b/Makefile
index e68ae85..d2a0dcd 100644
--- a/Makefile
+++ b/Makefile
@@ -16,28 +16,28 @@ src/resources:
 src:
 	mkdir src
 
-blockracer.o: blockracer.cpp mainloop.h graphics.h input.h player.h world.h text.h archive.h clouds.h
+blockracer.o: blockracer.cpp graphics.h input.h player.h world.h text.h archive.h clouds.h
 	$(CC) $(ARGS)
 
-mainloop.o: mainloop.cpp
+mainloop.o: libs/mainloop-api/mainloop.cpp
 	$(CC) $(ARGS)
 
-graphics.o: graphics.cpp mainloop.h graphics.h player.h world.h textures.h clouds.h
+graphics.o: graphics.cpp graphics.h player.h world.h textures.h clouds.h
 	$(CC) $(ARGS)
 
-input.o: input.cpp input.h gamepad.h mainloop.h
+input.o: input.cpp input.h gamepad.h
 	$(CC) $(ARGS)
 
 gamepad.o: gamepad.c gamepad.h
 	gcc $(ARGS) -Wall -Werror
 
-player.o: player.cpp player.h input.h mainloop.h world.h textures.h blocks.h
+player.o: player.cpp player.h input.h world.h textures.h blocks.h
 	$(CC) $(ARGS)
 
 world.o: world.cpp world.h graphics.h blocks.h math.h player.h random.h
 	$(CC) $(ARGS)
 
-blocks.o: blocks.cpp blocks.h textures.h archive.h mainloop.h
+blocks.o: blocks.cpp blocks.h textures.h archive.h
 	$(CC) $(ARGS)
 
 textures.o: textures.cpp textures.h archive.h
@@ -58,7 +58,7 @@ compression.o: compression.cpp compression.h zlib.h
 random.o: random.cpp random.h
 	$(CC) $(ARGS)
 
-clouds.o: clouds.cpp clouds.h math.h textures.h random.h mainloop.h
+clouds.o: clouds.cpp clouds.h math.h textures.h random.h
 	$(CC) $(ARGS)
 
 clean:
diff --git a/blockracer.cpp b/blockracer.cpp
index a57bf70..45f79a7 100644
--- a/blockracer.cpp
+++ b/blockracer.cpp
@@ -1,4 +1,4 @@
-#include "mainloop.h"
+#include "libs/mainloop-api/mainloop.h"
 #include "graphics.h"
 #include "archive.h"
 #include "player.h"
diff --git a/blocks.cpp b/blocks.cpp
index 3009ed9..48fc85f 100644
--- a/blocks.cpp
+++ b/blocks.cpp
@@ -3,7 +3,7 @@
 #include <math.h>
 
 #include "PerlinNoise.hpp"
-#include "mainloop.h"
+#include "libs/mainloop-api/mainloop.h"
 #include "archive.h"
 #include "textures.h"
 #include "blocks.h"
diff --git a/clouds.cpp b/clouds.cpp
index 3572598..404385f 100644
--- a/clouds.cpp
+++ b/clouds.cpp
@@ -4,7 +4,7 @@
 
 #include "PerlinNoise.hpp"
 #include "textures.h"
-#include "mainloop.h"
+#include "libs/mainloop-api/mainloop.h"
 #include "random.h"
 #include "math.h"
 
diff --git a/graphics.cpp b/graphics.cpp
index 69558aa..7c28936 100644
--- a/graphics.cpp
+++ b/graphics.cpp
@@ -9,7 +9,7 @@
 #include <Windows.h>
 #endif
 
-#include "mainloop.h"
+#include "libs/mainloop-api/mainloop.h"
 #include "graphics.h"
 #include "textures.h"
 #include "player.h"
diff --git a/input.cpp b/input.cpp
index 8bd3a3f..07a3002 100644
--- a/input.cpp
+++ b/input.cpp
@@ -1,4 +1,4 @@
-#include "mainloop.h"
+#include "libs/mainloop-api/mainloop.h"
 #include "gamepad.h"
 #include "input.h"
 
diff --git a/libs/mainloop-api b/libs/mainloop-api
index cd81dbe..59fb400 160000
--- a/libs/mainloop-api
+++ b/libs/mainloop-api
@@ -1 +1 @@
-Subproject commit cd81dbe0739d8b2ad124039ca4c7d54df3cf554a
+Subproject commit 59fb4005244bb2ceed72612ef3961cf565836da1
diff --git a/player.cpp b/player.cpp
index 55670bc..5a6da8b 100644
--- a/player.cpp
+++ b/player.cpp
@@ -5,7 +5,7 @@
 
 #include "player.h"
 #include "input.h"
-#include "mainloop.h"
+#include "libs/mainloop-api/mainloop.h"
 #include "textures.h"
 #include "blocks.h"
 #include "world.h"