# HG changeset patch
# User John Tsiombikas <nuclear@member.fsf.org>
# Date 1400973819 -10800
# Node ID d2b6cee8ea5c781852bdc7a95c2334e2577c6985
# Parent  20d6c05529f1a42a675e7de123727ce63383552d
fixed visual studio build

diff -r 20d6c05529f1 -r d2b6cee8ea5c erebus.vcxproj
--- a/erebus.vcxproj	Sun May 25 02:00:07 2014 +0300
+++ b/erebus.vcxproj	Sun May 25 02:23:39 2014 +0300
@@ -95,12 +95,13 @@
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <DisableSpecificWarnings>4244;4305;4996</DisableSpecificWarnings>
+      <AdditionalIncludeDirectories>$(SolutionDir)\liberebus\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalDependencies>opengl32.lib;glut32.lib;glew32.lib;libvmath.lib;libimago2.lib;jpeglib.lib;libpng.lib;zlib.lib;liberebus.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)\liberebus\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -128,6 +129,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <DisableSpecificWarnings>4244;4305;4996</DisableSpecificWarnings>
+      <AdditionalIncludeDirectories>$(SolutionDir)\liberebus\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
@@ -135,7 +137,7 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <AdditionalDependencies>opengl32.lib;glut32.lib;glew32.lib;libvmath.lib;libimago2.lib;jpeglib.lib;libpng.lib;zlib.lib;liberebus.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>$(SolutionDir)\liberebus\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
diff -r 20d6c05529f1 -r d2b6cee8ea5c liberebus/liberebus.vcxproj
--- a/liberebus/liberebus.vcxproj	Sun May 25 02:00:07 2014 +0300
+++ b/liberebus/liberebus.vcxproj	Sun May 25 02:23:39 2014 +0300
@@ -19,7 +19,9 @@
     <ClInclude Include="src\erebus_impl.h" />
     <ClInclude Include="src\geomobj.h" />
     <ClInclude Include="src\image.h" />
+    <ClInclude Include="src\material.h" />
     <ClInclude Include="src\object.h" />
+    <ClInclude Include="src\rt.h" />
     <ClInclude Include="src\scene.h" />
     <ClInclude Include="src\snode.h" />
     <ClInclude Include="src\texture.h" />
@@ -29,7 +31,10 @@
     <ClCompile Include="src\bvol.cc" />
     <ClCompile Include="src\camera.cc" />
     <ClCompile Include="src\erebus.cc" />
+    <ClCompile Include="src\geomobj.cc" />
+    <ClCompile Include="src\material.cc" />
     <ClCompile Include="src\object.cc" />
+    <ClCompile Include="src\rt.cc" />
     <ClCompile Include="src\scene.cc" />
     <ClCompile Include="src\snode.cc" />
   </ItemGroup>
@@ -46,14 +51,14 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <PlatformToolset>v120</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
+    <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <PlatformToolset>v120</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
+    <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -72,8 +77,8 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <DisableSpecificWarnings>4244</DisableSpecificWarnings>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_USE_MATH_DEFINES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <DisableSpecificWarnings>4244;4305</DisableSpecificWarnings>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -88,8 +93,8 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <DisableSpecificWarnings>4244</DisableSpecificWarnings>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_USE_MATH_DEFINES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <DisableSpecificWarnings>4244;4305</DisableSpecificWarnings>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
diff -r 20d6c05529f1 -r d2b6cee8ea5c liberebus/liberebus.vcxproj.filters
--- a/liberebus/liberebus.vcxproj.filters	Sun May 25 02:00:07 2014 +0300
+++ b/liberebus/liberebus.vcxproj.filters	Sun May 25 02:23:39 2014 +0300
@@ -51,6 +51,12 @@
     <ClInclude Include="src\erebus_impl.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\material.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\rt.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\erebus.cc">
@@ -74,6 +80,15 @@
     <ClCompile Include="src\snode.cc">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\geomobj.cc">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\material.cc">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\rt.cc">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="src\image.inl">
diff -r 20d6c05529f1 -r d2b6cee8ea5c liberebus/src/geomobj.cc
--- a/liberebus/src/geomobj.cc	Sun May 25 02:00:07 2014 +0300
+++ b/liberebus/src/geomobj.cc	Sun May 25 02:23:39 2014 +0300
@@ -1,3 +1,4 @@
+#include <math.h>
 #include <float.h>
 #include "geomobj.h"