Skip to content

Commit 81ad356

Browse files
committed
Remove ANDROID from README and CCBReader
1 parent 197697a commit 81ad356

File tree

2 files changed

+5
-13
lines changed

2 files changed

+5
-13
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Please note, that the official site has moved. Please update your bookmarks
1414
[The Official Forum][3]
1515

1616
[Cocos2D-ObjC][1] is a framework for building 2D games, demos, and other
17-
graphical/interactive applications for iOS, Mac and Android.
17+
graphical/interactive applications for iOS, Mac and tvOS.
1818
It is based on the [Cocos2D][2] design, but instead of using Python it uses Swift and / or Objective-C.
1919

2020
Cocos2D-ObjC is:

cocos2d-ext/CCBReader/CCBReader.m

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -94,20 +94,12 @@ + (void) configureCCFileUtils
9494
@"resources-phonehd", CCFileUtilsSuffixMacHD,
9595
@"", CCFileUtilsSuffixDefault,
9696
nil];
97-
98-
#if __CC_PLATFORM_ANDROID
99-
sharedFileUtils.searchPath =
100-
[NSArray arrayWithObjects:
101-
[[[NSBundle mainBundle] resourcePath] stringByAppendingPathComponent:@"Published-Android"],
102-
[[NSBundle mainBundle] resourcePath],
103-
nil];
104-
#else
97+
10598
sharedFileUtils.searchPath =
10699
[NSArray arrayWithObjects:
107100
[[[NSBundle mainBundle] resourcePath] stringByAppendingPathComponent:@"Published-iOS"],
108101
[[NSBundle mainBundle] resourcePath],
109102
nil];
110-
#endif
111103

112104
sharedFileUtils.enableiPhoneResourcesOniPad = YES;
113105
sharedFileUtils.searchMode = CCFileUtilsSearchModeDirectory;
@@ -419,7 +411,7 @@ - (void) readPropertyForNode:(CCNode*) node parent:(CCNode*)parent isExtraProp:(
419411

420412
if (setProp)
421413
{
422-
#if __CC_PLATFORM_IOS || __CC_PLATFORM_ANDROID
414+
#if __CC_PLATFORM_IOS
423415
[node setValue:[NSValue valueWithCGPoint:ccp(x,y)] forKey:name];
424416
#elif __CC_PLATFORM_MAC
425417
[node setValue:[NSValue valueWithPoint:ccp(x,y)] forKey:name];
@@ -454,7 +446,7 @@ - (void) readPropertyForNode:(CCNode*) node parent:(CCNode*)parent isExtraProp:(
454446
if (setProp)
455447
{
456448
CGPoint pt = ccp(x,y);
457-
#if __CC_PLATFORM_IOS || __CC_PLATFORM_ANDROID
449+
#if __CC_PLATFORM_IOS
458450
[node setValue:[NSValue valueWithCGPoint:pt] forKey:name];
459451
#else
460452
[node setValue:[NSValue valueWithPoint:NSPointFromCGPoint(pt)] forKey:name];
@@ -475,7 +467,7 @@ - (void) readPropertyForNode:(CCNode*) node parent:(CCNode*)parent isExtraProp:(
475467
if (setProp)
476468
{
477469
CGSize size = CGSizeMake(w, h);
478-
#if __CC_PLATFORM_IOS || __CC_PLATFORM_ANDROID
470+
#if __CC_PLATFORM_IOS
479471
[node setValue:[NSValue valueWithCGSize:size] forKey:name];
480472
#elif __CC_PLATFORM_MAC
481473
[node setValue:[NSValue valueWithSize:size] forKey:name];

0 commit comments

Comments
 (0)