From 19686f54671b4af32b1b35c92fa6b3e234611410 Mon Sep 17 00:00:00 2001 From: Nicky Weber Date: Fri, 26 Sep 2014 21:15:18 +0200 Subject: [PATCH] SSZipArchive pointing to SB repo fork again. Updated revision of SSZipArchive. SSZipArchive header search path added. --- .gitmodules | 2 +- cocos2d-ios.xcodeproj/project.pbxproj | 18 ++++++++++-------- cocos2d/CCPackageUnzipper.h | 2 +- external/SSZipArchive | 2 +- 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/.gitmodules b/.gitmodules index 6c703e86ef7..c6aac2ddfd5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,4 +7,4 @@ url=https://github.com/slembcke/Chipmunk2D.git branch = apportable [submodule "external/SSZipArchive"] path = external/SSZipArchive - url = https://github.com/NickyWeber/ssziparchive.git + url = https://github.com/spritebuilder/ssziparchive.git diff --git a/cocos2d-ios.xcodeproj/project.pbxproj b/cocos2d-ios.xcodeproj/project.pbxproj index a7e18856413..abe2bafdd86 100644 --- a/cocos2d-ios.xcodeproj/project.pbxproj +++ b/cocos2d-ios.xcodeproj/project.pbxproj @@ -634,14 +634,14 @@ remoteGlobalIDString = 83409DDB19D5B65C004B7EB9; remoteInfo = SSZipArchiveTests; }; - 83409E3919D5B7A4004B7EB9 /* PBXContainerItemProxy */ = { + 83409E3B19D5B7DB004B7EB9 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 83409E2A19D5B791004B7EB9 /* SSZipArchive.xcodeproj */; proxyType = 1; - remoteGlobalIDString = 83409DCD19D5B65B004B7EB9; + remoteGlobalIDString = 21CC41A417DB7D1300201DDC; remoteInfo = SSZipArchive; }; - 83409E3B19D5B7DB004B7EB9 /* PBXContainerItemProxy */ = { + 83409E4C19D5E8A1004B7EB9 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 83409E2A19D5B791004B7EB9 /* SSZipArchive.xcodeproj */; proxyType = 1; @@ -2206,7 +2206,7 @@ buildRules = ( ); dependencies = ( - 83409E3A19D5B7A4004B7EB9 /* PBXTargetDependency */, + 83409E4D19D5E8A1004B7EB9 /* PBXTargetDependency */, FCFDA23E19C78E2D00B90910 /* PBXTargetDependency */, B759E5321880C70A00E8166C /* PBXTargetDependency */, ); @@ -2667,15 +2667,15 @@ /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ - 83409E3A19D5B7A4004B7EB9 /* PBXTargetDependency */ = { + 83409E3C19D5B7DB004B7EB9 /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = SSZipArchive; - targetProxy = 83409E3919D5B7A4004B7EB9 /* PBXContainerItemProxy */; + targetProxy = 83409E3B19D5B7DB004B7EB9 /* PBXContainerItemProxy */; }; - 83409E3C19D5B7DB004B7EB9 /* PBXTargetDependency */ = { + 83409E4D19D5E8A1004B7EB9 /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = SSZipArchive; - targetProxy = 83409E3B19D5B7DB004B7EB9 /* PBXContainerItemProxy */; + targetProxy = 83409E4C19D5E8A1004B7EB9 /* PBXContainerItemProxy */; }; B759E5321880C70A00E8166C /* PBXTargetDependency */ = { isa = PBXTargetDependency; @@ -2728,6 +2728,7 @@ "$(SRCROOT)/external/Chipmunk/include", "$(SRCROOT)/external/Chipmunk/objectivec/include", "$(SRCROOT)/external/ObjectAL/**", + "$(SRCROOT)/external/SSZipArchive/**", ); LIBRARY_SEARCH_PATHS = ( "$(inherited)", @@ -2762,6 +2763,7 @@ "$(SRCROOT)/external/Chipmunk/include", "$(SRCROOT)/external/Chipmunk/objectivec/include", "$(SRCROOT)/external/ObjectAL/**", + "$(SRCROOT)/external/SSZipArchive/**", ); LIBRARY_SEARCH_PATHS = ( "$(inherited)", diff --git a/cocos2d/CCPackageUnzipper.h b/cocos2d/CCPackageUnzipper.h index 6a56a72ca95..88ff7111597 100644 --- a/cocos2d/CCPackageUnzipper.h +++ b/cocos2d/CCPackageUnzipper.h @@ -1,5 +1,5 @@ #import -#import "SSZipArchive.h" +#import @protocol CCPackageUnzipperDelegate; @class CCPackage; diff --git a/external/SSZipArchive b/external/SSZipArchive index d4386f6d0d1..d150baedffa 160000 --- a/external/SSZipArchive +++ b/external/SSZipArchive @@ -1 +1 @@ -Subproject commit d4386f6d0d1cdc5b32b3327138f4e9e1cd798ac1 +Subproject commit d150baedffad624ad154d857d94ee4a43c7af052