Commit d8482473 authored by Brian Philipp's avatar Brian Philipp
Browse files

Merge branch 'brian' into 'master'

Brian

See merge request !3
parents d1028440 73af37ca

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.29326.143
VisualStudioVersion = 16.0.29503.13
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mm_raytracer", "mm_raytracer\mm_raytracer.vcxproj", "{F616952A-33C3-456C-9AC1-C4E727436E38}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "OpenGL_Raytracer", "OpenGL_Raytracer\OpenGL_Raytracer.vcxproj", "{0940ADE1-4E25-491D-8AAD-4A8EEDB0E87D}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
......@@ -13,19 +13,19 @@ Global
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{F616952A-33C3-456C-9AC1-C4E727436E38}.Debug|x64.ActiveCfg = Debug|x64
{F616952A-33C3-456C-9AC1-C4E727436E38}.Debug|x64.Build.0 = Debug|x64
{F616952A-33C3-456C-9AC1-C4E727436E38}.Debug|x86.ActiveCfg = Debug|Win32
{F616952A-33C3-456C-9AC1-C4E727436E38}.Debug|x86.Build.0 = Debug|Win32
{F616952A-33C3-456C-9AC1-C4E727436E38}.Release|x64.ActiveCfg = Release|x64
{F616952A-33C3-456C-9AC1-C4E727436E38}.Release|x64.Build.0 = Release|x64
{F616952A-33C3-456C-9AC1-C4E727436E38}.Release|x86.ActiveCfg = Release|Win32
{F616952A-33C3-456C-9AC1-C4E727436E38}.Release|x86.Build.0 = Release|Win32
{0940ADE1-4E25-491D-8AAD-4A8EEDB0E87D}.Debug|x64.ActiveCfg = Debug|x64
{0940ADE1-4E25-491D-8AAD-4A8EEDB0E87D}.Debug|x64.Build.0 = Debug|x64
{0940ADE1-4E25-491D-8AAD-4A8EEDB0E87D}.Debug|x86.ActiveCfg = Debug|Win32
{0940ADE1-4E25-491D-8AAD-4A8EEDB0E87D}.Debug|x86.Build.0 = Debug|Win32
{0940ADE1-4E25-491D-8AAD-4A8EEDB0E87D}.Release|x64.ActiveCfg = Release|x64
{0940ADE1-4E25-491D-8AAD-4A8EEDB0E87D}.Release|x64.Build.0 = Release|x64
{0940ADE1-4E25-491D-8AAD-4A8EEDB0E87D}.Release|x86.ActiveCfg = Release|Win32
{0940ADE1-4E25-491D-8AAD-4A8EEDB0E87D}.Release|x86.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {23D18646-C0E4-43B3-9DBD-CFD92B2509C3}
SolutionGuid = {6AA46A34-6C9F-43D1-A833-357B250F7C56}
EndGlobalSection
EndGlobal
 OpenGL_Raytracer.cpp
OpenGL_Raytracer.vcxproj -> C:\Users\eleph\source\repos\OpenGL_Raytracer\Debug\OpenGL_Raytracer.exe
B^C:\USERS\ELEPH\SOURCE\REPOS\OPENGL_RAYTRACER\OPENGL_RAYTRACER\GLAD.C
B^C:\USERS\ELEPH\SOURCE\REPOS\OPENGL_RAYTRACER\OPENGL_RAYTRACER\GLAD.C
B^C:\USERS\ELEPH\SOURCE\REPOS\OPENGL_RAYTRACER\OPENGL_RAYTRACER\GLAD.C
#TargetFrameworkVersion=v4.0:PlatformToolSet=v142:EnableManagedIncrementalBuild=false:VCToolArchitecture=Native32Bit:WindowsTargetPlatformVersion=10.0
Debug|Win32|C:\Users\eleph\Documents\GitHub\mm_raytracer\VisualStudio\|
Debug|Win32|C:\Users\eleph\source\repos\OpenGL_Raytracer\|
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment