Fix builds for iOS x86_64, arm64, improve code caching, speed up build

This commit is contained in:
Joshua Granick
2014-12-18 13:07:52 -08:00
parent 44e69d461d
commit f7ab6ab36b
5 changed files with 106 additions and 34 deletions

View File

@@ -390,11 +390,21 @@
"\"$(SRCROOT)/::APP_FILE::/lib/armv7-debug\"",
"\"$(SRCROOT)/::APP_FILE::/lib/armv7\"",
);
"LIBRARY_SEARCH_PATHS[sdk=iphonesimulator*]" = (
"LIBRARY_SEARCH_PATHS[arch=arm64]" = (
"$(inherited)",
"\"$(SRCROOT)/::APP_FILE::/lib/arm64-debug\"",
"\"$(SRCROOT)/::APP_FILE::/lib/arm64\"",
);
"LIBRARY_SEARCH_PATHS[arch=i386]" = (
"$(inherited)",
"\"$(SRCROOT)/::APP_FILE::/lib/i386-debug\"",
"\"$(SRCROOT)/::APP_FILE::/lib/i386\"",
);
"LIBRARY_SEARCH_PATHS[arch=x86_64]" = (
"$(inherited)",
"\"$(SRCROOT)/::APP_FILE::/lib/x86_64-debug\"",
"\"$(SRCROOT)/::APP_FILE::/lib/x86_64\"",
);
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
::foreach frameworkSearchPaths:: "\"::__current__::\"",
@@ -429,10 +439,18 @@
"$(inherited)",
"\"$(SRCROOT)/::APP_FILE::/lib/armv7\"",
);
"LIBRARY_SEARCH_PATHS[sdk=iphonesimulator*]" = (
"LIBRARY_SEARCH_PATHS[arch=arm64]" = (
"$(inherited)",
"\"$(SRCROOT)/::APP_FILE::/lib/arm64\"",
);
"LIBRARY_SEARCH_PATHS[arch=i386]" = (
"$(inherited)",
"\"$(SRCROOT)/::APP_FILE::/lib/i386\"",
);
"LIBRARY_SEARCH_PATHS[arch=x86_64]" = (
"$(inherited)",
"\"$(SRCROOT)/::APP_FILE::/lib/x86_64\"",
);
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
::foreach frameworkSearchPaths:: "::__current__::",