Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

update android NDK r26 #259

Closed
wants to merge 4 commits into from
Closed

update android NDK r26 #259

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9f83170
update android NDK r26
aldenml Oct 8, 2023
5944be3
update to boost 1.83.0
aldenml Oct 8, 2023
4b9b70e
fix
aldenml Oct 8, 2023
7c55717
fix
aldenml Oct 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/android.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ on:
- master

env:
BOOST_DOT_VERSION: "1.81.0"
BOOST_VERSION: "1_81_0"
NDK_VERSION: "r25c"
BOOST_DOT_VERSION: "1.83.0"
BOOST_VERSION: "1_83_0"
NDK_VERSION: "r26"
OPENSSL_VERSION: "1.1.1t"
OPENSSL_NO_OPTS: "no-deprecated no-shared no-makedepend no-static-engine no-stdio no-posix-io no-threads no-ui-console no-zlib no-zlib-dynamic -fno-strict-aliasing -fvisibility=hidden -O3"

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/linux.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ on:
- master

env:
BOOST_DOT_VERSION: "1.81.0"
BOOST_VERSION: "1_81_0"
BOOST_DOT_VERSION: "1.83.0"
BOOST_VERSION: "1_83_0"
OPENSSL_VERSION: "1.1.1t"
OPENSSL_NO_OPTS: "no-deprecated no-shared no-makedepend no-static-engine no-stdio no-posix-io no-threads no-ui-console no-zlib no-zlib-dynamic -fno-strict-aliasing -fvisibility=hidden -O3"
CXX: g++-10
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/macos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ on:
- master

env:
BOOST_DOT_VERSION: "1.81.0"
BOOST_VERSION: "1_81_0"
BOOST_DOT_VERSION: "1.83.0"
BOOST_VERSION: "1_83_0"
OPENSSL_VERSION: "1.1.1t"
OPENSSL_NO_OPTS: "no-deprecated no-shared no-makedepend no-static-engine no-stdio no-posix-io no-threads no-ui-console no-zlib no-zlib-dynamic -fno-strict-aliasing -fvisibility=hidden -O3"

Expand Down
2 changes: 2 additions & 0 deletions changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
* update to libtorrent master
* update to boost 1.83.0
* using SWIG 4.1.1
* update android NDK r26
* improved java api layer
* lt:allow to change save path without any additional actions
* lt:allow to change save path without moving any files
Expand Down
6 changes: 3 additions & 3 deletions swig/android-build/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ RUN apt update -y \
python perl make cmake \
g++

ENV BOOST_DOT_VERSION="1.81.0"
ENV BOOST_VERSION="1_81_0"
ENV NDK_VERSION="r25c"
ENV BOOST_DOT_VERSION="1.83.0"
ENV BOOST_VERSION="1_83_0"
ENV NDK_VERSION="r26"
ENV OPENSSL_VERSION="1.1.1t"
ENV OPENSSL_NO_OPTS="no-deprecated no-shared no-makedepend no-static-engine no-stdio no-posix-io no-threads no-ui-console no-zlib no-zlib-dynamic -fno-strict-aliasing -fvisibility=hidden -O3 -fPIC"

Expand Down
1 change: 1 addition & 0 deletions swig/config/android-arm-config.jam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ using clang-linux : arm : $(ANDROID_TOOLCHAIN)/bin/armv7a-linux-androideabi24-cl
<cxxflags>-fvisibility=hidden
<cxxflags>-D_FORTIFY_SOURCE=2
<cxxflags>-fstack-protector-strong
<cflags>-Wno-unused-but-set-variable
<linkflags>-static-libstdc++
<linkflags>-fuse-ld=lld
<linkflags>-Wl,--build-id=sha1
Expand Down
1 change: 1 addition & 0 deletions swig/config/android-arm64-config.jam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ using clang : arm64 : $(ANDROID_TOOLCHAIN)/bin/aarch64-linux-android24-clang++ :
<cxxflags>-fvisibility=hidden
<cxxflags>-D_FORTIFY_SOURCE=2
<cxxflags>-fstack-protector-strong
<cflags>-Wno-unused-but-set-variable
<linkflags>-static-libstdc++
<linkflags>-fuse-ld=lld
<linkflags>-Wl,--build-id=sha1
Expand Down
1 change: 1 addition & 0 deletions swig/config/android-x86-config.jam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ using clang : x86 : $(ANDROID_TOOLCHAIN)/bin/i686-linux-android24-clang++ :
<cxxflags>-fvisibility=hidden
<cxxflags>-D_FORTIFY_SOURCE=2
<cxxflags>-fstack-protector-strong
<cflags>-Wno-unused-but-set-variable
<linkflags>-static-libstdc++
<linkflags>-fuse-ld=lld
<linkflags>-Wl,--build-id=sha1
Expand Down
1 change: 1 addition & 0 deletions swig/config/android-x86_64-config.jam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ using clang : x86_64 : $(ANDROID_TOOLCHAIN)/bin/x86_64-linux-android24-clang++ :
<cxxflags>-fvisibility=hidden
<cxxflags>-D_FORTIFY_SOURCE=2
<cxxflags>-fstack-protector-strong
<cflags>-Wno-unused-but-set-variable
<linkflags>-static-libstdc++
<linkflags>-fuse-ld=lld
<linkflags>-Wl,--build-id=sha1
Expand Down
Loading