Unity-Technologies
/
idb
зеркало из
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Move Framework/Header Search paths to config 

Summary: Extracts the flags that are provided to the linker to the `xcconfig` file so that the `pbxproj` is trimmed down.

Reviewed By: marekcirkos

Differential Revision: D3366469

fbshipit-source-id: a87149865b37f79ebeca7bdd6ab63ff805371a5d
This commit is contained in:
Lawrence Lomax 2016-06-02 02:14:40 -07:00 коммит произвёл Facebook Github Bot 0
Родитель 63719bf668
Коммит c8dbdcb826
2 изменённых файлов: 5 добавлений и 63 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

5
Configuration/Shared.xcconfig
Просмотреть файл

@ -45,3 +45,8 @@ APPLE_FRAMEWORKS_DIR = $(DEVELOPER_DIR)/../Frameworks
APPLE_OTHER_FRAMEWORKS_DIR = $(DEVELOPER_DIR)/../OtherFrameworks
APPLE_PLUGINS_DIR = $(DEVELOPER_DIR)/../PlugIns
APPLE_SHARED_FRAMEWORKS_DIR = $(DEVELOPER_DIR)/../SharedFrameworks
// Search Paths for Frameworks & Headers
ALWAYS_SEARCH_USER_PATHS = NO
FRAMEWORK_SEARCH_PATHS = $(inherited) $(APPLE_FRAMEWORKS_DIR) $(APPLE_PLUGINS_DIR) $(APPLE_OTHER_FRAMEWORKS_DIR) $(APPLE_SHARED_FRAMEWORKS_DIR) $(DEVELOPER_LIBRARY_DIR)/PrivateFrameworks $(SDKROOT)/System/Library/PrivateFrameworks
HEADER_SEARCH_PATHS = $(inherited) $(SRCROOT)/PrivateHeaders

63
FBSimulatorControl.xcodeproj/project.pbxproj
Просмотреть файл

@ -2786,23 +2786,10 @@
4952437303EDA63300000002 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ENABLE_OBJC_ARC = YES;
COMBINE_HIDPI_IMAGES = YES;
ENABLE_TESTABILITY = YES;
FRAMEWORK_SEARCH_PATHS = (
"$(APPLE_FRAMEWORKS_DIR)",
"$(APPLE_PLUGINS_DIR)",
"$(APPLE_OTHER_FRAMEWORKS_DIR)",
"$(APPLE_SHARED_FRAMEWORKS_DIR)",
"$(DEVELOPER_LIBRARY_DIR)/PrivateFrameworks",
"$(SDKROOT)/System/Library/PrivateFrameworks",
);
GCC_OPTIMIZATION_LEVEL = 0;
HEADER_SEARCH_PATHS = (
"$(inherited)",
"$(SRCROOT)/PrivateHeaders",
);
MACOSX_DEPLOYMENT_TARGET = 10.10;
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = (
@ -2840,22 +2827,9 @@
4952437350C7218900000002 /* Profile */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ENABLE_OBJC_ARC = YES;
COMBINE_HIDPI_IMAGES = YES;
FRAMEWORK_SEARCH_PATHS = (
"$(APPLE_FRAMEWORKS_DIR)",
"$(APPLE_PLUGINS_DIR)",
"$(APPLE_OTHER_FRAMEWORKS_DIR)",
"$(APPLE_SHARED_FRAMEWORKS_DIR)",
"$(DEVELOPER_LIBRARY_DIR)/PrivateFrameworks",
"$(SDKROOT)/System/Library/PrivateFrameworks",
);
GCC_OPTIMIZATION_LEVEL = s;
HEADER_SEARCH_PATHS = (
"$(inherited)",
"$(SRCROOT)/PrivateHeaders",
);
MACOSX_DEPLOYMENT_TARGET = 10.10;
OTHER_LDFLAGS = (
"$(inherited)",
@ -2892,22 +2866,9 @@
49524373A439BFE700000002 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ENABLE_OBJC_ARC = YES;
COMBINE_HIDPI_IMAGES = YES;
FRAMEWORK_SEARCH_PATHS = (
"$(APPLE_FRAMEWORKS_DIR)",
"$(APPLE_PLUGINS_DIR)",
"$(APPLE_OTHER_FRAMEWORKS_DIR)",
"$(APPLE_SHARED_FRAMEWORKS_DIR)",
"$(DEVELOPER_LIBRARY_DIR)/PrivateFrameworks",
"$(SDKROOT)/System/Library/PrivateFrameworks",
);
GCC_OPTIMIZATION_LEVEL = s;
HEADER_SEARCH_PATHS = (
"$(inherited)",
"$(SRCROOT)/PrivateHeaders",
);
MACOSX_DEPLOYMENT_TARGET = 10.10;
OTHER_LDFLAGS = (
"$(inherited)",
@ -2943,10 +2904,6 @@
"DEBUG=1",
"$(inherited)",
);
HEADER_SEARCH_PATHS = (
"$(inherited)",
"\"${PODS_ROOT}/Headers/Public\"",
);
INFOPLIST_FILE = "FBSimulatorControlTests/FBSimulatorControlTests-Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
MTL_ENABLE_DEBUG_INFO = YES;
@ -2970,10 +2927,6 @@
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_NO_COMMON_BLOCKS = YES;
HEADER_SEARCH_PATHS = (
"$(inherited)",
"\"${PODS_ROOT}/Headers/Public\"",
);
INFOPLIST_FILE = "FBSimulatorControlTests/FBSimulatorControlTests-Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
MTL_ENABLE_DEBUG_INFO = NO;
@ -2996,10 +2949,6 @@
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_NO_COMMON_BLOCKS = YES;
HEADER_SEARCH_PATHS = (
"$(inherited)",
"\"${PODS_ROOT}/Headers/Public\"",
);
INFOPLIST_FILE = "FBSimulatorControlTests/FBSimulatorControlTests-Info.plist";
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks @loader_path/../Frameworks";
MTL_ENABLE_DEBUG_INFO = NO;
@ -3194,10 +3143,6 @@
DYLIB_CURRENT_VERSION = 1;
DYLIB_INSTALL_NAME_BASE = "@rpath";
ENABLE_STRICT_OBJC_MSGSEND = YES;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Carthage/Build/Mac",
);
FRAMEWORK_VERSION = A;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_DYNAMIC_NO_PIC = NO;
@ -3237,10 +3182,6 @@
DYLIB_INSTALL_NAME_BASE = "@rpath";
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Carthage/Build/Mac",
);
FRAMEWORK_VERSION = A;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_NO_COMMON_BLOCKS = YES;
@ -3275,10 +3216,6 @@
DYLIB_INSTALL_NAME_BASE = "@rpath";
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Carthage/Build/Mac",
);
FRAMEWORK_VERSION = A;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_NO_COMMON_BLOCKS = YES;