Skip to content
This repository was archived by the owner on Aug 31, 2021. It is now read-only.

Commit 9872284

Browse files
peter-bpeter-b
committed
Merge branch 'develop-7.0' into develop-7.0-js
Conflicts: Makefile thirdparty
2 parents 80abbd6 + 38a037d commit 9872284

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+447
-352
lines changed

‎INSTALL-android.md‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,6 @@ android-ndk-r10e/build/tools/make-standalone-toolchain.sh \
4141
--install-dir=${HOME}/android/toolchain/standalone
4242
````
4343

44-
By default, the Android toolchain uses the `gold` linker. However, this doesn't work for compiling LiveCode, so it's necessary to change the default linker to `ld.bfd` by replacing the `ld` symlink:
45-
46-
````bash
47-
rm standalone/bin/arm-linux-androideabi-ld
48-
ln -s arm-linux-androideabi-ld.bfd \
49-
standalone/bin/arm-linux-androideabi-ld
50-
````
51-
5244
Add a couple of symlinks to allow the engine configuration script to find the Android toolchain:
5345

5446
````bash
@@ -79,7 +71,7 @@ COMMON_FLAGS="-target ${TRIPLE} -march=${ARCH}"
7971

8072
CC="${BINDIR}/${TRIPLE}-clang ${COMMON_FLAGS} -integrated-as"
8173
CXX="${BINDIR}/${TRIPLE}-clang ${COMMON_FLAGS} -integrated-as"
82-
LINK="${BINDIR}/${TRIPLE}-clang ${COMMON_FLAGS}"
74+
LINK="${BINDIR}/${TRIPLE}-clang ${COMMON_FLAGS} -fuse-ld=bfd"
8375
AR="${BINDIR}/${TRIPLE}-ar"
8476

8577
# Android platform information

‎Makefile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ EMMAKE ?= emmake
2525

2626
# Some magic to control which versions of iOS we try to build. N.b. you may
2727
# also need to modify the buildbot configuration
28-
IPHONEOS_VERSIONS ?= 8.2 8.3
29-
IPHONESIMULATOR_VERSIONS ?= 5.1 6.1 7.1 8.2 8.3
28+
IPHONEOS_VERSIONS ?= 8.2 8.4
29+
IPHONESIMULATOR_VERSIONS ?= 5.1 6.1 7.1 8.2 8.4
3030

3131
IOS_SDKS ?= \
3232
$(addprefix iphoneos,$(IPHONEOS_VERSIONS)) \
@@ -139,9 +139,9 @@ compile-ios-%:
139139
$(XCODEBUILD) -project "build-ios-$*$(BUILD_SUBDIR)/$(BUILD_PROJECT).xcodeproj" -configuration $(BUILDTYPE)
140140

141141
# Provide some synonyms for "latest iOS SDK"
142-
$(addsuffix -ios-iphoneos,all config compile): %: %8.3
142+
$(addsuffix -ios-iphoneos,all config compile): %: %8.4
143143
@true
144-
$(addsuffix -ios-iphonesimulator,all config compile): %: %8.3
144+
$(addsuffix -ios-iphonesimulator,all config compile): %: %8.4
145145
@true
146146

147147
all_ios_subplatforms = iphoneos iphonesimulator $(IOS_SDKS)

‎config.sh‎

Lines changed: 75 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ fi
229229
if test -z "$XCODE_TARGET_SDK"; then
230230
case ${OS} in
231231
mac) XCODE_TARGET_SDK="macosx10.8" ;;
232-
ios) XCODE_TARGET_SDK="iphoneos8.3" ;;
232+
ios) XCODE_TARGET_SDK="iphoneos" ;;
233233
esac
234234
fi
235235

@@ -268,87 +268,79 @@ fi
268268
WIN_PERL=${WIN_PERL:-"C:/perl/bin/perl.exe"}
269269

