Enable CP_USE_DOUBLES in tizen

Change-Id: I664a06dab831962a17750113ccacf97e0fbd0c38

diff --git a/build/tizen/CMakeLists.txt b/build/tizen/CMakeLists.txt
index 3eae574f68ceb1473b3abcf95411f504c57c836b..d5dae8cded44c7d267fa3867cc2fc085597eba55 100644 (file)
--- a/build/tizen/CMakeLists.txt
+++ b/build/tizen/CMakeLists.txt
@@ -138,6 +138,10 @@ IF( ENABLE_I18N )
   ADD_DEFINITIONS( "-DDGETTEXT_ENABLED" )
 ENDIF( ENABLE_I18N )
 
+IF( BUILD_PHYSICS )
+  ADD_DEFINITIONS( "-DCP_USE_DOUBLES")
+ENDIF( BUILD_PHYSICS)
+
 IF( WIN32 )
   ADD_DEFINITIONS( "-DBUILDING_DALI_TOOLKIT" )
 

diff --git a/dali-physics/third-party/chipmunk2d/src/cpHastySpace.c b/dali-physics/third-party/chipmunk2d/src/cpHastySpace.c
index 8422c3ebe64a309fa619b9ed9991c3a15336aa13..43c15b38245ec7a43177fdfed861f6b544a5ea65 100644 (file)
--- a/dali-physics/third-party/chipmunk2d/src/cpHastySpace.c
+++ b/dali-physics/third-party/chipmunk2d/src/cpHastySpace.c
@@ -231,11 +231,7 @@ int pthread_join(pthread_t thread, void **value_ptr)
        #error Compiler not supported.
 #endif
 
-#if CP_USE_DOUBLES
-       #if !__arm64
-               #error Cannot use CP_USE_DOUBLES on 32 bit ARM.
-       #endif
-       
+#if CP_USE_DOUBLES && (__arm64)
        typedef float64_t cpFloat_t;
        typedef float64x2_t cpFloatx2_t;
        #define vld vld1q_f64

diff --git a/packaging/dali-toolkit.spec b/packaging/dali-toolkit.spec
index 3b2dd580b3326cb97d7d864c078390c2d13f811a..a0b869f3f2cf74dd46c87c0c50def3491c28cda4 100644 (file)
--- a/packaging/dali-toolkit.spec
+++ b/packaging/dali-toolkit.spec
@@ -247,6 +247,7 @@ cmake \
       -DCMAKE_INSTALL_LIBDIR=%{_libdir} \
       -DCMAKE_INSTALL_INCLUDEDIR=%{_includedir} \
       -DENABLE_I18N=ON \
+      -DCP_USE_DOUBLES=ON \
       .
 
 make %{?jobs:-j%jobs}