commit a9c9a3dbfda44c1095753aa8fabaaf550fe80384
parent dae38f764b7574e3414844936db9f27c7f17174e
Author: Brian Swetland <swetland@frotz.net>
Date: Tue, 2 Jul 2013 15:15:49 -0700
windows: include texturefont, fix build
Diffstat:
3 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/common/common.vcxproj b/common/common.vcxproj
@@ -103,6 +103,7 @@
<ClInclude Include="matrix.h" />
<ClInclude Include="opengl.h" />
<ClInclude Include="textgrid.h" />
+ <ClInclude Include="texturefont.h" />
<ClInclude Include="util.h" />
</ItemGroup>
<ItemGroup>
@@ -124,6 +125,7 @@
<ClCompile Include="shaders.cc" />
<ClCompile Include="simplexnoise.cc" />
<ClCompile Include="textgrid.cc" />
+ <ClCompile Include="texturefont.cc" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
diff --git a/common/texturefont.cc b/common/texturefont.cc
@@ -15,10 +15,10 @@
#include <stdio.h>
-#include <util.h>
-#include <matrix.h>
-#include <app.h>
-#include <texturefont.h>
+#include "util.h"
+#include "matrix.h"
+#include "app.h"
+#include "texturefont.h"
// idx, src, dst, count, offset, stride, divisor
static VertexAttrDesc layout[] = {
diff --git a/common/texturefont.h b/common/texturefont.h
@@ -16,8 +16,8 @@
#ifndef _TEXTUREFONT_H_
#define _TEXTUREFONT_H_
-#include <app.h>
-#include <matrix.h>
+#include "app.h"
+#include "matrix.h"
struct CharInfo {
// location in texture