270270
# Android default settings and tools
271-
ANDROID_NDK_VERSION=${ANDROID_NDK_VERSION:-r10d}
272-
ANDROID_PLATFORM=${ANDROID_PLATFORM:-android-8}
273-
274-
# Attempt to locate an Android NDK
275-
if [ -z "${ANDROID_NDK}" ] ; then
276-
# Try the symlink we suggest in INSTALL-android.md
277-
if [ -d "${HOME}/android/toolchain/android-ndk" ] ; then
278-
ANDROID_NDK="${HOME}/android/toolchain/android-ndk"
279-
else
280-
if [ "${OS}" = "android" ] ; then
281-
echo >&2 "Error: Android NDK not found (set \$ANDROID_NDK)"
282-
exit 1
283-
fi
284-
fi
285-
fi
286-
287-
# Attempt to locate an Android SDK
288-
if [ -z "${ANDROID_SDK}" ] ; then
289-
# Try the symlink we suggest in INSTALL-android.md
290-
if [ -d "${HOME}/android/toolchain/android-sdk" ] ; then
291-
ANDROID_SDK="${HOME}/android/toolchain/android-sdk"
292-
else
293-
if [ "${OS}" = "android" ] ; then
294-
echo >&2 "Error: Android SDK not found (set \$ANDROID_SDK)"
295-
exit 1
296-
fi
297-
fi
298-
fi
299-
300-
# Attempt to guess the Android build tools version
301-
if [ -z "${ANDROID_BUILD_TOOLS}" ] ; then
302-
# Check for a sub-folder in the appropriate place
303-
# Possibly fragile - are there ever multiple sub-folders?
304-
if [ ! "$(echo \"${ANDROID_SDK}/build-tools/\"*)" = "${ANDROID_SDK}/build-tools/*" ] ; then
305-
ANDROID_BUILD_TOOLS=$(basename $(echo "${ANDROID_SDK}/build-tools/"*))
306-
else
307-
if [ "${OS}" = "android" ] ; then
308-
echo >&2 "Error: Android build tools not found (set \$ANDROID_BUILD_TOOLS)"
309-
exit 1
310-
fi
311-
fi
312-
fi
313-
314-
if [ -z "${ANDROID_TOOLCHAIN}" ] ; then
315-
# Try the folder we suggest in INSTALL-android.md
316-
if [ -d "${HOME}/android/toolchain/standalone" ] ; then
317-
ANDROID_TOOLCHAIN="${HOME}/android/toolchain/standalone/bin/arm-linux-androideabi-"
318-
else
319-
if [ "${OS}" = "android" ] ; then
320-
echo >&2 "Error: Android toolchain not found (set \$ANDROID_TOOLCHAIN)"
321-
exit 1
322-
fi
323-
fi
324-
fi
325-
326-
ANDROID_AR=${AR:-${ANDROID_TOOLCHAIN}ar}
327-
ANDROID_CC=${CC:-${ANDROID_TOOLCHAIN}clang -target arm-linux-androideabi -march=armv6 -integrated-as}
328-
ANDROID_CXX=${CXX:-${ANDROID_TOOLCHAIN}clang -target arm-linux-androideabi -march=armv6 -integrated-as}
329-
ANDROID_LINK=${LINK:-${ANDROID_TOOLCHAIN}clang -target arm-linux-androideabi -march=armv6 -integrated-as}
330-
ANDROID_OBJCOPY=${OBJCOPY:-${ANDROID_TOOLCHAIN}objcopy}
331-
ANDROID_OBJDUMP=${OBJDUMP:-${ANDROID_TOOLCHAIN}objdump}
332-
ANDROID_STRIP=${STRIP:-${ANDROID_TOOLCHAIN}strip}
333-
334-
if [ -z "${JAVA_SDK}" ] ; then
335-
# Utility used to locate Java on OSX systems
336-
if [ -x /usr/libexec/java_home ] ; then
337-
ANDROID_JAVA_SDK="$(/usr/libexec/java_home)"
338-
elif [ -d /usr/lib/jvm/default ] ; then
339-
ANDROID_JAVA_SDK=/usr/lib/jvm/default
340-
elif [ -d /usr/lib/jvm/default-java ] ; then
341-
ANDROID_JAVA_SDK=/usr/lib/jvm/default-java
342-
else
343-
if [ "${OS}" = "android" ] ; then
344-
echo >&2 "Error: no Java SDK found - set \$JAVA_SDK"
345-
exit 1
346-
fi
347-
fi
348-
else
349-
ANDROID_JAVA_SDK="${JAVA_SDK}"
350-
fi
351-
271+
if test "${OS}" = "android" ; then
272+
ANDROID_NDK_VERSION=${ANDROID_NDK_VERSION:-r10d}
273+
ANDROID_PLATFORM=${ANDROID_PLATFORM:-android-8}
274+
275+
# Attempt to locate an Android NDK
276+
if [ -z "${ANDROID_NDK}" -a "${OS}" = "android" ] ; then
277+
# Try the symlink we suggest in INSTALL-android.md
278+
if [ -d "${HOME}/android/toolchain/android-ndk" ] ; then
279+
ANDROID_NDK="${HOME}/android/toolchain/android-ndk"
280+
else
281+
echo >&2 "Error: Android NDK not found (set \$ANDROID_NDK)"
282+
exit 1
283+
fi
284+
fi
285+
286+
# Attempt to locate an Android SDK
287+
if [ -z "${ANDROID_SDK}" ] ; then
288+
# Try the symlink we suggest in INSTALL-android.md
289+
if [ -d "${HOME}/android/toolchain/android-sdk" ] ; then
290+
ANDROID_SDK="${HOME}/android/toolchain/android-sdk"
291+
else
292+
echo >&2 "Error: Android SDK not found (set \$ANDROID_SDK)"
293+
exit 1
294+
fi
295+
fi
296+
297+
# Attempt to guess the Android build tools version
298+
if [ -z "${ANDROID_BUILD_TOOLS}" ] ; then
299+
# Check for a sub-folder in the appropriate place
300+
# Possibly fragile - are there ever multiple sub-folders?
301+
if [ ! "$(echo \"${ANDROID_SDK}/build-tools/\"*)" = "${ANDROID_SDK}/build-tools/*" ] ; then
302+
ANDROID_BUILD_TOOLS=$(basename $(echo "${ANDROID_SDK}/build-tools/"*))
303+
else
304+
echo >&2 "Error: Android build tools not found (set \$ANDROID_BUILD_TOOLS)"
305+
exit 1
306+
fi
307+
fi
308+
309+
if [ -z "${ANDROID_TOOLCHAIN}" ] ; then
310+
# Try the folder we suggest in INSTALL-android.md
311+
if [ -d "${HOME}/android/toolchain/standalone" ] ; then
312+
ANDROID_TOOLCHAIN="${HOME}/android/toolchain/standalone/bin/arm-linux-androideabi-"
313+
else
314+
echo >&2 "Error: Android toolchain not found (set \$ANDROID_TOOLCHAIN)"
315+
exit 1
316+
fi
317+
fi
318+
319+
ANDROID_AR=${AR:-${ANDROID_TOOLCHAIN}ar}
320+
ANDROID_CC=${CC:-${ANDROID_TOOLCHAIN}clang -target arm-linux-androideabi -march=armv6 -integrated-as}
321+
ANDROID_CXX=${CXX:-${ANDROID_TOOLCHAIN}clang -target arm-linux-androideabi -march=armv6 -integrated-as}
322+
ANDROID_LINK=${LINK:-${ANDROID_TOOLCHAIN}clang -target arm-linux-androideabi -march=armv6 -integrated-as -fuse-ld=bfd}
323+
ANDROID_OBJCOPY=${OBJCOPY:-${ANDROID_TOOLCHAIN}objcopy}
324+
ANDROID_OBJDUMP=${OBJDUMP:-${ANDROID_TOOLCHAIN}objdump}
325+
ANDROID_STRIP=${STRIP:-${ANDROID_TOOLCHAIN}strip}
326+
327+
if [ -z "${JAVA_SDK}" ] ; then
328+
# Utility used to locate Java on OSX systems
329+
if [ -x /usr/libexec/java_home ] ; then
330+
ANDROID_JAVA_SDK="$(/usr/libexec/java_home)"
331+
elif [ -d /usr/lib/jvm/default ] ; then
332+
ANDROID_JAVA_SDK=/usr/lib/jvm/default
333+
elif [ -d /usr/lib/jvm/default-java ] ; then
334+
ANDROID_JAVA_SDK=/usr/lib/jvm/default-java
335+
else
336+
echo >&2 "Error: no Java SDK found - set \$JAVA_SDK"
337+
exit 1
338+
fi
339+
else
340+
ANDROID_JAVA_SDK="${JAVA_SDK}"
341+
fi
342+
343+
fi # End of Android defaults & tools
352344

353345
################################################################
354346
# Invoke gyp
@@ -370,7 +362,7 @@ case ${OS} in
370362
export ANDROID_NDK
371363
export ANDROID_PLATFORM
372364
export ANDROID_SDK
373-
365+
374366
export JAVA_SDK="${ANDROID_JAVA_SDK}"
375367

376368
export AR="${ANDROID_AR}"

‎docs/notes/bugfix-11803.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# set the RTFText of field does not work on Android

‎docs/notes/bugfix-14289.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# Update SQLite to 3.8.10.2
2+

‎docs/notes/bugfix-14418.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Player doesn't accept filenames starting with file://

‎docs/notes/bugfix-15259.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# DataGrid library missing in standalones

‎docs/notes/bugfix-15263.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Large files can EOF prematurely on Linux.

‎docs/notes/bugfix-15556.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Mouse focus not synced when object is created

‎docs/notes/bugfix-15566.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# Preferences Mobile Support can't find the SDK for Xcode 6.4

0 commit comments

Comments
 (0)