Merge branch 'master' into minIOS11

# Conflicts:
#	Sources/ListSnapshot.swift
This commit is contained in:
John Estropia
2020-11-11 13:44:58 +09:00
8 changed files with 190 additions and 23 deletions

View File

@@ -3415,7 +3415,7 @@
DYLIB_INSTALL_NAME_BASE = "@rpath";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
MARKETING_VERSION = 7.3.0;
MARKETING_VERSION = 7.3.1;
OTHER_LDFLAGS = (
"-weak_framework",
Combine,
@@ -3438,7 +3438,7 @@
DYLIB_INSTALL_NAME_BASE = "@rpath";
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
MARKETING_VERSION = 7.3.0;
MARKETING_VERSION = 7.3.1;
OTHER_LDFLAGS = (
"-weak_framework",
Combine,
@@ -3498,7 +3498,7 @@
GCC_NO_COMMON_BLOCKS = YES;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
MARKETING_VERSION = 7.3.0;
MARKETING_VERSION = 7.3.1;
OTHER_LDFLAGS = (
"-weak_framework",
Combine,
@@ -3524,7 +3524,7 @@
GCC_NO_COMMON_BLOCKS = YES;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
MARKETING_VERSION = 7.3.0;
MARKETING_VERSION = 7.3.1;
OTHER_LDFLAGS = (
"-weak_framework",
Combine,
@@ -3589,7 +3589,7 @@
GCC_NO_COMMON_BLOCKS = YES;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
MARKETING_VERSION = 7.3.0;
MARKETING_VERSION = 7.3.1;
OTHER_LDFLAGS = (
"-weak_framework",
Combine,
@@ -3618,7 +3618,7 @@
GCC_NO_COMMON_BLOCKS = YES;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/Frameworks";
MARKETING_VERSION = 7.3.0;
MARKETING_VERSION = 7.3.1;
OTHER_LDFLAGS = (
"-weak_framework",
Combine,
@@ -3684,7 +3684,7 @@
GCC_NO_COMMON_BLOCKS = YES;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
MARKETING_VERSION = 7.3.0;
MARKETING_VERSION = 7.3.1;
OTHER_LDFLAGS = (
"-weak_framework",
Combine,
@@ -3712,7 +3712,7 @@
GCC_NO_COMMON_BLOCKS = YES;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
MARKETING_VERSION = 7.3.0;
MARKETING_VERSION = 7.3.1;
OTHER_LDFLAGS = (
"-weak_framework",
Combine,