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

Merge branch 'develop' into Merge_GUI_to_Develop

This commit is contained in:
CaiWenzhi 2013-09-17 20:43:16 +08:00
parent 841408d1bc 05ef572b24
commit f42797bc0d
8 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
extensions/network/HttpClient.cpp
View File

@ -86,10 +86,10 @@ static size_t writeHeaderData(void *ptr, size_t size, size_t nmemb, void *stream
} }
static int processGetTask(HttpRequest *request, write_callback callback, void *stream, int32_t *errorCode, write_callback headerCallback, void *headerStream); static int processGetTask(HttpRequest *request, write_callback callback, void *stream, long *errorCode, write_callback headerCallback, void *headerStream);
static int processPostTask(HttpRequest *request, write_callback callback, void *stream, int32_t *errorCode, write_callback headerCallback, void *headerStream); static int processPostTask(HttpRequest *request, write_callback callback, void *stream, long *errorCode, write_callback headerCallback, void *headerStream);
static int processPutTask(HttpRequest *request, write_callback callback, void *stream, int32_t *errorCode, write_callback headerCallback, void *headerStream); static int processPutTask(HttpRequest *request, write_callback callback, void *stream, long *errorCode, write_callback headerCallback, void *headerStream);
static int processDeleteTask(HttpRequest *request, write_callback callback, void *stream, int32_t *errorCode, write_callback headerCallback, void *headerStream); static int processDeleteTask(HttpRequest *request, write_callback callback, void *stream, long *errorCode, write_callback headerCallback, void *headerStream);
// int processDownloadTask(HttpRequest *task, write_callback callback, void *stream, int32_t *errorCode); // int processDownloadTask(HttpRequest *task, write_callback callback, void *stream, int32_t *errorCode);
@ -137,7 +137,7 @@ static void networkThread(void)
request->release(); request->release();
// ok, refcount = 1 now, only HttpResponse hold it. // ok, refcount = 1 now, only HttpResponse hold it.
int32_t responseCode = -1; long responseCode = -1;
int retValue = 0; int retValue = 0;
// Process the request -> get response packet // Process the request -> get response packet
@ -320,7 +320,7 @@ public:
} }
/// @param responseCode Null not allowed /// @param responseCode Null not allowed
bool perform(int *responseCode) bool perform(long *responseCode)
{ {
if (CURLE_OK != curl_easy_perform(_curl)) if (CURLE_OK != curl_easy_perform(_curl))
return false; return false;
@ -336,7 +336,7 @@ public:
}; };
//Process Get Request //Process Get Request
static int processGetTask(HttpRequest *request, write_callback callback, void *stream, int32_t *responseCode, write_callback headerCallback, void *headerStream) static int processGetTask(HttpRequest *request, write_callback callback, void *stream, long *responseCode, write_callback headerCallback, void *headerStream)
{ {
CURLRaii curl; CURLRaii curl;
bool ok = curl.init(request, callback, stream, headerCallback, headerStream) bool ok = curl.init(request, callback, stream, headerCallback, headerStream)
@ -346,7 +346,7 @@ static int processGetTask(HttpRequest *request, write_callback callback, void *s
} }
//Process POST Request //Process POST Request
static int processPostTask(HttpRequest *request, write_callback callback, void *stream, int32_t *responseCode, write_callback headerCallback, void *headerStream) static int processPostTask(HttpRequest *request, write_callback callback, void *stream, long *responseCode, write_callback headerCallback, void *headerStream)
{ {
CURLRaii curl; CURLRaii curl;
bool ok = curl.init(request, callback, stream, headerCallback, headerStream) bool ok = curl.init(request, callback, stream, headerCallback, headerStream)
@ -358,7 +358,7 @@ static int processPostTask(HttpRequest *request, write_callback callback, void *
} }
//Process PUT Request //Process PUT Request
static int processPutTask(HttpRequest *request, write_callback callback, void *stream, int32_t *responseCode, write_callback headerCallback, void *headerStream) static int processPutTask(HttpRequest *request, write_callback callback, void *stream, long *responseCode, write_callback headerCallback, void *headerStream)
{ {
CURLRaii curl; CURLRaii curl;
bool ok = curl.init(request, callback, stream, headerCallback, headerStream) bool ok = curl.init(request, callback, stream, headerCallback, headerStream)
@ -370,7 +370,7 @@ static int processPutTask(HttpRequest *request, write_callback callback, void *s
} }
//Process DELETE Request //Process DELETE Request
static int processDeleteTask(HttpRequest *request, write_callback callback, void *stream, int32_t *responseCode, write_callback headerCallback, void *headerStream) static int processDeleteTask(HttpRequest *request, write_callback callback, void *stream, long *responseCode, write_callback headerCallback, void *headerStream)
{ {
CURLRaii curl; CURLRaii curl;
bool ok = curl.init(request, callback, stream, headerCallback, headerStream) bool ok = curl.init(request, callback, stream, headerCallback, headerStream)

6
install-deps-linux.sh
View File

@ -1,5 +1,8 @@
#!/bin/bash #!/bin/bash
# Change directory to the location of this script
cd $(dirname ${BASH_SOURCE[0]})
DEPENDS='libx11-dev' DEPENDS='libx11-dev'
DEPENDS+=' libxmu-dev' DEPENDS+=' libxmu-dev'
DEPENDS+=' libglu1-mesa-dev' DEPENDS+=' libglu1-mesa-dev'
@ -28,3 +31,6 @@ if [ -n "$MISSING" ]; then
sudo apt-get --force-yes --yes install $MISSING sudo apt-get --force-yes --yes install $MISSING
fi fi
# install glfw
tools/travis-scripts/install_glfw.sh

1
make-all-linux-project.sh
View File

@ -15,7 +15,6 @@ cd $(dirname ${BASH_SOURCE[0]})
if $COCOS2DX_USEAPT; then if $COCOS2DX_USEAPT; then
./install-deps-linux.sh ./install-deps-linux.sh
tools/travis-scripts/install_glfw.sh
fi fi
export MAKEFLAGS=-j10 export MAKEFLAGS=-j10

2
samples/Javascript/Shared

@ -1 +1 @@
Subproject commit 9f73f0db3b2a95a8c9fe087e7770dc469c27c94a Subproject commit 022292761c6a9d056e25cc6e844430650208513f

2
scripting/auto-generated

@ -1 +1 @@
Subproject commit 558b0d0b086fc2b5011b49237fa5f49b6d6537f4 Subproject commit bff05d857c2e3b4a412e97b903ddb97d95232c1e

2
scripting/javascript/bindings/cocos2d_specifics.cpp.REMOVED.git-id
View File

@ -1 +1 @@
cd24df86bd74572c1ef45ee4af05633066a9d966 32258227169afc6f38d187ff2ecc4175a852efef

4
scripting/javascript/bindings/js/jsb_deprecated.js
View File

@ -60,4 +60,8 @@ var cc = cc || {};
return cc.TMXTiledMap.prototype.getPropertiesForGID.apply(this, arguments); return cc.TMXTiledMap.prototype.getPropertiesForGID.apply(this, arguments);
}; };
cc.Menu.prototype.setHandlerPriority = function() {
cc.log("cc.Menu.setHandlerPriority was deprecated, 3.0 uses new event dispatcher to dispatch touch event based on draw order, so setHandlerPriority is not needed now.");
};
})(); })();

3
template/multi-platform-cpp/proj.ios/HelloCpp.xcodeproj/project.pbxproj
View File

@ -613,7 +613,7 @@
SDKROOT = iphoneos; SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2"; TARGETED_DEVICE_FAMILY = "1,2";
USER_HEADER_SEARCH_PATHS = ""; USER_HEADER_SEARCH_PATHS = "";
VALID_ARCHS = "armv6 armv7 i386"; VALID_ARCHS = "armv6 armv7 armv7s i386";
}; };
name = Debug; name = Debug;
}; };
@ -664,6 +664,7 @@
TARGETED_DEVICE_FAMILY = "1,2"; TARGETED_DEVICE_FAMILY = "1,2";
USER_HEADER_SEARCH_PATHS = ""; USER_HEADER_SEARCH_PATHS = "";
VALIDATE_PRODUCT = YES; VALIDATE_PRODUCT = YES;
VALID_ARCHS = "armv6 armv7 armv7s i386";
}; };
name = Release; name = Release;
}; };