ios / Masonry · Commits

Go to a project

Authored by Aron Cedercrantz
Commit dab2f2afc9d949f64ea5748eb431b2d944315fdf 1 parent 59319e7d

Fix some more linking and searching for frameworks.

Inline Side-by-side
Showing 1 changed file with 4 additions and 10 deletions
@@ -11,6 +11,7 @@ @@ -11,6 +11,7 @@
11 9C61C40117CCF3F0001A124A /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9C61C40017CCF3F0001A124A /* Cocoa.framework */; }; 11 9C61C40117CCF3F0001A124A /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9C61C40017CCF3F0001A124A /* Cocoa.framework */; };
12 9CEFD2D917CCF7210014B0FF /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9CEFD2D817CCF7210014B0FF /* UIKit.framework */; }; 12 9CEFD2D917CCF7210014B0FF /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9CEFD2D817CCF7210014B0FF /* UIKit.framework */; };
13 9CEFD2DA17CCF7A90014B0FF /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9CEFD2D817CCF7210014B0FF /* UIKit.framework */; }; 13 9CEFD2DA17CCF7A90014B0FF /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9CEFD2D817CCF7210014B0FF /* UIKit.framework */; };
  14 + 9CEFD2DB17CCF80D0014B0FF /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9C61C40017CCF3F0001A124A /* Cocoa.framework */; };
14 9DAD1ADAED04452C8C32D34E /* libPods-Masonry iOS Tests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3FF61518EB0044E0A00EB62E /* libPods-Masonry iOS Tests.a */; }; 15 9DAD1ADAED04452C8C32D34E /* libPods-Masonry iOS Tests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3FF61518EB0044E0A00EB62E /* libPods-Masonry iOS Tests.a */; };
15 DD38397E17A5170F00C35C17 /* MASConstraintDelegateMock.m in Sources */ = {isa = PBXBuildFile; fileRef = DD38397D17A5170F00C35C17 /* MASConstraintDelegateMock.m */; }; 16 DD38397E17A5170F00C35C17 /* MASConstraintDelegateMock.m in Sources */ = {isa = PBXBuildFile; fileRef = DD38397D17A5170F00C35C17 /* MASConstraintDelegateMock.m */; };
16 DD52F1AE179CA93B005CD195 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DD52F1AD179CA93B005CD195 /* Foundation.framework */; }; 17 DD52F1AE179CA93B005CD195 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DD52F1AD179CA93B005CD195 /* Foundation.framework */; };
@@ -174,6 +175,7 @@ @@ -174,6 +175,7 @@
174 isa = PBXFrameworksBuildPhase; 175 isa = PBXFrameworksBuildPhase;
175 buildActionMask = 2147483647; 176 buildActionMask = 2147483647;
176 files = ( 177 files = (
  178 + 9CEFD2DB17CCF80D0014B0FF /* Cocoa.framework in Frameworks */,
177 DDA4D70217C0253B0076BD87 /* SenTestingKit.framework in Frameworks */, 179 DDA4D70217C0253B0076BD87 /* SenTestingKit.framework in Frameworks */,
178 DDA4D70617C0253B0076BD87 /* Masonry.framework in Frameworks */, 180 DDA4D70617C0253B0076BD87 /* Masonry.framework in Frameworks */,
179 81A5AEFE5B9041ABBC74F614 /* libPods-Masonry Mac Tests.a in Frameworks */, 181 81A5AEFE5B9041ABBC74F614 /* libPods-Masonry Mac Tests.a in Frameworks */,
@@ -830,10 +832,6 @@ @@ -830,10 +832,6 @@
830 buildSettings = { 832 buildSettings = {
831 ARCHS = "$(ARCHS_STANDARD_64_BIT)"; 833 ARCHS = "$(ARCHS_STANDARD_64_BIT)";
832 COMBINE_HIDPI_IMAGES = YES; 834 COMBINE_HIDPI_IMAGES = YES;
833 - FRAMEWORK_SEARCH_PATHS = (  
834 - "\"$(DEVELOPER_LIBRARY_DIR)/Frameworks\"",  
835 - "$(inherited)",  
836 - );  
837 GCC_ENABLE_OBJC_EXCEPTIONS = YES; 835 GCC_ENABLE_OBJC_EXCEPTIONS = YES;
838 GCC_PRECOMPILE_PREFIX_HEADER = YES; 836 GCC_PRECOMPILE_PREFIX_HEADER = YES;
839 GCC_PREFIX_HEADER = "MasonryTests/MasonryTests-Prefix.pch"; 837 GCC_PREFIX_HEADER = "MasonryTests/MasonryTests-Prefix.pch";
@@ -842,7 +840,7 @@ @@ -842,7 +840,7 @@
842 MACOSX_DEPLOYMENT_TARGET = 10.7; 840 MACOSX_DEPLOYMENT_TARGET = 10.7;
843 ONLY_ACTIVE_ARCH = NO; 841 ONLY_ACTIVE_ARCH = NO;
844 PRODUCT_NAME = "$(TARGET_NAME)"; 842 PRODUCT_NAME = "$(TARGET_NAME)";
845 - SDKROOT = macosx10.7; 843 + SDKROOT = macosx;
846 VALID_ARCHS = "x86_64 i386"; 844 VALID_ARCHS = "x86_64 i386";
847 WRAPPER_EXTENSION = octest; 845 WRAPPER_EXTENSION = octest;
848 }; 846 };
@@ -855,10 +853,6 @@ @@ -855,10 +853,6 @@
855 ARCHS = "$(ARCHS_STANDARD_64_BIT)"; 853 ARCHS = "$(ARCHS_STANDARD_64_BIT)";
856 COMBINE_HIDPI_IMAGES = YES; 854 COMBINE_HIDPI_IMAGES = YES;
857 DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; 855 DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
858 - FRAMEWORK_SEARCH_PATHS = (  
859 - "\"$(DEVELOPER_LIBRARY_DIR)/Frameworks\"",  
860 - "$(inherited)",  
861 - );  
862 GCC_ENABLE_OBJC_EXCEPTIONS = YES; 856 GCC_ENABLE_OBJC_EXCEPTIONS = YES;
863 GCC_PRECOMPILE_PREFIX_HEADER = YES; 857 GCC_PRECOMPILE_PREFIX_HEADER = YES;
864 GCC_PREFIX_HEADER = "MasonryTests/MasonryTests-Prefix.pch"; 858 GCC_PREFIX_HEADER = "MasonryTests/MasonryTests-Prefix.pch";
@@ -867,7 +861,7 @@ @@ -867,7 +861,7 @@
867 MACOSX_DEPLOYMENT_TARGET = 10.7; 861 MACOSX_DEPLOYMENT_TARGET = 10.7;
868 ONLY_ACTIVE_ARCH = NO; 862 ONLY_ACTIVE_ARCH = NO;
869 PRODUCT_NAME = "$(TARGET_NAME)"; 863 PRODUCT_NAME = "$(TARGET_NAME)";
870 - SDKROOT = macosx10.7; 864 + SDKROOT = macosx;
871 VALID_ARCHS = "x86_64 i386"; 865 VALID_ARCHS = "x86_64 i386";
872 WRAPPER_EXTENSION = octest; 866 WRAPPER_EXTENSION = octest;
873 }; 867 };