Skip to content

Commit ba4a9dc

Browse files
authored
Ensure fseeko available on ndk > 23 (#2490)
Also remove unnecessary macro USE_FILE32API which is not used at anywhere
1 parent 76b0a8f commit ba4a9dc

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

cmake/Modules/AXConfigDefine.cmake

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -117,9 +117,14 @@ endif()
117117
set(CMAKE_DEBUG_POSTFIX "" CACHE STRING "Library postfix for debug builds. Normally left blank." FORCE)
118118
set(CMAKE_PLATFORM_NO_VERSIONED_SONAME TRUE CACHE BOOL "Disable dynamic libraries symblink." FORCE)
119119

120-
# set hash style to both for android old device compatible
121-
# see also: https://github.com/axmolengine/axmol/discussions/614
120+
122121
if (ANDROID)
122+
# Ensure fseeko available on ndk > 23
123+
math(EXPR _ARCH_BITS "${CMAKE_SIZEOF_VOID_P} * 8")
124+
add_definitions(-D_FILE_OFFSET_BITS=${_ARCH_BITS})
125+
126+
# set hash style to both for android old device compatible
127+
# see also: https://github.com/axmolengine/axmol/discussions/614
123128
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--hash-style=both")
124129
endif()
125130

@@ -133,7 +138,6 @@ function(use_ax_compile_define target)
133138

134139
if(APPLE)
135140
target_compile_definitions(${target} PUBLIC __APPLE__)
136-
target_compile_definitions(${target} PUBLIC USE_FILE32API)
137141
if(AX_USE_GL)
138142
target_compile_definitions(${target}
139143
PUBLIC AX_USE_GL=1
@@ -151,7 +155,6 @@ function(use_ax_compile_define target)
151155
target_compile_definitions(${target} PUBLIC AX_GLES_PROFILE=${AX_GLES_PROFILE})
152156
endif()
153157
target_compile_definitions(${target} PUBLIC AX_GLES_PROFILE=${AX_GLES_PROFILE})
154-
target_compile_definitions(${target} PUBLIC USE_FILE32API)
155158
elseif(EMSCRIPTEN)
156159
target_compile_definitions(${target} PUBLIC AX_GLES_PROFILE=${AX_GLES_PROFILE})
157160
elseif(WINDOWS)

0 commit comments

Comments
 (0)