solstice-anim

commit 02b524b2dfcf79cccab5bd074ede98dfd475eaed
parent 329a85a938d15ca3b730f65163cf6adcc5ed3795
Author: Christophe Coustet <christophe.coustet@meso-star.com>
Date:   Wed, 21 Oct 2020 14:00:32 +0200

Fix build: possible double definition with some rsys versions

Diffstat:
M
cmake/CMakeLists.txt
 | 
4
++--
M
src/sanim_node.c
 | 
11
-----------

2 files changed, 2 insertions(+), 13 deletions(-)
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
@@ -23,8 +23,8 @@ option(NO_TEST "Do not build tests" OFF)
 ################################################################################
 # Check dependencies
 ################################################################################
-find_package(RCMake 0.2.3 REQUIRED)
-find_package(RSys 0.6 REQUIRED)
+find_package(RCMake 0.4 REQUIRED)
+find_package(RSys 0.10 REQUIRED)
 find_package(OpenMP 1.2 REQUIRED)
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${RCMAKE_SOURCE_DIR})
diff --git a/src/sanim_node.c b/src/sanim_node.c
@@ -66,17 +66,6 @@ d34_set_identity(double dst[12])
   d3_splat(dst + 9, 0);
 }
 
-static INLINE double*
-d22_rotation(double dst[4], const double angle/* in radian */)
-{
-  const double c = (double) cos((double) angle);
-  const double s = (double) sin((double) angle);
-  ASSERT(dst);
-  dst[0] = c; dst[1] = s;
-  dst[2] = -s; dst[3] = c;
-  return dst;
-}
-
 static double*
 get_Xpivot_transform
   (const double angle,