# HG changeset patch # User John Tsiombikas # Date 1420995810 -7200 # Node ID 64089dd45d50ebed28c6f71461be212675485377 # Parent 5558b43eb653b0816f45278b5c74f5e507e63c61 updated for the Oculus SDK 0.4.4 diff -r 5558b43eb653 -r 64089dd45d50 oculus2.sln --- a/oculus2.sln Wed Oct 29 01:56:42 2014 +0200 +++ b/oculus2.sln Sun Jan 11 19:03:30 2015 +0200 @@ -1,20 +1,26 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2013 -VisualStudioVersion = 12.0.30501.0 +VisualStudioVersion = 12.0.31101.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "oculus2", "oculus2.vcxproj", "{7A2D6788-B885-455C-8DE6-46D5C7313207}" 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 {7A2D6788-B885-455C-8DE6-46D5C7313207}.Debug|Win32.ActiveCfg = Debug|Win32 {7A2D6788-B885-455C-8DE6-46D5C7313207}.Debug|Win32.Build.0 = Debug|Win32 + {7A2D6788-B885-455C-8DE6-46D5C7313207}.Debug|x64.ActiveCfg = Debug|x64 + {7A2D6788-B885-455C-8DE6-46D5C7313207}.Debug|x64.Build.0 = Debug|x64 {7A2D6788-B885-455C-8DE6-46D5C7313207}.Release|Win32.ActiveCfg = Release|Win32 {7A2D6788-B885-455C-8DE6-46D5C7313207}.Release|Win32.Build.0 = Release|Win32 + {7A2D6788-B885-455C-8DE6-46D5C7313207}.Release|x64.ActiveCfg = Release|x64 + {7A2D6788-B885-455C-8DE6-46D5C7313207}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff -r 5558b43eb653 -r 64089dd45d50 oculus2.vcxproj --- a/oculus2.vcxproj Wed Oct 29 01:56:42 2014 +0200 +++ b/oculus2.vcxproj Sun Jan 11 19:03:30 2015 +0200 @@ -5,10 +5,18 @@ Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {7A2D6788-B885-455C-8DE6-46D5C7313207} @@ -20,14 +28,27 @@ Application true v120 - Unicode + MultiByte + + + Application + true + v120 + MultiByte Application false v120 true - Unicode + MultiByte + + + Application + false + v120 + true + MultiByte @@ -35,16 +56,28 @@ + + + + + + true + + true + false + + false + @@ -60,6 +93,21 @@ kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;sdl2.lib;sdl2main.lib;opengl32.lib;glu32.lib;glew32.lib;libovrd.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies) + + + + + Level3 + Disabled + WIN32;_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + 4305;4244 + + + Console + true + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;sdl2.lib;sdl2main.lib;opengl32.lib;glu32.lib;glew32.lib;libovrd.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies) + + Level3 @@ -79,6 +127,25 @@ kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;sdl2.lib;sdl2main.lib;opengl32.lib;glu32.lib;glew32.lib;libovr.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies) + + + Level3 + + + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions) + 4305;4244 + + + Console + true + true + true + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;sdl2.lib;sdl2main.lib;opengl32.lib;glu32.lib;glew32.lib;libovr.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies) + + diff -r 5558b43eb653 -r 64089dd45d50 src/main.c --- a/src/main.c Wed Oct 29 01:56:42 2014 +0200 +++ b/src/main.c Sun Jan 11 19:03:30 2015 +0200 @@ -150,7 +150,7 @@ */ memset(&glcfg, 0, sizeof glcfg); glcfg.OGL.Header.API = ovrRenderAPI_OpenGL; - glcfg.OGL.Header.RTSize = hmd->Resolution; + glcfg.OGL.Header.BackBufferSize = hmd->Resolution; glcfg.OGL.Header.Multisample = 1; #ifdef WIN32