diff options
Diffstat (limited to 'sources/android/ndk_helper')
-rw-r--r-- | sources/android/ndk_helper/GLContext.h | 8 | ||||
-rw-r--r-- | sources/android/ndk_helper/NDKHelper.h | 4 | ||||
-rw-r--r-- | sources/android/ndk_helper/gestureDetector.h | 7 | ||||
-rw-r--r-- | sources/android/ndk_helper/gl3stub.h | 7 | ||||
-rw-r--r-- | sources/android/ndk_helper/interpolator.h | 4 | ||||
-rw-r--r-- | sources/android/ndk_helper/perfMonitor.h | 4 | ||||
-rw-r--r-- | sources/android/ndk_helper/shader.h | 4 | ||||
-rw-r--r-- | sources/android/ndk_helper/tapCamera.h | 1 | ||||
-rw-r--r-- | sources/android/ndk_helper/vecmath.h | 4 |
9 files changed, 10 insertions, 33 deletions
diff --git a/sources/android/ndk_helper/GLContext.h b/sources/android/ndk_helper/GLContext.h index cc0db463e..8862aa445 100644 --- a/sources/android/ndk_helper/GLContext.h +++ b/sources/android/ndk_helper/GLContext.h @@ -14,11 +14,7 @@ * limitations under the License. */ -//-------------------------------------------------------------------------------- -// GLContext.h -//-------------------------------------------------------------------------------- -#ifndef GLCONTEXT_H_ -#define GLCONTEXT_H_ +#pragma once #include <EGL/egl.h> #include <GLES2/gl2.h> @@ -121,5 +117,3 @@ public: }; } //namespace ndkHelper - -#endif /* GLCONTEXT_H_ */ diff --git a/sources/android/ndk_helper/NDKHelper.h b/sources/android/ndk_helper/NDKHelper.h index de2a10e63..c170b5bf9 100644 --- a/sources/android/ndk_helper/NDKHelper.h +++ b/sources/android/ndk_helper/NDKHelper.h @@ -14,8 +14,7 @@ * limitations under the License. */ -#ifndef _NDKSUPPORT_H -#define _NDKSUPPORT_H +#pragma once /****************************************************************** * NDK support helpers @@ -36,4 +35,3 @@ #include "gestureDetector.h" //Tap/Doubletap/Pinch detector #include "perfMonitor.h" //FPS counter #include "interpolator.h" //Interpolator -#endif diff --git a/sources/android/ndk_helper/gestureDetector.h b/sources/android/ndk_helper/gestureDetector.h index 6ae5d80ef..6c8683bf7 100644 --- a/sources/android/ndk_helper/gestureDetector.h +++ b/sources/android/ndk_helper/gestureDetector.h @@ -14,11 +14,7 @@ * limitations under the License. */ -//-------------------------------------------------------------------------------- -// gestureDetector.h -//-------------------------------------------------------------------------------- -#ifndef GESTUREDETECTOR_H_ -#define GESTUREDETECTOR_H_ +#pragma once #include <vector> @@ -163,4 +159,3 @@ public: }; } //namespace ndkHelper -#endif /* GESTUREDETECTOR_H_ */ diff --git a/sources/android/ndk_helper/gl3stub.h b/sources/android/ndk_helper/gl3stub.h index c8960dfd6..2b8df9c15 100644 --- a/sources/android/ndk_helper/gl3stub.h +++ b/sources/android/ndk_helper/gl3stub.h @@ -1,6 +1,3 @@ -#ifndef __gl3_h_ -#define __gl3_h_ - /* * stub gl3.h for dynamic loading, based on: * gl3.h last updated on $Date: 2013-02-12 14:37:24 -0800 (Tue, 12 Feb 2013) $ @@ -13,6 +10,8 @@ * - Added gl3stubInit() declaration */ +#pragma once + #include <GLES2/gl2.h> #include <android/api-level.h> @@ -500,5 +499,3 @@ extern GL_APICALL void (* GL_APIENTRY glGetInternalformativ) (GLenum target, GLe #ifdef __cplusplus } #endif - -#endif diff --git a/sources/android/ndk_helper/interpolator.h b/sources/android/ndk_helper/interpolator.h index 1226e334b..61b8d8f0a 100644 --- a/sources/android/ndk_helper/interpolator.h +++ b/sources/android/ndk_helper/interpolator.h @@ -14,8 +14,7 @@ * limitations under the License. */ -#ifndef INTERPOLATOR_H_ -#define INTERPOLATOR_H_ +#pragma once #include <jni.h> #include <errno.h> @@ -86,4 +85,3 @@ public: }; } //namespace ndkHelper -#endif /* INTERPOLATOR_H_ */ diff --git a/sources/android/ndk_helper/perfMonitor.h b/sources/android/ndk_helper/perfMonitor.h index f418c436b..b886d6df6 100644 --- a/sources/android/ndk_helper/perfMonitor.h +++ b/sources/android/ndk_helper/perfMonitor.h @@ -14,8 +14,7 @@ * limitations under the License. */ -#ifndef PERFMONITOR_H_ -#define PERFMONITOR_H_ +#pragma once #include <jni.h> #include <errno.h> @@ -58,4 +57,3 @@ public: }; } //namespace ndkHelper -#endif /* PERFMONITOR_H_ */ diff --git a/sources/android/ndk_helper/shader.h b/sources/android/ndk_helper/shader.h index d362a5344..8a21a1177 100644 --- a/sources/android/ndk_helper/shader.h +++ b/sources/android/ndk_helper/shader.h @@ -14,8 +14,7 @@ * limitations under the License. */ -#ifndef SHADER_H_ -#define SHADER_H_ +#pragma once #include <jni.h> @@ -121,4 +120,3 @@ bool ValidateProgram( const GLuint prog ); } //namespace shader } //namespace ndkHelper -#endif /* SHADER_H_ */ diff --git a/sources/android/ndk_helper/tapCamera.h b/sources/android/ndk_helper/tapCamera.h index 7d124e8e2..92f282e4e 100644 --- a/sources/android/ndk_helper/tapCamera.h +++ b/sources/android/ndk_helper/tapCamera.h @@ -15,6 +15,7 @@ */ #pragma once + #include <vector> #include <string> #include <GLES2/gl2.h> diff --git a/sources/android/ndk_helper/vecmath.h b/sources/android/ndk_helper/vecmath.h index 0692e3d01..a81e4f8a1 100644 --- a/sources/android/ndk_helper/vecmath.h +++ b/sources/android/ndk_helper/vecmath.h @@ -14,8 +14,7 @@ * limitations under the License. */ -#ifndef VECMATH_H_ -#define VECMATH_H_ +#pragma once #include <math.h> #include "JNIHelper.h" @@ -1113,4 +1112,3 @@ public: }; } //namespace ndk_helper -#endif /* VECMATH_H_ */ |