Minor edits

rzhikharevich · Apr 14, 2016 · cf0dd2b · cf0dd2b
1 parent df1448a
commit cf0dd2b
Show file tree

Hide file tree

Showing 11 changed files with 8 additions and 6 deletions.
diff --git a/Makefile b/Makefile
@@ -1,5 +1,6 @@
-CXXFLAGS = -std=c++14
-LDFLAGS  = -lSDL2 -lSDL2_image
+DEPS     = jsoncpp sdl2 SDL2_image
+CXXFLAGS = -std=c++14 $(shell pkg-config --cflags $(DEPS))
+LDFLAGS  = $(shell pkg-config --libs $(DEPS))
 OBJS     = $(patsubst %.cpp,%.o,$(wildcard *.cpp))
 APP_NAME = deathgame
 

diff --git a/README.md b/README.md
@@ -4,6 +4,7 @@
 
 * SDL2
 * SDL2_image
+* jsoncpp
 
 ## Building
 
@@ -12,4 +13,4 @@ $ make
 ## Running
 
 The current working directory must contain a file called "config.json".
-For an example see "deathgame/config.json" in the source tree.
+For an example see "example/config.json" in the source tree.
diff --git a/deathgame/bees/README.start.png.txt → example/bees/README.start.png.txt b/deathgame/bees/README.start.png.txt → example/bees/README.start.png.txt
diff --git a/deathgame/bees/start.dasm → example/bees/start.dasm b/deathgame/bees/start.dasm → example/bees/start.dasm
diff --git a/deathgame/bees/start.png → example/bees/start.png b/deathgame/bees/start.png → example/bees/start.png
diff --git a/deathgame/chickens/README.chick.png.txt → example/chickens/README.chick.png.txt b/deathgame/chickens/README.chick.png.txt → example/chickens/README.chick.png.txt
diff --git a/deathgame/chickens/chick.dasm → example/chickens/chick.dasm b/deathgame/chickens/chick.dasm → example/chickens/chick.dasm
diff --git a/deathgame/chickens/chick.png → example/chickens/chick.png b/deathgame/chickens/chick.png → example/chickens/chick.png
diff --git a/deathgame/config.json → example/config.json b/deathgame/config.json → example/config.json
diff --git a/ui.cpp b/ui.cpp
@@ -1,8 +1,8 @@
 #include "ui.hpp"
 #include <chrono>
 #include <algorithm>
-#include <SDL2/SDL.h>
-#include <SDL2/SDL_image.h>
+#include <SDL.h>
+#include <SDL_image.h>
 
 using std::shared_ptr;
 using std::vector;

diff --git a/ui.hpp b/ui.hpp
@@ -6,7 +6,7 @@
 #include <exception>
 #include <vector>
 #include <thread>
-#include <SDL2/SDL.h>
+#include <SDL.h>
 #include "util.hpp"