From f6959b99c6d2b18a47bb3c5de792c86ca73821c1 Mon Sep 17 00:00:00 2001 From: Recep Aslantas Date: Thu, 15 Jun 2017 20:06:00 +0300 Subject: [PATCH] fix pre-compiled vector header and suppress warnings --- include/call/cglmc-euler.h | 6 +++--- include/call/cglmc-vec.h | 10 +++++----- src/cglm-cam.c | 1 + src/cglm-euler.c | 1 + src/cglm-io.c | 1 + src/cglm-mat.c | 1 + src/cglm-mat3.c | 1 + src/cglm-quat.c | 1 + src/cglm-vec.c | 1 + src/clgm-affine.c | 1 + 10 files changed, 16 insertions(+), 8 deletions(-) diff --git a/include/call/cglmc-euler.h b/include/call/cglmc-euler.h index 0aea082..8cbea2b 100644 --- a/include/call/cglmc-euler.h +++ b/include/call/cglmc-euler.h @@ -5,8 +5,8 @@ * Full license can be found in the LICENSE file */ -#ifndef glmc_euler_h -#define glmc_euler_h +#ifndef cglmc_euler_h +#define cglmc_euler_h #ifdef __cplusplus extern "C" { #endif @@ -48,4 +48,4 @@ glmc_euler_by_order(vec3 angles, glm_euler_sq axis, mat4 dest); #ifdef __cplusplus } #endif -#endif /* glmc_euler_h */ +#endif /* cglmc_euler_h */ diff --git a/include/call/cglmc-vec.h b/include/call/cglmc-vec.h index 5d9ce0d..655ebce 100644 --- a/include/call/cglmc-vec.h +++ b/include/call/cglmc-vec.h @@ -5,8 +5,8 @@ * Full license can be found in the LICENSE file */ -#ifndef cglm_vec_h -#define cglm_vec_h +#ifndef cglmc_vec_h +#define cglmc_vec_h #ifdef __cplusplus extern "C" { #endif @@ -116,7 +116,7 @@ glmc_vec4_flipsign(vec4 v); CGLM_EXPORT float -glmc_vec_angle(vec3 v1, vec3 v2) +glmc_vec_angle(vec3 v1, vec3 v2); CGLM_EXPORT void @@ -130,7 +130,7 @@ CGLM_EXPORT void glmc_vec_proj(vec3 a, vec3 b, vec3 dest); -CGLM_INLINE +CGLM_EXPORT void glmc_vec_center(vec3 v1, vec3 v2, vec3 dest); @@ -145,4 +145,4 @@ glmc_vec4_distance(vec4 v1, vec4 v2); #ifdef __cplusplus } #endif -#endif /* cglm_vec_h */ +#endif /* cglmc_vec_h */ diff --git a/src/cglm-cam.c b/src/cglm-cam.c index a5d864d..e242eb8 100644 --- a/src/cglm-cam.c +++ b/src/cglm-cam.c @@ -6,6 +6,7 @@ */ #include "../include/cglm.h" +#include "../include/cglm-call.h" CGLM_EXPORT void diff --git a/src/cglm-euler.c b/src/cglm-euler.c index 3e84490..399a6e9 100644 --- a/src/cglm-euler.c +++ b/src/cglm-euler.c @@ -6,6 +6,7 @@ */ #include "../include/cglm.h" +#include "../include/cglm-call.h" CGLM_EXPORT void diff --git a/src/cglm-io.c b/src/cglm-io.c index 6d2be00..9f36ec0 100644 --- a/src/cglm-io.c +++ b/src/cglm-io.c @@ -6,6 +6,7 @@ */ #include "../include/cglm.h" +#include "../include/cglm-call.h" CGLM_EXPORT void diff --git a/src/cglm-mat.c b/src/cglm-mat.c index 5677c81..9025f24 100644 --- a/src/cglm-mat.c +++ b/src/cglm-mat.c @@ -6,6 +6,7 @@ */ #include "../include/cglm.h" +#include "../include/cglm-call.h" CGLM_EXPORT void diff --git a/src/cglm-mat3.c b/src/cglm-mat3.c index cc94e7d..6ba4231 100644 --- a/src/cglm-mat3.c +++ b/src/cglm-mat3.c @@ -6,6 +6,7 @@ */ #include "../include/cglm.h" +#include "../include/cglm-call.h" CGLM_EXPORT void diff --git a/src/cglm-quat.c b/src/cglm-quat.c index d210322..5ca75ab 100644 --- a/src/cglm-quat.c +++ b/src/cglm-quat.c @@ -6,6 +6,7 @@ */ #include "../include/cglm.h" +#include "../include/cglm-call.h" CGLM_EXPORT void diff --git a/src/cglm-vec.c b/src/cglm-vec.c index f32c533..124bde5 100644 --- a/src/cglm-vec.c +++ b/src/cglm-vec.c @@ -6,6 +6,7 @@ */ #include "../include/cglm.h" +#include "../include/cglm-call.h" CGLM_EXPORT void diff --git a/src/clgm-affine.c b/src/clgm-affine.c index c739113..ec3768c 100644 --- a/src/clgm-affine.c +++ b/src/clgm-affine.c @@ -6,6 +6,7 @@ */ #include "../include/cglm.h" +#include "../include/cglm-call.h" CGLM_EXPORT void