File tree Expand file tree Collapse file tree 3 files changed +10
-7
lines changed
Expand file tree Collapse file tree 3 files changed +10
-7
lines changed Original file line number Diff line number Diff line change @@ -75,10 +75,11 @@ if(ANDROID)
7575
7676target_link_libraries (CMakeProject1 PUBLIC m)
7777set (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
8081set_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 " )
8283set_target_properties (CMakeProject1 PROPERTIES SUFFIX ".so" )
8384elseif (UNIX )
8485set_target_properties (CMakeProject1 PROPERTIES PREFIX "" )
Original file line number Diff line number Diff 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 "
5050export PATH="$ANDROID_NDK/toolchains/llvm/prebuilt/windows-x86_64/bin:$PATH"
5151
5252cmake -DCMAKE_TOOLCHAIN_FILE="$ANDROID_NDK/build/cmake/android.toolchain.cmake" \
Original file line number Diff line number Diff line change @@ -76,15 +76,17 @@ constexpr size_t alignment = 64;
7676
7777inline 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;
You can’t perform that action at this time.
0 commit comments