fixed android zlib compile error.

pull/1811/head
Marco Di Benedetto 2018-02-09 16:02:27 +01:00
parent affedc139e
commit 59ea3b6c85
2 changed files with 7 additions and 6 deletions

View File

@ -230,10 +230,10 @@ ELSEIF( CMAKE_COMPILER_IS_MINGW )
ADD_DEFINITIONS( -U__STRICT_ANSI__ )
ENDIF()
if(IOS)
if (IOS)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fembed-bitcode -O3")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fembed-bitcode -O3")
endif(IOS)
endif()
if (ASSIMP_COVERALLS)
MESSAGE(STATUS "Coveralls enabled")

View File

@ -77,8 +77,9 @@ extern "C" {
the consistency of the compressed data, so the library should never crash
even in the case of corrupted input.
*/
#ifdef __ANDROID__
using zcrc_t = unsigned_long;
typedef unsigned long zcrc_t;
#endif
typedef voidpf (*alloc_func) OF((voidpf opaque, uInt items, uInt size));