Skip to content

Commit b33c8c4

Browse files
committed
SSZipArchive included in project.
Code re-enabled to compile.
1 parent 6abf9db commit b33c8c4

File tree

3 files changed

+9
-6
lines changed

3 files changed

+9
-6
lines changed

cocos2d-ios.xcodeproj/project.pbxproj

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,7 @@
148148
83E1A88919C8ACDC000A3BCA /* CCPackageInstallData.m in Sources */ = {isa = PBXBuildFile; fileRef = 83E1A88119C8ACDC000A3BCA /* CCPackageInstallData.m */; };
149149
83E1A88A19C8ACDC000A3BCA /* CCPackageInstaller.h in Headers */ = {isa = PBXBuildFile; fileRef = 83E1A88219C8ACDC000A3BCA /* CCPackageInstaller.h */; };
150150
83E1A88B19C8ACDC000A3BCA /* CCPackageInstaller.m in Sources */ = {isa = PBXBuildFile; fileRef = 83E1A88319C8ACDC000A3BCA /* CCPackageInstaller.m */; };
151+
83E1A88E19C8C19D000A3BCA /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 83E1A88D19C8C19D000A3BCA /* libz.dylib */; };
151152
9D85671D191B018200573093 /* CCEffectBrightness.h in Headers */ = {isa = PBXBuildFile; fileRef = 9D85671B191B018200573093 /* CCEffectBrightness.h */; };
152153
9D85671E191B018200573093 /* CCEffectBrightness.m in Sources */ = {isa = PBXBuildFile; fileRef = 9D85671C191B018200573093 /* CCEffectBrightness.m */; };
153154
9D856721191B019900573093 /* CCEffectContrast.h in Headers */ = {isa = PBXBuildFile; fileRef = 9D85671F191B019900573093 /* CCEffectContrast.h */; };
@@ -922,6 +923,7 @@
922923
83E1A88119C8ACDC000A3BCA /* CCPackageInstallData.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCPackageInstallData.m; sourceTree = "<group>"; };
923924
83E1A88219C8ACDC000A3BCA /* CCPackageInstaller.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCPackageInstaller.h; sourceTree = "<group>"; };
924925
83E1A88319C8ACDC000A3BCA /* CCPackageInstaller.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CCPackageInstaller.m; sourceTree = "<group>"; };
926+
83E1A88D19C8C19D000A3BCA /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; };
925927
92FF6C7318F33A2A005B7139 /* CCActionManager_Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CCActionManager_Private.h; sourceTree = "<group>"; };
926928
9D85671A191AE2CC00573093 /* CCEffectStack_Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CCEffectStack_Private.h; sourceTree = "<group>"; };
927929
9D85671B191B018200573093 /* CCEffectBrightness.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCEffectBrightness.h; sourceTree = "<group>"; };
@@ -1202,6 +1204,7 @@
12021204
isa = PBXFrameworksBuildPhase;
12031205
buildActionMask = 2147483647;
12041206
files = (
1207+
83E1A88E19C8C19D000A3BCA /* libz.dylib in Frameworks */,
12051208
D3903B1A19952ABD003AA81A /* Metal.framework in Frameworks */,
12061209
D24FAEEC198014B90043E27D /* GLKit.framework in Frameworks */,
12071210
D28A2E211954F85700ADC03D /* AVFoundation.framework in Frameworks */,
@@ -1275,6 +1278,7 @@
12751278
29B97323FDCFA39411CA2CEA /* Frameworks */ = {
12761279
isa = PBXGroup;
12771280
children = (
1281+
83E1A88D19C8C19D000A3BCA /* libz.dylib */,
12781282
FC55599F1991A26300E29CCE /* libogg.a */,
12791283
D3903B1919952ABD003AA81A /* Metal.framework */,
12801284
D24FAEEB198014B90043E27D /* GLKit.framework */,
@@ -2992,6 +2996,7 @@
29922996
"$(SRCROOT)/external/Chipmunk/include",
29932997
"$(SRCROOT)/external/Chipmunk/objectivec/include",
29942998
"$(SRCROOT)/external/ObjectAL/**",
2999+
"$(SRCROOT)/external/SSZipArchive/SSZipArchive/**",
29953000
);
29963001
LIBRARY_SEARCH_PATHS = (
29973002
"$(inherited)",
@@ -3026,6 +3031,7 @@
30263031
"$(SRCROOT)/external/Chipmunk/include",
30273032
"$(SRCROOT)/external/Chipmunk/objectivec/include",
30283033
"$(SRCROOT)/external/ObjectAL/**",
3034+
"$(SRCROOT)/external/SSZipArchive/SSZipArchive/**",
30293035
);
30303036
LIBRARY_SEARCH_PATHS = (
30313037
"$(inherited)",

cocos2d/CCPackageUnzipper.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
#import <Foundation/Foundation.h>
2-
// #import "SSZipArchive.h"
2+
#import "SSZipArchive.h"
33

44
@protocol CCPackageUnzipperDelegate;
55
@class CCPackage;
66

7-
@interface CCPackageUnzipper : NSObject // <SSZipArchiveDelegate>
7+
@interface CCPackageUnzipper : NSObject <SSZipArchiveDelegate>
88

99
@property (nonatomic, strong, readonly) CCPackage *package;
1010
@property (nonatomic, weak) id <CCPackageUnzipperDelegate> delegate;

cocos2d/CCPackageUnzipper.m

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#import "CCPackageUnzipper.h"
22
#import "CCPackageUnzipperDelegate.h"
33
#import "CCPackage.h"
4-
// #import "SSZipArchive.h"
4+
#import "SSZipArchive.h"
55
#import "CCPackageInstallData.h"
66
#import "CCPackage+InstallData.h"
77
#import "ccMacros.h"
@@ -58,15 +58,12 @@ - (void)unpackPackageOnQueue:(dispatch_queue_t)queue
5858
CCLOGINFO(@"[PACKAGE/UNZIP][INFO]: Unzipping package... %@", _package);
5959

6060
NSError *error;
61-
BOOL success = YES;
62-
/*
6361
BOOL success = [SSZipArchive unzipFileAtPath:installData.localDownloadURL.path
6462
toDestination:installData.unzipURL.path
6563
overwrite:YES
6664
password:_password
6765
error:&error
6866
delegate:self];
69-
*/
7067

7168
if (success)
7269
{

0 commit comments

Comments
 (0)