Permalink
Browse files

Merge pull request #8 from jcromartie/fix-build

Fix build
  • Loading branch information...
2 parents 2172493 + aabcca6 commit 44d2f1caa951e08eb4959a271590e79d95735945 @welschp welschp committed Sep 10, 2012
Showing with 12 additions and 4 deletions.
  1. +4 −0 README.md
  2. +6 −2 WhiteHouseApp.xcodeproj/project.pbxproj
  3. +1 −1 libs/facebook
  4. +1 −1 libs/nimbus
View
@@ -57,6 +57,10 @@ To intialize submodules, run:
git submodule update --init
+To build Facebook, `cd` into `libs/facebook` and run
+`./scripts/build_facebook_ios_sdk_static_lib.sh`. This will build the
+static library used by the app.
+
### Binary Libraries
The following libraries must be downloaded and installed manually:
@@ -11,6 +11,7 @@
5208905F15A77883004CD40F /* NSArray+WHAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 5208905E15A77883004CD40F /* NSArray+WHAdditions.m */; };
5208906215A78209004CD40F /* WHLiveBarController.m in Sources */ = {isa = PBXBuildFile; fileRef = 5208906115A78209004CD40F /* WHLiveBarController.m */; };
520A463A15C828C100547BAE /* AppConfig.plist in Resources */ = {isa = PBXBuildFile; fileRef = 520A463915C828C100547BAE /* AppConfig.plist */; };
+ 5216259115FAAA1400CB8B59 /* libUAirship-1.3.2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5216259015FAAA1400CB8B59 /* libUAirship-1.3.2.a */; };
5221B01A157E44FE00265F1B /* NimbusWebController.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 5221B019157E44FE00265F1B /* NimbusWebController.bundle */; };
5221B031157E466600265F1B /* ASIAuthenticationDialog.m in Sources */ = {isa = PBXBuildFile; fileRef = 5221B01E157E466500265F1B /* ASIAuthenticationDialog.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
5221B032157E466600265F1B /* ASIDataCompressor.m in Sources */ = {isa = PBXBuildFile; fileRef = 5221B021157E466500265F1B /* ASIDataCompressor.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
@@ -92,7 +93,6 @@
5265E72915B865CE00173B1C /* shrinkify@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 5265E72815B865CE00173B1C /* shrinkify@2x.png */; };
5265E73715B8B01200173B1C /* AirshipConfig.plist in Resources */ = {isa = PBXBuildFile; fileRef = 5265E73615B8B01200173B1C /* AirshipConfig.plist */; };
5265E84215B8B09B00173B1C /* CHANGELOG in Resources */ = {isa = PBXBuildFile; fileRef = 5265E73A15B8B09B00173B1C /* CHANGELOG */; };
- 5265E84315B8B09B00173B1C /* libUAirship-1.2.2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5265E79915B8B09B00173B1C /* libUAirship-1.2.2.a */; };
5265E84415B8B09B00173B1C /* LICENSE in Resources */ = {isa = PBXBuildFile; fileRef = 5265E79A15B8B09B00173B1C /* LICENSE */; };
5265E84515B8B09B00173B1C /* README.rst in Resources */ = {isa = PBXBuildFile; fileRef = 5265E79B15B8B09B00173B1C /* README.rst */; };
5265E8AB15B8B13700173B1C /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5265E8AA15B8B13700173B1C /* CoreLocation.framework */; };
@@ -169,6 +169,7 @@
5208906015A78209004CD40F /* WHLiveBarController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WHLiveBarController.h; sourceTree = "<group>"; };
5208906115A78209004CD40F /* WHLiveBarController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WHLiveBarController.m; sourceTree = "<group>"; };
520A463915C828C100547BAE /* AppConfig.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = AppConfig.plist; sourceTree = "<group>"; };
+ 5216259015FAAA1400CB8B59 /* libUAirship-1.3.2.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libUAirship-1.3.2.a"; path = "libs/Airship/libUAirship-1.3.2.a"; sourceTree = "<group>"; };
5221B019157E44FE00265F1B /* NimbusWebController.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = NimbusWebController.bundle; path = libs/nimbus/src/webcontroller/resources/NimbusWebController.bundle; sourceTree = SOURCE_ROOT; };
5221B01D157E466500265F1B /* ASIAuthenticationDialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ASIAuthenticationDialog.h; path = "libs/asi-http-request/Classes/ASIAuthenticationDialog.h"; sourceTree = SOURCE_ROOT; };
5221B01E157E466500265F1B /* ASIAuthenticationDialog.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ASIAuthenticationDialog.m; path = "libs/asi-http-request/Classes/ASIAuthenticationDialog.m"; sourceTree = SOURCE_ROOT; };
@@ -520,6 +521,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
+ 5216259115FAAA1400CB8B59 /* libUAirship-1.3.2.a in Frameworks */,
5265E8AF15B8B15200173B1C /* StoreKit.framework in Frameworks */,
5265E8AD15B8B13D00173B1C /* CoreTelephony.framework in Frameworks */,
5265E8AB15B8B13700173B1C /* CoreLocation.framework in Frameworks */,
@@ -539,7 +541,6 @@
5235CC1B155C5FF10095163C /* Foundation.framework in Frameworks */,
5235CC1D155C5FF10095163C /* CoreGraphics.framework in Frameworks */,
52256435157E8E22004922B5 /* libGoogleAnalytics.a in Frameworks */,
- 5265E84315B8B09B00173B1C /* libUAirship-1.2.2.a in Frameworks */,
52FCB73615B9A21200B76924 /* libfacebook_ios_sdk.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
@@ -735,6 +736,7 @@
5235CC17155C5FF10095163C /* Frameworks */ = {
isa = PBXGroup;
children = (
+ 5216259015FAAA1400CB8B59 /* libUAirship-1.3.2.a */,
5265E8AE15B8B15200173B1C /* StoreKit.framework */,
5265E8AC15B8B13D00173B1C /* CoreTelephony.framework */,
5265E8AA15B8B13700173B1C /* CoreLocation.framework */,
@@ -1591,6 +1593,7 @@
HEADER_SEARCH_PATHS = (
"\"${SDK_DIR}/usr/include/libxml2\"",
"\"$(SRCROOT)/libs/Airship\"",
+ "\"$(SRCROOT)/libs/facebook/lib/facebook-ios-sdk\"",
);
INFOPLIST_FILE = "WhiteHouseApp/WhiteHouseApp-Info.plist";
LIBRARY_SEARCH_PATHS = (
@@ -1617,6 +1620,7 @@
HEADER_SEARCH_PATHS = (
"\"${SDK_DIR}/usr/include/libxml2\"",
"\"$(SRCROOT)/libs/Airship\"",
+ "\"$(SRCROOT)/libs/facebook/lib/facebook-ios-sdk\"",
);
INFOPLIST_FILE = "WhiteHouseApp/WhiteHouseApp-Info.plist";
LIBRARY_SEARCH_PATHS = (
Submodule facebook updated 381 files
Submodule nimbus updated 293 files

0 comments on commit 44d2f1c

Please sign in to comment.