diff options
| author | Sven Gothel <[email protected]> | 2015-03-28 02:08:11 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2015-03-28 02:08:11 +0100 |
| commit | 450aa6f7df9e67dd256b86f94e65eaf707032aad (patch) | |
| tree | 04aa207d84ddc8ca246d2573aaaf756b3ce8a0b5 /LibOVR/Projects/Windows/VS2013/LibOVRRT.sln | |
| parent | 3c7b8a17e907f4ef2afd9f77db566a3f6179cbe4 (diff) | |
| parent | 4207f9c279e832e3afcb3f5fc6cd8d84cb4cfe4c (diff) | |
Merge branch 'vanilla_0.5.0.1' into jogamp_0.5.0.1
Conflicts:
LibOVR/Include/OVR_CAPI_0_5_0.h
LibOVR/Src/CAPI/CAPI_HMDState.cpp
LibOVR/Src/Displays/OVR_Win32_Dxgi_Display.h
LibOVR/Src/Kernel/OVR_System.cpp
LibOVR/Src/OVR_CAPI.cpp
LibOVR/Src/OVR_Profile.cpp
LibOVRKernel/Src/Kernel/OVR_ThreadsWinAPI.cpp
LibOVRKernel/Src/Kernel/OVR_Types.h
Diffstat (limited to 'LibOVR/Projects/Windows/VS2013/LibOVRRT.sln')
| -rw-r--r-- | LibOVR/Projects/Windows/VS2013/LibOVRRT.sln | 57 |
1 files changed, 57 insertions, 0 deletions
diff --git a/LibOVR/Projects/Windows/VS2013/LibOVRRT.sln b/LibOVR/Projects/Windows/VS2013/LibOVRRT.sln new file mode 100644 index 0000000..d61c4ff --- /dev/null +++ b/LibOVR/Projects/Windows/VS2013/LibOVRRT.sln @@ -0,0 +1,57 @@ +
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2013
+VisualStudioVersion = 12.0.21005.1
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LibOVRRT", "LibOVRRT.vcxproj", "{934B40C7-F40A-4E4C-97A7-B9659BE0A441}"
+ ProjectSection(ProjectDependencies) = postProject
+ {ADCFC940-8E3E-40BB-A47A-A10CC311BC0D} = {ADCFC940-8E3E-40BB-A47A-A10CC311BC0D}
+ {29FA0962-DDC6-4F72-9D12-E150DF29E279} = {29FA0962-DDC6-4F72-9D12-E150DF29E279}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LibOVRKernel", "..\..\..\..\LibOVRKernel\Projects\Windows\VS2013\LibOVRKernel.vcxproj", "{29FA0962-DDC6-4F72-9D12-E150DF29E279}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{2BA5450C-9D41-4AED-9744-965F24298465}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ShaderReflector", "..\..\..\..\Tools\ShaderReflector\ShaderReflector\ShaderReflector_VS2013.vcxproj", "{ADCFC940-8E3E-40BB-A47A-A10CC311BC0D}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Win32 = Debug|Win32
+ Debug|x64 = Debug|x64
+ Release|Win32 = Release|Win32
+ Release|x64 = Release|x64
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {934B40C7-F40A-4E4C-97A7-B9659BE0A441}.Debug|Win32.ActiveCfg = Debug|Win32
+ {934B40C7-F40A-4E4C-97A7-B9659BE0A441}.Debug|Win32.Build.0 = Debug|Win32
+ {934B40C7-F40A-4E4C-97A7-B9659BE0A441}.Debug|x64.ActiveCfg = Debug|x64
+ {934B40C7-F40A-4E4C-97A7-B9659BE0A441}.Debug|x64.Build.0 = Debug|x64
+ {934B40C7-F40A-4E4C-97A7-B9659BE0A441}.Release|Win32.ActiveCfg = Release|Win32
+ {934B40C7-F40A-4E4C-97A7-B9659BE0A441}.Release|Win32.Build.0 = Release|Win32
+ {934B40C7-F40A-4E4C-97A7-B9659BE0A441}.Release|x64.ActiveCfg = Release|x64
+ {934B40C7-F40A-4E4C-97A7-B9659BE0A441}.Release|x64.Build.0 = Release|x64
+ {29FA0962-DDC6-4F72-9D12-E150DF29E279}.Debug|Win32.ActiveCfg = Debug|Win32
+ {29FA0962-DDC6-4F72-9D12-E150DF29E279}.Debug|Win32.Build.0 = Debug|Win32
+ {29FA0962-DDC6-4F72-9D12-E150DF29E279}.Debug|x64.ActiveCfg = Debug|x64
+ {29FA0962-DDC6-4F72-9D12-E150DF29E279}.Debug|x64.Build.0 = Debug|x64
+ {29FA0962-DDC6-4F72-9D12-E150DF29E279}.Release|Win32.ActiveCfg = Release|Win32
+ {29FA0962-DDC6-4F72-9D12-E150DF29E279}.Release|Win32.Build.0 = Release|Win32
+ {29FA0962-DDC6-4F72-9D12-E150DF29E279}.Release|x64.ActiveCfg = Release|x64
+ {29FA0962-DDC6-4F72-9D12-E150DF29E279}.Release|x64.Build.0 = Release|x64
+ {ADCFC940-8E3E-40BB-A47A-A10CC311BC0D}.Debug|Win32.ActiveCfg = Release|Win32
+ {ADCFC940-8E3E-40BB-A47A-A10CC311BC0D}.Debug|Win32.Build.0 = Release|Win32
+ {ADCFC940-8E3E-40BB-A47A-A10CC311BC0D}.Debug|x64.ActiveCfg = Release|Win32
+ {ADCFC940-8E3E-40BB-A47A-A10CC311BC0D}.Debug|x64.Build.0 = Release|Win32
+ {ADCFC940-8E3E-40BB-A47A-A10CC311BC0D}.Release|Win32.ActiveCfg = Release|Win32
+ {ADCFC940-8E3E-40BB-A47A-A10CC311BC0D}.Release|Win32.Build.0 = Release|Win32
+ {ADCFC940-8E3E-40BB-A47A-A10CC311BC0D}.Release|x64.ActiveCfg = Release|Win32
+ {ADCFC940-8E3E-40BB-A47A-A10CC311BC0D}.Release|x64.Build.0 = Release|Win32
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+ GlobalSection(NestedProjects) = preSolution
+ {ADCFC940-8E3E-40BB-A47A-A10CC311BC0D} = {2BA5450C-9D41-4AED-9744-965F24298465}
+ EndGlobalSection
+EndGlobal
|