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