Skip to content

Commit 60ed1ac

Browse files
committed
adjustments for android compile
1 parent dc25590 commit 60ed1ac

File tree

3 files changed

+10
-7
lines changed

3 files changed

+10
-7
lines changed

H264SharpNative/CMakeLists.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,11 @@ if(ANDROID)
7575

7676
target_link_libraries(CMakeProject1 PUBLIC m)
7777
set(CMAKE_CXX_STANDARD_LIBRARIES "-stdlib=libc++")
78-
target_link_libraries(CMakeProject1 PUBLIC c++_shared)
78+
#target_link_libraries(CMakeProject1 PUBLIC c++_shared)
79+
target_link_libraries(CMakeProject1 PUBLIC c++_static)
7980

8081
set_target_properties(CMakeProject1 PROPERTIES PREFIX "")
81-
set_target_properties(CMakeProject1 PROPERTIES OUTPUT_NAME "H264SharpNative-android-x64")
82+
set_target_properties(CMakeProject1 PROPERTIES OUTPUT_NAME "H264SharpNative-android-arm64")
8283
set_target_properties(CMakeProject1 PROPERTIES SUFFIX ".so")
8384
elseif(UNIX)
8485
set_target_properties(CMakeProject1 PROPERTIES PREFIX "")

H264SharpNative/pch.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ cmake -DCMAKE_TOOLCHAIN_FILE="$ANDROID_NDK/build/cmake/android.toolchain.cmake"
4646
4747
//NDK 27
4848
49-
export ANDROID_NDK="C:/Program Files (x86)/Android/AndroidNDK/android-ndk-r27c"
49+
export ANDROID_NDK="C:/Program Files (x86)/Android/AndroidNDK/android-ndk-r26d"
5050
export PATH="$ANDROID_NDK/toolchains/llvm/prebuilt/windows-x86_64/bin:$PATH"
5151
5252
cmake -DCMAKE_TOOLCHAIN_FILE="$ANDROID_NDK/build/cmake/android.toolchain.cmake" \

H264SharpNative/pch.h

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,15 +76,17 @@ constexpr size_t alignment = 64;
7676

7777
inline void* AllignAlloc(size_t capacity) {
7878
// Ensure capacity is a multiple of alignment
79-
if (capacity % alignment != 0)
80-
{
81-
capacity += (alignment - (capacity % alignment));
79+
if (capacity % alignment != 0) {
80+
capacity += alignment - (capacity % alignment);
8281
}
8382

8483
#ifdef _WIN32
8584
void* ptr = _aligned_malloc(capacity, alignment);
8685
#else
87-
void* ptr = aligned_alloc(alignment, capacity);
86+
void* ptr = nullptr;
87+
if (posix_memalign(&ptr, alignment, capacity) != 0) {
88+
ptr = nullptr;
89+
}
8890
#endif
8991

9092
return ptr;

0 commit comments

Comments
 (0)