diff --git a/CMakeLists.txt b/CMakeLists.txt
index 89dc53f..4b3ccd9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,7 +7,7 @@ include(FindPackageHandleStandardArgs)
 option(STEAM "Build for Steam" OFF)
 set(STEAMWORKS_PATH "${CMAKE_CURRENT_SOURCE_DIR}/steamworks" CACHE PATH "Path to Steamworks folder")
 option(DEBUG "Debug mode" ON)
-
+set(SDLTTF_VENDORED ON)
 ## Misc setup ##
 
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
diff --git a/src/al-util.h b/src/al-util.h
index b360f1e..0af49d5 100644
--- a/src/al-util.h
+++ b/src/al-util.h
@@ -86,8 +86,7 @@ namespace Buffer{
 	}
 }
 
-namespace Source
-{
+namespace Source{
 	DEF_AL_ID
 
 	inline Source::ID gen(){
diff --git a/src/aldatasource.h b/src/aldatasource.h
index 8be9717..6f67f5c 100644
--- a/src/aldatasource.h
+++ b/src/aldatasource.h
@@ -29,8 +29,7 @@
 #endif
 
 struct ALDataSource{
-	enum Status
-	{
+	enum Status{
 		NoError,
 		EndOfStream,
 		WrapAround,
diff --git a/src/alstream.h b/src/alstream.h
index 7e7dede..c446d1b 100644
--- a/src/alstream.h
+++ b/src/alstream.h
@@ -34,10 +34,8 @@ struct ALDataSource;
 
 /* State-machine like audio playback stream.
  * This class is NOT thread safe */
-struct ALStream
-{
-	enum State
-	{
+struct ALStream{
+	enum State{
 		Closed,
 		Stopped,
 		Playing,
@@ -77,14 +75,12 @@ struct ALStream
 	// made it pointer, idk if its right. never worked with SDL
 	SDL_IOStream* srcOps;
 
-	struct
-	{
+	struct{
 		ALenum format;
 		ALsizei freq;
 	} stream;
 
-	enum LoopMode
-	{
+	enum LoopMode{
 		Looped,
 		NotLooped
 	};
diff --git a/src/filesystem.h b/src/filesystem.h
index 5dd9819..e524aa9 100644
--- a/src/filesystem.h
+++ b/src/filesystem.h
@@ -27,8 +27,7 @@
 struct FileSystemPrivate;
 class SharedFontState;
 
-class FileSystem
-{
+class FileSystem{
 public:
 	FileSystem(bool allowSymlinks);
 	~FileSystem();
@@ -42,8 +41,7 @@ public:
 	 * available font assets */
 	void initFontSets(SharedFontState &sfs);
 
-	struct OpenHandler
-	{
+	struct OpenHandler{
 		/* Try to read and interpret data provided from ops.
 		 * If data cannot be parsed, return false, otherwise true.
 		 * Can be called multiple times until a parseable file is found.
diff --git a/src/font.cpp b/src/font.cpp
index 37f9c00..74b34bb 100644
--- a/src/font.cpp
+++ b/src/font.cpp
@@ -354,7 +354,7 @@ void Font::initDefaultDynAttribs(){
 
 void Font::initDefaults(const SharedFontState &sfs){
 	std::vector<std::string> &names = FontPrivate::initialDefaultNames;
-
+	
 	switch (rgssVer){
 	case 1 :
 		// FIXME: Japanese version has "MS PGothic" instead
diff --git a/src/font.h b/src/font.h
index eff0550..da6f434 100644
--- a/src/font.h
+++ b/src/font.h
@@ -36,8 +36,7 @@ struct Config;
 
 struct SharedFontStatePrivate;
 
-class SharedFontState
-{
+class SharedFontState{
 public:
 	SharedFontState(const Config &conf);
 	~SharedFontState();
@@ -60,8 +59,7 @@ private:
 
 struct FontPrivate;
 
-class Font
-{
+class Font{
 public:
 	static bool doesExist(const char *name);
 
diff --git a/steamshim_parent/CMakeLists.txt b/steamshim_parent/CMakeLists.txt
index ed8ea55..9d60235 100644
--- a/steamshim_parent/CMakeLists.txt
+++ b/steamshim_parent/CMakeLists.txt
@@ -4,6 +4,11 @@ set(STEAMWORKS_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../steamworks" CACHE PATH "Path
 set(GAME_LAUNCH_NAME "oneshot" CACHE STRING "Game launch name")
 option(DEBUG "Debug mode" OFF)
 
+if(DEBUG)
+	set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -g3 -O0 -fno-omit-frame-pointer -ggdb")
+	set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -g3 -O0 -fno-omit-frame-pointer -ggdb")
+endif()
+
 set(SOURCES
 	steamshim_parent.cpp
 )