Skip to content

Commit 3b37abc

Browse files
livecodealilivecodeali
committed
Merge remote-tracking branch 'upstream/develop-9.0' into merge-develop-9.0_24.07.18
2 parents b177a44 + b73cbb7 commit 3b37abc

34 files changed

Lines changed: 839 additions & 302 deletions

‎Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ endif
9191
# Linux rules
9292
################################################################
9393

94-
LINUX_ARCHS = x86_64 x86
94+
LINUX_ARCHS = x86_64 x86 armv6hf armv7
9595

9696
config-linux-%:
9797
ifneq ($(TRAVIS),undefined)
@@ -134,7 +134,7 @@ $(addsuffix -linux,all config compile check): %: %-$(guess_linux_arch)
134134
# Android rules
135135
################################################################
136136

137-
ANDROID_ARCHS = armv6
137+
ANDROID_ARCHS = armv6 armv7 arm64 x86 x86_64
138138

139139
config-android-%:
140140
./config.sh --platform android-$*

‎config-rpi.sh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#/bin/bash
2+
3+
./config.sh --cross --platform linux-armv6hf --cc-prefix ${HOME}/x-tools/arm-rpi-linux-gnueabihf/bin/arm-rpi-linux-gnueabihf- --sysroot ${HOME}/x-tools/arm-rpi-linux-gnueabihf/arm-rpi-linux-gnueabihf/sysroot --aux-sysroot /var/lib/schroot/chroots/jessie-armhf --triple arm-linux-gnueabihf

0 commit comments

Comments
 (0)