diff options
| -rwxr-xr-x | ConfigurePermissionsAndPackages.sh | 4 | ||||
| -rwxr-xr-x | OculusConfigurationUtility.sh | 2 | ||||
| -rw-r--r-- | Samples/CommonSrc/Platform/OSX_Gamepad.cpp | 1 | ||||
| -rw-r--r-- | Samples/OculusWorldDemo/Makefile | 30 |
4 files changed, 28 insertions, 9 deletions
diff --git a/ConfigurePermissionsAndPackages.sh b/ConfigurePermissionsAndPackages.sh index 37f7587..e19a913 100755 --- a/ConfigurePermissionsAndPackages.sh +++ b/ConfigurePermissionsAndPackages.sh @@ -21,8 +21,8 @@ echo "Installing OculusVR Rift udev rules file..." sudo cp ./LibOVR/90-oculus.rules /lib/udev/rules.d echo "Installing libudev..." sudo apt-get install libudev-dev -echo "Installing libext..." -sudo apt-get install libext-dev +echo "Installing libxext..." +sudo apt-get install libxext-dev echo "Installing mesa-common..." sudo apt-get install mesa-common-dev echo "Installing freeglut3..." diff --git a/OculusConfigurationUtility.sh b/OculusConfigurationUtility.sh index 788cba9..aeafec3 100755 --- a/OculusConfigurationUtility.sh +++ b/OculusConfigurationUtility.sh @@ -19,7 +19,7 @@ MACHINE_TYPE=`uname -m` if [ ${MACHINE_TYPE} == 'x86_64' ]; then - ./Tools/OculusConfigUtil/RiftConfigUtil_x86_64 + ./Tools/OculusConfigUtil/OculusConfigUtil_x86_64 else echo "The Oculus Configuration Utility is currently only supported on 64-bit Linux." fi 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 e89ed61..9791233 100644 --- a/Samples/OculusWorldDemo/Makefile +++ b/Samples/OculusWorldDemo/Makefile @@ -58,13 +58,15 @@ CUSTOM_PATH = $(RELEASETYPE)/$(SYSARCH) 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 SRCPATH = . @@ -72,14 +74,32 @@ COMMONSRCPATH = ../CommonSrc 3RDPARTYPATH = ../../3rdParty INCPATH = -I. -I.. -I$(COMMONSRCPATH) -I$(LIBOVRPATH)/Include -I$(LIBOVRPATH)/Src OBJPATH = ./Obj/Linux/$(RELEASETYPE)/$(SYSARCH) -LFLAGS = -O1 -L$(LIBOVRPATH)/Lib/Linux/$(RELEASETYPE)/$(SYSARCH) -LIBS = $(SUBLIBS) -lovr -ludev -lpthread -lGL -lX11 -lXinerama CXX_BUILD = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $(OBJPATH)/ ####### Files -# Filter out Windows and OSX files -COMMON_SRCPATH = ./Common +LIBS = -L$(LIBOVRPATH)/Lib/Linux/$(RELEASETYPE)/$(SYSARCH) \ + -lovr \ + -ludev \ + -lpthread \ + -lGL \ + -lX11 \ + -lXinerama + +OBJECTS = $(OBJPATH)/OculusWorldDemo.o \ + $(OBJPATH)/Player.o \ + $(OBJPATH)/Platform.o \ + $(OBJPATH)/Linux_Platform.o \ + $(OBJPATH)/Linux_Gamepad.o \ + $(OBJPATH)/Render_Device.o \ + $(OBJPATH)/Render_GL_Device.o \ + $(OBJPATH)/Render_LoadTextureDDS.o \ + $(OBJPATH)/Render_LoadTextureTGA.o \ + $(OBJPATH)/Render_XmlSceneLoader.o + +TARGET = ./Release/OculusWorldDemo_$(SYSARCH)_$(RELEASETYPE) + +####### Rules ALL_SRCS := $(shell find ${COMMONSRCPATH} -name "*.cpp") ALL_SRCS += $(shell find . -name "*.cpp") |