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

Merge pull request #4158 from dumganhar/remove-jsb-version 

[ci skip]Removing JSB Version since JSB source codes will be updated with cocos2d-x.
This commit is contained in:
minggo 2013-11-10 20:45:22 -08:00
parent def560c811 0c4b6e7a37
commit e981dbf7e4
3 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cocos/scripting/javascript/bindings/ScriptingCore.cpp
View File

@ -246,7 +246,7 @@ JSBool JSBCore_version(JSContext *cx, uint32_t argc, jsval *vp)
} }
char version[256]; char version[256];
snprintf(version, sizeof(version)-1, "%s - %s", cocos2dVersion(), JSB_version); snprintf(version, sizeof(version)-1, "%s", cocos2dVersion());
JSString * js_version = JS_InternString(cx, version); JSString * js_version = JS_InternString(cx, version);
jsval ret = STRING_TO_JSVAL(js_version); jsval ret = STRING_TO_JSVAL(js_version);

11
cocos/scripting/javascript/bindings/js_bindings_core.cpp
View File

@ -43,17 +43,6 @@ typedef struct _hashJSObject
static tHashJSObject *hash = NULL; static tHashJSObject *hash = NULL;
static tHashJSObject *reverse_hash = NULL; static tHashJSObject *reverse_hash = NULL;
// Globals
char* JSB_association_proxy_key = NULL;
const char* JSB_version = "0.3-beta";
static void its_finalize(JSFreeOp *fop, JSObject *obj)
{
CCLOGINFO("Finalizing global class");
}
//#pragma mark JSBCore - Helper free functions //#pragma mark JSBCore - Helper free functions
static void reportError(JSContext *cx, const char *message, JSErrorReport *report) static void reportError(JSContext *cx, const char *message, JSErrorReport *report)
{ {

5
cocos/scripting/javascript/bindings/js_bindings_core.h
View File

@ -30,10 +30,6 @@
#include "chipmunk.h" #include "chipmunk.h"
#include "SimpleAudioEngine.h" #include "SimpleAudioEngine.h"
// Globals
// one shared key for associations
extern char * JSB_association_proxy_key;
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
@ -77,7 +73,6 @@ extern "C" {
// needed for callbacks. It does nothing. // needed for callbacks. It does nothing.
JSBool JSB_do_nothing(JSContext *cx, uint32_t argc, jsval *vp); JSBool JSB_do_nothing(JSContext *cx, uint32_t argc, jsval *vp);
extern const char* JSB_version;
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif