# HG changeset patch
# User John Tsiombikas <nuclear@member.fsf.org>
# Date 1415536237 -7200
# Node ID 92695e89164b195043567a2e8be175625b0df2c0
# Parent  f234630e38ff9d8cda8d139c3d33d6e6a87e07e0
vc project

diff -r f234630e38ff -r 92695e89164b anim/anim.c
--- a/anim/anim.c	Sun Nov 09 13:03:36 2014 +0200
+++ b/anim/anim.c	Sun Nov 09 14:30:37 2014 +0200
@@ -19,9 +19,11 @@
 
 	memset(node, 0, sizeof *node);
 
+#ifdef ANIM_THREAD_SAFE
 	/* initialize thread-local matrix cache */
 	pthread_key_create(&node->cache_key, 0);
 	pthread_mutex_init(&node->cache_list_lock, 0);
+#endif
 
 	for(i=0; i<ANM_NUM_TRACKS; i++) {
 		if(anm_init_track(node->tracks + i) == -1) {
@@ -43,8 +45,10 @@
 		anm_destroy_track(node->tracks + i);
 	}
 
+#ifdef ANIM_THREAD_SAFE
 	/* destroy thread-specific cache */
 	pthread_key_delete(node->cache_key);
+#endif
 
 	while(node->cache_list) {
 		struct mat_cache *tmp = node->cache_list;
@@ -383,19 +387,27 @@
 
 void anm_get_matrix(struct anm_node *node, mat4_t mat, anm_time_t tm)
 {
+#ifdef ANIM_THREAD_SAFE
 	struct mat_cache *cache = pthread_getspecific(node->cache_key);
+#else
+	struct mat_cache *cache = node->cache_list;
+#endif
 	if(!cache) {
 		cache = malloc(sizeof *cache);
 		assert(cache);
+		cache->time = ANM_TIME_INVAL;
+		cache->inv_time = ANM_TIME_INVAL;
 
+#ifdef ANIM_THREAD_SAFE
 		pthread_mutex_lock(&node->cache_list_lock);
 		cache->next = node->cache_list;
 		node->cache_list = cache;
 		pthread_mutex_unlock(&node->cache_list_lock);
-
-		cache->time = ANM_TIME_INVAL;
-		cache->inv_time = ANM_TIME_INVAL;
 		pthread_setspecific(node->cache_key, cache);
+#else
+		cache->next = node->cache_list;
+		node->cache_list = cache;
+#endif
 	}
 
 	if(cache->time != tm) {
@@ -414,19 +426,27 @@
 
 void anm_get_inv_matrix(struct anm_node *node, mat4_t mat, anm_time_t tm)
 {
+#ifdef ANIM_THREAD_SAFE
 	struct mat_cache *cache = pthread_getspecific(node->cache_key);
+#else
+	struct mat_cache *cache = node->cache_list;
+#endif
 	if(!cache) {
 		cache = malloc(sizeof *cache);
 		assert(cache);
+		cache->time = ANM_TIME_INVAL;
+		cache->inv_time = ANM_TIME_INVAL;
 
+#ifdef ANIM_THREAD_SAFE
 		pthread_mutex_lock(&node->cache_list_lock);
 		cache->next = node->cache_list;
 		node->cache_list = cache;
 		pthread_mutex_unlock(&node->cache_list_lock);
-
-		cache->inv_time = ANM_TIME_INVAL;
-		cache->inv_time = ANM_TIME_INVAL;
 		pthread_setspecific(node->cache_key, cache);
+#else
+		cache->next = node->cache_list;
+		node->cache_list = cache;
+#endif
 	}
 
 	if(cache->inv_time != tm) {
@@ -491,7 +511,11 @@
 
 static void invalidate_cache(struct anm_node *node)
 {
+#ifdef ANIM_THREAD_SAFE
 	struct mat_cache *cache = pthread_getspecific(node->cache_key);
+#else
+	struct mat_cache *cache = node->cache_list;
+#endif
 	if(cache) {
 	   cache->time = cache->inv_time = ANM_TIME_INVAL;
 	}
diff -r f234630e38ff -r 92695e89164b anim/anim.h
--- a/anim/anim.h	Sun Nov 09 13:03:36 2014 +0200
+++ b/anim/anim.h	Sun Nov 09 14:30:37 2014 +0200
@@ -39,8 +39,10 @@
 		anm_time_t time, inv_time;
 		struct mat_cache *next;
 	} *cache_list;
+#ifdef ANIM_THREAD_SAFE
 	pthread_key_t cache_key;
 	pthread_mutex_t cache_list_lock;
+#endif
 
 	struct anm_node *parent;
 	struct anm_node *child;
diff -r f234630e38ff -r 92695e89164b gpuray_glsl.sln
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gpuray_glsl.sln	Sun Nov 09 14:30:37 2014 +0200
@@ -0,0 +1,22 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2013
+VisualStudioVersion = 12.0.30723.0
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gpuray_glsl", "gpuray_glsl.vcxproj", "{67C47591-86E2-42F7-A6CA-6A494F80FFCA}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Release|Win32 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{67C47591-86E2-42F7-A6CA-6A494F80FFCA}.Debug|Win32.ActiveCfg = Debug|Win32
+		{67C47591-86E2-42F7-A6CA-6A494F80FFCA}.Debug|Win32.Build.0 = Debug|Win32
+		{67C47591-86E2-42F7-A6CA-6A494F80FFCA}.Release|Win32.ActiveCfg = Release|Win32
+		{67C47591-86E2-42F7-A6CA-6A494F80FFCA}.Release|Win32.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff -r f234630e38ff -r 92695e89164b gpuray_glsl.vcxproj
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gpuray_glsl.vcxproj	Sun Nov 09 14:30:37 2014 +0200
@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="12.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>{67C47591-86E2-42F7-A6CA-6A494F80FFCA}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>gpuray_glsl</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v120</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v120</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</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;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)\src;$(SolutionDir)\imago;$(SolutionDir)\vmath;$(SolutionDir)\anim</AdditionalIncludeDirectories>
+      <DisableSpecificWarnings>4244;4996</DisableSpecificWarnings>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>opengl32.lib;glut32.lib;glew32.lib;libpng.lib;jpeglib.lib;zlib.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;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)\src;$(SolutionDir)\imago;$(SolutionDir)\vmath;$(SolutionDir)\anim</AdditionalIncludeDirectories>
+      <DisableSpecificWarnings>4244;4996</DisableSpecificWarnings>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>opengl32.lib;glut32.lib;glew32.lib;libpng.lib;jpeglib.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="anim\anim.c" />
+    <ClCompile Include="anim\dynarr.c" />
+    <ClCompile Include="anim\track.c" />
+    <ClCompile Include="imago\conv.c" />
+    <ClCompile Include="imago\file_jpeg.c" />
+    <ClCompile Include="imago\file_png.c" />
+    <ClCompile Include="imago\file_ppm.c" />
+    <ClCompile Include="imago\file_rgbe.c" />
+    <ClCompile Include="imago\ftype_module.c" />
+    <ClCompile Include="imago\imago2.c" />
+    <ClCompile Include="imago\imago_gl.c" />
+    <ClCompile Include="imago\modules.c" />
+    <ClCompile Include="src\box.cc" />
+    <ClCompile Include="src\camera.cc" />
+    <ClCompile Include="src\glsdr.c" />
+    <ClCompile Include="src\gpuscene.cc" />
+    <ClCompile Include="src\image.cc" />
+    <ClCompile Include="src\light.cc" />
+    <ClCompile Include="src\main.cc" />
+    <ClCompile Include="src\material.cc" />
+    <ClCompile Include="src\object.cc" />
+    <ClCompile Include="src\plane.cc" />
+    <ClCompile Include="src\rend.cc" />
+    <ClCompile Include="src\scene.cc" />
+    <ClCompile Include="src\scene_load.cc" />
+    <ClCompile Include="src\sphere.cc" />
+    <ClCompile Include="src\texture.cc" />
+    <ClCompile Include="src\xform_node.cc" />
+    <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\vector.cc" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="anim\anim.h" />
+    <ClInclude Include="anim\config.h" />
+    <ClInclude Include="anim\dynarr.h" />
+    <ClInclude Include="anim\track.h" />
+    <ClInclude Include="imago\ftype_module.h" />
+    <ClInclude Include="imago\imago2.h" />
+    <ClInclude Include="src\box.h" />
+    <ClInclude Include="src\camera.h" />
+    <ClInclude Include="src\glsdr.h" />
+    <ClInclude Include="src\gpuscene.h" />
+    <ClInclude Include="src\image.h" />
+    <ClInclude Include="src\light.h" />
+    <ClInclude Include="src\material.h" />
+    <ClInclude Include="src\object.h" />
+    <ClInclude Include="src\opengl.h" />
+    <ClInclude Include="src\plane.h" />
+    <ClInclude Include="src\rend.h" />
+    <ClInclude Include="src\scene.h" />
+    <ClInclude Include="src\sphere.h" />
+    <ClInclude Include="src\texture.h" />
+    <ClInclude Include="src\xform_node.h" />
+    <ClInclude Include="vmath\matrix.h" />
+    <ClInclude Include="vmath\quat.h" />
+    <ClInclude Include="vmath\ray.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="sdr\postsdr.glsl" />
+    <None Include="sdr\rt.glsl" />
+    <None Include="sdr\vertex.glsl" />
+    <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 f234630e38ff -r 92695e89164b gpuray_glsl.vcxproj.filters
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/gpuray_glsl.vcxproj.filters	Sun Nov 09 14:30:37 2014 +0200
@@ -0,0 +1,240 @@
+<?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;h;hpp;inl;inc</Extensions>
+    </Filter>
+    <Filter Include="vmath">
+      <UniqueIdentifier>{5946a165-6c38-4913-96d8-0365f17329b2}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="anim">
+      <UniqueIdentifier>{af4eb374-7991-43ab-a961-2477351ca47d}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="sdr">
+      <UniqueIdentifier>{d750317b-ef2d-4b6b-afa6-3820784d5b3d}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="imago">
+      <UniqueIdentifier>{03007862-3db1-4979-b8ef-6af8304727d9}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="src\box.cc">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="src\camera.cc">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="src\glsdr.c">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="src\gpuscene.cc">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="src\image.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\object.cc">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="src\plane.cc">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="src\rend.cc">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="src\scene.cc">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="src\scene_load.cc">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="src\sphere.cc">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="src\texture.cc">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="src\xform_node.cc">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="vmath\matrix.cc">
+      <Filter>vmath</Filter>
+    </ClCompile>
+    <ClCompile Include="vmath\matrix_c.c">
+      <Filter>vmath</Filter>
+    </ClCompile>
+    <ClCompile Include="vmath\quat.cc">
+      <Filter>vmath</Filter>
+    </ClCompile>
+    <ClCompile Include="vmath\quat_c.c">
+      <Filter>vmath</Filter>
+    </ClCompile>
+    <ClCompile Include="vmath\ray.cc">
+      <Filter>vmath</Filter>
+    </ClCompile>
+    <ClCompile Include="vmath\ray_c.c">
+      <Filter>vmath</Filter>
+    </ClCompile>
+    <ClCompile Include="vmath\vector.cc">
+      <Filter>vmath</Filter>
+    </ClCompile>
+    <ClCompile Include="anim\anim.c">
+      <Filter>anim</Filter>
+    </ClCompile>
+    <ClCompile Include="anim\dynarr.c">
+      <Filter>anim</Filter>
+    </ClCompile>
+    <ClCompile Include="anim\track.c">
+      <Filter>anim</Filter>
+    </ClCompile>
+    <ClCompile Include="imago\conv.c">
+      <Filter>imago</Filter>
+    </ClCompile>
+    <ClCompile Include="imago\file_jpeg.c">
+      <Filter>imago</Filter>
+    </ClCompile>
+    <ClCompile Include="imago\file_png.c">
+      <Filter>imago</Filter>
+    </ClCompile>
+    <ClCompile Include="imago\file_ppm.c">
+      <Filter>imago</Filter>
+    </ClCompile>
+    <ClCompile Include="imago\file_rgbe.c">
+      <Filter>imago</Filter>
+    </ClCompile>
+    <ClCompile Include="imago\ftype_module.c">
+      <Filter>imago</Filter>
+    </ClCompile>
+    <ClCompile Include="imago\imago_gl.c">
+      <Filter>imago</Filter>
+    </ClCompile>
+    <ClCompile Include="imago\imago2.c">
+      <Filter>imago</Filter>
+    </ClCompile>
+    <ClCompile Include="imago\modules.c">
+      <Filter>imago</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="src\box.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="src\camera.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="src\glsdr.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="src\gpuscene.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="src\image.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\object.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="src\opengl.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="src\plane.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="src\rend.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="src\scene.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="src\sphere.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="src\texture.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="src\xform_node.h">
+      <Filter>src</Filter>
+    </ClInclude>
+    <ClInclude Include="vmath\matrix.h">
+      <Filter>vmath</Filter>
+    </ClInclude>
+    <ClInclude Include="vmath\quat.h">
+      <Filter>vmath</Filter>
+    </ClInclude>
+    <ClInclude Include="vmath\ray.h">
+      <Filter>vmath</Filter>
+    </ClInclude>
+    <ClInclude Include="vmath\vector.h">
+      <Filter>vmath</Filter>
+    </ClInclude>
+    <ClInclude Include="vmath\vmath.h">
+      <Filter>vmath</Filter>
+    </ClInclude>
+    <ClInclude Include="vmath\vmath_config.h">
+      <Filter>vmath</Filter>
+    </ClInclude>
+    <ClInclude Include="vmath\vmath_types.h">
+      <Filter>vmath</Filter>
+    </ClInclude>
+    <ClInclude Include="anim\anim.h">
+      <Filter>anim</Filter>
+    </ClInclude>
+    <ClInclude Include="anim\config.h">
+      <Filter>anim</Filter>
+    </ClInclude>
+    <ClInclude Include="anim\dynarr.h">
+      <Filter>anim</Filter>
+    </ClInclude>
+    <ClInclude Include="anim\track.h">
+      <Filter>anim</Filter>
+    </ClInclude>
+    <ClInclude Include="imago\ftype_module.h">
+      <Filter>imago</Filter>
+    </ClInclude>
+    <ClInclude Include="imago\imago2.h">
+      <Filter>imago</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="vmath\matrix.inl">
+      <Filter>vmath</Filter>
+    </None>
+    <None Include="vmath\quat.inl">
+      <Filter>vmath</Filter>
+    </None>
+    <None Include="vmath\ray.inl">
+      <Filter>vmath</Filter>
+    </None>
+    <None Include="vmath\vector.inl">
+      <Filter>vmath</Filter>
+    </None>
+    <None Include="vmath\vmath.inl">
+      <Filter>vmath</Filter>
+    </None>
+    <None Include="sdr\postsdr.glsl">
+      <Filter>sdr</Filter>
+    </None>
+    <None Include="sdr\rt.glsl">
+      <Filter>sdr</Filter>
+    </None>
+    <None Include="sdr\vertex.glsl">
+      <Filter>sdr</Filter>
+    </None>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff -r f234630e38ff -r 92695e89164b src/texture.cc
--- a/src/texture.cc	Sun Nov 09 13:03:36 2014 +0200
+++ b/src/texture.cc	Sun Nov 09 14:30:37 2014 +0200
@@ -1,10 +1,17 @@
 #include <stdio.h>
-#include <unistd.h>
 #include <string.h>
 #include <errno.h>
 #include "texture.h"
 #include "object.h"
 
+#ifndef WIN32
+#include <unistd.h>
+#else
+#include <io.h>
+
+#define R_OK	4
+#endif
+
 static inline Color sample_image(const Image &img, float u, float v, Texture::WrapMode wrapping);
 
 Texture::Texture()
diff -r f234630e38ff -r 92695e89164b vmath/vmath.h
--- a/vmath/vmath.h	Sun Nov 09 13:03:36 2014 +0200
+++ b/vmath/vmath.h	Sun Nov 09 14:30:37 2014 +0200
@@ -44,10 +44,6 @@
 #define MIN(a, b)	((a) < (b) ? (a) : (b))
 #define MAX(a, b)	((a) > (b) ? (a) : (b))
 
-#ifndef __GNUC__
-#define round(x)	((x) >= 0 ? (x) + 0.5 : (x) - 0.5)
-#endif
-
 #ifdef __cplusplus
 extern "C" {
 #endif	/* __cplusplus */
diff -r f234630e38ff -r 92695e89164b vmath/vmath_config.h
--- a/vmath/vmath_config.h	Sun Nov 09 13:03:36 2014 +0200
+++ b/vmath/vmath_config.h	Sun Nov 09 14:30:37 2014 +0200
@@ -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