From d2235ef1a3607fca185c349fca1a1bfe256c3a80 Mon Sep 17 00:00:00 2001
From: Walzer <walzer@cocos2d-x.org>
Date: Fri, 23 Jul 2010 07:39:24 +0000
Subject: [PATCH] issue 7#, add NSLock.h in platform/

---
 cocos2dx/include/CCTextureCache.h    |  1 -
 cocos2dx/platform/NSLock.h           | 32 ++++++++++++++++++++++++++++
 cocos2dx/textures/CCTextureCache.cpp |  2 +-
 3 files changed, 33 insertions(+), 2 deletions(-)
 create mode 100644 cocos2dx/platform/NSLock.h

diff --git a/cocos2dx/include/CCTextureCache.h b/cocos2dx/include/CCTextureCache.h
index 3cb2178fd9..cc778f69cc 100644
--- a/cocos2dx/include/CCTextureCache.h
+++ b/cocos2dx/include/CCTextureCache.h
@@ -29,7 +29,6 @@ THE SOFTWARE.
 #include "cocoa/NSObject.h"
 /// @todo #import <Foundation/Foundation.h>
 /// @todo #import <CoreGraphics/CGImage.h>
-//#include "platform/uphone/NSLock.h"
 #include "cocoa/NSMutableDictionary.h"
 
 class CCTexture2D;
diff --git a/cocos2dx/platform/NSLock.h b/cocos2dx/platform/NSLock.h
new file mode 100644
index 0000000000..790b8ed787
--- /dev/null
+++ b/cocos2dx/platform/NSLock.h
@@ -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__
\ No newline at end of file
diff --git a/cocos2dx/textures/CCTextureCache.cpp b/cocos2dx/textures/CCTextureCache.cpp
index a1fb5030a8..39aed7d379 100644
--- a/cocos2dx/textures/CCTextureCache.cpp
+++ b/cocos2dx/textures/CCTextureCache.cpp
@@ -25,7 +25,7 @@ THE SOFTWARE.
 #include "CCTextureCache.h"
 #include "CCTexture2D.h"
 #include "ccMacros.h"
-#include "platform/uphone/NSLock.h"
+#include "platform/NSLock.h"
 //#include "CCDirector.h"
 //#include "Support/CCFileUtils.h"