Fixes and updates

Makefile

@@ -1,14 +1,14 @@
 
 CPPFILES=CumulativeDistributionFunction.cpp Galaxy.cpp GalaxyWnd.cpp Helper.cpp main.cpp SDLWnd.cpp TextBuffer.cpp
 OBJFILES=$(CPPFILES:.cpp=.o)
-OUT=main
+OUT=galaxy_renderer
 PKG_CONFIG?=pkg-config
 SDLLIBS:=$(shell $(PKG_CONFIG) sdl2 --libs)
 SDLCFLAGS:=$(shell $(PKG_CONFIG) sdl2 --cflags)
 GLEWLIBS:=$(shell $(PKG_CONFIG) --libs-only-l glew)
 GLEWCFLAGS:=$(shell $(PKG_CONFIG) --cflags glew)
 DEBUG=-g
-CFLAGS=${DEBUG} -Wall -Wextra --pedantic -std=c++11 -Iinclude -I/usr/include/SDL2 ${GLEWCFLAGS} ${SDLCFLAGS}
+CFLAGS=${DEBUG} -Wall -Wextra --pedantic -std=c++11 -Idependencies/glm -Iinclude -I/usr/include/SDL2 ${GLEWCFLAGS} ${SDLCFLAGS}
 LIBS=${SDLLIBS} ${GLEWLIBS} -lSDL2_ttf
 
 COMPILE=g++ ${CFLAGS}
@@ -21,5 +21,5 @@ $(OUT):	$(OBJFILES)
 	$(COMPILE) -c -o $@ $^
 
 clean:
-	rm -f ${OBJFILES} main
+	rm -f ${OBJFILES} $(OUT)
 

TextBuffer.cpp

@@ -82,15 +82,15 @@ void TextBuffer::Initialize()
 	if (!TTF_WasInit())
 		TTF_Init();
 
-	_pSmallFont = TTF_OpenFont("consola.ttf", 14);
+	_pSmallFont = TTF_OpenFont("assets/consola.ttf", 14);
 	if (_pSmallFont == nullptr)
 		throw std::runtime_error(TTF_GetError());
 
-	_pFont = TTF_OpenFont("arial.ttf", 18);
+	_pFont = TTF_OpenFont("assets/arial.ttf", 18);
 	if (_pFont == nullptr)
 		throw std::runtime_error(TTF_GetError());
 
-	_pFontCaption = TTF_OpenFont("arial.ttf", 40);
+	_pFontCaption = TTF_OpenFont("assets/arial.ttf", 40);
 	if (_pFontCaption == nullptr)
 		throw std::runtime_error(TTF_GetError());