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

issue 7#, add NSLock.h in platform/

This commit is contained in:
Walzer 2010-07-23 07:39:24 +00:00
parent 636c60c2ed
commit d2235ef1a3
3 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cocos2dx/include/CCTextureCache.h
View File

@ -29,7 +29,6 @@ THE SOFTWARE.
#include "cocoa/NSObject.h" #include "cocoa/NSObject.h"
/// @todo #import <Foundation/Foundation.h> /// @todo #import <Foundation/Foundation.h>
/// @todo #import <CoreGraphics/CGImage.h> /// @todo #import <CoreGraphics/CGImage.h>
//#include "platform/uphone/NSLock.h"
#include "cocoa/NSMutableDictionary.h" #include "cocoa/NSMutableDictionary.h"
class CCTexture2D; class CCTexture2D;

32
cocos2dx/platform/NSLock.h Normal file
View File

@ -0,0 +1,32 @@
/****************************************************************************
Copyright (c) 2010 cocos2d-x.org
http://www.cocos2d-x.org
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
****************************************************************************/
#ifndef __PLATFORM_NSLOCK_H__
#define __PLATFORM_NSLOCK_H__
#ifdef _UPHONE
#include "uphone/NSLock.h"
#endif //_UPHONE
#endif //__PLATFORM_NSLOCK_H__

2
cocos2dx/textures/CCTextureCache.cpp
View File

@ -25,7 +25,7 @@ THE SOFTWARE.
#include "CCTextureCache.h" #include "CCTextureCache.h"
#include "CCTexture2D.h" #include "CCTexture2D.h"
#include "ccMacros.h" #include "ccMacros.h"
#include "platform/uphone/NSLock.h" #include "platform/NSLock.h"
//#include "CCDirector.h" //#include "CCDirector.h"
//#include "Support/CCFileUtils.h" //#include "Support/CCFileUtils.h"