Merge branch 'develop' into prototype/containers

This commit is contained in:
John Estropia
2021-08-03 11:43:48 +09:00
26 changed files with 389 additions and 41 deletions

View File

@@ -3505,7 +3505,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 = 8.0.0;
MARKETING_VERSION = 8.0.1;
OTHER_LDFLAGS = (
"-weak_framework",
Combine,
@@ -3528,7 +3528,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 = 8.0.0;
MARKETING_VERSION = 8.0.1;
OTHER_LDFLAGS = (
"-weak_framework",
Combine,
@@ -3588,7 +3588,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 = 8.0.0;
MARKETING_VERSION = 8.0.1;
OTHER_LDFLAGS = (
"-weak_framework",
Combine,
@@ -3615,7 +3615,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 = 8.0.0;
MARKETING_VERSION = 8.0.1;
OTHER_LDFLAGS = (
"-weak_framework",
Combine,
@@ -3681,7 +3681,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 = 8.0.0;
MARKETING_VERSION = 8.0.1;
OTHER_LDFLAGS = (
"-weak_framework",
Combine,
@@ -3710,7 +3710,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 = 8.0.0;
MARKETING_VERSION = 8.0.1;
OTHER_LDFLAGS = (
"-weak_framework",
Combine,
@@ -3776,7 +3776,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 = 8.0.0;
MARKETING_VERSION = 8.0.1;
OTHER_LDFLAGS = (
"-weak_framework",
Combine,
@@ -3805,7 +3805,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 = 8.0.0;
MARKETING_VERSION = 8.0.1;
OTHER_LDFLAGS = (
"-weak_framework",
Combine,