--- brogue-1.7.4/src/libtcod-1.5.2/Makefile	2018-02-23 21:52:28.894801347 +0100
+++ brogue-1.7.4/src/libtcod-1.5.2/Makefile.new	2018-02-24 00:30:31.436490636 +0100
@@ -6,8 +6,8 @@
 
 #dependencies
 # SDL
-SDL_FLAGS=`sdl-config --cflags`
-SDL_LIBS=`sdl-config --libs`
+SDL_FLAGS=`pkg-config --cflags sdl`
+SDL_LIBS=`pkg-config --libs sdl`
 
 # ZLIB
 
@@ -16,10 +16,8 @@
 
 LIBS=$(ZLIB_LIBS) $(SDL_LIBS) $(OPENGL_LIB) -lm -ldl -lX11 -lpthread -lz
 
-CFLAGS=$(FLAGS) -I$(INCDIR) -I$(INCDIR)/gui -Wall $(SDL_FLAGS) -fPIC
-TEMP=/tmp
-CC=gcc
-CPP=g++
+CFLAGS+=$(FLAGS) -I$(INCDIR) -I$(INCDIR)/gui -Wall $(SDL_FLAGS) -fPIC
+TEMP=${WORKDIR}/tmp
 .SUFFIXES: a .o .h .c
 
 $(TEMP)/libtcod/release/%.o : $(SRCDIR)/%.c
@@ -27,19 +25,19 @@
 	@$(CC) $(CFLAGS) -O2 -DNDEBUG -s -o $@ -c $<
 $(TEMP)/libtcod/release/%.o : $(SRCDIR)/%.cpp
 	@ echo Compiling release $(basename $<).cpp
-	@$(CPP) $(CFLAGS) -O2 -DNDEBUG -s -o $@ -c $< 
+	@$(CXX) $(CFLAGS) -O2 -DNDEBUG -s -o $@ -c $< 
 $(TEMP)/libtcod/release/gui/%.o : $(SRCDIR)/gui/%.cpp
 	@ echo Compiling release $(basename $<).cpp
-	@$(CPP) $(CFLAGS) -O2 -DNDEBUG -s -o $@ -c $< 
+	@$(CXX) $(CFLAGS) -O2 -DNDEBUG -s -o $@ -c $< 
 $(TEMP)/libtcod/debug/%.o : $(SRCDIR)/%.c
 	@echo Compiling debug $(basename $<).c
 	@$(CC) $(CFLAGS) -g -o $@ -c $<
 $(TEMP)/libtcod/debug/%.o : $(SRCDIR)/%.cpp
 	@echo Compiling debug $(basename $<).cpp
-	@$(CPP) $(CFLAGS) -g -o $@ -c $< 
+	@$(CXX) $(CFLAGS) -g -o $@ -c $< 
 $(TEMP)/libtcod/debug/gui/%.o : $(SRCDIR)/gui/%.cpp
 	@echo Compiling debug $(basename $<).cpp
-	@$(CPP) $(CFLAGS) -g -o $@ -c $< 
+	@$(CXX) $(CFLAGS) -g -o $@ -c $< 
 
 
 LIBOBJS_C= \
@@ -120,7 +118,7 @@
 
 debug : libtcod_debug.so libtcodxx_debug.so libtcodgui_debug.so
 
-release : libtcod.so libtcodxx.so libtcodgui.so
+release : libtcod.so #libtcodxx.so libtcodgui.so
 
 $(TEMP)/libtcod/debug/png :
 	mkdir -p $@
@@ -136,35 +134,36 @@
 
 
 libtcod.a : $(LIBOBJS_C_DEBUG)
-	ar r $@ $(LIBOBJS_C_DEBUG)
+	${AR} r $@ $(LIBOBJS_C_DEBUG)
 
 
 libtcodxx.a : $(LIBOBJS_CPP_DEBUG)
