diff options
| author | Sven Gothel <[email protected]> | 2015-03-28 02:08:11 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2015-03-28 02:08:11 +0100 |
| commit | 450aa6f7df9e67dd256b86f94e65eaf707032aad (patch) | |
| tree | 04aa207d84ddc8ca246d2573aaaf756b3ce8a0b5 /OculusConfigurationUtility.sh | |
| parent | 3c7b8a17e907f4ef2afd9f77db566a3f6179cbe4 (diff) | |
| parent | 4207f9c279e832e3afcb3f5fc6cd8d84cb4cfe4c (diff) | |
Merge branch 'vanilla_0.5.0.1' into jogamp_0.5.0.1
Conflicts:
LibOVR/Include/OVR_CAPI_0_5_0.h
LibOVR/Src/CAPI/CAPI_HMDState.cpp
LibOVR/Src/Displays/OVR_Win32_Dxgi_Display.h
LibOVR/Src/Kernel/OVR_System.cpp
LibOVR/Src/OVR_CAPI.cpp
LibOVR/Src/OVR_Profile.cpp
LibOVRKernel/Src/Kernel/OVR_ThreadsWinAPI.cpp
LibOVRKernel/Src/Kernel/OVR_Types.h
Diffstat (limited to 'OculusConfigurationUtility.sh')
| -rwxr-xr-x | OculusConfigurationUtility.sh | 28 |
1 files changed, 0 insertions, 28 deletions
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 - |