diff --git a/renderdoc/Makefile b/renderdoc/Makefile
index caa45d33e..885df44e5 100644
--- a/renderdoc/Makefile
+++ b/renderdoc/Makefile
@@ -56,13 +56,16 @@ os/linux/linux_process.o \
 os/linux/linux_stringio.o \
 os/linux/linux_threading.o \
 hooks/linux_libentry.o
-SHADERS=data/glsl/blit.frago \
+DATA=data/glsl/blit.frago \
 data/glsl/blit.verto \
 data/glsl/texdisplay.frago \
 data/glsl/checkerboard.frago \
 data/glsl/generic.frago \
 data/glsl/generic.verto \
-data/glsl/mesh.verto
+data/glsl/mesh.verto \
+data/glsl/text.verto \
+data/glsl/text.frago \
+data/sourcecodepro.ttfo
 
 .PHONY: all
 all: librenderdoc.so
@@ -89,12 +92,17 @@ $(OBJDIR)/%.frago: %.frag
 	cd $$(dirname $<) && objcopy --input binary --output elf64-x86-64 --binary-architecture i386 $$(basename $<) $$(basename $@)
 	@mv $$(dirname $<)/$$(basename $@) $@
 
+$(OBJDIR)/%.ttfo: %.ttf
+	@mkdir -p $$(dirname $@)
+	cd $$(dirname $<) && objcopy --input binary --output elf64-x86-64 --binary-architecture i386 $$(basename $<) $$(basename $@)
+	@mv $$(dirname $<)/$$(basename $@) $@
+
 OBJDIR_OBJECTS=$(addprefix $(OBJDIR)/, $(OBJECTS))
-OBJDIR_SHADERS=$(addprefix $(OBJDIR)/, $(SHADERS))
+OBJDIR_DATA=$(addprefix $(OBJDIR)/, $(DATA))
 
 -include $(OBJDIR_OBJECTS:.o=.d)
 
-librenderdoc.so: $(OBJDIR_OBJECTS) $(OBJDIR_SHADERS)
+librenderdoc.so: $(OBJDIR_OBJECTS) $(OBJDIR_DATA)
 	g++ -o librenderdoc.so $^ $(LDFLAGS)
 
 .PHONY: clean
diff --git a/renderdoc/data/embedded_files.h b/renderdoc/data/embedded_files.h
index 3a777128c..3dfc090bf 100644
--- a/renderdoc/data/embedded_files.h
+++ b/renderdoc/data/embedded_files.h
@@ -35,5 +35,8 @@ DECLARE_EMBED(checkerboard_frag);
 DECLARE_EMBED(mesh_vert);
 DECLARE_EMBED(generic_vert);
 DECLARE_EMBED(generic_frag);
+DECLARE_EMBED(text_frag);
+DECLARE_EMBED(text_vert);
+DECLARE_EMBED(sourcecodepro_ttf);
 
 #undef DECLARE_EMBED
diff --git a/renderdoc/driver/gl/gl_driver.cpp b/renderdoc/driver/gl/gl_driver.cpp
index d7e1ef5d6..8407eff76 100644
--- a/renderdoc/driver/gl/gl_driver.cpp
+++ b/renderdoc/driver/gl/gl_driver.cpp
@@ -704,7 +704,7 @@ void WrappedOpenGL::RenderOverlayStr(float x, float y, const char *text)
 
 	const GLHookSet &gl = m_Real;
 	
-	RDCASSERT(strlen(text) < FONT_MAX_CHARS);
+	RDCASSERT(strlen(text) < (size_t)FONT_MAX_CHARS);
 
 	FontData &font = m_Fonts[GetCtx()];