Skip to content

Commit 7cf7eba

Browse files
committed
Mac fixes
1 parent d7b02ae commit 7cf7eba

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

cocos2d-tests.xcodeproj/project.pbxproj

-2
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,6 @@
447447
D3763D4F19E734C5006C050D /* ColorTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 7587BDB6185A64AD00EEEFDE /* ColorTest.m */; };
448448
D3763D5019E734C5006C050D /* CCBMFontTest.m in Sources */ = {isa = PBXBuildFile; fileRef = D3B2A7E4187DD60B00406C5A /* CCBMFontTest.m */; };
449449
D3763D5119E734C5006C050D /* VertexZTest.m in Sources */ = {isa = PBXBuildFile; fileRef = A6167B92189A7D4D0044D391 /* VertexZTest.m */; };
450-
D3763D5219E734C5006C050D /* PositioningTest.m in Sources */ = {isa = PBXBuildFile; fileRef = A664A4EE18A3D9B8006184B8 /* PositioningTest.m */; };
451450
D3763D5619E73513006C050D /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = D3763D5519E73513006C050D /* AppDelegate.m */; };
452451
D3763D5819E7352F006C050D /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = D3763D5719E7352F006C050D /* main.m */; };
453452
D3763DD919E735CB006C050D /* libcocos2d-mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D3763BBF19E72F85006C050D /* libcocos2d-mac.a */; };
@@ -2288,7 +2287,6 @@
22882287
084B95771C6BA1DD003A580D /* OALTools.m in Sources */,
22892288
D3763D5119E734C5006C050D /* VertexZTest.m in Sources */,
22902289
084B95471C6BA1DD003A580D /* OALActionManager.m in Sources */,
2291-
D3763D5219E734C5006C050D /* PositioningTest.m in Sources */,
22922290
084B95001C6BA116003A580D /* CCActionAudio.m in Sources */,
22932291
);
22942292
runOnlyForDeploymentPostprocessing = 0;

cocos2d-ui/CCPotentiometer.m

+3
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,7 @@ -(BOOL)hitTestWithWorldPos:(CGPoint)pos {
164164

165165
}
166166

167+
#if __CC_PLATFORM_IOS
167168
-(void)touchBegan:(CCTouch *)touch withEvent:(CCTouchEvent *)event {
168169

169170
_previousLocation = [touch locationInNode:self];
@@ -186,6 +187,8 @@ -(void)touchCancelled:(CCTouch *)touch withEvent:(CCTouchEvent *)event {
186187
[self touchEnded:touch withEvent:event];
187188
}
188189

190+
#endif
191+
189192
#pragma mark -
190193
#pragma mark CCControlPotentiometer Public Methods
191194

0 commit comments

Comments
 (0)