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

Merge branch 'v3' into billboardTest

This commit is contained in:
Nite Luo 2015-01-16 00:05:28 -08:00
parent 414115690e 8dc7299d9d
commit 3f5c65034a
8 changed files with 101 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cocos/2d/CCGrid.cpp
View File

@ -318,7 +318,10 @@ void Grid3D::beforeBlit()
if(_needDepthTestForBlit) if(_needDepthTestForBlit)
{ {
_oldDepthTestValue = glIsEnabled(GL_DEPTH_TEST); _oldDepthTestValue = glIsEnabled(GL_DEPTH_TEST);
_oldDepthWriteValue = glIsEnabled(GL_DEPTH_WRITEMASK); GLboolean depthWriteMask;
glGetBooleanv(GL_DEPTH_WRITEMASK, &depthWriteMask);
_oldDepthWriteValue = depthWriteMask;
CHECK_GL_ERROR_DEBUG();
glEnable(GL_DEPTH_TEST); glEnable(GL_DEPTH_TEST);
glDepthMask(true); glDepthMask(true);
} }

28
cocos/physics/CCPhysicsWorld.cpp
View File

@ -332,6 +332,11 @@ void PhysicsWorld::rayCast(PhysicsRayCastCallbackFunc func, const Vec2& point1,
if (func != nullptr) if (func != nullptr)
{ {
if (!_delayAddBodies.empty() || !_delayRemoveBodies.empty())
{
_scene->updatePhysicsBodyTransform(_scene, _scene->getNodeToParentTransform(), 0, 1.0f, 1.0f);
updateBodies();
}
RayCastCallbackInfo info = { this, func, point1, point2, data }; RayCastCallbackInfo info = { this, func, point1, point2, data };
PhysicsWorldCallback::continues = true; PhysicsWorldCallback::continues = true;
@ -351,6 +356,11 @@ void PhysicsWorld::queryRect(PhysicsQueryRectCallbackFunc func, const Rect& rect
if (func != nullptr) if (func != nullptr)
{ {
if (!_delayAddBodies.empty() || !_delayRemoveBodies.empty())
{
_scene->updatePhysicsBodyTransform(_scene, _scene->getNodeToParentTransform(), 0, 1.0f, 1.0f);
updateBodies();
}
RectQueryCallbackInfo info = {this, func, data}; RectQueryCallbackInfo info = {this, func, data};
PhysicsWorldCallback::continues = true; PhysicsWorldCallback::continues = true;
@ -369,6 +379,11 @@ void PhysicsWorld::queryPoint(PhysicsQueryPointCallbackFunc func, const Vec2& po
if (func != nullptr) if (func != nullptr)
{ {
if (!_delayAddBodies.empty() || !_delayRemoveBodies.empty())
{
_scene->updatePhysicsBodyTransform(_scene, _scene->getNodeToParentTransform(), 0, 1.0f, 1.0f);
updateBodies();
}
PointQueryCallbackInfo info = {this, func, data}; PointQueryCallbackInfo info = {this, func, data};
PhysicsWorldCallback::continues = true; PhysicsWorldCallback::continues = true;
@ -493,7 +508,6 @@ void PhysicsWorld::addBodyOrDelay(PhysicsBody* body)
if (_delayAddBodies.find(body) == _delayAddBodies.end()) if (_delayAddBodies.find(body) == _delayAddBodies.end())
{ {
_delayAddBodies.pushBack(body); _delayAddBodies.pushBack(body);
_delayDirty = true;
} }
} }
@ -567,7 +581,6 @@ void PhysicsWorld::removeBodyOrDelay(PhysicsBody* body)
if (_delayRemoveBodies.getIndex(body) == CC_INVALID_INDEX) if (_delayRemoveBodies.getIndex(body) == CC_INVALID_INDEX)
{ {
_delayRemoveBodies.pushBack(body); _delayRemoveBodies.pushBack(body);
_delayDirty = true;
} }
}else }else
{ {
@ -598,7 +611,6 @@ void PhysicsWorld::removeJoint(PhysicsJoint* joint, bool destroy)
if (std::find(_delayRemoveJoints.rbegin(), _delayRemoveJoints.rend(), joint) == _delayRemoveJoints.rend()) if (std::find(_delayRemoveJoints.rbegin(), _delayRemoveJoints.rend(), joint) == _delayRemoveJoints.rend())
{ {
_delayRemoveJoints.push_back(joint); _delayRemoveJoints.push_back(joint);
_delayDirty = true;
} }
} }
else else
@ -669,7 +681,6 @@ void PhysicsWorld::addJoint(PhysicsJoint* joint)
if (std::find(_delayAddJoints.begin(), _delayAddJoints.end(), joint) == _delayAddJoints.end()) if (std::find(_delayAddJoints.begin(), _delayAddJoints.end(), joint) == _delayAddJoints.end())
{ {
_delayAddJoints.push_back(joint); _delayAddJoints.push_back(joint);
_delayDirty = true;
} }
} }
} }
@ -814,12 +825,14 @@ void PhysicsWorld::update(float delta, bool userCall/* = false*/)
_scene->updatePhysicsBodyTransform(_scene, _scene->getNodeToParentTransform(), 0, 1.0f, 1.0f); _scene->updatePhysicsBodyTransform(_scene, _scene->getNodeToParentTransform(), 0, 1.0f, 1.0f);
while (_delayDirty) if (!_delayAddBodies.empty() || !_delayRemoveBodies.empty())
{ {
updateBodies(); updateBodies();
updateJoints(); }
_delayDirty = !(_delayAddBodies.size() == 0 && _delayRemoveBodies.size() == 0 && _delayAddJoints.size() == 0 && _delayRemoveJoints.size() == 0); if (!_delayAddJoints.empty() || !_delayRemoveJoints.empty())
{
updateJoints();
} }
if (userCall) if (userCall)
@ -864,7 +877,6 @@ PhysicsWorld::PhysicsWorld()
, _substeps(1) , _substeps(1)
, _cpSpace(nullptr) , _cpSpace(nullptr)
, _scene(nullptr) , _scene(nullptr)
, _delayDirty(false)
, _autoStep(true) , _autoStep(true)
, _debugDraw(nullptr) , _debugDraw(nullptr)
, _debugDrawMask(DEBUGDRAW_NONE) , _debugDrawMask(DEBUGDRAW_NONE)

1
cocos/physics/CCPhysicsWorld.h
View File

@ -208,7 +208,6 @@ protected:
std::list<PhysicsJoint*> _joints; std::list<PhysicsJoint*> _joints;
Scene* _scene; Scene* _scene;
bool _delayDirty;
bool _autoStep; bool _autoStep;
PhysicsDebugDraw* _debugDraw; PhysicsDebugDraw* _debugDraw;
int _debugDrawMask; int _debugDrawMask;

34
cocos/platform/android/jni/CocosPlayClient.cpp
View File

@ -32,9 +32,13 @@ using namespace cocos2d;
#define LOG_TAG "CocosPlayClient.cpp" #define LOG_TAG "CocosPlayClient.cpp"
#if COCOS2D_DEBUG #if COCOS2D_DEBUG
#define LOGD(...) __android_log_print(ANDROID_LOG_ERROR,LOG_TAG,__VA_ARGS__) #define LOGD(...) __android_log_print(ANDROID_LOG_DEBUG,LOG_TAG,__VA_ARGS__)
#define LOGW(...) __android_log_print(ANDROID_LOG_WARN,LOG_TAG,__VA_ARGS__)
#define LOGE(...) __android_log_print(ANDROID_LOG_ERROR,LOG_TAG,__VA_ARGS__)
#else #else
#define LOGD(...) #define LOGD(...)
#define LOGW(...)
#define LOGE(...)
#endif #endif
static std::string __gameRootPath; static std::string __gameRootPath;
@ -94,7 +98,7 @@ static bool getEnv(JNIEnv **env)
bRet = true; bRet = true;
break; break;
default: default:
LOGD("%s", "Failed to get the environment using GetEnv()"); LOGE("%s", "Failed to get the environment using GetEnv()");
break; break;
} }
@ -115,7 +119,7 @@ static void initClassLoaderForMultiThread()
{ {
env->ExceptionDescribe(); env->ExceptionDescribe();
env->ExceptionClear(); env->ExceptionClear();
LOGD("Exception initClassLoaderForMultiThread cocos2dClass is exception"); LOGW("Exception initClassLoaderForMultiThread cocos2dClass is exception");
break; break;
} }
@ -124,7 +128,7 @@ static void initClassLoaderForMultiThread()
{ {
env->ExceptionDescribe(); env->ExceptionDescribe();
env->ExceptionClear(); env->ExceptionClear();
LOGD("Exception initClassLoaderForMultiThread classClass is exception"); LOGW("Exception initClassLoaderForMultiThread classClass is exception");
break; break;
} }
@ -133,7 +137,7 @@ static void initClassLoaderForMultiThread()
{ {
env->ExceptionDescribe(); env->ExceptionDescribe();
env->ExceptionClear(); env->ExceptionClear();
LOGD("Exception initClassLoaderForMultiThread classLoaderClass"); LOGW("Exception initClassLoaderForMultiThread classLoaderClass");
break; break;
} }
@ -143,7 +147,7 @@ static void initClassLoaderForMultiThread()
{ {
env->ExceptionDescribe(); env->ExceptionDescribe();
env->ExceptionClear(); env->ExceptionClear();
LOGD("Exception initClassLoaderForMultiThread classLoader"); LOGW("Exception initClassLoaderForMultiThread classLoader");
break; break;
} }
__classLoader = env->NewGlobalRef(classLoader); __classLoader = env->NewGlobalRef(classLoader);
@ -156,7 +160,7 @@ static void initClassLoaderForMultiThread()
env->ExceptionClear(); env->ExceptionClear();
__findClassMethod = NULL; __findClassMethod = NULL;
__classLoader = NULL; __classLoader = NULL;
LOGD("Exception initClassLoaderForMultiThread findClassMethod"); LOGW("Exception initClassLoaderForMultiThread findClassMethod");
break; break;
} }
}while(0); }while(0);
@ -189,7 +193,7 @@ static jclass getClassID_(const char *className, JNIEnv *env)
if(ret) break; if(ret) break;
} }
LOGD("Failed to find class of %s", className); LOGE("Failed to find class of %s", className);
break; break;
} }
} while (0); } while (0);
@ -216,7 +220,7 @@ static bool getStaticMethodInfo(cocos2d::JniMethodInfo &methodinfo, const char *
methodID = pEnv->GetStaticMethodID(classID, methodName, paramCode); methodID = pEnv->GetStaticMethodID(classID, methodName, paramCode);
if (! methodID) if (! methodID)
{ {
LOGD("Failed to find static method id of %s", methodName); LOGW("Failed to find static method id of %s", methodName);
break; break;
} }
@ -257,7 +261,10 @@ void lazyInit()
LOGD("isNotifyFileLoadedEnabled = %d", __isNotifyFileLoadedEnabled); LOGD("isNotifyFileLoadedEnabled = %d", __isNotifyFileLoadedEnabled);
} }
if (__isCocosPlayEnabled)
{
initClassLoaderForMultiThread(); initClassLoaderForMultiThread();
}
__isCocosPlayInited = true; __isCocosPlayInited = true;
} }
@ -278,13 +285,8 @@ void updateAssets(const std::string& filePath)
{ {
lazyInit(); lazyInit();
} }
if (!__isCocosPlayEnabled)
{
LOGD("ERROR: CocosPlayClient isn't enabled!");
return;
}
if (__isDemo) if (!__isCocosPlayEnabled || __isDemo)
{ {
return; return;
} }
@ -360,7 +362,7 @@ std::string getGameRoot()
{ {
if (!__isCocosPlayEnabled) if (!__isCocosPlayEnabled)
{ {
LOGD("ERROR: CocosPlayClient isn't enabled!"); LOGW("CocosPlayClient isn't enabled!");
return ""; return "";
} }

17
cocos/scripting/lua-bindings/manual/LuaBasicConversions.cpp
View File

@ -121,7 +121,22 @@ bool luaval_to_int32(lua_State* L,int lo,int* outValue, const char* funcName)
if (ok) if (ok)
{ {
*outValue = (int)(unsigned int)lua_tonumber(L, lo); /**
When we want to convert the number value from the Lua to int, we would call lua_tonumber to implement.It would
experience two phase conversion: int -> double, double->int.But,for the 0x80000000 which the min value of int, the
int cast may return an undefined result,like 0x7fffffff.So we must use the (int)(unsigned int)lua_tonumber() to get
predictable results for 0x80000000.In this place,we didn't use lua_tointeger, because it may produce differen results
depending on the compiler,e.g:for iPhone4s,it also get wrong value for 0x80000000.
*/
unsigned int estimateValue = (unsigned int)lua_tonumber(L, lo);
if (estimateValue == std::numeric_limits<int>::min())
{
*outValue = (int)estimateValue;
}
else
{
*outValue = (int)lua_tonumber(L, lo);
}
} }
return ok; return ok;

20
templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj
View File

@ -53,8 +53,8 @@
9FC760451A677A4A00D1E6E7 /* SimpleConfigParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9FC760411A67791200D1E6E7 /* SimpleConfigParser.cpp */; }; 9FC760451A677A4A00D1E6E7 /* SimpleConfigParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9FC760411A67791200D1E6E7 /* SimpleConfigParser.cpp */; };
9FF504841A5E87B100AFDA55 /* ConsoleWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9FF504811A5E87B100AFDA55 /* ConsoleWindow.xib */; }; 9FF504841A5E87B100AFDA55 /* ConsoleWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9FF504811A5E87B100AFDA55 /* ConsoleWindow.xib */; };
9FF504851A5E87B100AFDA55 /* ConsoleWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9FF504831A5E87B100AFDA55 /* ConsoleWindowController.m */; }; 9FF504851A5E87B100AFDA55 /* ConsoleWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9FF504831A5E87B100AFDA55 /* ConsoleWindowController.m */; };
9FF504861A5E881200AFDA55 /* liblibsimulator.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9FF5047E1A5E86D600AFDA55 /* liblibsimulator.a */; }; 9FF504861A5E881200AFDA55 /* libsimulator Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9FF5047E1A5E86D600AFDA55 /* libsimulator Mac.a */; };
9FF504871A5E88CE00AFDA55 /* liblibsimulator_iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9FF504801A5E86D600AFDA55 /* liblibsimulator_iOS.a */; }; 9FF504871A5E88CE00AFDA55 /* libsimulator iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9FF504801A5E86D600AFDA55 /* libsimulator iOS.a */; };
9FFC07361A4A764100AED399 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9FFC07341A4A764100AED399 /* MainMenu.xib */; }; 9FFC07361A4A764100AED399 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9FFC07341A4A764100AED399 /* MainMenu.xib */; };
C03781B918BF655400FE4F13 /* res in Resources */ = {isa = PBXBuildFile; fileRef = C03781B718BF655400FE4F13 /* res */; }; C03781B918BF655400FE4F13 /* res in Resources */ = {isa = PBXBuildFile; fileRef = C03781B718BF655400FE4F13 /* res */; };
C03781BA18BF655400FE4F13 /* res in Resources */ = {isa = PBXBuildFile; fileRef = C03781B718BF655400FE4F13 /* res */; }; C03781BA18BF655400FE4F13 /* res in Resources */ = {isa = PBXBuildFile; fileRef = C03781B718BF655400FE4F13 /* res */; };
@ -240,7 +240,7 @@
isa = PBXFrameworksBuildPhase; isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
9FF504861A5E881200AFDA55 /* liblibsimulator.a in Frameworks */, 9FF504861A5E881200AFDA55 /* libsimulator Mac.a in Frameworks */,
15427CEE198F24AF00DC375D /* libcocos2d Mac.a in Frameworks */, 15427CEE198F24AF00DC375D /* libcocos2d Mac.a in Frameworks */,
15427CEC198F24A600DC375D /* libluacocos2d Mac.a in Frameworks */, 15427CEC198F24A600DC375D /* libluacocos2d Mac.a in Frameworks */,
15A8A4881834C90F00142BE0 /* libcurl.dylib in Frameworks */, 15A8A4881834C90F00142BE0 /* libcurl.dylib in Frameworks */,
@ -260,7 +260,7 @@
isa = PBXFrameworksBuildPhase; isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
9FF504871A5E88CE00AFDA55 /* liblibsimulator_iOS.a in Frameworks */, 9FF504871A5E88CE00AFDA55 /* libsimulator iOS.a in Frameworks */,
5200BECA1A53D9A500AC45E4 /* Security.framework in Frameworks */, 5200BECA1A53D9A500AC45E4 /* Security.framework in Frameworks */,
15427CD5198F222200DC375D /* libluacocos2d iOS.a in Frameworks */, 15427CD5198F222200DC375D /* libluacocos2d iOS.a in Frameworks */,
15427CD3198F221400DC375D /* libcocos2d iOS.a in Frameworks */, 15427CD3198F221400DC375D /* libcocos2d iOS.a in Frameworks */,
@ -362,8 +362,8 @@
9FF504791A5E86D600AFDA55 /* Products */ = { 9FF504791A5E86D600AFDA55 /* Products */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
9FF5047E1A5E86D600AFDA55 /* liblibsimulator.a */, 9FF5047E1A5E86D600AFDA55 /* libsimulator Mac.a */,
9FF504801A5E86D600AFDA55 /* liblibsimulator_iOS.a */, 9FF504801A5E86D600AFDA55 /* libsimulator iOS.a */,
); );
name = Products; name = Products;
sourceTree = "<group>"; sourceTree = "<group>";
@ -571,17 +571,17 @@
remoteRef = 15A8A4241834BDA200142BE0 /* PBXContainerItemProxy */; remoteRef = 15A8A4241834BDA200142BE0 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR; sourceTree = BUILT_PRODUCTS_DIR;
}; };
9FF5047E1A5E86D600AFDA55 /* liblibsimulator.a */ = { 9FF5047E1A5E86D600AFDA55 /* libsimulator Mac.a */ = {
isa = PBXReferenceProxy; isa = PBXReferenceProxy;
fileType = archive.ar; fileType = archive.ar;
path = liblibsimulator.a; path = "libsimulator Mac.a";
remoteRef = 9FF5047D1A5E86D600AFDA55 /* PBXContainerItemProxy */; remoteRef = 9FF5047D1A5E86D600AFDA55 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR; sourceTree = BUILT_PRODUCTS_DIR;
}; };
9FF504801A5E86D600AFDA55 /* liblibsimulator_iOS.a */ = { 9FF504801A5E86D600AFDA55 /* libsimulator iOS.a */ = {
isa = PBXReferenceProxy; isa = PBXReferenceProxy;
fileType = archive.ar; fileType = archive.ar;
path = liblibsimulator_iOS.a; path = "libsimulator iOS.a";
remoteRef = 9FF5047F1A5E86D600AFDA55 /* PBXContainerItemProxy */; remoteRef = 9FF5047F1A5E86D600AFDA55 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR; sourceTree = BUILT_PRODUCTS_DIR;
}; };

