Skip to content

Commit

Permalink
updated vs project files for use with pre-compiled dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
@pknowles
pknowles committed Apr 23, 2016
1 parent 21b944b commit 1d42595
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 20 deletions.
4 changes: 3 additions & 1 deletion main.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ const char* sceneFiles[] = {
"scenes/tree.xml",
"scenes/planes2.xml",
"scenes/ship.xml",
"scenes/spheres.xml",
};

bool directionalLight = true;
Expand Down Expand Up @@ -615,7 +616,8 @@ int main(int argc, char* argv[])

scene.forceDoubleSided = true;
scene.setCamera(&fly.camera);
scene.load(sceneFiles[1]);
if (!scene.load(sceneFiles[1])) //try the atrium
scene.load(sceneFiles[7]); //else load some spheres
scene.enableLighting(false);
viewSlider.i = 0;
viewSlider.upper = mymax(0, scene.getNumViews() - 1);
Expand Down
36 changes: 22 additions & 14 deletions vs/oit.vcxproj
View file
Original file line number Diff line number Diff line change
@@ -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="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
Expand Down Expand Up @@ -27,26 +27,26 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v120</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v120</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v120</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v120</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
Expand All @@ -71,33 +71,40 @@
<IntDir>$(ProjectDir)\$(Configuration)_x$(PlatformArchitecture)\$(ProjectName)\</IntDir>
<OutDir>$(SolutionDir)\bin_x$(PlatformArchitecture)\</OutDir>
<TargetName>$(ProjectName)_$(Configuration)_x$(PlatformArchitecture)</TargetName>
<IncludePath>C:\Users\Pyar\Desktop\oit\libs\include;$(IncludePath)</IncludePath>
<LibraryPath>$(LibraryPath)</LibraryPath>
<IncludePath>$(ProjectDir)../../libs/include/;$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath>
<LibraryPath>$(ProjectDir)../../libs/lib/x32/;$(LibraryPath)</LibraryPath>
<ReferencePath>$(ReferencePath)</ReferencePath>
<ExecutablePath>$(ProjectDir)../../libs/lib/x32/;$(VC_ExecutablePath_x86);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH);</ExecutablePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<TargetName>$(ProjectName)_$(Configuration)_x$(PlatformArchitecture)</TargetName>
<LinkIncremental>true</LinkIncremental>
<IntDir>$(ProjectDir)\$(Configuration)_x$(PlatformArchitecture)\$(ProjectName)\</IntDir>
<OutDir>$(SolutionDir)\bin_x$(PlatformArchitecture)\</OutDir>
<ReferencePath>$(ReferencePath)</ReferencePath>
<LibraryPath>$(LibraryPath)</LibraryPath>
<LibraryPath>$(ProjectDir)../../libs/lib/x64/;$(LibraryPath);</LibraryPath>
<IncludePath>$(ProjectDir)../../libs/include/;$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath>
<ExecutablePath>$(ProjectDir)../../libs/lib/x64/;$(VC_ExecutablePath_x64);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(FxCopDir);$(PATH);</ExecutablePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
<IntDir>$(ProjectDir)\$(Configuration)_x$(PlatformArchitecture)\$(ProjectName)\</IntDir>
<OutDir>$(SolutionDir)\bin_x$(PlatformArchitecture)\</OutDir>
<TargetName>$(ProjectName)_$(Configuration)_x$(PlatformArchitecture)</TargetName>
<ReferencePath>$(ReferencePath)</ReferencePath>
<LibraryPath>$(LibraryPath)</LibraryPath>
<LibraryPath>$(ProjectDir)../../libs/lib/x32/;$(LibraryPath)</LibraryPath>
<IncludePath>$(ProjectDir)../../libs/include/;$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath>
<ExecutablePath>$(ProjectDir)../../libs/lib/x32/;$(VC_ExecutablePath_x86);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(SystemRoot)\SysWow64;$(FxCopDir);$(PATH);</ExecutablePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LinkIncremental>false</LinkIncremental>
<OutDir>$(SolutionDir)\bin_x$(PlatformArchitecture)\</OutDir>
<TargetName>$(ProjectName)_$(Configuration)_x$(PlatformArchitecture)</TargetName>
<IntDir>$(ProjectDir)\$(Configuration)_x$(PlatformArchitecture)\$(ProjectName)\</IntDir>
<ReferencePath>$(ReferencePath)</ReferencePath>
<LibraryPath>$(LibraryPath)</LibraryPath>
<LibraryPath>$(ProjectDir)../../libs/lib/x64/;$(LibraryPath);</LibraryPath>
<IncludePath>$(ProjectDir)../../libs/include/;$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath>
<ExecutablePath>$(ProjectDir)../../libs/lib/x64/;$(VC_ExecutablePath_x64);$(WindowsSDK_ExecutablePath);$(VS_ExecutablePath);$(MSBuild_ExecutablePath);$(FxCopDir);$(PATH);</ExecutablePath>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
Expand All @@ -111,7 +118,7 @@
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);glew32.lib;freetype255.lib;SDL2.lib;libpng16.lib;zlib.lib;opengl32.lib;glu32.lib;winmm.lib</AdditionalDependencies>
<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);glew32.lib;freetype263.lib;SDL2.lib;libpng16.lib;zlib.lib;opengl32.lib;glu32.lib;winmm.lib</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
Expand All @@ -126,7 +133,7 @@
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);glew32.lib;freetype255.lib;SDL2.lib;libpng16.lib;zlib.lib;opengl32.lib;glu32.lib;winmm.lib</AdditionalDependencies>
<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);glew32.lib;freetype263.lib;SDL2.lib;libpng16.lib;zlib.lib;opengl32.lib;glu32.lib;winmm.lib</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
Expand All @@ -146,7 +153,7 @@
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);glew32.lib;freetype255.lib;SDL2.lib;libpng16.lib;zlib.lib;opengl32.lib;glu32.lib;winmm.lib</AdditionalDependencies>
<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);glew32.lib;freetype263.lib;SDL2.lib;libpng16.lib;zlib.lib;opengl32.lib;glu32.lib;winmm.lib</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
Expand All @@ -160,13 +167,14 @@
<PreprocessorDefinitions>NO_CUDA=1;WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)../../</AdditionalIncludeDirectories>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<WholeProgramOptimization>false</WholeProgramOptimization>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);glew32.lib;freetype255.lib;SDL2.lib;libpng16.lib;zlib.lib;opengl32.lib;glu32.lib;winmm.lib</AdditionalDependencies>
<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);glew32.lib;freetype263.lib;SDL2.lib;libpng16.lib;zlib.lib;opengl32.lib;glu32.lib;winmm.lib</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
Expand Down
14 changes: 9 additions & 5 deletions vs/oit_cuda.vcxproj
View file
Original file line number Diff line number Diff line change
@@ -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="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
Expand Down Expand Up @@ -27,26 +27,26 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v120</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v120</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v120</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v120</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
Expand All @@ -69,18 +69,22 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<IntDir>$(ProjectDir)\$(Configuration)_x$(PlatformArchitecture)\$(ProjectName)\</IntDir>
<OutDir>$(ProjectDir)\$(Configuration)_x$(PlatformArchitecture)\</OutDir>
<IncludePath>$(ProjectDir)../../libs/include/;$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<IntDir>$(ProjectDir)\$(Configuration)_x$(PlatformArchitecture)\$(ProjectName)\</IntDir>
<OutDir>$(ProjectDir)\$(Configuration)_x$(PlatformArchitecture)\</OutDir>
<IncludePath>$(ProjectDir)../../libs/include/;$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<IntDir>$(ProjectDir)\$(Configuration)_x$(PlatformArchitecture)\$(ProjectName)\</IntDir>
<OutDir>$(ProjectDir)\$(Configuration)_x$(PlatformArchitecture)\</OutDir>
<IncludePath>$(ProjectDir)../../libs/include/;$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<OutDir>$(ProjectDir)\$(Configuration)_x$(PlatformArchitecture)\</OutDir>
<IntDir>$(ProjectDir)\$(Configuration)_x$(PlatformArchitecture)\$(ProjectName)\</IntDir>
<IncludePath>$(ProjectDir)../../libs/include/;$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
Expand Down

0 comments on commit 1d42595

Please sign in to comment.