X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=laserbrain_demo;a=blobdiff_plain;f=laserbrain_demo.vcxproj;h=a52a9fda7b2c8d49181e984497c5ba23776cdaea;hp=65d6e82eb81cb8cfea74b5e49de089ea74f0c657;hb=3d82e694aea99b4164028c63ab2be1f372854ec8;hpb=3bfa17f584d9b6ad0bcb468c85b815c5046d7250

diff --git a/laserbrain_demo.vcxproj b/laserbrain_demo.vcxproj
index 65d6e82..a52a9fd 100644
--- a/laserbrain_demo.vcxproj
+++ b/laserbrain_demo.vcxproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -14,20 +14,21 @@
     <ProjectGuid>{71A6DAF0-CBF6-4135-BE23-B3999E432EF6}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>laserbrain_demo</RootNamespace>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
   </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>Unicode</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+    <CharacterSet>NotSet</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
+    <PlatformToolset>v141</PlatformToolset>
+    <WholeProgramOptimization>false</WholeProgramOptimization>
+    <CharacterSet>NotSet</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -51,14 +52,15 @@
       </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <DisableSpecificWarnings>4244;4305;4996</DisableSpecificWarnings>
+      <PreprocessorDefinitions>WIN32;SDL_MAIN_HANDLED;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <DisableSpecificWarnings>4244;4305;4996;4800</DisableSpecificWarnings>
       <AdditionalIncludeDirectories>$(ProjectDir)\src;$(ProjectDir)\src\machine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>opengl32.lib;freeglut.lib;glew32.lib;libgmath.lib;libvmath.lib;libimago2.lib;zlib.lib;libpng.lib;libjpeg.lib;libresman.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>opengl32.lib;glu32.lib;glew32.lib;SDL2.lib;libgmath.lib;libimago2.lib;zlib.lib;libpng.lib;libjpeg.lib;libresman.lib;treestore.lib;libgoatvr.lib;libdrawtext.lib;assimp.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -69,23 +71,29 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <DisableSpecificWarnings>4244;4305;4996</DisableSpecificWarnings>
+      <PreprocessorDefinitions>WIN32;SDL_MAIN_HANDLED;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <DisableSpecificWarnings>4244;4305;4996;4800</DisableSpecificWarnings>
       <AdditionalIncludeDirectories>$(ProjectDir)\src;$(ProjectDir)\src\machine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalDependencies>opengl32.lib;freeglut.lib;glew32.lib;libgmath.lib;libvmath.lib;libimago2.lib;zlib.lib;libpng.lib;libjpeg.lib;libresman.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>opengl32.lib;glu32.lib;glew32.lib;SDL2.lib;libgmath.lib;libimago2.lib;zlib.lib;libpng.lib;libjpeg.lib;libresman.lib;treestore.lib;libgoatvr.lib;libdrawtext.lib;assimp.lib;legacy_stdio_definitions.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="src\app.cc" />
+    <ClCompile Include="src\blobs\metasurf.c" />
+    <ClCompile Include="src\blob_exhibit.cc" />
     <ClCompile Include="src\datamap.cc" />
+    <ClCompile Include="src\exhibit.cc" />
+    <ClCompile Include="src\exman.cc" />
     <ClCompile Include="src\geom.cc" />
     <ClCompile Include="src\image.cc" />
+    <ClCompile Include="src\logger.cc" />
     <ClCompile Include="src\machine\gear.cc" />
     <ClCompile Include="src\machine\machine.cc" />
     <ClCompile Include="src\machine\mparser.cc" />
@@ -93,22 +101,37 @@
     <ClCompile Include="src\material.cc" />
     <ClCompile Include="src\mesh.cc" />
     <ClCompile Include="src\meshgen.cc" />
+    <ClCompile Include="src\metascene.cc" />
     <ClCompile Include="src\object.cc" />
     <ClCompile Include="src\objmesh.cc" />
+    <ClCompile Include="src\opt.cc" />
+    <ClCompile Include="src\optcfg.c" />
+    <ClCompile Include="src\post.cc" />
+    <ClCompile Include="src\renderer.cc" />
+    <ClCompile Include="src\rend_cubemap.cc" />
     <ClCompile Include="src\scene.cc" />
     <ClCompile Include="src\sceneload.cc" />
     <ClCompile Include="src\sdr.c" />
+    <ClCompile Include="src\sdrman.cc" />
+    <ClCompile Include="src\shader.cc" />
     <ClCompile Include="src\shadow.cc" />
     <ClCompile Include="src\snode.cc" />
     <ClCompile Include="src\texture.cc" />
+    <ClCompile Include="src\ui.cc" />
+    <ClCompile Include="src\unistate.cc" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="src\app.h" />
+    <ClInclude Include="src\blobs\mcubes.h" />
+    <ClInclude Include="src\blobs\metasurf.h" />
+    <ClInclude Include="src\blob_exhibit.h" />
     <ClInclude Include="src\datamap.h" />
     <ClInclude Include="src\dataset.h" />
     <ClInclude Include="src\exhibit.h" />
+    <ClInclude Include="src\exman.h" />
     <ClInclude Include="src\geom.h" />
     <ClInclude Include="src\image.h" />
+    <ClInclude Include="src\logger.h" />
     <ClInclude Include="src\machine\gear.h" />
     <ClInclude Include="src\machine\machine.h" />
     <ClInclude Include="src\machine\mparser.h" />
@@ -116,15 +139,25 @@
     <ClInclude Include="src\mech_exhibit.h" />
     <ClInclude Include="src\mesh.h" />
     <ClInclude Include="src\meshgen.h" />
+    <ClInclude Include="src\metascene.h" />
     <ClInclude Include="src\object.h" />
     <ClInclude Include="src\objmesh.h" />
     <ClInclude Include="src\opengl.h" />
+    <ClInclude Include="src\opt.h" />
+    <ClInclude Include="src\optcfg.h" />
+    <ClInclude Include="src\post.h" />
+    <ClInclude Include="src\renderer.h" />
+    <ClInclude Include="src\rend_cubemap.h" />
     <ClInclude Include="src\scene.h" />
     <ClInclude Include="src\sceneload.h" />
     <ClInclude Include="src\sdr.h" />
+    <ClInclude Include="src\sdrman.h" />
+    <ClInclude Include="src\shader.h" />
     <ClInclude Include="src\shadow.h" />
     <ClInclude Include="src\snode.h" />
     <ClInclude Include="src\texture.h" />
+    <ClInclude Include="src\ui.h" />
+    <ClInclude Include="src\unistate.h" />
   </ItemGroup>
   <ItemGroup>
     <None Include="sdr\shadow-notex.p.glsl" />