Additional official SDK files from the linux distribution

5 files changed, 16 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/LibOVR/Makefile b/LibOVR/Makefile
index 7525b0b..174e8a5 100644
--- a/LibOVR/Makefile
+++ b/LibOVR/Makefile
@@ -46,10 +46,10 @@ DELETEFILE    = rm -f
 
 DEBUG         = 0
 ifeq ($(DEBUG), 1)
-	CXXFLAGS      = -pipe -DDEBUG -g
+	CXXFLAGS      = -pipe -fPIC -DDEBUG -g
 	RELEASETYPE   = Debug
 else
-	CXXFLAGS      = -pipe -O2
+	CXXFLAGS      = -pipe -fPIC -O2
 	RELEASETYPE   = Release
 endif
 
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 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 \