From 6088e62291f6c1064d0c2ac8d93a0bc3c129bdad Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Sun, 8 May 2011 19:41:13 +0100 Subject: [PATCH 1/2] Fixed namespace error --- glm/gtx/matrix_operation.inl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/glm/gtx/matrix_operation.inl b/glm/gtx/matrix_operation.inl index 3af709f1..74f1377c 100644 --- a/glm/gtx/matrix_operation.inl +++ b/glm/gtx/matrix_operation.inl @@ -8,7 +8,7 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// namespace glm{ -namespace gtc{ +namespace gtx{ namespace matrix_operation { template From e2f3ce429e5d9e1b239ec29d1da8d5c7e5eef975 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Tue, 10 May 2011 00:38:33 +0100 Subject: [PATCH 2/2] Added automatic GLM detection --- glm/core/setup.hpp | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/glm/core/setup.hpp b/glm/core/setup.hpp index 06c6010f..255cda1b 100644 --- a/glm/core/setup.hpp +++ b/glm/core/setup.hpp @@ -168,24 +168,6 @@ #elif defined(__MWERKS__) # define GLM_COMPILER GLM_COMPILER_CODEWARRIOR -// CUDA -/* -#elif defined(__CUDACC__) -# if CUDA_VERSION < 3000 -# error "GLM requires CUDA 3.0 or higher" -# elif CUDA_VERSION == 3000 -# define GLM_COMPILER GLM_COMPILER_CUDA30 -# elif CUDA_VERSION == 3010 -# define GLM_COMPILER GLM_COMPILER_CUDA31 -# elif CUDA_VERSION == 3020 -# define GLM_COMPILER GLM_COMPILER_CUDA32 -# elif CUDA_VERSION == 4000 -# define GLM_COMPILER GLM_COMPILER_CUDA40 -# else -# define GLM_COMPILER GLM_COMPILER_CUDA -# endif -*/ - #else # define GLM_COMPILER GLM_COMPILER_UNKNOWN #endif @@ -403,7 +385,7 @@ // User defines: GLM_FORCE_INLINE GLM_FORCE_CUDA -#if(defined(GLM_FORCE_CUDA) || (defined(GLM_COMPILER) && (GLM_COMPILER >= GLM_COMPILER_CUDA30))) +#if(defined(GLM_FORCE_CUDA) || (defined(__CUDACC__))) # define GLM_CUDA_FUNC_DEF __device__ __host__ # define GLM_CUDA_FUNC_DECL __device__ __host__ #else