diff --git a/lcidlc/lclink.sh b/lcidlc/lclink.sh index f05aa2a90d8..90603879c37 100644 --- a/lcidlc/lclink.sh +++ b/lcidlc/lclink.sh @@ -1,12 +1,17 @@ # Dependencies are calculated from the .ios file that lists which libraries and frameworks to link # against. -if [ "$LIVECODE_DEP_FILE" == "" ]; then - LIVECODE_DEP_FILE="$SRCROOT/$PRODUCT_NAME.ios" -fi read SDK_MAJORVERSION SDK_MINORVERSION <<<${SDK_NAME//[^0-9]/ } read SDK_PLATFORM <<<${SDK_NAME//[0-9.]/ } +if [ "$LIVECODE_DEP_FILE" == "" ]; then + if [[ $SDK_MAJORVERSION -ge 14 && $PRODUCT_NAME == "standalone" ]] ; then + LIVECODE_DEP_FILE="$SRCROOT/${PRODUCT_NAME}14.ios" + else + LIVECODE_DEP_FILE="$SRCROOT/$PRODUCT_NAME.ios" + fi +fi + if [ -f "$LIVECODE_DEP_FILE" ]; then DEPS=$(cat "$LIVECODE_DEP_FILE") diff --git a/tools/build-extension-ios.sh b/tools/build-extension-ios.sh index a5d6271e2ed..a3520011011 100755 --- a/tools/build-extension-ios.sh +++ b/tools/build-extension-ios.sh @@ -6,7 +6,16 @@ SYMBOLS=$1 SYMBOLS_FILE=$2 COPY_PATH=$3 -DEPS=`cat "$SRCROOT/$PRODUCT_NAME.ios"` +read SDK_MAJORVERSION SDK_MINORVERSION <<<${SDK_NAME//[^0-9]/ } + +if [[ $SDK_MAJORVERSION -ge 14 && "$PRODUCT_NAME" == "standalone" ]] ; then + DEPS_PATH="$SRCROOT/${PRODUCT_NAME}14.ios" +else + DEPS_PATH="$SRCROOT/$PRODUCT_NAME.ios" +fi + +DEPS=`cat $DEPS_PATH` + DEPS=${DEPS//library /-l} DEPS=${DEPS//framework /-framework } @@ -68,7 +77,7 @@ if [ -z "$FAT_INFO" -o $BUILD_DYLIB -eq 1 ]; then exit $? fi - $BIN_DIR/g++ -stdlib=libc++ -nodefaultlibs $STRIP_OPTIONS ${ARCHS} $MIN_OS_VERSION -isysroot $SDKROOT -L"$SOLUTION_DIR/prebuilt/lib/ios/$SDK_NAME" -o "$BUILT_PRODUCTS_DIR/$PRODUCT_NAME.lcext" "$BUILT_PRODUCTS_DIR/$EXECUTABLE_NAME" -Wl,-sectcreate -Wl,__MISC -Wl,__deps -Wl,"$SRCROOT/$PRODUCT_NAME.ios" -Wl,-exported_symbol -Wl,___libinfoptr_$PRODUCT_NAME $STATIC_DEPS + $BIN_DIR/g++ -stdlib=libc++ -nodefaultlibs $STRIP_OPTIONS ${ARCHS} $MIN_OS_VERSION -isysroot $SDKROOT -L"$SOLUTION_DIR/prebuilt/lib/ios/$SDK_NAME" -o "$BUILT_PRODUCTS_DIR/$PRODUCT_NAME.lcext" "$BUILT_PRODUCTS_DIR/$EXECUTABLE_NAME" -Wl,-sectcreate -Wl,__MISC -Wl,__deps -Wl,$DEPS_PATH -Wl,-exported_symbol -Wl,___libinfoptr_$PRODUCT_NAME $STATIC_DEPS if [ $? -ne 0 ]; then exit $? @@ -102,7 +111,7 @@ else fi fi - OUTPUT=$($BIN_DIR/g++ -stdlib=libc++ -nodefaultlibs $STRIP_OPTIONS -arch ${ARCH} -miphoneos-version-min=${MIN_VERSION} -isysroot $SDKROOT -L"$SOLUTION_DIR/prebuilt/lib/ios/$SDK_NAME" -o "${LCEXT_FILE}" "$BUILT_PRODUCTS_DIR/$EXECUTABLE_NAME" -Wl,-sectcreate -Wl,__MISC -Wl,__deps -Wl,"$SRCROOT/$PRODUCT_NAME.ios" -Wl,-exported_symbol -Wl,___libinfoptr_$PRODUCT_NAME $STATIC_DEPS) + OUTPUT=$($BIN_DIR/g++ -stdlib=libc++ -nodefaultlibs $STRIP_OPTIONS -arch ${ARCH} -miphoneos-version-min=${MIN_VERSION} -isysroot $SDKROOT -L"$SOLUTION_DIR/prebuilt/lib/ios/$SDK_NAME" -o "${LCEXT_FILE}" "$BUILT_PRODUCTS_DIR/$EXECUTABLE_NAME" -Wl,-sectcreate -Wl,__MISC -Wl,__deps -Wl,$DEPS_PATH -Wl,-exported_symbol -Wl,___libinfoptr_$PRODUCT_NAME $STATIC_DEPS) if [ $? -ne 0 ]; then echo "Linking ""${LCEXT_FILE}""failed:"