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

Reverse include path in network module and update web engine

This commit is contained in:
pandamicro 2016-05-25 23:57:40 +08:00
parent 8692ee176c
commit ea6a6a8586
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

4
cocos/network/HttpCookie.cpp
View File

@ -22,8 +22,8 @@
THE SOFTWARE.
****************************************************************************/
#include "HttpCookie.h"
#include "CCFileUtils.h"
#include "network/HttpCookie.h"
#include "platform/CCFileUtils.h"
#include <sstream>
#include <stdio.h>

6
cocos/network/SocketIO.cpp
View File

@ -27,14 +27,14 @@
****************************************************************************/
#include "SocketIO.h"
#include "network/SocketIO.h"
#include <algorithm>
#include <sstream>
#include <iterator>
#include "base/CCDirector.h"
#include "base/CCScheduler.h"
#include "WebSocket.h"
#include "HttpClient.h"
#include "network/WebSocket.h"
#include "network/HttpClient.h"
#include "json/rapidjson.h"
#include "json/document.h"

2
cocos/network/WebSocket.cpp
View File

@ -27,7 +27,7 @@
****************************************************************************/
#include "WebSocket.h"
#include "network/WebSocket.h"
#include "base/CCDirector.h"
#include "base/CCScheduler.h"
#include "base/CCEventDispatcher.h"

2
web

@ -1 +1 @@
Subproject commit 29e12e52e4d8f47aa5a256967613b353fbbb424d
Subproject commit 5ab968aff4dc8518cb13a6c8b7f31439852a2c49