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

Merge pull request #10066 from samuele3hu/v3_4_rc1_check 

Add macro judgement for CC_PLATFORM_MAC
This commit is contained in:
minggo 2015-01-20 15:32:05 +08:00
parent c8688afbf6 cc732743da
commit 6ebe1169f6
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cocos/scripting/lua-bindings/manual/network/Lua_web_socket.cpp
View File

@ -22,7 +22,7 @@
THE SOFTWARE.
****************************************************************************/
#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_WIN32)
#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_WIN32 || CC_TARGET_PLATFORM == CC_PLATFORM_MAC)
#include "Lua_web_socket.h"
#include <map>
#include <string>

2
cocos/scripting/lua-bindings/manual/network/Lua_web_socket.h
View File

@ -24,7 +24,7 @@
#ifndef __LUA_WEB_SOCKET_H__
#define __LUA_WEB_SOCKET_H__
#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_WIN32)
#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_WIN32 || CC_TARGET_PLATFORM == CC_PLATFORM_MAC)
#ifdef __cplusplus
extern "C" {

2
cocos/scripting/lua-bindings/manual/network/lua_cocos2dx_network_manual.cpp
View File

@ -27,7 +27,7 @@ extern "C" {
#include "lua_extensions.h"
#endif
}
#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_WIN32)
#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_WIN32 || CC_TARGET_PLATFORM == CC_PLATFORM_MAC)
#include "Lua_web_socket.h"
#endif