20
tools/simulator/frameworks/runtime-src/proj.ios_mac/simulator.xcodeproj/project.pbxproj
View File

@ -49,8 +49,8 @@
521A8E7119F0C3D200D177D7 /* Default-736h@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 521A8E6F19F0C3D200D177D7 /* Default-736h@3x.png */; }; 521A8E7119F0C3D200D177D7 /* Default-736h@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 521A8E6F19F0C3D200D177D7 /* Default-736h@3x.png */; };
9F7214271A5C1E4C00DAED06 /* libluacocos2d Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9F7213E01A5C19ED00DAED06 /* libluacocos2d Mac.a */; }; 9F7214271A5C1E4C00DAED06 /* libluacocos2d Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9F7213E01A5C19ED00DAED06 /* libluacocos2d Mac.a */; };
9F7214281A5C1E5B00DAED06 /* libluacocos2d iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9F7213E21A5C19ED00DAED06 /* libluacocos2d iOS.a */; }; 9F7214281A5C1E5B00DAED06 /* libluacocos2d iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9F7213E21A5C19ED00DAED06 /* libluacocos2d iOS.a */; };
9FD6FC0B1A5D27870028EDC6 /* liblibsimulator.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9FD6FC081A5D26580028EDC6 /* liblibsimulator.a */; settings = {ATTRIBUTES = (Required, ); }; }; 9FD6FC0B1A5D27870028EDC6 /* libsimulator Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9FD6FC081A5D26580028EDC6 /* libsimulator Mac.a */; settings = {ATTRIBUTES = (Required, ); }; };
9FD6FC0C1A5D278E0028EDC6 /* liblibsimulator_iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9FD6FC0A1A5D26580028EDC6 /* liblibsimulator_iOS.a */; }; 9FD6FC0C1A5D278E0028EDC6 /* libsimulator iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9FD6FC0A1A5D26580028EDC6 /* libsimulator iOS.a */; };
9FD6FC721A5D2A820028EDC6 /* ConsoleWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9FD6FC6F1A5D2A820028EDC6 /* ConsoleWindow.xib */; }; 9FD6FC721A5D2A820028EDC6 /* ConsoleWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9FD6FC6F1A5D2A820028EDC6 /* ConsoleWindow.xib */; };
9FD6FC731A5D2A820028EDC6 /* ConsoleWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9FD6FC711A5D2A820028EDC6 /* ConsoleWindowController.m */; }; 9FD6FC731A5D2A820028EDC6 /* ConsoleWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9FD6FC711A5D2A820028EDC6 /* ConsoleWindowController.m */; };
9FFC07261A4A739200AED399 /* lang in Resources */ = {isa = PBXBuildFile; fileRef = 9FFC07061A4A739200AED399 /* lang */; }; 9FFC07261A4A739200AED399 /* lang in Resources */ = {isa = PBXBuildFile; fileRef = 9FFC07061A4A739200AED399 /* lang */; };
@ -231,7 +231,7 @@
isa = PBXFrameworksBuildPhase; isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
9FD6FC0B1A5D27870028EDC6 /* liblibsimulator.a in Frameworks */, 9FD6FC0B1A5D27870028EDC6 /* libsimulator Mac.a in Frameworks */,
9F7214271A5C1E4C00DAED06 /* libluacocos2d Mac.a in Frameworks */, 9F7214271A5C1E4C00DAED06 /* libluacocos2d Mac.a in Frameworks */,
15427CEE198F24AF00DC375D /* libcocos2d Mac.a in Frameworks */, 15427CEE198F24AF00DC375D /* libcocos2d Mac.a in Frameworks */,
15A8A4881834C90F00142BE0 /* libcurl.dylib in Frameworks */, 15A8A4881834C90F00142BE0 /* libcurl.dylib in Frameworks */,
@ -251,7 +251,7 @@
isa = PBXFrameworksBuildPhase; isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
9FD6FC0C1A5D278E0028EDC6 /* liblibsimulator_iOS.a in Frameworks */, 9FD6FC0C1A5D278E0028EDC6 /* libsimulator iOS.a in Frameworks */,
9F7214281A5C1E5B00DAED06 /* libluacocos2d iOS.a in Frameworks */, 9F7214281A5C1E5B00DAED06 /* libluacocos2d iOS.a in Frameworks */,
5200BECA1A53D9A500AC45E4 /* Security.framework in Frameworks */, 5200BECA1A53D9A500AC45E4 /* Security.framework in Frameworks */,
15427CD3198F221400DC375D /* libcocos2d iOS.a in Frameworks */, 15427CD3198F221400DC375D /* libcocos2d iOS.a in Frameworks */,
@ -350,8 +350,8 @@
9FD6FC031A5D26580028EDC6 /* Products */ = { 9FD6FC031A5D26580028EDC6 /* Products */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
9FD6FC081A5D26580028EDC6 /* liblibsimulator.a */, 9FD6FC081A5D26580028EDC6 /* libsimulator Mac.a */,
9FD6FC0A1A5D26580028EDC6 /* liblibsimulator_iOS.a */, 9FD6FC0A1A5D26580028EDC6 /* libsimulator iOS.a */,
); );
name = Products; name = Products;
sourceTree = "<group>"; sourceTree = "<group>";
@ -547,17 +547,17 @@
remoteRef = 9F7213E11A5C19ED00DAED06 /* PBXContainerItemProxy */; remoteRef = 9F7213E11A5C19ED00DAED06 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR; sourceTree = BUILT_PRODUCTS_DIR;
}; };
9FD6FC081A5D26580028EDC6 /* liblibsimulator.a */ = { 9FD6FC081A5D26580028EDC6 /* libsimulator Mac.a */ = {
isa = PBXReferenceProxy; isa = PBXReferenceProxy;
fileType = archive.ar; fileType = archive.ar;
path = liblibsimulator.a; path = "libsimulator Mac.a";
remoteRef = 9FD6FC071A5D26580028EDC6 /* PBXContainerItemProxy */; remoteRef = 9FD6FC071A5D26580028EDC6 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR; sourceTree = BUILT_PRODUCTS_DIR;
}; };
9FD6FC0A1A5D26580028EDC6 /* liblibsimulator_iOS.a */ = { 9FD6FC0A1A5D26580028EDC6 /* libsimulator iOS.a */ = {
isa = PBXReferenceProxy; isa = PBXReferenceProxy;
fileType = archive.ar; fileType = archive.ar;
path = liblibsimulator_iOS.a; path = "libsimulator iOS.a";
remoteRef = 9FD6FC091A5D26580028EDC6 /* PBXContainerItemProxy */; remoteRef = 9FD6FC091A5D26580028EDC6 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR; sourceTree = BUILT_PRODUCTS_DIR;
}; };

