Skip to content
Snippets Groups Projects
Commit 0a01d574 authored by Roman Khlopkov's avatar Roman Khlopkov 🔜
Browse files

Merge branch 'feature-android-build' into 'release-5.3'

[+] android build pipes

See merge request !1767
parents 0b39992a d09b60c4
No related branches found
No related tags found
1 merge request!1767[+] android build pipes
Pipeline #43611 passed with stage
in 16 minutes and 37 seconds
...@@ -82,3 +82,11 @@ build:macos: ...@@ -82,3 +82,11 @@ build:macos:
script: script:
- mkdir build - mkdir build
- cd build && $(${OSXCROSS_ROOT}/bin/osxcross-conf) && export OSXCROSS_NO_INCLUDE_PATH_WARNINGS=1 && export OSXCROSS_HOST=x86_64-apple-darwin20.4 && cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=${OSXCROSS_ROOT}/toolchain.cmake -DBoost_INCLUDE_DIR=$BOOST_INCLUDE_DIR .. && make -j$(nproc) - cd build && $(${OSXCROSS_ROOT}/bin/osxcross-conf) && export OSXCROSS_NO_INCLUDE_PATH_WARNINGS=1 && export OSXCROSS_HOST=x86_64-apple-darwin20.4 && cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=${OSXCROSS_ROOT}/toolchain.cmake -DBoost_INCLUDE_DIR=$BOOST_INCLUDE_DIR .. && make -j$(nproc)
build:android:
extends: .tests
image: demlabs/android/any:qt5
before_script: /opt/buildtools/prepare_environment.sh amd64-windows
script:
- ./prod_build/build.sh --target android
Subproject commit 76bb290ca9d93e5adac3a56a32d42bc94ad354c5 Subproject commit 0da8b02fe25253e36f14b13d22f23c88496a7ccf
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
//#define __USE_GNU //#define __USE_GNU
#if defined(__USE_BSD) || defined(__USE_GNU) #if defined(__USE_BSD) || defined(__USE_GNU) || defined(DAP_OS_ANDROID)
#define S_IREAD S_IRUSR #define S_IREAD S_IRUSR
#define S_IWRITE S_IWUSR #define S_IWRITE S_IWUSR
#define S_IEXEC S_IXUSR #define S_IEXEC S_IXUSR
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment