From ed10b92a607098865eea82338c0c42e93c415ef9 Mon Sep 17 00:00:00 2001
From: James Chen <jianhua.chen@cocos2d-x.org>
Date: Fri, 1 Nov 2013 15:19:10 +0800
Subject: [PATCH] Fix of including wrong include files.

---
 build/cocos2d_libs.xcodeproj/project.pbxproj.REMOVED.git-id    | 2 +-
 build/cocos2d_samples.xcodeproj/project.pbxproj.REMOVED.git-id | 2 +-
 cocos/2d/platform/mac/CCDirectorCaller.mm                      | 2 +-
 .../mac/{CCEventDispatcher.h => CCEventDispatcherMac.h}        | 0
 .../mac/{CCEventDispatcher.mm => CCEventDispatcherMac.mm}      | 3 +--
 cocos/2d/platform/mac/EAGLView.mm                              | 2 +-
 6 files changed, 5 insertions(+), 6 deletions(-)
 rename cocos/2d/platform/mac/{CCEventDispatcher.h => CCEventDispatcherMac.h} (100%)
 rename cocos/2d/platform/mac/{CCEventDispatcher.mm => CCEventDispatcherMac.mm} (99%)

diff --git a/build/cocos2d_libs.xcodeproj/project.pbxproj.REMOVED.git-id b/build/cocos2d_libs.xcodeproj/project.pbxproj.REMOVED.git-id
index f82767e410..d13b25c773 100644
--- a/build/cocos2d_libs.xcodeproj/project.pbxproj.REMOVED.git-id
+++ b/build/cocos2d_libs.xcodeproj/project.pbxproj.REMOVED.git-id
@@ -1 +1 @@
-f918efd122d7a0cfabddf411f64d954d4fcd8579
\ No newline at end of file
+245681d0a739a5432c0e588df5627789e03d902f
\ No newline at end of file
diff --git a/build/cocos2d_samples.xcodeproj/project.pbxproj.REMOVED.git-id b/build/cocos2d_samples.xcodeproj/project.pbxproj.REMOVED.git-id
index 9bd7c96932..f27b44e3fa 100644
--- a/build/cocos2d_samples.xcodeproj/project.pbxproj.REMOVED.git-id
+++ b/build/cocos2d_samples.xcodeproj/project.pbxproj.REMOVED.git-id
@@ -1 +1 @@
-99dcbba48124bf51788735fe775650f659d7302c
\ No newline at end of file
+92d0a8b3ee96411da3d9d2d3422dee5e9e0b40fb
\ No newline at end of file
diff --git a/cocos/2d/platform/mac/CCDirectorCaller.mm b/cocos/2d/platform/mac/CCDirectorCaller.mm
index 83d9689470..af4645a7aa 100644
--- a/cocos/2d/platform/mac/CCDirectorCaller.mm
+++ b/cocos/2d/platform/mac/CCDirectorCaller.mm
@@ -25,7 +25,7 @@
 #import "CCDirectorCaller.h"
 #import "CCDirector.h"
 #import "EAGLView.h"
-#import "CCEventDispatcher.h"
+#import "CCEventDispatcherMac.h"
 #include "CCAutoreleasePool.h"
 
 static id s_sharedDirectorCaller;
diff --git a/cocos/2d/platform/mac/CCEventDispatcher.h b/cocos/2d/platform/mac/CCEventDispatcherMac.h
similarity index 100%
rename from cocos/2d/platform/mac/CCEventDispatcher.h
rename to cocos/2d/platform/mac/CCEventDispatcherMac.h
diff --git a/cocos/2d/platform/mac/CCEventDispatcher.mm b/cocos/2d/platform/mac/CCEventDispatcherMac.mm
similarity index 99%
rename from cocos/2d/platform/mac/CCEventDispatcher.mm
rename to cocos/2d/platform/mac/CCEventDispatcherMac.mm
index 6487d877a1..89660ce0f5 100644
--- a/cocos/2d/platform/mac/CCEventDispatcher.mm
+++ b/cocos/2d/platform/mac/CCEventDispatcherMac.mm
@@ -27,12 +27,11 @@
 // But in case they are included, it won't be compiled.
 #import <Availability.h>
 
-#import "CCEventDispatcher.h"
+#import "CCEventDispatcherMac.h"
 #import "ccConfig.h"
 #include "utlist.h"
 
 #include "CCDirector.h"
-#include "platform/mac/CCEventDispatcher.h"
 
 //NS_CC_BEGIN;
 static CCEventDispatcher *sharedDispatcher = nil;
diff --git a/cocos/2d/platform/mac/EAGLView.mm b/cocos/2d/platform/mac/EAGLView.mm
index 2bc17be1f1..ff456d0e6a 100644
--- a/cocos/2d/platform/mac/EAGLView.mm
+++ b/cocos/2d/platform/mac/EAGLView.mm
@@ -37,7 +37,7 @@ THE SOFTWARE.
 #import "CCTouch.h"
 #import "CCIMEDispatcher.h"
 #import "CCWindow.h"
-#import "CCEventDispatcher.h"
+#import "CCEventDispatcherMac.h"
 #import "CCEGLView.h"