From c29cd1a2fbff6282bab956ad61661ac9d48c4e6e Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Sat, 28 Mar 2015 00:30:41 +0100 Subject: Remove unused files (unrelated for sources) --- ConfigurePermissionsAndPackages.sh | 51 ------------ LibOVR/90-oculus.rules | 2 - LibOVR/Makefile | 156 ------------------------------------- OculusConfigurationUtility.sh | 28 ------- OculusWorldDemo.sh | 25 ------ 5 files changed, 262 deletions(-) delete mode 100755 ConfigurePermissionsAndPackages.sh delete mode 100644 LibOVR/90-oculus.rules delete mode 100644 LibOVR/Makefile delete mode 100755 OculusConfigurationUtility.sh delete mode 100755 OculusWorldDemo.sh diff --git a/ConfigurePermissionsAndPackages.sh b/ConfigurePermissionsAndPackages.sh deleted file mode 100755 index 44f550b..0000000 --- a/ConfigurePermissionsAndPackages.sh +++ /dev/null @@ -1,51 +0,0 @@ -#!/bin/bash - -############################################################################# -# -# Filename : ConfigurePermissionsAndPackages.sh -# Content : Linux file for installing prerequisite libraries and the -# permissions file for the USB HID device -# Created : 2013 -# Authors : Simon Hallam and Brant Lewis -# Copyright : Copyright 2013 OculusVR, Inc. All Rights Reserved -# Instruction : Ensure that the install.sh has execute permissions. -# Navigate to a command shell, enter: -# -# ./install.sh -# -# Enter the administrator password for sudo access. -# -# Notes : UBUNTU 13 USERS -# --------------- -# The OculusConfigUtil does not currently support Ubuntu 13 -# out of the box. If you see an error similar to this upon -# launching OculusConfigUtil: -# -# "error while loading shared libraries: libudev.so.0" -# -# Then please try the following solution, until we officially -# support Ubuntu 13: -# -# cd /lib/x86_64-linux-gnu/ -# sudo ln -sf libudev.so.1 libudev.so.0 -# -############################################################################# - -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 libxext..." -sudo apt-get install libxext-dev -echo "Installing mesa-common..." -sudo apt-get install mesa-common-dev -echo "Installing freeglut3..." -sudo apt-get install freeglut3-dev -echo "Installing Xinerama..." -sudo apt-get install libxinerama-dev -echo "Installing Xrandr..." -sudo apt-get install libxrandr-dev -echo "Installing XFree86" -sudo apt-get install libxxf86vm-dev -echo "Installation complete" - diff --git a/LibOVR/90-oculus.rules b/LibOVR/90-oculus.rules deleted file mode 100644 index 56bccdb..0000000 --- a/LibOVR/90-oculus.rules +++ /dev/null @@ -1,2 +0,0 @@ -# Oculus HID Sensor naming and permissioning -KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="2833", MODE="0666" diff --git a/LibOVR/Makefile b/LibOVR/Makefile deleted file mode 100644 index fba0a67..0000000 --- a/LibOVR/Makefile +++ /dev/null @@ -1,156 +0,0 @@ -############################################################################# -# -# Filename : Makefile -# Content : Makefile for building Linux version of: libovr -# Created : 2014 -# Authors : Simon Hallam, Peter Giokaris, Chris Taylor -# Copyright : Copyright 2014 OculusVR, Inc. All Rights Reserved -# Instruction : The g++ compiler and standard lib packages need to be -# installed on the system. Navigate in a shell to the -# directory where this Makefile is located and enter: -# -# make builds the release version for the -# current architecture -# make clean delete intermediate release object files -# and the library file -# make DEBUG=1 builds the debug version for the current -# architecture -# make clean DEBUG=1 deletes intermediate debug object files -# and the library file -# -# Output : Relative to the directory this Makefile lives in, libraries -# are built at the following locations depending upon the -# architecture of the system you are running: -# -# ./Lib/Linux/Debug/i386/libovr.a -# ./Lib/Linux/Debug/x86_64/libovr.a -# ./Lib/Linux/Release/i386/libovr.a -# ./Lib/Linux/Release/x86_64/libovr.a -# -############################################################################# - -####### Include auxiliary makefiles in current directory --include Makefile.*[^~] - -####### Detect system architecture - -SYSARCH = i386 -ifeq ($(shell uname -m),x86_64) -SYSARCH = x86_64 -endif - -####### Compiler, tools and options - -CXX = g++ -LINK = -DELETEFILE = rm -f - -####### Detect debug or release - -COMMONFLAGS = -Wall -Wextra -Werror -pipe -fPIC -msse2 - -DEBUG ?= 0 -CXXFLAGS ?= -ifeq ($(DEBUG), 1) - CXXFLAGS += $(COMMONFLAGS) -DDEBUG -DOVR_BUILD_DEBUG -g - RELEASETYPE ?= Debug -else - CXXFLAGS += $(COMMONFLAGS) -O2 -fno-strict-aliasing - RELEASETYPE ?= Release -endif - -####### Paths - -LIBOVRPATH = . -3RDPARTYPATH = ../3rdParty -INCPATH = -I. -I.. -I$(LIBOVRPATH)/Include -I$(LIBOVRPATH)/Src -OBJPATH = ./Obj/Linux/$(RELEASETYPE)/$(SYSARCH) -PREFIX = /usr/local - -####### Files - -TARGET_DIR = ./Lib/Linux/$(RELEASETYPE)/$(SYSARCH) -STATIC_NAME = libovr.a -STATIC_TARGET = $(TARGET_DIR)/$(STATIC_NAME) -LIBOVR_INST_HDR = Src/OVR_CAPI.h Src/OVR_CAPI_Keys.h Src/OVR_CAPI_GL.h - -####### Rules - -all: $(STATIC_TARGET) - -OTHER_SOURCE = $(3RDPARTYPATH)/EDID/edid.cpp \ - $(3RDPARTYPATH)/TinyXml/tinyxml2.cpp - -OTHER_OBJECTS = $(OTHER_SOURCE:.cpp=.o) - -LIBOVR_SOURCE = $(LIBOVRPATH)/Src/Net/OVR_BitStream.cpp \ - $(LIBOVRPATH)/Src/Net/OVR_Unix_Socket.cpp \ - $(LIBOVRPATH)/Src/Net/OVR_NetworkPlugin.cpp \ - $(LIBOVRPATH)/Src/Net/OVR_PacketizedTCPSocket.cpp \ - $(LIBOVRPATH)/Src/Net/OVR_RPC1.cpp \ - $(LIBOVRPATH)/Src/Net/OVR_Session.cpp \ - $(LIBOVRPATH)/Src/Net/OVR_Socket.cpp \ - $(LIBOVRPATH)/Src/Service/Service_NetClient.cpp \ - $(LIBOVRPATH)/Src/Service/Service_NetSessionCommon.cpp \ - $(LIBOVRPATH)/Src/Tracking/Tracking_SensorStateReader.cpp \ - $(LIBOVRPATH)/Src/Displays/OVR_Display.cpp \ - $(LIBOVRPATH)/Src/Displays/OVR_Linux_Display.cpp \ - $(LIBOVRPATH)/Src/Displays/OVR_Linux_SDKWindow.cpp \ - $(LIBOVRPATH)/Src/CAPI/CAPI_DistortionRenderer.cpp \ - $(LIBOVRPATH)/Src/CAPI/CAPI_HSWDisplay.cpp \ - $(LIBOVRPATH)/Src/CAPI/CAPI_FrameTimeManager.cpp \ - $(LIBOVRPATH)/Src/CAPI/CAPI_HMDRenderState.cpp \ - $(LIBOVRPATH)/Src/CAPI/CAPI_HMDState.cpp \ - $(LIBOVRPATH)/Src/CAPI/CAPI_LatencyStatistics.cpp \ - $(LIBOVRPATH)/Src/CAPI/GL/CAPI_GL_DistortionRenderer.cpp \ - $(LIBOVRPATH)/Src/CAPI/GL/CAPI_GL_HSWDisplay.cpp \ - $(LIBOVRPATH)/Src/CAPI/GL/CAPI_GL_Util.cpp \ - $(LIBOVRPATH)/Src/CAPI/GL/CAPI_GLE.cpp \ - $(LIBOVRPATH)/Src/Kernel/OVR_Alg.cpp \ - $(LIBOVRPATH)/Src/Kernel/OVR_Allocator.cpp \ - $(LIBOVRPATH)/Src/Kernel/OVR_Atomic.cpp \ - $(LIBOVRPATH)/Src/Kernel/OVR_CRC32.cpp \ - $(LIBOVRPATH)/Src/Kernel/OVR_DebugHelp.cpp \ - $(LIBOVRPATH)/Src/Kernel/OVR_File.cpp \ - $(LIBOVRPATH)/Src/Kernel/OVR_FileFILE.cpp \ - $(LIBOVRPATH)/Src/Kernel/OVR_Lockless.cpp \ - $(LIBOVRPATH)/Src/Kernel/OVR_Log.cpp \ - $(LIBOVRPATH)/Src/Kernel/OVR_Math.cpp \ - $(LIBOVRPATH)/Src/Kernel/OVR_RefCount.cpp \ - $(LIBOVRPATH)/Src/Kernel/OVR_SharedMemory.cpp \ - $(LIBOVRPATH)/Src/Kernel/OVR_Std.cpp \ - $(LIBOVRPATH)/Src/Kernel/OVR_String.cpp \ - $(LIBOVRPATH)/Src/Kernel/OVR_String_FormatUtil.cpp \ - $(LIBOVRPATH)/Src/Kernel/OVR_String_PathUtil.cpp \ - $(LIBOVRPATH)/Src/Kernel/OVR_SysFile.cpp \ - $(LIBOVRPATH)/Src/Kernel/OVR_System.cpp \ - $(LIBOVRPATH)/Src/Kernel/OVR_ThreadsPthread.cpp \ - $(LIBOVRPATH)/Src/Kernel/OVR_ThreadCommandQueue.cpp \ - $(LIBOVRPATH)/Src/Kernel/OVR_Timer.cpp \ - $(LIBOVRPATH)/Src/Kernel/OVR_UTF8Util.cpp \ - $(LIBOVRPATH)/Src/Util/Util_Interface.cpp \ - $(LIBOVRPATH)/Src/Util/Util_LatencyTest2Reader.cpp \ - $(LIBOVRPATH)/Src/Util/Util_Render_Stereo.cpp \ - $(LIBOVRPATH)/Src/Util/Util_SystemInfo.cpp \ - $(LIBOVRPATH)/Src/Util/Util_SystemGUI.cpp \ - $(LIBOVRPATH)/Src/OVR_CAPI.cpp \ - $(LIBOVRPATH)/Src/OVR_SerialFormat.cpp \ - $(LIBOVRPATH)/Src/OVR_JSON.cpp \ - $(LIBOVRPATH)/Src/OVR_Profile.cpp \ - $(LIBOVRPATH)/Src/OVR_Stereo.cpp - -LIBOVR_OBJECTS = $(patsubst $(LIBOVRPATH)%.cpp,$(OBJPATH)%.o,$(LIBOVR_SOURCE)) - -OBJECTS = $(OTHER_OBJECTS) $(LIBOVR_OBJECTS) - -$(OBJPATH)/%.o: %.cpp - @mkdir -p $(dir $@) - $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $< - -$(STATIC_TARGET): $(OBJECTS) - @mkdir -p $(@D) - ar rvs $(STATIC_TARGET) $(OBJECTS) - -clean: - -$(DELETEFILE) $(OBJECTS) - -$(DELETEFILE) $(STATIC_TARGET) diff --git a/OculusConfigurationUtility.sh b/OculusConfigurationUtility.sh deleted file mode 100755 index a70d7f6..0000000 --- a/OculusConfigurationUtility.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash - -############################################################################# -# -# Filename : OculusConfigurationUtility.sh -# Content : Linux file for starting the OculusConfigurationUtility app -# from the SDK package root. It will determine the -# architechture of the system it is running on, and start the -# approprite executable -# Created : 2013 -# Authors : Simon Hallam -# Copyright : Copyright 2013 OculusVR, Inc. All Rights Reserved -# Instruction : Ensure that the OculusConfigurationUtility.sh has execute -# permissions. Navigate to a command shell, enter: -# -# ./OculusConfigurationUtility.sh -# -############################################################################# - -MACHINE_TYPE=`uname -m` -if [ ${MACHINE_TYPE} == 'x86_64' ]; then - ./Tools/OculusConfigUtil/OculusConfigUtil_x86_64 -elif [ ${MACHINE_TYPE} == 'i686' ]; then - ./Tools/OculusConfigUtil/OculusConfigUtil_i386 -else - echo "The Oculus Configuration Utility does not currently support this platform." -fi - diff --git a/OculusWorldDemo.sh b/OculusWorldDemo.sh deleted file mode 100755 index e668c93..0000000 --- a/OculusWorldDemo.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash - -############################################################################# -# -# Filename : OculusWorldDemo.sh -# Content : Linux file for starting the OculusWorldDemo app from the SDK -# package root. It will determine the architechture of the -# system it is running on, and start the approprite executable -# Created : 2013 -# Authors : Simon Hallam -# Copyright : Copyright 2013 OculusVR, Inc. All Rights Reserved -# Instruction : Ensure that the OculusWorldDemo.sh has execute permissions. -# Navigate to a command shell, enter: -# -# ./OculusWorldDemo.sh -# -############################################################################# - -MACHINE_TYPE=`uname -m` -if [ ${MACHINE_TYPE} == 'x86_64' ]; then - ./Samples/OculusWorldDemo/Release/OculusWorldDemo_x86_64_Release -else - ./Samples/OculusWorldDemo/Release/OculusWorldDemo_i386_Release -fi - -- cgit v1.2.3