Fixed mainloop issues
This commit is contained in:
parent
4c60bfad75
commit
206b0d5c8a
14
Makefile
14
Makefile
|
@ -16,28 +16,28 @@ src/resources:
|
||||||
src:
|
src:
|
||||||
mkdir 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)
|
$(CC) $(ARGS)
|
||||||
|
|
||||||
mainloop.o: mainloop.cpp
|
mainloop.o: libs/mainloop-api/mainloop.cpp
|
||||||
$(CC) $(ARGS)
|
$(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)
|
$(CC) $(ARGS)
|
||||||
|
|
||||||
input.o: input.cpp input.h gamepad.h mainloop.h
|
input.o: input.cpp input.h gamepad.h
|
||||||
$(CC) $(ARGS)
|
$(CC) $(ARGS)
|
||||||
|
|
||||||
gamepad.o: gamepad.c gamepad.h
|
gamepad.o: gamepad.c gamepad.h
|
||||||
gcc $(ARGS) -Wall -Werror
|
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)
|
$(CC) $(ARGS)
|
||||||
|
|
||||||
world.o: world.cpp world.h graphics.h blocks.h math.h player.h random.h
|
world.o: world.cpp world.h graphics.h blocks.h math.h player.h random.h
|
||||||
$(CC) $(ARGS)
|
$(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)
|
$(CC) $(ARGS)
|
||||||
|
|
||||||
textures.o: textures.cpp textures.h archive.h
|
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
|
random.o: random.cpp random.h
|
||||||
$(CC) $(ARGS)
|
$(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)
|
$(CC) $(ARGS)
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
#include "mainloop.h"
|
#include "libs/mainloop-api/mainloop.h"
|
||||||
#include "graphics.h"
|
#include "graphics.h"
|
||||||
#include "archive.h"
|
#include "archive.h"
|
||||||
#include "player.h"
|
#include "player.h"
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
|
|
||||||
#include "PerlinNoise.hpp"
|
#include "PerlinNoise.hpp"
|
||||||
#include "mainloop.h"
|
#include "libs/mainloop-api/mainloop.h"
|
||||||
#include "archive.h"
|
#include "archive.h"
|
||||||
#include "textures.h"
|
#include "textures.h"
|
||||||
#include "blocks.h"
|
#include "blocks.h"
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
|
|
||||||
#include "PerlinNoise.hpp"
|
#include "PerlinNoise.hpp"
|
||||||
#include "textures.h"
|
#include "textures.h"
|
||||||
#include "mainloop.h"
|
#include "libs/mainloop-api/mainloop.h"
|
||||||
#include "random.h"
|
#include "random.h"
|
||||||
#include "math.h"
|
#include "math.h"
|
||||||
|
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
#include <Windows.h>
|
#include <Windows.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "mainloop.h"
|
#include "libs/mainloop-api/mainloop.h"
|
||||||
#include "graphics.h"
|
#include "graphics.h"
|
||||||
#include "textures.h"
|
#include "textures.h"
|
||||||
#include "player.h"
|
#include "player.h"
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
#include "mainloop.h"
|
#include "libs/mainloop-api/mainloop.h"
|
||||||
#include "gamepad.h"
|
#include "gamepad.h"
|
||||||
#include "input.h"
|
#include "input.h"
|
||||||
|
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit cd81dbe0739d8b2ad124039ca4c7d54df3cf554a
|
Subproject commit 59fb4005244bb2ceed72612ef3961cf565836da1
|
|
@ -5,7 +5,7 @@
|
||||||
|
|
||||||
#include "player.h"
|
#include "player.h"
|
||||||
#include "input.h"
|
#include "input.h"
|
||||||
#include "mainloop.h"
|
#include "libs/mainloop-api/mainloop.h"
|
||||||
#include "textures.h"
|
#include "textures.h"
|
||||||
#include "blocks.h"
|
#include "blocks.h"
|
||||||
#include "world.h"
|
#include "world.h"
|
||||||
|
|
Loading…
Reference in New Issue