# HG changeset patch
# User John Tsiombikas <nuclear@member.fsf.org>
# Date 1421832570 -7200
# Node ID 6a3a9840c303d936ef0deb337cf6736ef5799906
# Parent  1a832e88854abf983bdbc8d6555a4cca51702404
fixed on macosx

diff -r 1a832e88854a -r 6a3a9840c303 Makefile
--- a/Makefile	Wed Jan 14 07:11:11 2015 +0200
+++ b/Makefile	Wed Jan 21 11:29:30 2015 +0200
@@ -3,12 +3,13 @@
 bin = oculus2
 
 CFLAGS = -pedantic -Wall -g `pkg-config --cflags sdl2`
-LDFLAGS = $(libgl) `pkg-config --libs sdl2` -lovr -lX11
+LDFLAGS = $(libgl) `pkg-config --libs sdl2` -lovr $(libsys)
 
 ifeq ($(shell uname -s), Darwin)
 	libgl = -framework OpenGL -lGLEW
 else
 	libgl = -lGL -lGLU -lGLEW
+	libsys = -lX11
 endif
 
 $(bin): $(obj)
diff -r 1a832e88854a -r 6a3a9840c303 src/main.c
--- a/src/main.c	Wed Jan 14 07:11:11 2015 +0200
+++ b/src/main.c	Wed Jan 21 11:29:30 2015 +0200
@@ -95,7 +95,7 @@
 
 	x = y = SDL_WINDOWPOS_UNDEFINED;
 	flags = SDL_WINDOW_OPENGL;
-	if(!(win = SDL_CreateWindow("press 'f' to move to the HMD", x, y, 1280, 800, flags))) {
+	if(!(win = SDL_CreateWindow("press 'f' to move to the HMD", x, y, 1024, 640, flags))) {
 		fprintf(stderr, "failed to create window\n");
 		return -1;
 	}
@@ -150,13 +150,14 @@
 	 */
 	memset(&glcfg, 0, sizeof glcfg);
 	glcfg.OGL.Header.API = ovrRenderAPI_OpenGL;
-	glcfg.OGL.Header.BackBufferSize = hmd->Resolution;
+	glcfg.OGL.Header.BackBufferSize.w = win_width;
+	glcfg.OGL.Header.BackBufferSize.h = win_height;
 	glcfg.OGL.Header.Multisample = 1;
 
-#ifdef WIN32
+#ifdef OVR_OS_WIN32
 	glcfg.OGL.Window = GetActiveWindow();
 	glcfg.OGL.DC = wglGetCurrentDC();
-#else
+#elif defined(OVR_OS_LINUX)
 	glcfg.OGL.Disp = glXGetCurrentDisplay();
 #endif
 
@@ -169,7 +170,7 @@
 		 */
 #ifdef WIN32
 		ovrHmd_AttachToWindow(hmd, glcfg.OGL.Window, 0, 0);
-#else
+#elif defined(OVR_OS_LINUX)
 		ovrHmd_AttachToWindow(hmd, (void*)glXGetCurrentDrawable(), 0, 0);
 #endif
 		printf("running in \"direct-hmd\" mode\n");
@@ -183,7 +184,7 @@
 	 * timewrap, which shifts the image before drawing to counter any lattency between the call
 	 * to ovrHmd_GetEyePose and ovrHmd_EndFrame.
 	 */
-	distort_caps = ovrDistortionCap_Chromatic | ovrDistortionCap_Vignette | ovrDistortionCap_TimeWarp |
+	distort_caps = ovrDistortionCap_Chromatic | ovrDistortionCap_TimeWarp |
 		ovrDistortionCap_Overdrive;
 	if(!ovrHmd_ConfigureRendering(hmd, &glcfg.Config, distort_caps, hmd->DefaultEyeFov, eye_rdesc)) {
 		fprintf(stderr, "failed to configure distortion renderer\n");