Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dependencies, include 64bit arch #37

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions Frank.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -1347,6 +1347,7 @@
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = src/Frank_Prefix.pch;
INSTALL_PATH = /usr/local/lib;
IPHONEOS_DEPLOYMENT_TARGET = 5.1.1;
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"\"$(SRCROOT)/lib/PublicAutomation/build/$(CONFIGURATION)-$(PLATFORM_NAME)\"",
Expand All @@ -1365,10 +1366,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = YES;
ARCHS = (
"$(ARCHS_STANDARD_32_BIT)",
armv6,
);
ARCHS = "$(ARCHS_STANDARD)";
DSTROOT = /tmp/Frank.dst;
GCC_MODEL_TUNING = G5;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
Expand All @@ -1391,7 +1389,7 @@
1DEB922308733DC00010E9CD /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
ARCHS = "$(ARCHS_STANDARD)";
GCC_C_LANGUAGE_STANDARD = c99;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
Expand All @@ -1405,7 +1403,7 @@
1DEB922408733DC00010E9CD /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
ARCHS = "$(ARCHS_STANDARD)";
GCC_C_LANGUAGE_STANDARD = c99;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
Expand Down
9 changes: 9 additions & 0 deletions Frank.xcodeproj/xcshareddata/xcschemes/Frank.xcscheme
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,15 @@
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
allowLocationSimulation = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "D6E8FF3113D3DC9200D24F43"
BuildableName = "libShelley.a"
BlueprintName = "Shelley"
ReferencedContainer = "container:lib/Shelley/Shelley.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
Expand Down
4 changes: 2 additions & 2 deletions gem/frank-cucumber.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ Gem::Specification.new do |s|

s.add_dependency( "cucumber", ["~>1.3.10"] )
s.add_dependency( "rspec", ["~>2.14.1"] )
s.add_dependency( "sim_launcher", ["~>0.4.6"] )
s.add_dependency( "sim_launcher", ["~>0.5.0"] )
s.add_dependency( "i18n", ["~>0.6.9"] )
s.add_dependency( "plist", ["~>3.1.0"] )
s.add_dependency( "json", ["1.8.1"] ) # TODO: figure out how to be more permissive as to which JSON gems we allow
s.add_dependency( "dnssd", ["~>2.0"] )
s.add_dependency( "thor", ["~>0.18.1"] )
s.add_dependency( "xcodeproj", ["~>0.14.1"] )
s.add_dependency( "xcodeproj", ["~>0.20.2"] )

s.add_development_dependency( "rr" )
s.add_development_dependency( "yard" )
Expand Down
Binary file modified gem/frank-skeleton/libCocoaAsyncSocket.a
Binary file not shown.
Binary file modified gem/frank-skeleton/libCocoaAsyncSocketMac.a
Binary file not shown.
Binary file modified gem/frank-skeleton/libCocoaHTTPServer.a
Binary file not shown.
Binary file modified gem/frank-skeleton/libCocoaHTTPServerMac.a
Binary file not shown.
Binary file modified gem/frank-skeleton/libCocoaLumberjack.a
Binary file not shown.
Binary file modified gem/frank-skeleton/libCocoaLumberjackMac.a
Binary file not shown.
Binary file modified gem/frank-skeleton/libFrank.a
Binary file not shown.
Binary file modified gem/frank-skeleton/libFrankMac.a
Binary file not shown.
Binary file modified gem/frank-skeleton/libShelley.a
Binary file not shown.