42
tools/simulator/libsimulator/proj.ios_mac/libsimulator.xcodeproj/project.pbxproj
View File

@ -175,8 +175,8 @@
9F2F21BB1A635F1C006B8BF1 /* RuntimeProtocol.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RuntimeProtocol.cpp; sourceTree = "<group>"; }; 9F2F21BB1A635F1C006B8BF1 /* RuntimeProtocol.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RuntimeProtocol.cpp; sourceTree = "<group>"; };
9F2F21BC1A635F1C006B8BF1 /* RuntimeProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RuntimeProtocol.h; sourceTree = "<group>"; }; 9F2F21BC1A635F1C006B8BF1 /* RuntimeProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RuntimeProtocol.h; sourceTree = "<group>"; };
9F2F21C61A635FFF006B8BF1 /* Runtime_ios-mac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "Runtime_ios-mac.mm"; sourceTree = "<group>"; }; 9F2F21C61A635FFF006B8BF1 /* Runtime_ios-mac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "Runtime_ios-mac.mm"; sourceTree = "<group>"; };
9F7214351A5C271F00DAED06 /* liblibsimulator.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = liblibsimulator.a; sourceTree = BUILT_PRODUCTS_DIR; }; 9F7214351A5C271F00DAED06 /* libsimulator Mac.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libsimulator Mac.a"; sourceTree = BUILT_PRODUCTS_DIR; };
9F7214851A5C28BA00DAED06 /* liblibsimulator_iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = liblibsimulator_iOS.a; sourceTree = BUILT_PRODUCTS_DIR; }; 9F7214851A5C28BA00DAED06 /* libsimulator iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libsimulator iOS.a"; sourceTree = BUILT_PRODUCTS_DIR; };
9FB638201A635BA300AAEC43 /* config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = config.h; sourceTree = "<group>"; }; 9FB638201A635BA300AAEC43 /* config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = config.h; sourceTree = "<group>"; };
9FB638231A635BA300AAEC43 /* extension_set.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = extension_set.cc; sourceTree = "<group>"; }; 9FB638231A635BA300AAEC43 /* extension_set.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = extension_set.cc; sourceTree = "<group>"; };
9FB638241A635BA300AAEC43 /* extension_set.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = extension_set.h; sourceTree = "<group>"; }; 9FB638241A635BA300AAEC43 /* extension_set.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = extension_set.h; sourceTree = "<group>"; };
@ -315,8 +315,8 @@
9F7214361A5C271F00DAED06 /* Products */ = { 9F7214361A5C271F00DAED06 /* Products */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
9F7214351A5C271F00DAED06 /* liblibsimulator.a */, 9F7214351A5C271F00DAED06 /* libsimulator Mac.a */,
9F7214851A5C28BA00DAED06 /* liblibsimulator_iOS.a */, 9F7214851A5C28BA00DAED06 /* libsimulator iOS.a */,
); );
name = Products; name = Products;
sourceTree = "<group>"; sourceTree = "<group>";
@ -609,9 +609,9 @@
/* End PBXHeadersBuildPhase section */ /* End PBXHeadersBuildPhase section */
/* Begin PBXNativeTarget section */ /* Begin PBXNativeTarget section */
9F7214341A5C271F00DAED06 /* libsimulator */ = { 9F7214341A5C271F00DAED06 /* libsimulator Mac */ = {
isa = PBXNativeTarget; isa = PBXNativeTarget;
buildConfigurationList = 9F7214401A5C271F00DAED06 /* Build configuration list for PBXNativeTarget "libsimulator" */; buildConfigurationList = 9F7214401A5C271F00DAED06 /* Build configuration list for PBXNativeTarget "libsimulator Mac" */;
buildPhases = ( buildPhases = (
9F7214311A5C271F00DAED06 /* Sources */, 9F7214311A5C271F00DAED06 /* Sources */,
9F7214321A5C271F00DAED06 /* Frameworks */, 9F7214321A5C271F00DAED06 /* Frameworks */,
@ -621,14 +621,14 @@
); );
dependencies = ( dependencies = (
); );
name = libsimulator; name = "libsimulator Mac";
productName = libsimulator; productName = "libsimulator Mac";
productReference = 9F7214351A5C271F00DAED06 /* liblibsimulator.a */; productReference = 9F7214351A5C271F00DAED06 /* libsimulator Mac.a */;
productType = "com.apple.product-type.library.static"; productType = "com.apple.product-type.library.static";
}; };
9F7214841A5C28BA00DAED06 /* libsimulator_iOS */ = { 9F7214841A5C28BA00DAED06 /* libsimulator iOS */ = {
isa = PBXNativeTarget; isa = PBXNativeTarget;
buildConfigurationList = 9F7214961A5C28BA00DAED06 /* Build configuration list for PBXNativeTarget "libsimulator_iOS" */; buildConfigurationList = 9F7214961A5C28BA00DAED06 /* Build configuration list for PBXNativeTarget "libsimulator iOS" */;
buildPhases = ( buildPhases = (
9F7214811A5C28BA00DAED06 /* Sources */, 9F7214811A5C28BA00DAED06 /* Sources */,
9F7214821A5C28BA00DAED06 /* Frameworks */, 9F7214821A5C28BA00DAED06 /* Frameworks */,
@ -638,9 +638,9 @@
); );
dependencies = ( dependencies = (
); );
name = libsimulator_iOS; name = "libsimulator iOS";
productName = libsimulator_iOS; productName = "libsimulator iOS";
productReference = 9F7214851A5C28BA00DAED06 /* liblibsimulator_iOS.a */; productReference = 9F7214851A5C28BA00DAED06 /* libsimulator iOS.a */;
productType = "com.apple.product-type.library.static"; productType = "com.apple.product-type.library.static";
}; };
/* End PBXNativeTarget section */ /* End PBXNativeTarget section */
@ -672,8 +672,8 @@
projectDirPath = ""; projectDirPath = "";
projectRoot = ""; projectRoot = "";
targets = ( targets = (
9F7214341A5C271F00DAED06 /* libsimulator */, 9F7214341A5C271F00DAED06 /* libsimulator Mac */,
9F7214841A5C28BA00DAED06 /* libsimulator_iOS */, 9F7214841A5C28BA00DAED06 /* libsimulator iOS */,
); );
}; };
/* End PBXProject section */ /* End PBXProject section */
@ -868,7 +868,7 @@
buildSettings = { buildSettings = {
ALWAYS_SEARCH_USER_PATHS = YES; ALWAYS_SEARCH_USER_PATHS = YES;
CLANG_ENABLE_OBJC_ARC = NO; CLANG_ENABLE_OBJC_ARC = NO;
EXECUTABLE_PREFIX = lib; EXECUTABLE_PREFIX = "";
GCC_ENABLE_CPP_EXCEPTIONS = YES; GCC_ENABLE_CPP_EXCEPTIONS = YES;
GCC_ENABLE_CPP_RTTI = YES; GCC_ENABLE_CPP_RTTI = YES;
GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES;
@ -896,7 +896,7 @@
buildSettings = { buildSettings = {
ALWAYS_SEARCH_USER_PATHS = YES; ALWAYS_SEARCH_USER_PATHS = YES;
CLANG_ENABLE_OBJC_ARC = NO; CLANG_ENABLE_OBJC_ARC = NO;
EXECUTABLE_PREFIX = lib; EXECUTABLE_PREFIX = "";
GCC_ENABLE_CPP_EXCEPTIONS = YES; GCC_ENABLE_CPP_EXCEPTIONS = YES;
GCC_ENABLE_CPP_RTTI = YES; GCC_ENABLE_CPP_RTTI = YES;
GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES;
@ -923,6 +923,7 @@
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
ALWAYS_SEARCH_USER_PATHS = YES; ALWAYS_SEARCH_USER_PATHS = YES;
EXECUTABLE_PREFIX = "";
GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = ios/Prefix.pch; GCC_PREFIX_HEADER = ios/Prefix.pch;
GCC_PREPROCESSOR_DEFINITIONS = ( GCC_PREPROCESSOR_DEFINITIONS = (
@ -947,6 +948,7 @@
isa = XCBuildConfiguration; isa = XCBuildConfiguration;
buildSettings = { buildSettings = {
ALWAYS_SEARCH_USER_PATHS = YES; ALWAYS_SEARCH_USER_PATHS = YES;
EXECUTABLE_PREFIX = "";
GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = ios/Prefix.pch; GCC_PREFIX_HEADER = ios/Prefix.pch;
GCC_PREPROCESSOR_DEFINITIONS = ( GCC_PREPROCESSOR_DEFINITIONS = (
@ -980,7 +982,7 @@
defaultConfigurationIsVisible = 0; defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release; defaultConfigurationName = Release;
}; };
9F7214401A5C271F00DAED06 /* Build configuration list for PBXNativeTarget "libsimulator" */ = { 9F7214401A5C271F00DAED06 /* Build configuration list for PBXNativeTarget "libsimulator Mac" */ = {
isa = XCConfigurationList; isa = XCConfigurationList;
buildConfigurations = ( buildConfigurations = (
9F7214411A5C271F00DAED06 /* Debug */, 9F7214411A5C271F00DAED06 /* Debug */,
@ -989,7 +991,7 @@
defaultConfigurationIsVisible = 0; defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release; defaultConfigurationName = Release;
}; };
9F7214961A5C28BA00DAED06 /* Build configuration list for PBXNativeTarget "libsimulator_iOS" */ = { 9F7214961A5C28BA00DAED06 /* Build configuration list for PBXNativeTarget "libsimulator iOS" */ = {
isa = XCConfigurationList; isa = XCConfigurationList;
buildConfigurations = ( buildConfigurations = (
9F7214971A5C28BA00DAED06 /* Debug */, 9F7214971A5C28BA00DAED06 /* Debug */,