diff options
| author | Sven Gothel <sgothel@jausoft.com> | 2015-03-28 02:08:11 +0100 |
|---|---|---|
| committer | Sven Gothel <sgothel@jausoft.com> | 2015-03-28 02:08:11 +0100 |
| commit | 450aa6f7df9e67dd256b86f94e65eaf707032aad (patch) | |
| tree | 04aa207d84ddc8ca246d2573aaaf756b3ce8a0b5 /LibOVR/Include/OVR_Kernel.h | |
| 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 'LibOVR/Include/OVR_Kernel.h')
| -rw-r--r-- | LibOVR/Include/OVR_Kernel.h | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/LibOVR/Include/OVR_Kernel.h b/LibOVR/Include/OVR_Kernel.h index 1a8a903..72ab48a 100644 --- a/LibOVR/Include/OVR_Kernel.h +++ b/LibOVR/Include/OVR_Kernel.h @@ -23,20 +23,22 @@ limitations under the License. *************************************************************************************/ -#ifndef OVR_h -#define OVR_h - -#include "../Src/Kernel/OVR_Types.h" -#include "../Src/Kernel/OVR_Allocator.h" -#include "../Src/Kernel/OVR_RefCount.h" -#include "../Src/Kernel/OVR_Log.h" -#include "../Src/Kernel/OVR_Math.h" -#include "../Src/Kernel/OVR_System.h" -#include "../Src/Kernel/OVR_Nullptr.h" -#include "../Src/Kernel/OVR_String.h" -#include "../Src/Kernel/OVR_Array.h" -#include "../Src/Kernel/OVR_Timer.h" -#include "../Src/Kernel/OVR_SysFile.h" +/* This header file is deprecated and will be removed from a future version of this library */ + +#ifndef OVR_Kernel_h +#define OVR_Kernel_h + +#include "Kernel/OVR_Types.h" +#include "Kernel/OVR_Allocator.h" +#include "Kernel/OVR_RefCount.h" +#include "Kernel/OVR_Log.h" +#include "Kernel/OVR_System.h" +#include "Kernel/OVR_Nullptr.h" +#include "Kernel/OVR_String.h" +#include "Kernel/OVR_Array.h" +#include "Kernel/OVR_Timer.h" +#include "Kernel/OVR_SysFile.h" +#include "Extras/OVR_Math.h" #endif |