diff options
Diffstat (limited to 'Samples')
| -rw-r--r-- | Samples/CommonSrc/Platform/OSX_Gamepad.cpp | 1 | ||||
| -rw-r--r-- | Samples/OculusWorldDemo/Makefile | 14 |
2 files changed, 11 insertions, 4 deletions
diff --git a/Samples/CommonSrc/Platform/OSX_Gamepad.cpp b/Samples/CommonSrc/Platform/OSX_Gamepad.cpp index 934319b..96219e4 100644 --- a/Samples/CommonSrc/Platform/OSX_Gamepad.cpp +++ b/Samples/CommonSrc/Platform/OSX_Gamepad.cpp @@ -204,7 +204,6 @@ void GamepadManager::onDeviceValueChanged(IOHIDValueRef value) int vendorID = getIntDeviceProperty(device, CFSTR(kIOHIDVendorIDKey)); int productID = getIntDeviceProperty(device, CFSTR(kIOHIDProductIDKey)); - OVR_UNUSED(productID); uint32_t usagePage = IOHIDElementGetUsagePage(element); uint32_t usage = IOHIDElementGetUsage(element); diff --git a/Samples/OculusWorldDemo/Makefile b/Samples/OculusWorldDemo/Makefile index c5588bc..6015560 100644 --- a/Samples/OculusWorldDemo/Makefile +++ b/Samples/OculusWorldDemo/Makefile @@ -49,25 +49,33 @@ DEFINES = -DQT_WEBKIT -DGL_GLEXT_PROTOTYPES DEBUG = 0 ifeq ($(DEBUG), 1) CXXFLAGS = -pipe -DDEBUG -g $(DEFINES) + LFLAGS = RELEASETYPE = Debug else CXXFLAGS = -pipe -O2 $(DEFINES) + LFLAGS = -O1 RELEASETYPE = Release endif -####### Compiler, tools and options +####### Paths LIBOVRPATH = ../../LibOVR COMMONSRCPATH = ../CommonSrc 3RDPARTYPATH = ../../3rdParty INCPATH = -I. -I.. -I$(COMMONSRCPATH) -I$(LIBOVRPATH)/Include -I$(LIBOVRPATH)/Src OBJPATH = ./Obj/Linux/$(RELEASETYPE)/$(SYSARCH) -LFLAGS = -Wl -O1 -L$(LIBOVRPATH)/Lib/Linux/$(RELEASETYPE)/$(SYSARCH) -LIBS = $(SUBLIBS) -lovr -ludev -lpthread -lGL -lX11 -lXinerama CXX_BUILD = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $(OBJPATH)/ ####### Files +LIBS = -L$(LIBOVRPATH)/Lib/Linux/$(RELEASETYPE)/$(SYSARCH) \ + -lovr \ + -ludev \ + -lpthread \ + -lGL \ + -lX11 \ + -lXinerama + OBJECTS = $(OBJPATH)/OculusWorldDemo.o \ $(OBJPATH)/Player.o \ $(OBJPATH)/Platform.o \ |