# HG changeset patch
# User John Tsiombikas <nuclear@member.fsf.org>
# Date 1349564711 -10800
# Node ID 1141a325cb7393a8a7fb92d0cc12a95167cb7909
# Parent  2560a7ab024356731182ca0fd29494cef0838bc3# Parent  6a471c87f9cab82d8dab5ebb8f63bc10a65ff665
merged with visual studio crap

diff -r 2560a7ab0243 -r 1141a325cb73 prototype/drawtext/drawtext_impl.h
--- a/prototype/drawtext/drawtext_impl.h	Sun Oct 07 02:04:00 2012 +0300
+++ b/prototype/drawtext/drawtext_impl.h	Sun Oct 07 02:05:11 2012 +0300
@@ -18,6 +18,10 @@
 #ifndef TEXT_IMPL_H_
 #define TEXT_IMPL_H_
 
+#include <stdio.h>
+#include <string.h>
+#include <errno.h>
+
 struct glyph {
 	int code;
 	float x, y, width, height;
@@ -61,7 +65,7 @@
 
 
 #define fperror(str) \
-	fprintf(stderr, "%s: %s: %s\n", __func__, (str), strerror(errno))
+	fprintf(stderr, "%s: %s: %s\n", __FUNCTION__, (str), strerror(errno))
 
 int dtx_gl_init(void);
 
diff -r 2560a7ab0243 -r 1141a325cb73 prototype/drawtext/font.c
--- a/prototype/drawtext/font.c	Sun Oct 07 02:04:00 2012 +0300
+++ b/prototype/drawtext/font.c	Sun Oct 07 02:05:11 2012 +0300
@@ -332,7 +332,7 @@
 
 			res = sscanf(line + 1, "%d: %fx%f+%f+%f\n", &c, &xsz, &ysz, &x, &y);
 			if(res != 5) {
-				fprintf(stderr, "%s: invalid glyph info line\n", __func__);
+				fprintf(stderr, "%s: invalid glyph info line\n", __FUNCTION__);
 				goto err;
 			}
 
@@ -358,14 +358,14 @@
 			switch(hdr_lines) {
 			case 0:
 				if(0[line] != 'P' || 1[line] != '6') {
-					fprintf(stderr, "%s: invalid file format (magic)\n", __func__);
+					fprintf(stderr, "%s: invalid file format (magic)\n", __FUNCTION__);
 					goto err;
 				}
 				break;
 
 			case 1:
 				if(sscanf(line, "%d %d", &gmap->xsz, &gmap->ysz) != 2) {
-					fprintf(stderr, "%s: invalid file format (dim)\n", __func__);
+					fprintf(stderr, "%s: invalid file format (dim)\n", __FUNCTION__);
 					goto err;
 				}
 				break;
@@ -375,7 +375,7 @@
 					char *endp;
 					max_pixval = strtol(line, &endp, 10);
 					if(endp == line) {
-						fprintf(stderr, "%s: invalid file format (maxval)\n", __func__);
+						fprintf(stderr, "%s: invalid file format (maxval)\n", __FUNCTION__);
 						goto err;
 					}
 				}
@@ -438,7 +438,7 @@
 	int res;
 
 	if(!(fp = fopen(fname, "wb"))) {
-		fprintf(stderr, "%s: failed to open file: %s: %s\n", __func__, fname, strerror(errno));
+		fprintf(stderr, "%s: failed to open file: %s: %s\n", __FUNCTION__, fname, strerror(errno));
 		return -1;
 	}
 	res = dtx_save_glyphmap_stream(fp, gmap);
diff -r 2560a7ab0243 -r 1141a325cb73 prototype/prototype.sln
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/prototype/prototype.sln	Sun Oct 07 02:05:11 2012 +0300
@@ -0,0 +1,20 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2012
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "prototype", "prototype.vcxproj", "{DBC203E4-17DE-4B50-9D14-85A063ABCFBF}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Release|Win32 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{DBC203E4-17DE-4B50-9D14-85A063ABCFBF}.Debug|Win32.ActiveCfg = Debug|Win32
+		{DBC203E4-17DE-4B50-9D14-85A063ABCFBF}.Debug|Win32.Build.0 = Debug|Win32
+		{DBC203E4-17DE-4B50-9D14-85A063ABCFBF}.Release|Win32.ActiveCfg = Release|Win32
+		{DBC203E4-17DE-4B50-9D14-85A063ABCFBF}.Release|Win32.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff -r 2560a7ab0243 -r 1141a325cb73 prototype/prototype.vcxproj
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/prototype/prototype.vcxproj	Sun Oct 07 02:05:11 2012 +0300
@@ -0,0 +1,177 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{DBC203E4-17DE-4B50-9D14-85A063ABCFBF}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>prototype</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v110</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v110</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(SolutionDir)\vmath;$(SolutionDir)\drawtext;$(SolutionDir)\kdtree;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <DisableSpecificWarnings>4996</DisableSpecificWarnings>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;assimp.lib;glut32.lib;glew32.lib;libimago2.lib;zlib.lib;jpeglib.lib;libpng.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(SolutionDir)\vmath;$(SolutionDir)\drawtext;$(SolutionDir)\kdtree;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <DisableSpecificWarnings>4996</DisableSpecificWarnings>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;assimp.lib;glut32.lib;glew32.lib;libimago2.lib;zlib.lib;jpeglib.lib;libpng.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="drawtext\drawgl.c" />
+    <ClCompile Include="drawtext\font.c" />
+    <ClCompile Include="drawtext\utf8.c" />
+    <ClCompile Include="kdtree\kdtree.c" />
+    <ClCompile Include="src\audio\audio.cc" />
+    <ClCompile Include="src\audio\auman.cc" />
+    <ClCompile Include="src\audio\ovstream.cc" />
+    <ClCompile Include="src\audio\sample.cc" />
+    <ClCompile Include="src\audio\source.cc" />
+    <ClCompile Include="src\audio\stream.cc" />
+    <ClCompile Include="src\camera.cc" />
+    <ClCompile Include="src\cfg.cc" />
+    <ClCompile Include="src\cmdcon.cc" />
+    <ClCompile Include="src\datapath.cc" />
+    <ClCompile Include="src\level.cc" />
+    <ClCompile Include="src\light.cc" />
+    <ClCompile Include="src\main.cc" />
+    <ClCompile Include="src\material.cc" />
+    <ClCompile Include="src\mesh.cc" />
+    <ClCompile Include="src\opengl.cc" />
+    <ClCompile Include="src\renderer.cc" />
+    <ClCompile Include="src\renderer_deferred.cc" />
+    <ClCompile Include="src\renderer_multipass.cc" />
+    <ClCompile Include="src\sdr.c" />
+    <ClCompile Include="src\texture.cc" />
+    <ClCompile Include="src\tile.cc" />
+    <ClCompile Include="src\tileset.cc" />
+    <ClCompile Include="src\timer.cc" />
+    <ClCompile Include="vmath\basis.cc" />
+    <ClCompile Include="vmath\basis_c.c" />
+    <ClCompile Include="vmath\geom.c" />
+    <ClCompile Include="vmath\matrix.cc" />
+    <ClCompile Include="vmath\matrix_c.c" />
+    <ClCompile Include="vmath\quat.cc" />
+    <ClCompile Include="vmath\quat_c.c" />
+    <ClCompile Include="vmath\ray.cc" />
+    <ClCompile Include="vmath\ray_c.c" />
+    <ClCompile Include="vmath\sphvec.cc" />
+    <ClCompile Include="vmath\vector.cc" />
+    <ClCompile Include="vmath\vmath.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="drawtext\drawtext.h" />
+    <ClInclude Include="drawtext\drawtext_impl.h" />
+    <ClInclude Include="kdtree\kdtree.h" />
+    <ClInclude Include="src\audio\audio.h" />
+    <ClInclude Include="src\audio\auman.h" />
+    <ClInclude Include="src\audio\openal.h" />
+    <ClInclude Include="src\audio\ovstream.h" />
+    <ClInclude Include="src\audio\sample.h" />
+    <ClInclude Include="src\audio\source.h" />
+    <ClInclude Include="src\audio\stream.h" />
+    <ClInclude Include="src\camera.h" />
+    <ClInclude Include="src\cfg.h" />
+    <ClInclude Include="src\cmdcon.h" />
+    <ClInclude Include="src\color.h" />
+    <ClInclude Include="src\datapath.h" />
+    <ClInclude Include="src\dataset.h" />
+    <ClInclude Include="src\level.h" />
+    <ClInclude Include="src\light.h" />
+    <ClInclude Include="src\material.h" />
+    <ClInclude Include="src\mesh.h" />
+    <ClInclude Include="src\opengl.h" />
+    <ClInclude Include="src\renderer.h" />
+    <ClInclude Include="src\renderer_deferred.h" />
+    <ClInclude Include="src\renderer_multipass.h" />
+    <ClInclude Include="src\sdr.h" />
+    <ClInclude Include="src\texture.h" />
+    <ClInclude Include="src\tile.h" />
+    <ClInclude Include="src\tileset.h" />
+    <ClInclude Include="src\timer.h" />
+    <ClInclude Include="vmath\basis.h" />
+    <ClInclude Include="vmath\geom.h" />
+    <ClInclude Include="vmath\matrix.h" />
+    <ClInclude Include="vmath\quat.h" />
+    <ClInclude Include="vmath\ray.h" />
+    <ClInclude Include="vmath\sphvec.h" />
+    <ClInclude Include="vmath\vector.h" />
+    <ClInclude Include="vmath\vmath.h" />
+    <ClInclude Include="vmath\vmath_config.h" />
+    <ClInclude Include="vmath\vmath_types.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="vmath\matrix.inl" />
+    <None Include="vmath\quat.inl" />
+    <None Include="vmath\ray.inl" />
+    <None Include="vmath\vector.inl" />
+    <None Include="vmath\vmath.inl" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff -r 2560a7ab0243 -r 1141a325cb73 prototype/prototype.vcxproj.filters
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/prototype/prototype.vcxproj.filters	Sun Oct 07 02:05:11 2012 +0300
@@ -0,0 +1,282 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="src">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="audio">
+      <UniqueIdentifier>{cb48c0ab-e309-4f8f-b3c7-ba5522748dfe}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="libs">
+      <UniqueIdentifier>{b0ec2f24-37c0-4783-b242-5bb90a09f3c7}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="libs\vmath">
+      <UniqueIdentifier>{76d11503-7646-4655-80e3-e055ffbd3671}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="libs\kdtree">
+      <UniqueIdentifier>{88a7a215-3123-49c8-abbc-be8b4c1477ac}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="libs\drawtext">
+      <UniqueIdentifier>{a1933fec-b18b-4122-a680-4da3e97a2d88}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="src\camera.cc">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cfg.cc">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="src\cmdcon.cc">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="src\datapath.cc">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="src\level.cc">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="src\light.cc">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="src\main.cc">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="src\material.cc">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="src\mesh.cc">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="src\opengl.cc">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="src\renderer.cc">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="src\renderer_deferred.cc">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="src\renderer_multipass.cc">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="src\sdr.c">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="src\texture.cc">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="src\tile.cc">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="src\tileset.cc">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="src\timer.cc">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="src\audio\audio.cc">
+      <Filter>audio</Filter>
+    </ClCompile>
+    <ClCompile Include="src\audio\auman.cc">
+      <Filter>audio</Filter>
+    </ClCompile>
+    <ClCompile Include="src\audio\ovstream.cc">
+      <Filter>audio</Filter>
+    </ClCompile>
+    <ClCompile Include="src\audio\sample.cc">
+      <Filter>audio</Filter>
+    </ClCompile>
+    <ClCompile Include="src\audio\source.cc">
+      <Filter>audio</Filter>
+    </ClCompile>
+    <ClCompile Include="src\audio\stream.cc">
+      <Filter>audio</Filter>
+    </ClCompile>
+    <ClCompile Include="vmath\basis.cc">
+      <Filter>libs\vmath</Filter>
+    </ClCompile>
+    <ClCompile Include="vmath\basis_c.c">
+      <Filter>libs\vmath</Filter>
+    </ClCompile>
+    <ClCompile Include="vmath\geom.c">
+      <Filter>libs\vmath</Filter>
+    </ClCompile>
+    <ClCompile Include="vmath\matrix.cc">
+      <Filter>libs\vmath</Filter>
+    </ClCompile>
+    <ClCompile Include="vmath\matrix_c.c">
+      <Filter>libs\vmath</Filter>
+    </ClCompile>
+    <ClCompile Include="vmath\quat.cc">
+      <Filter>libs\vmath</Filter>
+    </ClCompile>
+    <ClCompile Include="vmath\quat_c.c">
+      <Filter>libs\vmath</Filter>
+    </ClCompile>
+    <ClCompile Include="vmath\ray.cc">
+      <Filter>libs\vmath</Filter>
+    </ClCompile>
+    <ClCompile Include="vmath\ray_c.c">
+      <Filter>libs\vmath</Filter>
+    </ClCompile>
+    <ClCompile Include="vmath\sphvec.cc">
+      <Filter>libs\vmath</Filter>
+    </ClCompile>
+    <ClCompile Include="vmath\vector.cc">
+      <Filter>libs\vmath</Filter>
+    </ClCompile>
+    <ClCompile Include="vmath\vmath.c">
+      <Filter>libs\vmath</Filter>
+    </ClCompile>
+    <ClCompile Include="kdtree\kdtree.c">
+      <Filter>libs\kdtree</Filter>
+    </ClCompile>
+    <ClCompile Include="drawtext\drawgl.c">
+      <Filter>libs\drawtext</Filter>
+    </ClCompile>
+    <ClCompile Include="drawtext\font.c">
+      <Filter>libs\drawtext</Filter>
+    </ClCompile>
+    <ClCompile Include="drawtext\utf8.c">
+      <Filter>libs\drawtext</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="src\camera.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="src\cfg.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="src\cmdcon.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="src\color.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="src\datapath.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="src\dataset.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="src\level.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="src\light.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="src\material.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="src\mesh.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="src\opengl.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="src\renderer.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="src\renderer_deferred.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="src\renderer_multipass.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="src\sdr.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="src\texture.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="src\tile.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="src\tileset.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="src\timer.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="src\audio\audio.h">
+      <Filter>audio</Filter>
+    </ClInclude>
+    <ClInclude Include="src\audio\auman.h">
+      <Filter>audio</Filter>
+    </ClInclude>
+    <ClInclude Include="src\audio\openal.h">
+      <Filter>audio</Filter>
+    </ClInclude>
+    <ClInclude Include="src\audio\ovstream.h">
+      <Filter>audio</Filter>
+    </ClInclude>
+    <ClInclude Include="src\audio\sample.h">
+      <Filter>audio</Filter>
+    </ClInclude>
+    <ClInclude Include="src\audio\source.h">
+      <Filter>audio</Filter>
+    </ClInclude>
+    <ClInclude Include="src\audio\stream.h">
+      <Filter>audio</Filter>
+    </ClInclude>
+    <ClInclude Include="vmath\basis.h">
+      <Filter>libs\vmath</Filter>
+    </ClInclude>
+    <ClInclude Include="vmath\geom.h">
+      <Filter>libs\vmath</Filter>
+    </ClInclude>
+    <ClInclude Include="vmath\matrix.h">
+      <Filter>libs\vmath</Filter>
+    </ClInclude>
+    <ClInclude Include="vmath\quat.h">
+      <Filter>libs\vmath</Filter>
+    </ClInclude>
+    <ClInclude Include="vmath\ray.h">
+      <Filter>libs\vmath</Filter>
+    </ClInclude>
+    <ClInclude Include="vmath\sphvec.h">
+      <Filter>libs\vmath</Filter>
+    </ClInclude>
+    <ClInclude Include="vmath\vector.h">
+      <Filter>libs\vmath</Filter>
+    </ClInclude>
+    <ClInclude Include="vmath\vmath.h">
+      <Filter>libs\vmath</Filter>
+    </ClInclude>
+    <ClInclude Include="vmath\vmath_config.h">
+      <Filter>libs\vmath</Filter>
+    </ClInclude>
+    <ClInclude Include="vmath\vmath_types.h">
+      <Filter>libs\vmath</Filter>
+    </ClInclude>
+    <ClInclude Include="kdtree\kdtree.h">
+      <Filter>libs\kdtree</Filter>
+    </ClInclude>
+    <ClInclude Include="drawtext\drawtext.h">
+      <Filter>libs\drawtext</Filter>
+    </ClInclude>
+    <ClInclude Include="drawtext\drawtext_impl.h">
+      <Filter>libs\drawtext</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="vmath\matrix.inl">
+      <Filter>libs\vmath</Filter>
+    </None>
+    <None Include="vmath\quat.inl">
+      <Filter>libs\vmath</Filter>
+    </None>
+    <None Include="vmath\ray.inl">
+      <Filter>libs\vmath</Filter>
+    </None>
+    <None Include="vmath\vector.inl">
+      <Filter>libs\vmath</Filter>
+    </None>
+    <None Include="vmath\vmath.inl">
+      <Filter>libs\vmath</Filter>
+    </None>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff -r 2560a7ab0243 -r 1141a325cb73 prototype/src/mesh.cc
--- a/prototype/src/mesh.cc	Sun Oct 07 02:04:00 2012 +0300
+++ b/prototype/src/mesh.cc	Sun Oct 07 02:05:11 2012 +0300
@@ -38,7 +38,7 @@
 bool Mesh::create(const aiScene *scn, aiMesh *aim)
 {
 	if(aim->mPrimitiveTypes != aiPrimitiveType_TRIANGLE) {
-		fprintf(stderr, "%s: non-triangle mesh!? primtype mask: %x\n", __func__, aim->mPrimitiveTypes);
+		fprintf(stderr, "%s: non-triangle mesh!? primtype mask: %x\n", __FUNCTION__, aim->mPrimitiveTypes);
 		return false;
 	}
 
diff -r 2560a7ab0243 -r 1141a325cb73 prototype/src/tile.h
--- a/prototype/src/tile.h	Sun Oct 07 02:04:00 2012 +0300
+++ b/prototype/src/tile.h	Sun Oct 07 02:05:11 2012 +0300
@@ -4,7 +4,7 @@
 #include <vector>
 #include <map>
 #include <assimp/scene.h>
-#include <psys/psys.h>
+#include "psys/psys.h"
 #include "mesh.h"
 #include "light.h"
 #include "audio/sample.h"
diff -r 2560a7ab0243 -r 1141a325cb73 prototype/vmath/vmath_config.h
--- a/prototype/vmath/vmath_config.h	Sun Oct 07 02:04:00 2012 +0300
+++ b/prototype/vmath/vmath_config.h	Sun Oct 07 02:05:11 2012 +0300
@@ -1,7 +1,7 @@
 #ifndef VMATH_CONFIG_H_
 #define VMATH_CONFIG_H_
 
-#if (__STDC_VERSION__ < 199999)
+#if (__STDC_VERSION__ < 199999) && !defined(__cplusplus)
 #if defined(__GNUC__) || defined(_MSC_VER)
 #define inline __inline
 #else