oculus2

changeset 24:b2afe1196579

find changesets by author, revision, files, or words in the commit message
minor fixes
author John Tsiombikas <nuclear@member.fsf.org>
date Thu, 02 Apr 2015 09:57:14 +0300
parents 21067f4802dd
children 0c7d02c58e4e
files Makefile src/main.c
diffstat 2 files changed, 2 insertions(+), 4 deletions(-) [+]
line diff
     1.1 --- a/Makefile	Thu Apr 02 09:51:01 2015 +0300
     1.2 +++ b/Makefile	Thu Apr 02 09:57:14 2015 +0300
     1.3 @@ -3,7 +3,7 @@
     1.4  bin = oculus2
     1.5  
     1.6  CFLAGS = -pedantic -Wall -g `pkg-config --cflags sdl2`
     1.7 -LDFLAGS = $(libgl) `pkg-config --libs sdl2` -lovr $(libsys)
     1.8 +LDFLAGS = $(libgl) `pkg-config --libs sdl2` -lOVR -ldl $(libsys)
     1.9  
    1.10  ifeq ($(shell uname -s), Darwin)
    1.11  	libgl = -framework OpenGL -lGLEW

     2.1 --- a/src/main.c	Thu Apr 02 09:51:01 2015 +0300
     2.2 +++ b/src/main.c	Thu Apr 02 09:57:14 2015 +0300
     2.3 @@ -190,7 +190,7 @@
     2.4  	}
     2.5  
     2.6  	/* disable the retarded "health and safety warning" */
     2.7 -	ovrhmd_EnableHSWDisplaySDKRender(hmd, 0);
     2.8 +	/*ovrhmd_EnableHSWDisplaySDKRender(hmd, 0);*/
     2.9  
    2.10  	glEnable(GL_DEPTH_TEST);
    2.11  	glEnable(GL_CULL_FACE);
    2.12 @@ -514,13 +514,11 @@
    2.13  int key_event(int key, int state)
    2.14  {
    2.15  	if(state) {
    2.16 -		/*
    2.17  		ovrHSWDisplayState hsw;
    2.18  		ovrHmd_GetHSWDisplayState(hmd, &hsw);
    2.19  		if(hsw.Displayed) {
    2.20  			ovrHmd_DismissHSWDisplay(hmd);
    2.21  		}
    2.22 -		*/
    2.23  
    2.24  		switch(key) {
    2.25  		case 27: