Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixes includes in .m and .mm files.

This commit is contained in:
Xpol Wan 2016-03-21 11:02:00 +08:00
parent 6dcd7d51c3
commit 931d56bc10
21 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cocos/audio/apple/AudioCache.mm
View File

@ -25,7 +25,7 @@
#include "platform/CCPlatformConfig.h" #include "platform/CCPlatformConfig.h"
#if CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_MAC #if CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_MAC
#include "AudioCache.h" #include "audio/apple/AudioCache.h"
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
#import <OpenAL/alc.h> #import <OpenAL/alc.h>

2
cocos/audio/apple/AudioEngine-inl.mm
View File

@ -25,7 +25,7 @@
#include "platform/CCPlatformConfig.h" #include "platform/CCPlatformConfig.h"
#if CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_MAC #if CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_MAC
#include "AudioEngine-inl.h" #include "audio/apple/AudioEngine-inl.h"
#import <OpenAL/alc.h> #import <OpenAL/alc.h>
#import <AVFoundation/AVFoundation.h> #import <AVFoundation/AVFoundation.h>

4
cocos/audio/apple/AudioPlayer.mm
View File

@ -27,8 +27,8 @@
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
#include "AudioPlayer.h" #include "audio/apple/AudioPlayer.h"
#include "AudioCache.h" #include "audio/apple/AudioCache.h"
#include "platform/CCFileUtils.h" #include "platform/CCFileUtils.h"
#import <AudioToolbox/ExtendedAudioFile.h> #import <AudioToolbox/ExtendedAudioFile.h>

2
cocos/audio/ios/SimpleAudioEngine.mm
View File

@ -23,7 +23,7 @@ THE SOFTWARE.
****************************************************************************/ ****************************************************************************/
#include "audio/include/SimpleAudioEngine.h" #include "audio/include/SimpleAudioEngine.h"
#include "SimpleAudioEngine_objc.h" #include "audio/ios/SimpleAudioEngine_objc.h"
#include "cocos2d.h" #include "cocos2d.h"
USING_NS_CC; USING_NS_CC;

2
cocos/audio/mac/SimpleAudioEngine.mm
View File

@ -23,7 +23,7 @@ THE SOFTWARE.
****************************************************************************/ ****************************************************************************/
#include "audio/include/SimpleAudioEngine.h" #include "audio/include/SimpleAudioEngine.h"
#include "SimpleAudioEngine_objc.h" #include "audio/mac/SimpleAudioEngine_objc.h"
#include <string> #include <string>
#include "platform/CCFileUtils.h" #include "platform/CCFileUtils.h"

14
cocos/base/CCController-iOS.mm
View File

@ -23,16 +23,16 @@
THE SOFTWARE. THE SOFTWARE.
****************************************************************************/ ****************************************************************************/
#include "CCController.h" #include "base/CCController.h"
#include "platform/CCPlatformConfig.h" #include "platform/CCPlatformConfig.h"
#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS) #if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS)
#include "ccMacros.h" #include "base/ccMacros.h"
#include "CCEventDispatcher.h" #include "base/CCEventDispatcher.h"
#include "CCEventController.h" #include "base/CCEventController.h"
#include "CCEventListenerController.h" #include "base/CCEventListenerController.h"
#include "CCDirector.h" #include "base/CCDirector.h"
#include "CCLabel.h" #include "2d/CCLabel.h"
#import <GameController/GameController.h> #import <GameController/GameController.h>

2
cocos/network/CCDownloader-apple.mm
View File

@ -25,7 +25,7 @@
#include "network/CCDownloader-apple.h" #include "network/CCDownloader-apple.h"
#include "network/CCDownloader.h" #include "network/CCDownloader.h"
#include "CCString.h" #include "deprecated/CCString.h"
#include <queue> #include <queue>
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////

2
cocos/network/HttpClient-apple.mm
View File

@ -27,7 +27,7 @@
#include "platform/CCPlatformConfig.h" #include "platform/CCPlatformConfig.h"
#if (CC_TARGET_PLATFORM == CC_PLATFORM_MAC) || (CC_TARGET_PLATFORM == CC_PLATFORM_IOS) #if (CC_TARGET_PLATFORM == CC_PLATFORM_MAC) || (CC_TARGET_PLATFORM == CC_PLATFORM_IOS)
#include "HttpClient.h" #include "network/HttpClient.h"
#include <queue> #include <queue>
#include <errno.h> #include <errno.h>

2
cocos/platform/apple/CCFileUtils-apple.mm
View File

@ -25,7 +25,7 @@ THE SOFTWARE.
****************************************************************************/ ****************************************************************************/
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
#include "CCFileUtils-apple.h" #include "platform/apple/CCFileUtils-apple.h"
#include <ftw.h> #include <ftw.h>

2
cocos/platform/ios/CCDevice-ios.mm
View File

@ -27,7 +27,7 @@
#include "platform/CCPlatformConfig.h" #include "platform/CCPlatformConfig.h"
#if CC_TARGET_PLATFORM == CC_PLATFORM_IOS #if CC_TARGET_PLATFORM == CC_PLATFORM_IOS
#include "CCDevice.h" #include "platform/CCDevice.h"
#include "base/ccTypes.h" #include "base/ccTypes.h"
#include "base/CCEventDispatcher.h" #include "base/CCEventDispatcher.h"
#include "base/CCEventAcceleration.h" #include "base/CCEventAcceleration.h"

8
cocos/platform/ios/CCGLViewImpl-ios.mm
View File

@ -28,10 +28,10 @@
#import <UIKit/UIKit.h> #import <UIKit/UIKit.h>
#include "CCEAGLView-ios.h" #include "platform/ios/CCEAGLView-ios.h"
#include "CCDirectorCaller-ios.h" #include "platform/ios/CCDirectorCaller-ios.h"
#include "CCGLViewImpl-ios.h" #include "platform/ios/CCGLViewImpl-ios.h"
#include "CCSet.h" #include "deprecated/CCSet.h"
#include "base/CCTouch.h" #include "base/CCTouch.h"
NS_CC_BEGIN NS_CC_BEGIN

6
cocos/scripting/js-bindings/manual/platform/ios/JavaScriptObjCBridge.mm
View File

@ -23,9 +23,9 @@
#import <Foundation/Foundation.h> #import <Foundation/Foundation.h>
#import "JavaScriptObjCBridge.h" #import "JavaScriptObjCBridge.h"
#include "spidermonkey_specifics.h" #include "scripting/js-bindings/manual/spidermonkey_specifics.h"
#include "ScriptingCore.h" #include "scripting/js-bindings/manual/ScriptingCore.h"
#include "js_manual_conversions.h" #include "scripting/js-bindings/manual/js_manual_conversions.h"
#include "cocos2d.h" #include "cocos2d.h"
JavaScriptObjCBridge::CallInfo::~CallInfo(void) JavaScriptObjCBridge::CallInfo::~CallInfo(void)
{ {

2
cocos/scripting/lua-bindings/manual/platform/ios/CCLuaObjcBridge.mm
View File

@ -1,5 +1,5 @@
#include "CCLuaObjcBridge.h" #include "scripting/lua-bindings/manual/platform/ios/CCLuaObjcBridge.h"
#include <Foundation/Foundation.h> #include <Foundation/Foundation.h>
NS_CC_BEGIN NS_CC_BEGIN

6
cocos/ui/UIEditBox/Mac/CCUIEditBoxMac.mm
View File

@ -25,9 +25,9 @@
#import "CCUIEditBoxMac.h" #import "CCUIEditBoxMac.h"
#include "base/CCDirector.h" #include "base/CCDirector.h"
#include "CCUISingleLineTextField.h" #include "ui/UIEditBox/Mac/CCUISingleLineTextField.h"
#include "CCUIPasswordTextField.h" #include "ui/UIEditBox/Mac/CCUIPasswordTextField.h"
#include "CCUIMultilineTextField.h" #include "ui/UIEditBox/Mac/CCUIMultilineTextField.h"
#define getEditBoxImplMac() ((cocos2d::ui::EditBoxImplMac *)_editBox) #define getEditBoxImplMac() ((cocos2d::ui::EditBoxImplMac *)_editBox)

2
cocos/ui/UIEditBox/Mac/CCUIPasswordTextField.m
View File

@ -24,7 +24,7 @@
****************************************************************************/ ****************************************************************************/
#import "CCUIPasswordTextField.h" #import "CCUIPasswordTextField.h"
#include "CCUITextFieldFormatter.h" #include "ui/UIEditBox/Mac/CCUITextFieldFormatter.h"
@interface CCUIPasswordTextField() @interface CCUIPasswordTextField()
@property (nonatomic, retain) NSMutableDictionary *placeholderAttributes; @property (nonatomic, retain) NSMutableDictionary *placeholderAttributes;

2
cocos/ui/UIEditBox/Mac/CCUISingleLineTextField.m
View File

@ -24,7 +24,7 @@
****************************************************************************/ ****************************************************************************/
#import "CCUISingleLineTextField.h" #import "CCUISingleLineTextField.h"
#include "CCUITextFieldFormatter.h" #include "ui/UIEditBox/Mac/CCUITextFieldFormatter.h"
@interface CCUISingleLineTextField() @interface CCUISingleLineTextField()
@property (nonatomic, retain) NSMutableDictionary *placeholderAttributes; @property (nonatomic, retain) NSMutableDictionary *placeholderAttributes;

4
cocos/ui/UIEditBox/UIEditBoxImpl-ios.mm
View File

@ -23,13 +23,13 @@
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE. THE SOFTWARE.
****************************************************************************/ ****************************************************************************/
#include "UIEditBoxImpl-ios.h" #include "ui/UIEditBox/UIEditBoxImpl-ios.h"
#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS) #if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS)
#define kLabelZOrder 9999 #define kLabelZOrder 9999
#include "UIEditBox.h" #include "ui/UIEditBox/UIEditBox.h"
#include "base/CCDirector.h" #include "base/CCDirector.h"
#include "2d/CCLabel.h" #include "2d/CCLabel.h"
#import "platform/ios/CCEAGLView-ios.h" #import "platform/ios/CCEAGLView-ios.h"

6
cocos/ui/UIEditBox/UIEditBoxImpl-mac.mm
View File

@ -26,11 +26,11 @@
#include "platform/CCPlatformConfig.h" #include "platform/CCPlatformConfig.h"
#if (CC_TARGET_PLATFORM == CC_PLATFORM_MAC) #if (CC_TARGET_PLATFORM == CC_PLATFORM_MAC)
#include "UIEditBoxImpl-mac.h" #include "ui/UIEditBox/UIEditBoxImpl-mac.h"
#include "base/CCDirector.h" #include "base/CCDirector.h"
#include "UIEditBox.h" #include "ui/UIEditBox/UIEditBox.h"
#include "deprecated/CCString.h" #include "deprecated/CCString.h"
#include "Mac/CCUIEditBoxMac.h" #include "ui/UIEditBox/Mac/CCUIEditBoxMac.h"
NS_CC_BEGIN NS_CC_BEGIN

2
cocos/ui/UIVideoPlayer-ios.mm
View File

@ -22,7 +22,7 @@
THE SOFTWARE. THE SOFTWARE.
****************************************************************************/ ****************************************************************************/
#include "UIVideoPlayer.h" #include "ui/UIVideoPlayer.h"
// No Available on tvOS // No Available on tvOS
#if CC_TARGET_PLATFORM == CC_PLATFORM_IOS && !defined(CC_TARGET_OS_TVOS) #if CC_TARGET_PLATFORM == CC_PLATFORM_IOS && !defined(CC_TARGET_OS_TVOS)

4
cocos/ui/UIWebView.mm
View File

@ -26,7 +26,7 @@
#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_IOS) && !defined(CC_PLATFORM_OS_TVOS) #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_IOS) && !defined(CC_PLATFORM_OS_TVOS)
#include "UIWebViewImpl-ios.h" #include "ui/UIWebViewImpl-ios.h"
#include "UIWebView-inl.h" #include "ui/UIWebView-inl.h"
#endif #endif

2
cocos/ui/UIWebViewImpl-ios.mm
View File

@ -27,7 +27,7 @@
// Webview not available on tvOS // Webview not available on tvOS
#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS) && !defined(CC_TARGET_OS_TVOS) #if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS) && !defined(CC_TARGET_OS_TVOS)
#include "UIWebViewImpl-ios.h" #include "ui/UIWebViewImpl-ios.h"
#include "renderer/CCRenderer.h" #include "renderer/CCRenderer.h"
#include "base/CCDirector.h" #include "base/CCDirector.h"
#include "platform/CCGLView.h" #include "platform/CCGLView.h"