|
@@ -168,24 +168,6 @@
|
|
|
#elif defined(__MWERKS__)
|
|
#elif defined(__MWERKS__)
|
|
|
# define GLM_COMPILER GLM_COMPILER_CODEWARRIOR
|
|
# 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
|
|
#else
|
|
|
# define GLM_COMPILER GLM_COMPILER_UNKNOWN
|
|
# define GLM_COMPILER GLM_COMPILER_UNKNOWN
|
|
|
#endif
|
|
#endif
|
|
@@ -403,7 +385,7 @@
|
|
|
|
|
|
|
|
// User defines: GLM_FORCE_INLINE GLM_FORCE_CUDA
|
|
// 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_DEF __device__ __host__
|
|
|
# define GLM_CUDA_FUNC_DECL __device__ __host__
|
|
# define GLM_CUDA_FUNC_DECL __device__ __host__
|
|
|
#else
|
|
#else
|