From 4b9b576d5129b252bcfb4f231f1391cbc1679259 Mon Sep 17 00:00:00 2001
From: EndrII <endriimail@gmail.com>
Date: Sun, 3 May 2020 12:11:32 +0300
Subject: [PATCH] fix build
---
CMakeLists.txt | 31 ++++++++++++++++++-------------
1 file changed, 18 insertions(+), 13 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e8f234e..9664b8c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -30,7 +30,6 @@ cmake_minimum_required( VERSION 3.1.0 )
set( CMAKE_DISABLE_SOURCE_CHANGES ON )
set( CMAKE_DISABLE_IN_SOURCE_BUILD ON )
-set( FILAMENT_REQUIRES_CXXABI ON)
set( CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake" )
@@ -141,19 +140,25 @@ if( MINGW )
set( CMAKE_SHARED_LINKER_FLAGS "-Wl,--export-all" )
endif()
-include(CheckFunctionExists)
-include( CheckTypeSize )
+#include( CheckTypeSize )
+
+#check_type_size( "long" LONG_INT )
+#check_type_size( "long long" LONG_LONG_INT )
+#check_type_size( "int" INT )
+#if( HAVE_LONG_INT AND (${LONG_INT} EQUAL 8) )
+# set( SIXTY_FOUR_BIT_LONG ON )
+#elseif( HAVE_LONG_LONG_INT AND (${LONG_LONG_INT} EQUAL 8) )
+# set( SIXTY_FOUR_BIT ON )
+#else()
+# set( THIRTY_TWO_BIT ON )
+#endif()
+
+IF(ANDROID)
+ set( THIRTY_TWO_BIT ON )
+ELSE()
+ set( SIXTY_FOUR_BIT ON )
+ENDIF()
-check_type_size( "long" LONG_INT )
-check_type_size( "long long" LONG_LONG_INT )
-check_type_size( "int" INT )
-if( HAVE_LONG_INT AND (${LONG_INT} EQUAL 8) )
- set( SIXTY_FOUR_BIT_LONG ON )
-elseif( HAVE_LONG_LONG_INT AND (${LONG_LONG_INT} EQUAL 8) )
- set( SIXTY_FOUR_BIT ON )
-else()
- set( THIRTY_TWO_BIT ON )
-endif()
if( MSVC OR ( WIN32 AND MINGW AND NOT CYGWIN ) )
set( OPENSSL_EXPORT_VAR_AS_FUNCTION 1 )