-	ar r $@ $(LIBOBJS_CPP_DEBUG)
+	${AR} r $@ $(LIBOBJS_CPP_DEBUG)
 
 libtcod.so : $(TEMP)/libtcod/release/png $(LIBOBJS_C_RELEASE)
 	@echo Linking $@
-	@gcc -shared -Wl,-soname,libtcod.so.1 $(LDFLAGS) -o $@ $(LIBOBJS_C_RELEASE) $(LIBS) $(CFLAGS)
+	@${CC} -shared -Wl,-soname,libtcod.so.1 $(LDFLAGS) -o $@ $(LIBOBJS_C_RELEASE) $(LIBS) $(CFLAGS)
+	mv $@ ../../bin
 
 libtcodxx.so : $(TEMP)/libtcod/release/png $(LIBOBJS_CPP_RELEASE)
 	@echo Linking $@
-	@g++ -shared -Wl,-soname,libtcodxx.so.1 $(LDFLAGS) -o $@ $(LIBOBJS_CPP_RELEASE) -L. -ltcod $(CFLAGS)
+	@${CXX} -shared -Wl,-soname,libtcodxx.so.1 $(LDFLAGS) -o $@ $(LIBOBJS_CPP_RELEASE) -L. -ltcod $(CFLAGS)
 
 libtcodgui.so : $(TEMP)/libtcod/release/gui $(GUIOBJS_RELEASE)
 	@echo Linking $@
-	@g++ -shared -Wl,-soname,libtcodgui.so.1 $(LDFLAGS) -o $@ $(GUIOBJS_RELEASE) -L. -ltcod -ltcodxx $(CFLAGS)
+	@${CXX} -shared -Wl,-soname,libtcodgui.so.1 $(LDFLAGS) -o $@ $(GUIOBJS_RELEASE) -L. -ltcod -ltcodxx $(CFLAGS)
 
 libtcod_debug.so : $(TEMP)/libtcod/debug/png $(LIBOBJS_C_DEBUG) lib/libz.a
 	@echo Linking $@
-	@gcc -shared -Wl,-soname,$@ $(LDFLAGS) -o $@ $(LIBOBJS_C_DEBUG) $(LIBS) $(CFLAGS)
+	@${CC} -shared -Wl,-soname,$@ $(LDFLAGS) -o $@ $(LIBOBJS_C_DEBUG) $(LIBS) $(CFLAGS)
 
 libtcodxx_debug.so : $(TEMP)/libtcod/debug/png $(LIBOBJS_CPP_DEBUG)
 	@echo Linking $@
-	@g++ -shared -Wl,-soname,$@ $(LDFLAGS) -o $@ $(LIBOBJS_CPP_DEBUG) -L. -ltcod_debug $(CFLAGS)
+	@${CXX} -shared -Wl,-soname,$@ $(LDFLAGS) -o $@ $(LIBOBJS_CPP_DEBUG) -L. -ltcod_debug $(CFLAGS)
 
 libtcodgui_debug.so : $(TEMP)/libtcod/debug/gui $(GUIOBJS_DEBUG)
 	@echo Linking $@
-	@g++ -shared -Wl,-soname,$@ $(LDFLAGS) -o $@ $(GUIOBJS_DEBUG) -L. -ltcod_debug -ltcodxx_debug $(CFLAGS)
+	@${CXX} -shared -Wl,-soname,$@ $(LDFLAGS) -o $@ $(GUIOBJS_DEBUG) -L. -ltcod_debug -ltcodxx_debug $(CFLAGS)
 
 clean : 
 	\rm -f $(LIBOBJS_C_RELEASE) $(LIBOBJS_CPP_RELEASE) $(GUIOBJS_RELEASE) $(LIBOBJS_C_DEBUG) $(LIBOBJS_CPP_DEBUG) $(GUIOBJS_DEBUG) libtcod.a libtcodxx.a libtcod.so libtcodxx.so libtcodgui.so libtcod_debug.so libtcodxx_debug.so libtcodgui_debug.so libtcodpy.pyc