Major enhancements to the state web server. Added state-based shader instancing to avoid recompiles. Fixed issue #113 - Possible bug with REGAL_STATISTICS Corrected handling of GL_POINT_SIZE_MAX state in RegalState. Refreshed apitrace, civetweb, libpng, and GLEW from upstream.
244 lines
No EOL
14 KiB
XML
244 lines
No EOL
14 KiB
XML
<?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="Debug|x64">
|
|
<Configuration>Debug</Configuration>
|
|
<Platform>x64</Platform>
|
|
</ProjectConfiguration>
|
|
<ProjectConfiguration Include="Release|Win32">
|
|
<Configuration>Release</Configuration>
|
|
<Platform>Win32</Platform>
|
|
</ProjectConfiguration>
|
|
<ProjectConfiguration Include="Release|x64">
|
|
<Configuration>Release</Configuration>
|
|
<Platform>x64</Platform>
|
|
</ProjectConfiguration>
|
|
</ItemGroup>
|
|
<PropertyGroup Label="Globals">
|
|
<ProjectName>dreamtorus_static</ProjectName>
|
|
<ProjectGuid>{4279720C-503C-C9A3-8714-4E88F1D2B1E0}</ProjectGuid>
|
|
</PropertyGroup>
|
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
|
<ConfigurationType>Application</ConfigurationType>
|
|
<UseOfMfc>false</UseOfMfc>
|
|
<CharacterSet>Unicode</CharacterSet>
|
|
</PropertyGroup>
|
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
|
|
<ConfigurationType>Application</ConfigurationType>
|
|
<UseOfMfc>false</UseOfMfc>
|
|
<CharacterSet>Unicode</CharacterSet>
|
|
</PropertyGroup>
|
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
|
|
<ConfigurationType>Application</ConfigurationType>
|
|
<UseOfMfc>false</UseOfMfc>
|
|
<CharacterSet>Unicode</CharacterSet>
|
|
</PropertyGroup>
|
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
|
|
<ConfigurationType>Application</ConfigurationType>
|
|
<UseOfMfc>false</UseOfMfc>
|
|
<CharacterSet>Unicode</CharacterSet>
|
|
</PropertyGroup>
|
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
|
<ImportGroup Label="ExtensionSettings">
|
|
</ImportGroup>
|
|
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
|
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
</ImportGroup>
|
|
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
|
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
</ImportGroup>
|
|
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
|
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
</ImportGroup>
|
|
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
|
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
|
</ImportGroup>
|
|
<PropertyGroup Label="UserMacros" />
|
|
<PropertyGroup>
|
|
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
|
|
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\Win32\</OutDir>
|
|
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Release\x64\</OutDir>
|
|
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\Win32\dreamtorus_static\</IntDir>
|
|
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Release\x64\dreamtorus_static\</IntDir>
|
|
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\Win32\</OutDir>
|
|
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Debug\x64\</OutDir>
|
|
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\Win32\dreamtorus_static\</IntDir>
|
|
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Debug\x64\dreamtorus_static\</IntDir>
|
|
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">dreamtorus_static</TargetName>
|
|
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">dreamtorus_static</TargetName>
|
|
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">dreamtorus_static</TargetName>
|
|
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">dreamtorus_static</TargetName>
|
|
</PropertyGroup>
|
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
|
<ClCompile>
|
|
<Optimization>MaxSpeed</Optimization>
|
|
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
|
|
<AdditionalIncludeDirectories>../../../../include;../../../../src/glu/include;../../../../examples/dreamtorus/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
|
<PreprocessorDefinitions>GLUT_NO_LIB_PRAGMA;GLUT_STATIC;REGALGLU_DECL=;REGAL_DECL_EXPORT;_ITERATOR_DEBUG_LEVEL=0;_CRT_SECURE_NO_WARNINGS=1;WIN32;_WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
<StringPooling>true</StringPooling>
|
|
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
|
|
<FunctionLevelLinking>true</FunctionLevelLinking>
|
|
<PrecompiledHeader>
|
|
</PrecompiledHeader>
|
|
<AssemblerListingLocation>Release\Win32\dreamtorus_static\</AssemblerListingLocation>
|
|
<ObjectFileName>Release\Win32\dreamtorus_static\</ObjectFileName>
|
|
<ProgramDataBaseFileName>Release\Win32\dreamtorus_static.pdb</ProgramDataBaseFileName>
|
|
<WarningLevel>Level3</WarningLevel>
|
|
<SuppressStartupBanner>true</SuppressStartupBanner>
|
|
<CompileAs>Default</CompileAs>
|
|
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
|
|
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
|
|
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
|
</ClCompile>
|
|
<Link>
|
|
<AdditionalDependencies>rglutlib.lib;rglulib.lib;regallib.lib;winmm.lib;ws2_32.lib;civetweblib.lib;md5lib.lib;jsonsllib.lib;apitracelib.lib;glsloptlib.lib;pcrelib.lib;snappylib.lib;pnglib.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
|
<SuppressStartupBanner>true</SuppressStartupBanner>
|
|
<AdditionalLibraryDirectories>Release\Win32\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
|
<ModuleDefinitionFile></ModuleDefinitionFile>
|
|
<ProgramDatabaseFile>Release\Win32\dreamtorus_static.pdb</ProgramDatabaseFile>
|
|
<SubSystem>Console</SubSystem>
|
|
<TargetMachine>MachineX86</TargetMachine>
|
|
<ImportLibrary>Release\Win32\dreamtorus_static.lib</ImportLibrary>
|
|
</Link>
|
|
<Midl>
|
|
<HeaderFileName>
|
|
</HeaderFileName>
|
|
</Midl>
|
|
<ResourceCompile>
|
|
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
<Culture>0x0409</Culture>
|
|
</ResourceCompile>
|
|
</ItemDefinitionGroup>
|
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
|
<ClCompile>
|
|
<Optimization>MaxSpeed</Optimization>
|
|
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
|
|
<AdditionalIncludeDirectories>../../../../include;../../../../src/glu/include;../../../../examples/dreamtorus/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
|
<PreprocessorDefinitions>GLUT_NO_LIB_PRAGMA;GLUT_STATIC;REGALGLU_DECL=;REGAL_DECL_EXPORT;_ITERATOR_DEBUG_LEVEL=0;_CRT_SECURE_NO_WARNINGS=1;WIN32;_WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
<StringPooling>true</StringPooling>
|
|
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
|
|
<FunctionLevelLinking>true</FunctionLevelLinking>
|
|
<PrecompiledHeader>
|
|
</PrecompiledHeader>
|
|
<AssemblerListingLocation>Release\x64\dreamtorus_static\</AssemblerListingLocation>
|
|
<ObjectFileName>Release\x64\dreamtorus_static\</ObjectFileName>
|
|
<ProgramDataBaseFileName>Release\x64\dreamtorus_static.pdb</ProgramDataBaseFileName>
|
|
<WarningLevel>Level3</WarningLevel>
|
|
<SuppressStartupBanner>true</SuppressStartupBanner>
|
|
<CompileAs>Default</CompileAs>
|
|
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
|
|
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
|
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
|
|
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
|
</ClCompile>
|
|
<Link>
|
|
<AdditionalDependencies>rglutlib.lib;rglulib.lib;regallib.lib;winmm.lib;ws2_32.lib;civetweblib.lib;md5lib.lib;jsonsllib.lib;apitracelib.lib;glsloptlib.lib;pcrelib.lib;snappylib.lib;pnglib.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
|
<SuppressStartupBanner>true</SuppressStartupBanner>
|
|
<AdditionalLibraryDirectories>Release\x64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
|
<ModuleDefinitionFile></ModuleDefinitionFile>
|
|
<ProgramDatabaseFile>Release\x64\dreamtorus_static.pdb</ProgramDatabaseFile>
|
|
<SubSystem>Console</SubSystem>
|
|
<ImportLibrary>Release\x64\dreamtorus_static.lib</ImportLibrary>
|
|
</Link>
|
|
<Midl>
|
|
<HeaderFileName>
|
|
</HeaderFileName>
|
|
</Midl>
|
|
<ResourceCompile>
|
|
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
<Culture>0x0409</Culture>
|
|
</ResourceCompile>
|
|
</ItemDefinitionGroup>
|
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
|
<ClCompile>
|
|
<Optimization>Disabled</Optimization>
|
|
<AdditionalIncludeDirectories>../../../../include;../../../../src/glu/include;../../../../examples/dreamtorus/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
|
<PreprocessorDefinitions>GLUT_NO_LIB_PRAGMA;GLUT_STATIC;REGALGLU_DECL=;REGAL_DECL_EXPORT;_ITERATOR_DEBUG_LEVEL=0;_CRT_SECURE_NO_WARNINGS=1;WIN32;_WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
|
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
|
|
<PrecompiledHeader>
|
|
</PrecompiledHeader>
|
|
<AssemblerListingLocation>Debug\Win32\dreamtorus_static\</AssemblerListingLocation>
|
|
<ObjectFileName>Debug\Win32\dreamtorus_static\</ObjectFileName>
|
|
<ProgramDataBaseFileName>Debug\Win32\dreamtorus_static.pdb</ProgramDataBaseFileName>
|
|
<WarningLevel>Level3</WarningLevel>
|
|
<SuppressStartupBanner>true</SuppressStartupBanner>
|
|
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
|
|
<CompileAs>Default</CompileAs>
|
|
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
|
|
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
|
|
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
|
</ClCompile>
|
|
<Link>
|
|
<AdditionalDependencies>rglutlib.lib;rglulib.lib;regallib.lib;winmm.lib;ws2_32.lib;civetweblib.lib;md5lib.lib;jsonsllib.lib;apitracelib.lib;glsloptlib.lib;pcrelib.lib;snappylib.lib;pnglib.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
|
<SuppressStartupBanner>true</SuppressStartupBanner>
|
|
<AdditionalLibraryDirectories>Debug\Win32\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
|
<ModuleDefinitionFile></ModuleDefinitionFile>
|
|
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
<ProgramDatabaseFile>Debug\Win32\dreamtorus_static.pdb</ProgramDatabaseFile>
|
|
<SubSystem>Console</SubSystem>
|
|
<TargetMachine>MachineX86</TargetMachine>
|
|
<ImportLibrary>Debug\Win32\dreamtorus_static.lib</ImportLibrary>
|
|
</Link>
|
|
<Midl>
|
|
<HeaderFileName>
|
|
</HeaderFileName>
|
|
</Midl>
|
|
<ResourceCompile>
|
|
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
<Culture>0x0409</Culture>
|
|
</ResourceCompile>
|
|
</ItemDefinitionGroup>
|
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
|
<ClCompile>
|
|
<Optimization>Disabled</Optimization>
|
|
<AdditionalIncludeDirectories>../../../../include;../../../../src/glu/include;../../../../examples/dreamtorus/src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
|
<PreprocessorDefinitions>GLUT_NO_LIB_PRAGMA;GLUT_STATIC;REGALGLU_DECL=;REGAL_DECL_EXPORT;_ITERATOR_DEBUG_LEVEL=0;_CRT_SECURE_NO_WARNINGS=1;WIN32;_WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
|
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
|
|
<PrecompiledHeader>
|
|
</PrecompiledHeader>
|
|
<AssemblerListingLocation>Debug\x64\dreamtorus_static\</AssemblerListingLocation>
|
|
<ObjectFileName>Debug\x64\dreamtorus_static\</ObjectFileName>
|
|
<ProgramDataBaseFileName>Debug\x64\dreamtorus_static.pdb</ProgramDataBaseFileName>
|
|
<WarningLevel>Level3</WarningLevel>
|
|
<SuppressStartupBanner>true</SuppressStartupBanner>
|
|
<CompileAs>Default</CompileAs>
|
|
<DisableSpecificWarnings>4996</DisableSpecificWarnings>
|
|
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
|
<AdditionalOptions> %(AdditionalOptions)</AdditionalOptions>
|
|
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
|
</ClCompile>
|
|
<Link>
|
|
<AdditionalDependencies>rglutlib.lib;rglulib.lib;regallib.lib;winmm.lib;ws2_32.lib;civetweblib.lib;md5lib.lib;jsonsllib.lib;apitracelib.lib;glsloptlib.lib;pcrelib.lib;snappylib.lib;pnglib.lib;zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
|
<SuppressStartupBanner>true</SuppressStartupBanner>
|
|
<AdditionalLibraryDirectories>Debug\x64\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
|
<ModuleDefinitionFile></ModuleDefinitionFile>
|
|
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
<ProgramDatabaseFile>Debug\x64\dreamtorus_static.pdb</ProgramDatabaseFile>
|
|
<SubSystem>Console</SubSystem>
|
|
<ImportLibrary>Debug\x64\dreamtorus_static.lib</ImportLibrary>
|
|
</Link>
|
|
<Midl>
|
|
<HeaderFileName>
|
|
</HeaderFileName>
|
|
</Midl>
|
|
<ResourceCompile>
|
|
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
<Culture>0x0409</Culture>
|
|
</ResourceCompile>
|
|
</ItemDefinitionGroup>
|
|
<ItemGroup>
|
|
<ClCompile Include="..\..\..\..\examples\dreamtorus\glut\code\main.cpp" />
|
|
<ClCompile Include="..\..\..\..\examples\dreamtorus\src\render.cpp" />
|
|
</ItemGroup>
|
|
|
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
|
<ImportGroup Label="ExtensionTargets">
|
|
</ImportGroup>
|
|
</Project> |