diff --git a/build/cocos2d-win32.vc2012.sln b/build/cocos2d-win32.vc2012.sln index f1a71f1f16..f23109c90c 100644 --- a/build/cocos2d-win32.vc2012.sln +++ b/build/cocos2d-win32.vc2012.sln @@ -1,8 +1,6 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libchipmunk", "..\external\chipmunk\proj.win32\chipmunk.vcxproj", "{207BC7A9-CCF1-4F2F-A04D-45F72242AE25}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cpp-tests", "..\tests\cpp-tests\proj.win32\cpp-tests.vcxproj", "{76A39BB2-9B84-4C65-98A5-654D86B86F2A}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lua-tests", "..\tests\lua-tests\project\proj.win32\lua-tests.win32.vcxproj", "{4E6A7A0E-DDD8-4BAA-8B22-C964069364ED}" @@ -11,14 +9,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cpp-empty-test", "..\tests\ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lua-empty-test", "..\tests\lua-empty-test\project\proj.win32\lua-empty-test.vcxproj", "{13E55395-94A2-4CD9-BFC2-1A051F80C17D}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbox2d", "..\external\Box2D\proj.win32\libbox2d.vcxproj", "{929480E7-23C0-4DF6-8456-096D71547116}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocos2d", "..\cocos\2d\libcocos2d.vcxproj", "{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libspine", "..\cocos\editor-support\spine\proj.win32\libspine.vcxproj", "{B7C2A162-DEC9-4418-972E-240AB3CBFCAE}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocosbuilder", "..\cocos\editor-support\cocosbuilder\proj.win32\libcocosbuilder.vcxproj", "{811C0DAB-7B96-4BD3-A154-B7572B58E4AB}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libluacocos2d", "..\cocos\scripting\lua-bindings\proj.win32\libluacocos2d.vcxproj", "{9F2D6CE6-C893-4400-B50C-6DB70CC2562F}" EndProject Global @@ -27,10 +19,6 @@ Global Release|Win32 = Release|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {207BC7A9-CCF1-4F2F-A04D-45F72242AE25}.Debug|Win32.ActiveCfg = Debug|Win32 - {207BC7A9-CCF1-4F2F-A04D-45F72242AE25}.Debug|Win32.Build.0 = Debug|Win32 - {207BC7A9-CCF1-4F2F-A04D-45F72242AE25}.Release|Win32.ActiveCfg = Release|Win32 - {207BC7A9-CCF1-4F2F-A04D-45F72242AE25}.Release|Win32.Build.0 = Release|Win32 {76A39BB2-9B84-4C65-98A5-654D86B86F2A}.Debug|Win32.ActiveCfg = Debug|Win32 {76A39BB2-9B84-4C65-98A5-654D86B86F2A}.Debug|Win32.Build.0 = Debug|Win32 {76A39BB2-9B84-4C65-98A5-654D86B86F2A}.Release|Win32.ActiveCfg = Release|Win32 @@ -47,22 +35,10 @@ Global {13E55395-94A2-4CD9-BFC2-1A051F80C17D}.Debug|Win32.Build.0 = Debug|Win32 {13E55395-94A2-4CD9-BFC2-1A051F80C17D}.Release|Win32.ActiveCfg = Release|Win32 {13E55395-94A2-4CD9-BFC2-1A051F80C17D}.Release|Win32.Build.0 = Release|Win32 - {929480E7-23C0-4DF6-8456-096D71547116}.Debug|Win32.ActiveCfg = Debug|Win32 - {929480E7-23C0-4DF6-8456-096D71547116}.Debug|Win32.Build.0 = Debug|Win32 - {929480E7-23C0-4DF6-8456-096D71547116}.Release|Win32.ActiveCfg = Release|Win32 - {929480E7-23C0-4DF6-8456-096D71547116}.Release|Win32.Build.0 = Release|Win32 {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Debug|Win32.ActiveCfg = Debug|Win32 {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Debug|Win32.Build.0 = Debug|Win32 {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Release|Win32.ActiveCfg = Release|Win32 {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Release|Win32.Build.0 = Release|Win32 - {B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Debug|Win32.ActiveCfg = Debug|Win32 - {B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Debug|Win32.Build.0 = Debug|Win32 - {B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Release|Win32.ActiveCfg = Release|Win32 - {B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Release|Win32.Build.0 = Release|Win32 - {811C0DAB-7B96-4BD3-A154-B7572B58E4AB}.Debug|Win32.ActiveCfg = Debug|Win32 - {811C0DAB-7B96-4BD3-A154-B7572B58E4AB}.Debug|Win32.Build.0 = Debug|Win32 - {811C0DAB-7B96-4BD3-A154-B7572B58E4AB}.Release|Win32.ActiveCfg = Release|Win32 - {811C0DAB-7B96-4BD3-A154-B7572B58E4AB}.Release|Win32.Build.0 = Release|Win32 {9F2D6CE6-C893-4400-B50C-6DB70CC2562F}.Debug|Win32.ActiveCfg = Debug|Win32 {9F2D6CE6-C893-4400-B50C-6DB70CC2562F}.Debug|Win32.Build.0 = Debug|Win32 {9F2D6CE6-C893-4400-B50C-6DB70CC2562F}.Release|Win32.ActiveCfg = Release|Win32 diff --git a/build/cocos2d_libs.xcodeproj/project.pbxproj b/build/cocos2d_libs.xcodeproj/project.pbxproj index 94b955d54f..5194d33aa3 100644 --- a/build/cocos2d_libs.xcodeproj/project.pbxproj +++ b/build/cocos2d_libs.xcodeproj/project.pbxproj @@ -2346,8 +2346,6 @@ 3EA3EDBB1991CDFA00645534 /* CCCamera.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCCamera.h; path = ../base/CCCamera.h; sourceTree = ""; }; 464AD6E3197EBB1400E502D8 /* pvr.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = pvr.cpp; path = ../base/pvr.cpp; sourceTree = ""; }; 464AD6E4197EBB1400E502D8 /* pvr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pvr.h; path = ../base/pvr.h; sourceTree = ""; }; - 46633BC2199DDB2F00F6E838 /* CCModuleManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCModuleManager.cpp; path = ../base/CCModuleManager.cpp; sourceTree = ""; }; - 46633BC3199DDB2F00F6E838 /* CCModuleManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCModuleManager.h; path = ../base/CCModuleManager.h; sourceTree = ""; }; 46A15FCC1807A544005B8026 /* AUTHORS */ = {isa = PBXFileReference; lastKnownFileType = text; name = AUTHORS; path = ../AUTHORS; sourceTree = ""; }; 46A15FCE1807A544005B8026 /* README.md */ = {isa = PBXFileReference; lastKnownFileType = text; name = README.md; path = ../README.md; sourceTree = ""; }; 46A15FE11807A56F005B8026 /* Export.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Export.h; sourceTree = ""; }; @@ -3075,8 +3073,6 @@ 1A570095180BC5B00088DEC7 /* base-nodes */ = { isa = PBXGroup; children = ( - 46633BC2199DDB2F00F6E838 /* CCModuleManager.cpp */, - 46633BC3199DDB2F00F6E838 /* CCModuleManager.h */, 15EFA20F198A2BB5000C57D3 /* CCProtectedNode.cpp */, 15EFA210198A2BB5000C57D3 /* CCProtectedNode.h */, 1A57009C180BC5D20088DEC7 /* CCNode.cpp */, diff --git a/cocos/2d/CCActionCatmullRom.cpp b/cocos/2d/CCActionCatmullRom.cpp index f916b195c7..ca866e930d 100644 --- a/cocos/2d/CCActionCatmullRom.cpp +++ b/cocos/2d/CCActionCatmullRom.cpp @@ -31,6 +31,7 @@ */ #include "base/ccMacros.h" #include "2d/CCActionCatmullRom.h" +#include "2d/CCNode.h" using namespace std; diff --git a/cocos/2d/CCActionCatmullRom.h b/cocos/2d/CCActionCatmullRom.h index bd19201628..f1ef53df96 100644 --- a/cocos/2d/CCActionCatmullRom.h +++ b/cocos/2d/CCActionCatmullRom.h @@ -38,11 +38,12 @@ #include #include "2d/CCActionInterval.h" -#include "2d/CCNode.h" #include "math/CCGeometry.h" NS_CC_BEGIN; +class Node; + /** * @addtogroup actions * @{ diff --git a/cocos/2d/CCActionGrid3D.cpp b/cocos/2d/CCActionGrid3D.cpp index bed68e66aa..b036895f5a 100644 --- a/cocos/2d/CCActionGrid3D.cpp +++ b/cocos/2d/CCActionGrid3D.cpp @@ -25,7 +25,6 @@ THE SOFTWARE. ****************************************************************************/ #include "2d/CCActionGrid3D.h" #include "base/CCDirector.h" -#include NS_CC_BEGIN // implementation of Waves3D diff --git a/cocos/2d/CCActionInstant.cpp b/cocos/2d/CCActionInstant.cpp index 1b5372520a..2dd6f871ff 100644 --- a/cocos/2d/CCActionInstant.cpp +++ b/cocos/2d/CCActionInstant.cpp @@ -28,7 +28,6 @@ #include "2d/CCActionInstant.h" #include "2d/CCNode.h" #include "2d/CCSprite.h" -#include "base/CCScriptSupport.h" #if defined(__GNUC__) && ((__GNUC__ >= 4) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 1))) #pragma GCC diagnostic ignored "-Wdeprecated-declarations" diff --git a/cocos/2d/CCActionInstant.h b/cocos/2d/CCActionInstant.h index e5428fc130..22c173ca8b 100644 --- a/cocos/2d/CCActionInstant.h +++ b/cocos/2d/CCActionInstant.h @@ -28,10 +28,7 @@ THE SOFTWARE. #ifndef __CCINSTANT_ACTION_H__ #define __CCINSTANT_ACTION_H__ -#include #include - -#include "CCStdC.h" #include "2d/CCAction.h" NS_CC_BEGIN diff --git a/cocos/2d/CCActionInterval.cpp b/cocos/2d/CCActionInterval.cpp index ac6fbdade3..977936e184 100644 --- a/cocos/2d/CCActionInterval.cpp +++ b/cocos/2d/CCActionInterval.cpp @@ -28,10 +28,12 @@ THE SOFTWARE. #include "2d/CCActionInterval.h" #include "2d/CCSprite.h" #include "2d/CCNode.h" +#include "2d/CCSpriteFrame.h" #include "CCStdC.h" #include "2d/CCActionInstant.h" #include "base/CCDirector.h" #include "base/CCEventCustom.h" +#include "base/CCEventDispatcher.h" #include diff --git a/cocos/2d/CCActionInterval.h b/cocos/2d/CCActionInterval.h index 8bf306a761..a4ad997a9f 100644 --- a/cocos/2d/CCActionInterval.h +++ b/cocos/2d/CCActionInterval.h @@ -30,15 +30,17 @@ THE SOFTWARE. #include -#include "2d/CCNode.h" #include "2d/CCAction.h" -#include "2d/CCSpriteFrame.h" #include "2d/CCAnimation.h" #include "base/CCProtocols.h" #include "base/CCVector.h" NS_CC_BEGIN +class Node; +class SpriteFrame; +class EventCustom; + /** * @addtogroup actions * @{ diff --git a/cocos/2d/CCActionManager.cpp b/cocos/2d/CCActionManager.cpp index dd13ef678b..1b52f5021e 100644 --- a/cocos/2d/CCActionManager.cpp +++ b/cocos/2d/CCActionManager.cpp @@ -28,6 +28,7 @@ THE SOFTWARE. #include "2d/CCActionManager.h" #include "2d/CCNode.h" +#include "2d/CCAction.h" #include "base/CCScheduler.h" #include "base/ccMacros.h" #include "base/ccCArray.h" diff --git a/cocos/2d/CCActionManager.h b/cocos/2d/CCActionManager.h index f19e2ff6dc..b0877e3302 100644 --- a/cocos/2d/CCActionManager.h +++ b/cocos/2d/CCActionManager.h @@ -35,6 +35,8 @@ THE SOFTWARE. NS_CC_BEGIN +class Action; + struct _hashElement; /** diff --git a/cocos/2d/CCActionTiledGrid.cpp b/cocos/2d/CCActionTiledGrid.cpp index 200b03f066..549c3726fe 100644 --- a/cocos/2d/CCActionTiledGrid.cpp +++ b/cocos/2d/CCActionTiledGrid.cpp @@ -28,7 +28,6 @@ THE SOFTWARE. #include "2d/CCNodeGrid.h" #include "base/CCDirector.h" #include "base/ccMacros.h" -#include NS_CC_BEGIN diff --git a/cocos/2d/CCAtlasNode.cpp b/cocos/2d/CCAtlasNode.cpp index 397729445a..38d5024b1a 100644 --- a/cocos/2d/CCAtlasNode.cpp +++ b/cocos/2d/CCAtlasNode.cpp @@ -32,9 +32,6 @@ THE SOFTWARE. #include "renderer/CCTextureCache.h" #include "renderer/CCRenderer.h" #include "renderer/CCGLProgram.h" -#include "renderer/CCGLProgramState.h" -#include "renderer/ccGLStateCache.h" -#include "math/TransformUtils.h" NS_CC_BEGIN diff --git a/cocos/2d/CCDrawNode.cpp b/cocos/2d/CCDrawNode.cpp index e942e11103..64170484df 100644 --- a/cocos/2d/CCDrawNode.cpp +++ b/cocos/2d/CCDrawNode.cpp @@ -25,9 +25,8 @@ #include "CCGL.h" #include "base/CCEventType.h" #include "base/CCConfiguration.h" -#include "renderer/CCCustomCommand.h" #include "renderer/CCRenderer.h" -#include "renderer/CCGLProgramState.h" +#include "renderer/ccGLStateCache.h" #include "base/CCDirector.h" #include "base/CCEventListenerCustom.h" #include "base/CCEventDispatcher.h" diff --git a/cocos/2d/CCDrawingPrimitives.cpp b/cocos/2d/CCDrawingPrimitives.cpp index 4cca20c1b6..39e53aa78d 100644 --- a/cocos/2d/CCDrawingPrimitives.cpp +++ b/cocos/2d/CCDrawingPrimitives.cpp @@ -41,13 +41,10 @@ THE SOFTWARE. #include #include -#include "base/ccTypes.h" -#include "base/ccMacros.h" #include "CCGL.h" #include "base/CCDirector.h" #include "renderer/ccGLStateCache.h" #include "renderer/CCGLProgramCache.h" -#include "renderer/CCGLProgram.h" #include "2d/CCActionCatmullRom.h" #include "renderer/CCRenderer.h" diff --git a/cocos/2d/CCFastTMXLayer.cpp b/cocos/2d/CCFastTMXLayer.cpp index e2646aa42a..522a4036a5 100644 --- a/cocos/2d/CCFastTMXLayer.cpp +++ b/cocos/2d/CCFastTMXLayer.cpp @@ -40,6 +40,7 @@ THE SOFTWARE. #include "2d/CCSprite.h" #include "renderer/CCTextureCache.h" #include "renderer/CCGLProgramCache.h" +#include "renderer/ccGLStateCache.h" #include "renderer/CCGLProgram.h" #include "base/CCDirector.h" #include "base/CCConfiguration.h" diff --git a/cocos/2d/CCFont.h b/cocos/2d/CCFont.h index d11acc2f09..d79d394730 100644 --- a/cocos/2d/CCFont.h +++ b/cocos/2d/CCFont.h @@ -27,11 +27,12 @@ #define _CCFont_h_ #include - #include "2d/CCLabel.h" NS_CC_BEGIN +class FontAtlas; + // fwd class FontAtlas; diff --git a/cocos/2d/CCFontAtlas.h b/cocos/2d/CCFontAtlas.h index 56a76bca29..73eb643ef9 100644 --- a/cocos/2d/CCFontAtlas.h +++ b/cocos/2d/CCFontAtlas.h @@ -27,7 +27,7 @@ #include "base/CCPlatformMacros.h" #include "base/CCRef.h" -#include "CCStdC.h" +#include "CCStdC.h" // ssize_t on windows #include #include diff --git a/cocos/2d/CCFontAtlasCache.cpp b/cocos/2d/CCFontAtlasCache.cpp index 4708744221..c067ccd39f 100644 --- a/cocos/2d/CCFontAtlasCache.cpp +++ b/cocos/2d/CCFontAtlasCache.cpp @@ -29,7 +29,8 @@ #include "2d/CCFontFNT.h" #include "2d/CCFontFreeType.h" -#include "CCFontCharMap.h" +#include "2d/CCFontAtlas.h" +#include "2d/CCFontCharMap.h" #include "base/CCDirector.h" NS_CC_BEGIN diff --git a/cocos/2d/CCFontAtlasCache.h b/cocos/2d/CCFontAtlasCache.h index 4e2c17c687..1fc473c22d 100644 --- a/cocos/2d/CCFontAtlasCache.h +++ b/cocos/2d/CCFontAtlasCache.h @@ -28,11 +28,12 @@ #include -#include "2d/CCFontAtlas.h" #include "2d/CCLabel.h" NS_CC_BEGIN +class FontAtlas; + class CC_DLL FontAtlasCache { public: diff --git a/cocos/2d/CCFontCharMap.cpp b/cocos/2d/CCFontCharMap.cpp index e19c5a0dd4..3d908edecb 100644 --- a/cocos/2d/CCFontCharMap.cpp +++ b/cocos/2d/CCFontCharMap.cpp @@ -23,10 +23,9 @@ THE SOFTWARE. ****************************************************************************/ -#include "CCFontCharMap.h" +#include "2d/CCFontCharMap.h" #include "2d/CCFontAtlas.h" #include "platform/CCFileUtils.h" -#include "base/ccUTF8.h" #include "base/CCDirector.h" #include "renderer/CCTextureCache.h" diff --git a/cocos/2d/CCFontCharMap.h b/cocos/2d/CCFontCharMap.h index 76b4fb7e10..c902a35192 100644 --- a/cocos/2d/CCFontCharMap.h +++ b/cocos/2d/CCFontCharMap.h @@ -26,7 +26,7 @@ #ifndef _CCFontCharMap_h_ #define _CCFontCharMap_h_ -#include "CCFont.h" +#include "2d/CCFont.h" NS_CC_BEGIN diff --git a/cocos/2d/CCFontFNT.cpp b/cocos/2d/CCFontFNT.cpp index 8c5cb16389..a4d86bf6a4 100644 --- a/cocos/2d/CCFontFNT.cpp +++ b/cocos/2d/CCFontFNT.cpp @@ -26,7 +26,6 @@ #include "2d/CCFontFNT.h" #include "base/uthash.h" #include "2d/CCFontAtlas.h" -#include "base/ccUTF8.h" #include "platform/CCFileUtils.h" #include "base/CCConfiguration.h" #include "base/CCDirector.h" diff --git a/cocos/2d/CCFontFreeType.cpp b/cocos/2d/CCFontFreeType.cpp index 6a4623d392..1972e41a60 100644 --- a/cocos/2d/CCFontFreeType.cpp +++ b/cocos/2d/CCFontFreeType.cpp @@ -25,8 +25,6 @@ THE SOFTWARE. #include "2d/CCFontFreeType.h" -#include -#include #include "base/CCDirector.h" #include "base/ccUTF8.h" #include "platform/CCFileUtils.h" diff --git a/cocos/2d/CCFontFreeType.h b/cocos/2d/CCFontFreeType.h index 681f009a3b..71e2f413f3 100644 --- a/cocos/2d/CCFontFreeType.h +++ b/cocos/2d/CCFontFreeType.h @@ -27,7 +27,6 @@ #define _FontFreetype_h_ #include "CCFont.h" -#include "base/CCData.h" #include #include diff --git a/cocos/2d/CCGrabber.h b/cocos/2d/CCGrabber.h index acf7595673..d53918d4bb 100644 --- a/cocos/2d/CCGrabber.h +++ b/cocos/2d/CCGrabber.h @@ -26,7 +26,6 @@ THE SOFTWARE. #ifndef __EFFECTS_CCGRABBER_H__ #define __EFFECTS_CCGRABBER_H__ -#include "base/CCConfiguration.h" #include "base/CCRef.h" #include "CCGL.h" diff --git a/cocos/2d/CCGrid.cpp b/cocos/2d/CCGrid.cpp index 1e43ad7d5b..27b5016fa8 100644 --- a/cocos/2d/CCGrid.cpp +++ b/cocos/2d/CCGrid.cpp @@ -23,18 +23,18 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ +#include "2d/CCGrid.h" #include "base/ccMacros.h" -#include "base/CCDirector.h" -#include "2d/CCGrabber.h" #include "base/ccUtils.h" -#include "2d/CCGrid.h" +#include "2d/CCNode.h" +#include "2d/CCGrabber.h" #include "renderer/CCGLProgram.h" #include "renderer/CCGLProgramCache.h" #include "renderer/ccGLStateCache.h" #include "renderer/CCRenderer.h" +#include "renderer/CCTexture2D.h" #include "CCGL.h" -#include "math/TransformUtils.h" NS_CC_BEGIN // implementation of GridBase @@ -321,21 +321,7 @@ void Grid3D::blit(void) // // Attributes // -#ifdef EMSCRIPTEN - // Size calculations from calculateVertexPoints(). - unsigned int numOfPoints = (_gridSize.width+1) * (_gridSize.height+1); - // position - setGLBufferData(_vertices, numOfPoints * sizeof(Vec3), 0); - glVertexAttribPointer(GLProgram::VERTEX_ATTRIB_POSITION, 3, GL_FLOAT, GL_FALSE, 0, 0); - - // texCoords - setGLBufferData(_texCoordinates, numOfPoints * sizeof(Vec2), 1); - glVertexAttribPointer(GLProgram::VERTEX_ATTRIB_TEX_COORD, 2, GL_FLOAT, GL_FALSE, 0, 0); - - setGLIndexData(_indices, n * 12, 0); - glDrawElements(GL_TRIANGLES, (GLsizei) n*6, GL_UNSIGNED_SHORT, 0); -#else // position glVertexAttribPointer(GLProgram::VERTEX_ATTRIB_POSITION, 3, GL_FLOAT, GL_FALSE, 0, _vertices); @@ -343,8 +329,6 @@ void Grid3D::blit(void) glVertexAttribPointer(GLProgram::VERTEX_ATTRIB_TEX_COORD, 2, GL_FLOAT, GL_FALSE, 0, _texCoordinates); glDrawElements(GL_TRIANGLES, (GLsizei) n*6, GL_UNSIGNED_SHORT, _indices); -#endif // EMSCRIPTEN - CC_INCREMENT_GL_DRAWN_BATCHES_AND_VERTICES(1,n*6); } void Grid3D::calculateVertexPoints(void) @@ -537,20 +521,7 @@ void TiledGrid3D::blit(void) // Attributes // GL::enableVertexAttribs( GL::VERTEX_ATTRIB_FLAG_POSITION | GL::VERTEX_ATTRIB_FLAG_TEX_COORD ); -#ifdef EMSCRIPTEN - int numQuads = _gridSize.width * _gridSize.height; - // position - setGLBufferData(_vertices, (numQuads*4*sizeof(Vec3)), 0); - glVertexAttribPointer(GLProgram::VERTEX_ATTRIB_POSITION, 3, GL_FLOAT, GL_FALSE, 0, 0); - - // texCoords - setGLBufferData(_texCoordinates, (numQuads*4*sizeof(Vec2)), 1); - glVertexAttribPointer(GLProgram::VERTEX_ATTRIB_TEX_COORD, 2, GL_FLOAT, GL_FALSE, 0, 0); - - setGLIndexData(_indices, n * 12, 0); - glDrawElements(GL_TRIANGLES, (GLsizei) n*6, GL_UNSIGNED_SHORT, 0); -#else // position glVertexAttribPointer(GLProgram::VERTEX_ATTRIB_POSITION, 3, GL_FLOAT, GL_FALSE, 0, _vertices); @@ -558,8 +529,6 @@ void TiledGrid3D::blit(void) glVertexAttribPointer(GLProgram::VERTEX_ATTRIB_TEX_COORD, 2, GL_FLOAT, GL_FALSE, 0, _texCoordinates); glDrawElements(GL_TRIANGLES, (GLsizei)n*6, GL_UNSIGNED_SHORT, _indices); -#endif // EMSCRIPTEN - CC_INCREMENT_GL_DRAWN_BATCHES_AND_VERTICES(1,n*6); } diff --git a/cocos/2d/CCGrid.h b/cocos/2d/CCGrid.h index 4e0c96f68d..54ef7f46d4 100644 --- a/cocos/2d/CCGrid.h +++ b/cocos/2d/CCGrid.h @@ -29,17 +29,13 @@ THE SOFTWARE. #include "base/CCRef.h" #include "base/ccTypes.h" #include "base/CCDirector.h" -#include "2d/CCNode.h" -#include "renderer/CCTexture2D.h" -#ifdef EMSCRIPTEN -#include "CCGLBufferedNode.h" -#endif // EMSCRIPTEN NS_CC_BEGIN class Texture2D; class Grabber; class GLProgram; +class Node; /** * @addtogroup effects @@ -108,9 +104,6 @@ protected: Grid3D is a 3D grid implementation. Each vertex has 3 dimensions: x,y,z */ class CC_DLL Grid3D : public GridBase -#ifdef EMSCRIPTEN -, public GLBufferedNode -#endif // EMSCRIPTEN { public: /** create one Grid */ @@ -171,9 +164,6 @@ protected: the tiles can be separated from the grid. */ class CC_DLL TiledGrid3D : public GridBase -#ifdef EMSCRIPTEN -, public GLBufferedNode -#endif // EMSCRIPTEN { public: /** create one Grid */ diff --git a/cocos/2d/CCLabel.cpp b/cocos/2d/CCLabel.cpp index 3ad34b2acf..5faed073ac 100644 --- a/cocos/2d/CCLabel.cpp +++ b/cocos/2d/CCLabel.cpp @@ -28,17 +28,14 @@ #include "2d/CCSprite.h" #include "2d/CCLabelTextFormatter.h" #include "base/ccUTF8.h" -#include "2d/CCSpriteFrame.h" #include "platform/CCFileUtils.h" #include "2d/CCFont.h" -#include "renderer/CCGLProgramState.h" #include "renderer/CCRenderer.h" +#include "renderer/ccGLStateCache.h" #include "base/CCDirector.h" #include "base/CCEventListenerCustom.h" #include "base/CCEventDispatcher.h" -#include "base/CCEventType.h" #include "base/CCEventCustom.h" -#include "base/CCProfiling.h" #include "deprecated/CCString.h" diff --git a/cocos/2d/CCLabel.h b/cocos/2d/CCLabel.h index de4173527c..c41f5c0da8 100644 --- a/cocos/2d/CCLabel.h +++ b/cocos/2d/CCLabel.h @@ -28,7 +28,6 @@ #define _COCOS2D_CCLABEL_H_ #include "2d/CCSpriteBatchNode.h" -#include "base/ccTypes.h" #include "renderer/CCCustomCommand.h" #include "2d/CCFontAtlas.h" diff --git a/cocos/2d/CCLabelAtlas.cpp b/cocos/2d/CCLabelAtlas.cpp index 886091396d..73bd834804 100644 --- a/cocos/2d/CCLabelAtlas.cpp +++ b/cocos/2d/CCLabelAtlas.cpp @@ -24,17 +24,11 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "CCLabelAtlas.h" +#include "2d/CCLabelAtlas.h" #include "renderer/CCTextureAtlas.h" -#include "2d/CCDrawingPrimitives.h" #include "platform/CCFileUtils.h" -#include "base/ccConfig.h" #include "base/CCDirector.h" #include "renderer/CCTextureCache.h" -#include "renderer/CCGLProgramCache.h" -#include "renderer/CCGLProgram.h" -#include "renderer/ccGLStateCache.h" -#include "math/TransformUtils.h" #include "deprecated/CCString.h" diff --git a/cocos/2d/CCLabelBMFont.cpp b/cocos/2d/CCLabelBMFont.cpp index bd6826f1b7..217975ba68 100644 --- a/cocos/2d/CCLabelBMFont.cpp +++ b/cocos/2d/CCLabelBMFont.cpp @@ -31,8 +31,7 @@ http://slick.cokeandcode.com/demos/hiero.jnlp (Free, Java) http://www.angelcode.com/products/bmfont/ (Free, Windows only) ****************************************************************************/ -#include "CCLabelBMFont.h" -#include "2d/CCDrawingPrimitives.h" +#include "2d/CCLabelBMFont.h" #include "deprecated/CCString.h" #include "2d/CCSprite.h" diff --git a/cocos/2d/CCLabelTTF.cpp b/cocos/2d/CCLabelTTF.cpp index e55a957768..7341c8df6f 100644 --- a/cocos/2d/CCLabelTTF.cpp +++ b/cocos/2d/CCLabelTTF.cpp @@ -23,7 +23,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ****************************************************************************/ -#include "CCLabelTTF.h" +#include "2d/CCLabelTTF.h" #include "2d/CCLabel.h" #include "deprecated/CCString.h" diff --git a/cocos/2d/CCLayer.cpp b/cocos/2d/CCLayer.cpp index 753f744c88..b3da6235a8 100644 --- a/cocos/2d/CCLayer.cpp +++ b/cocos/2d/CCLayer.cpp @@ -29,10 +29,6 @@ THE SOFTWARE. #include "2d/CCLayer.h" #include "base/CCScriptSupport.h" #include "platform/CCDevice.h" -#include "2d/CCScene.h" -#include "renderer/CCGLProgramState.h" -#include "renderer/CCGLProgram.h" -#include "renderer/CCCustomCommand.h" #include "renderer/CCRenderer.h" #include "renderer/ccGLStateCache.h" #include "base/CCDirector.h" @@ -43,7 +39,7 @@ THE SOFTWARE. #include "base/CCEventListenerKeyboard.h" #include "base/CCEventAcceleration.h" #include "base/CCEventListenerAcceleration.h" -#include "math/TransformUtils.h" + #include "deprecated/CCString.h" diff --git a/cocos/2d/CCLayer.h b/cocos/2d/CCLayer.h index 08abcb3201..fade59b2e2 100644 --- a/cocos/2d/CCLayer.h +++ b/cocos/2d/CCLayer.h @@ -30,15 +30,8 @@ THE SOFTWARE. #include "2d/CCNode.h" #include "base/CCProtocols.h" -#include "base/CCEventTouch.h" -#ifdef EMSCRIPTEN -#include "CCGLBufferedNode.h" -#endif // EMSCRIPTEN - -#include "base/CCEventKeyboard.h" #include "renderer/CCCustomCommand.h" -#include "physics/CCPhysicsWorld.h" NS_CC_BEGIN @@ -54,6 +47,8 @@ class EventListenerTouch; class EventListenerKeyboard; class EventListenerAcceleration; +class Touch; + // // Layer // @@ -246,9 +241,6 @@ All features from Layer are valid, plus the following new features: - RGB colors */ class CC_DLL LayerColor : public Layer, public BlendProtocol -#ifdef EMSCRIPTEN -, public GLBufferedNode -#endif // EMSCRIPTEN { public: /** creates a fullscreen black layer */ diff --git a/cocos/2d/CCMenu.cpp b/cocos/2d/CCMenu.cpp index 5d9a861e48..bba717aa6f 100644 --- a/cocos/2d/CCMenu.cpp +++ b/cocos/2d/CCMenu.cpp @@ -28,6 +28,7 @@ THE SOFTWARE. #include "base/CCTouch.h" #include "CCStdC.h" #include "base/CCEventListenerTouch.h" +#include "base/CCEventDispatcher.h" #include "deprecated/CCString.h" #include diff --git a/cocos/2d/CCMenu.h b/cocos/2d/CCMenu.h index 31b9ef6120..e49932beb6 100644 --- a/cocos/2d/CCMenu.h +++ b/cocos/2d/CCMenu.h @@ -28,11 +28,10 @@ THE SOFTWARE. #include "2d/CCMenuItem.h" #include "2d/CCLayer.h" -#include "base/CCVector.h" -#include "base/CCEventTouch.h" #include "base/CCValue.h" NS_CC_BEGIN +class Touch; /** * @addtogroup GUI diff --git a/cocos/2d/CCNode.cpp b/cocos/2d/CCNode.cpp index fb42ac4ea2..a3f3d002ce 100644 --- a/cocos/2d/CCNode.cpp +++ b/cocos/2d/CCNode.cpp @@ -1,3 +1,5 @@ + + /**************************************************************************** Copyright (c) 2008-2010 Ricardo Quesada Copyright (c) 2009 Valentin Milea @@ -34,26 +36,20 @@ THE SOFTWARE. #include "base/CCDirector.h" #include "base/CCScheduler.h" -#include "base/CCTouch.h" #include "base/CCEventDispatcher.h" -#include "base/CCEvent.h" -#include "base/CCEventTouch.h" -#include "base/ccCArray.h" #include "base/CCCamera.h" -#include "2d/CCGrid.h" #include "2d/CCActionManager.h" -#include "base/CCScriptSupport.h" #include "2d/CCScene.h" #include "2d/CCComponent.h" #include "2d/CCComponentContainer.h" #include "renderer/CCGLProgram.h" -#include "renderer/CCGLProgramState.h" #include "math/TransformUtils.h" #include "deprecated/CCString.h" #if CC_USE_PHYSICS #include "physics/CCPhysicsBody.h" +#include "physics/CCPhysicsWorld.h" #endif diff --git a/cocos/2d/CCNode.h b/cocos/2d/CCNode.h index 186d8b3fca..c8b79e9498 100644 --- a/cocos/2d/CCNode.h +++ b/cocos/2d/CCNode.h @@ -30,14 +30,11 @@ #define __CCNODE_H__ #include "base/ccMacros.h" -#include "base/CCEventDispatcher.h" #include "base/CCVector.h" -#include "base/CCScriptSupport.h" #include "base/CCProtocols.h" +#include "base/CCScriptSupport.h" #include "math/CCAffineTransform.h" #include "math/CCMath.h" -#include "renderer/ccGLStateCache.h" -#include "CCGL.h" NS_CC_BEGIN diff --git a/cocos/2d/CCScene.cpp b/cocos/2d/CCScene.cpp index e9a7976ea9..b6a729f1d0 100644 --- a/cocos/2d/CCScene.cpp +++ b/cocos/2d/CCScene.cpp @@ -30,12 +30,12 @@ THE SOFTWARE. #include "base/CCCamera.h" #include "base/CCEventDispatcher.h" #include "base/CCEventListenerCustom.h" -#include "2d/CCLayer.h" -#include "2d/CCSprite.h" -#include "2d/CCSpriteBatchNode.h" -#include "physics/CCPhysicsWorld.h" #include "deprecated/CCString.h" +#if CC_USE_PHYSICS +#include "physics/CCPhysicsWorld.h" +#endif + NS_CC_BEGIN Scene::Scene() @@ -116,6 +116,24 @@ Scene* Scene::getScene() const return const_cast(this); } +void Scene::onProjectionChanged(EventCustom* event) +{ + if (_defaultCamera) + { + _defaultCamera->initDefault(); + } +} + +void Scene::setAmbientColor( const Color4F &color ) +{ + _ambientColor = color; +} + +const Color4F& Scene::getAmbientColor() const +{ + return _ambientColor; +} + #if CC_USE_PHYSICS void Scene::addChild(Node* child, int zOrder, int tag) { @@ -193,24 +211,6 @@ void Scene::addChildToPhysicsWorld(Node* child) } } -void Scene::onProjectionChanged(EventCustom* event) -{ - if (_defaultCamera) - { - _defaultCamera->initDefault(); - } -} - -void Scene::setAmbientColor( const Color4F &color ) -{ - _ambientColor = color; -} - -const Color4F& Scene::getAmbientColor() const -{ - return _ambientColor; -} - #endif NS_CC_END diff --git a/cocos/2d/CCScene.h b/cocos/2d/CCScene.h index 6ef4a8f30f..bf204fde88 100644 --- a/cocos/2d/CCScene.h +++ b/cocos/2d/CCScene.h @@ -30,12 +30,16 @@ THE SOFTWARE. #include #include "2d/CCNode.h" -#include "physics/CCPhysicsWorld.h" NS_CC_BEGIN class Camera; class Light3D; +class EventListenerCustom; +class EventCustom; +#if CC_USE_PHYSICS +class PhysicsWorld; +#endif /** * @addtogroup scene * @{ @@ -101,6 +105,7 @@ protected: friend class Camera; friend class Director; friend class Light3D; + friend class Renderer; std::vector _cameras; //weak ref to Camera Camera* _defaultCamera; //weak ref, default camera created by scene, _cameras[0], Caution that the default camera can not be added to _cameras before onEnter is called diff --git a/cocos/2d/CCTransition.cpp b/cocos/2d/CCTransition.cpp index 7546bd9a34..f2c1429790 100644 --- a/cocos/2d/CCTransition.cpp +++ b/cocos/2d/CCTransition.cpp @@ -26,7 +26,6 @@ THE SOFTWARE. ****************************************************************************/ #include "2d/CCTransition.h" -#include "base/CCDirector.h" #include "2d/CCActionInterval.h" #include "2d/CCActionInstant.h" #include "2d/CCActionEase.h" @@ -36,6 +35,8 @@ THE SOFTWARE. #include "2d/CCLayer.h" #include "2d/CCRenderTexture.h" #include "2d/CCNodeGrid.h" +#include "base/CCDirector.h" +#include "base/CCEventDispatcher.h" NS_CC_BEGIN diff --git a/cocos/2d/CCTransition.h b/cocos/2d/CCTransition.h index e86aa06394..bc7e58e461 100644 --- a/cocos/2d/CCTransition.h +++ b/cocos/2d/CCTransition.h @@ -29,7 +29,6 @@ THE SOFTWARE. #define __CCTRANSITION_H__ #include "2d/CCScene.h" -#include "base/ccTypes.h" NS_CC_BEGIN diff --git a/cocos/2d/CCTransitionPageTurn.cpp b/cocos/2d/CCTransitionPageTurn.cpp index 83264a2a4a..25a3860da0 100644 --- a/cocos/2d/CCTransitionPageTurn.cpp +++ b/cocos/2d/CCTransitionPageTurn.cpp @@ -26,9 +26,6 @@ THE SOFTWARE. #include "2d/CCTransitionPageTurn.h" #include "base/CCDirector.h" -#include "2d/CCActionInterval.h" -#include "2d/CCActionInstant.h" -#include "2d/CCActionGrid.h" #include "2d/CCActionPageTurn3D.h" #include "2d/CCNodeGrid.h" #include "renderer/CCRenderer.h" diff --git a/cocos/2d/CCTransitionProgress.cpp b/cocos/2d/CCTransitionProgress.cpp index 867661e247..19315f1bc8 100644 --- a/cocos/2d/CCTransitionProgress.cpp +++ b/cocos/2d/CCTransitionProgress.cpp @@ -30,7 +30,6 @@ THE SOFTWARE. #include "base/CCDirector.h" #include "2d/CCRenderTexture.h" #include "2d/CCProgressTimer.h" -#include "2d/CCLayer.h" #include "2d/CCActionInstant.h" #include "2d/CCActionProgressTimer.h" diff --git a/cocos/2d/CCTweenFunction.cpp b/cocos/2d/CCTweenFunction.cpp index 36cdf66d68..3432469d17 100644 --- a/cocos/2d/CCTweenFunction.cpp +++ b/cocos/2d/CCTweenFunction.cpp @@ -24,6 +24,10 @@ THE SOFTWARE. #include "2d/CCTweenFunction.h" +#define _USE_MATH_DEFINES // needed for M_PI and M_PI2 +#include // M_PI +#undef _USE_MATH_DEFINES + NS_CC_BEGIN namespace tweenfunc { diff --git a/cocos/2d/CCTweenFunction.h b/cocos/2d/CCTweenFunction.h index e9bf6e21c5..b825e30221 100644 --- a/cocos/2d/CCTweenFunction.h +++ b/cocos/2d/CCTweenFunction.h @@ -26,8 +26,6 @@ THE SOFTWARE. #define __CCTWEENFUNCTION_H__ #include "base/CCPlatformMacros.h" -#include "base/ccMacros.h" -#include NS_CC_BEGIN diff --git a/cocos/2d/cocos2dx.props b/cocos/2d/cocos2dx.props index 4e347ee14b..543f4ab5cc 100644 --- a/cocos/2d/cocos2dx.props +++ b/cocos/2d/cocos2dx.props @@ -7,7 +7,7 @@ - opengl32.lib;glew32.lib;libzlib.lib;libpng.lib;libjpeg.lib;libtiff.lib;libwebp.lib;libiconv.lib;glfw3.lib;freetype250.lib;winmm.lib;ws2_32.lib;%(AdditionalDependencies) + opengl32.lib;glew32.lib;libzlib.lib;libpng.lib;libjpeg.lib;libtiff.lib;libwebp.lib;libiconv.lib;glfw3.lib;freetype250.lib;winmm.lib;ws2_32.lib;libchipmunk.lib;libbox2d.lib;libspine.lib;%(AdditionalDependencies) $(OutDir);%(AdditionalLibraryDirectories) false diff --git a/cocos/2d/libcocos2d.vcxproj b/cocos/2d/libcocos2d.vcxproj index c87b6d06e5..2e2f446866 100644 --- a/cocos/2d/libcocos2d.vcxproj +++ b/cocos/2d/libcocos2d.vcxproj @@ -104,7 +104,9 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\zlib\prebuilt\*.*" "$(Ou xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\icon\prebuilt\*.*" "$(OutDir)" xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(OutDir)" xcopy /Y /Q "$(ProjectDir)..\..\external\sqlite3\libraries\win32\*.*" "$(OutDir)" - +xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\chipmunk\prebuilt\debug-lib\*.*" "$(OutDir)" +xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\box2d\prebuilt\debug-lib\*.*" "$(OutDir)" +xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\spine\prebuilt\debug-lib\*.*" "$(OutDir)" $(OutDir)$(ProjectName).dll @@ -116,7 +118,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\sqlite3\libraries\win32\*.*" "$(OutDir) $(TargetDir)$(TargetName).lib MachineX86 cocos2d.def - libchipmunk.lib;sqlite3.lib;libcurl_imp.lib;libBox2D.lib;websockets.lib;%(AdditionalDependencies) + sqlite3.lib;libcurl_imp.lib;websockets.lib;%(AdditionalDependencies) @@ -129,7 +131,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\sqlite3\libraries\win32\*.*" "$(OutDir) - $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;$(EngineRoot)external\sqlite3\include;$(EngineRoot)external\unzip;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\png\include\win32;$(EngineRoot)external\jpeg\include\win32;$(EngineRoot)external\tiff\include\win32;$(EngineRoot)external\webp\include\win32;$(EngineRoot)external\freetype2\include\win32;$(EngineRoot)external\win32-specific\icon\include;$(EngineRoot)external\win32-specific\zlib\include;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external\xxhash;$(EngineRoot)external\ConvertUTF;$(EngineRoot)external\Box2d;$(EngineRoot)external\curl\include\win32;$(EngineRoot)external\websockets\win32\include;$(EngineRoot)external;$(EngineRoot)cocos;$(EngineRoot)cocos\editor-support;$(EngineRoot)cocos\audio\include;$(EngineRoot)extensions;$(EngineRoot);%(AdditionalIncludeDirectories) + $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;$(EngineRoot)external\sqlite3\include;$(EngineRoot)external\unzip;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\png\include\win32;$(EngineRoot)external\jpeg\include\win32;$(EngineRoot)external\tiff\include\win32;$(EngineRoot)external\webp\include\win32;$(EngineRoot)external\freetype2\include\win32;$(EngineRoot)external\win32-specific\icon\include;$(EngineRoot)external\win32-specific\zlib\include;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external\xxhash;$(EngineRoot)external\ConvertUTF;$(EngineRoot)external\Box2d;$(EngineRoot)external\curl\include\win32;$(EngineRoot)external\websockets\include\win32\;$(EngineRoot)external;$(EngineRoot)cocos;$(EngineRoot)cocos\editor-support;$(EngineRoot)cocos\audio\include;$(EngineRoot)extensions;$(EngineRoot);%(AdditionalIncludeDirectories) WIN32;_USRDLL;NDEBUG;_WINDOWS;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_USE3DDLL;_EXPORT_DLL_;_USRSTUDIODLL;_USREXDLL;_USEGUIDLL;CC_ENABLE_CHIPMUNK_INTEGRATION=1;%(PreprocessorDefinitions) MultiThreadedDLL @@ -155,10 +157,12 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\websockets\prebuilt\win32\*.*" "$(OutDi xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\zlib\prebuilt\*.*" "$(OutDir)" xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\icon\prebuilt\*.*" "$(OutDir)" xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(OutDir)" - +xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\chipmunk\prebuilt\release-lib\*.*" "$(OutDir)" +xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\box2d\prebuilt\release-lib\*.*" "$(OutDir)" +xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\spine\prebuilt\release-lib\*.*" "$(OutDir)" - libchipmunk.lib;sqlite3.lib;libcurl_imp.lib;libBox2D.lib;websockets.lib;%(AdditionalDependencies) + sqlite3.lib;libcurl_imp.lib;websockets.lib;%(AdditionalDependencies) $(OutDir)$(ProjectName).dll $(OutDir);%(AdditionalLibraryDirectories) ;%(IgnoreSpecificDefaultLibraries) @@ -274,6 +278,28 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou + + + + + + + + + + + + + + + + + + + + + + @@ -609,6 +635,33 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -836,24 +889,6 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou - - - {929480e7-23c0-4df6-8456-096d71547116} - false - true - false - true - false - - - {207bc7a9-ccf1-4f2f-a04d-45f72242ae25} - false - true - false - true - false - - diff --git a/cocos/2d/libcocos2d.vcxproj.filters b/cocos/2d/libcocos2d.vcxproj.filters index ce2de86afc..8aec45df56 100644 --- a/cocos/2d/libcocos2d.vcxproj.filters +++ b/cocos/2d/libcocos2d.vcxproj.filters @@ -202,6 +202,15 @@ {d48c8016-e933-48dd-a5c0-202b0a84b82a} + + {e25a6c9d-eaf2-446f-b9b2-d89fd21a9bdd} + + + {bbba68d3-e519-4e06-8a01-d8ee89b544f2} + + + {8579ed15-b266-4f80-818d-a3a9251c4248} + @@ -1093,6 +1102,72 @@ 3d + + cocosbuilder\Source Files + + + cocosbuilder\Source Files + + + cocosbuilder\Source Files + + + cocosbuilder\Source Files + + + cocosbuilder\Source Files + + + cocosbuilder\Source Files + + + cocosbuilder\Source Files + + + cocosbuilder\Source Files + + + cocosbuilder\Source Files + + + cocosbuilder\Source Files + + + cocosbuilder\Source Files + + + cocosbuilder\Source Files + + + cocosbuilder\Source Files + + + cocosbuilder\Source Files + + + cocosbuilder\Source Files + + + cocosbuilder\Source Files + + + cocosbuilder\Source Files + + + cocosbuilder\Source Files + + + cocosbuilder\Source Files + + + cocosbuilder\Source Files + + + cocosbuilder\Source Files + + + cocosbuilder\Source Files + @@ -2140,6 +2215,87 @@ 3d + + cocosbuilder\Header Files + + + cocosbuilder\Header Files + + + cocosbuilder\Header Files + + + cocosbuilder\Header Files + + + cocosbuilder\Header Files + + + cocosbuilder\Header Files + + + cocosbuilder\Header Files + + + cocosbuilder\Header Files + + + cocosbuilder\Header Files + + + cocosbuilder\Header Files + + + cocosbuilder\Header Files + + + cocosbuilder\Header Files + + + cocosbuilder\Header Files + + + cocosbuilder\Header Files + + + cocosbuilder\Header Files + + + cocosbuilder\Header Files + + + cocosbuilder\Header Files + + + cocosbuilder\Header Files + + + cocosbuilder\Header Files + + + cocosbuilder\Header Files + + + cocosbuilder\Header Files + + + cocosbuilder\Header Files + + + cocosbuilder\Header Files + + + cocosbuilder\Header Files + + + cocosbuilder\Header Files + + + cocosbuilder\Header Files + + + cocosbuilder\Header Files + diff --git a/cocos/3d/Android.mk b/cocos/3d/Android.mk deleted file mode 100644 index ff4ffa8101..0000000000 --- a/cocos/3d/Android.mk +++ /dev/null @@ -1,32 +0,0 @@ -LOCAL_PATH := $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_MODULE := cocos3d_static - -LOCAL_MODULE_FILENAME := libcocos3d - -LOCAL_SRC_FILES := \ -CCRay.cpp \ -CCAABB.cpp \ -CCOBB.cpp \ -CCAnimate3D.cpp \ -CCAnimation3D.cpp \ -CCAttachNode.cpp \ -CCBundle3D.cpp \ -CCBundleReader.cpp \ -CCMesh.cpp \ -CCMeshSkin.cpp \ -CCMeshVertexIndexData.cpp \ -CCSprite3DMaterial.cpp \ -CCObjLoader.cpp \ -CCSkeleton3D.cpp \ -CCSprite3D.cpp \ - -LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/.. - -LOCAL_C_INCLUDES := $(LOCAL_PATH)/.. \ - $(LOCAL_PATH)/../../external \ - -LOCAL_WHOLE_STATIC_LIBRARIES := cocos2dx_static - -include $(BUILD_STATIC_LIBRARY) diff --git a/cocos/3d/CCAnimate3D.cpp b/cocos/3d/CCAnimate3D.cpp index c359194843..0aff12f2d1 100644 --- a/cocos/3d/CCAnimate3D.cpp +++ b/cocos/3d/CCAnimate3D.cpp @@ -96,17 +96,19 @@ void Animate3D::startWithTarget(Node *target) _boneCurves.clear(); auto skin = sprite->getSkeleton(); + bool hasCurve = false; for (unsigned int i = 0; i < skin->getBoneCount(); i++) { auto bone = skin->getBoneByIndex(i); auto curve = _animation->getBoneCurveByName(bone->getName()); if (curve) { _boneCurves[bone] = curve; + hasCurve = true; } - else - { - CCLOG("warning: bone %s not find in animation", bone->getName().c_str()); - } + } + if (!hasCurve) + { + CCLOG("warning: no animation finde for the skeleton"); } } diff --git a/cocos/3d/CCBundle3D.cpp b/cocos/3d/CCBundle3D.cpp index 8c8bbab2f8..b1a8020eec 100644 --- a/cocos/3d/CCBundle3D.cpp +++ b/cocos/3d/CCBundle3D.cpp @@ -1202,6 +1202,10 @@ bool Bundle3D::loadAnimationDataJson(Animation3DData* animationdata) { const rapidjson::Value& bone_keyframes = bone[KEYFRAMES]; rapidjson::SizeType keyframe_size = bone_keyframes.Size(); + animationdata->_rotationKeys[bone_name].reserve(keyframe_size); + animationdata->_scaleKeys[bone_name].reserve(keyframe_size); + animationdata->_translationKeys[bone_name].reserve(keyframe_size); + for (rapidjson::SizeType j = 0; j < keyframe_size; j++) { const rapidjson::Value& bone_keyframe = bone_keyframes[j]; @@ -1627,6 +1631,10 @@ bool Bundle3D::loadAnimationDataBinary(Animation3DData* animationdata) CCLOGINFO("Failed to read AnimationData: keyframeNum '%s'.", _path.c_str()); return false; } + + animationdata->_rotationKeys[boneName].reserve(keyframeNum); + animationdata->_scaleKeys[boneName].reserve(keyframeNum); + animationdata->_translationKeys[boneName].reserve(keyframeNum); for (unsigned int j = 0; j < keyframeNum; ++j) { diff --git a/cocos/3d/proj.win32/libcocos3d.vcxproj b/cocos/3d/proj.win32/libcocos3d.vcxproj deleted file mode 100644 index b4597e95f9..0000000000 --- a/cocos/3d/proj.win32/libcocos3d.vcxproj +++ /dev/null @@ -1,146 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - - {98a51ba8-fc3a-415b-ac8f-8c7bd464e93e} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {E24950FA-5BC1-4AEE-A900-4F0259354BF0} - libcocos3d - libcocos3d - - - - DynamicLibrary - true - v100 - v110 - v110_xp - v120 - v120_xp - Unicode - - - DynamicLibrary - false - v100 - v110 - v110_xp - v120 - v120_xp - true - Unicode - - - - - - - - - - - - - - - $(SolutionDir)$(Configuration).win32\ - $(Configuration).win32\ - - - $(SolutionDir)$(Configuration).win32\ - $(Configuration).win32\ - - - - Level3 - Disabled - - - $(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)external;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_USE3DDLL;%(PreprocessorDefinitions) - true - 4267;4251;4244;%(DisableSpecificWarnings) - false - OldStyle - - - true - $(OutDir);%(AdditionalLibraryDirectories) - opengl32.lib;glew32.lib;%(AdditionalDependencies) - - - - - Level3 - MinSpace - true - true - - - WIN32;_WINDOWS;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_USE3DDLL;%(PreprocessorDefinitions) - $(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)external;%(AdditionalIncludeDirectories) - None - false - - - true - true - true - $(OutDir);%(AdditionalLibraryDirectories) - opengl32.lib;glew32.lib;%(AdditionalDependencies) - - - - - - \ No newline at end of file diff --git a/cocos/3d/proj.win32/libcocos3d.vcxproj.filters b/cocos/3d/proj.win32/libcocos3d.vcxproj.filters deleted file mode 100644 index efcac73276..0000000000 --- a/cocos/3d/proj.win32/libcocos3d.vcxproj.filters +++ /dev/null @@ -1,114 +0,0 @@ - - - - - {6107c94d-579b-488f-86b7-c191d4c3b9aa} - - - - - 3d - - - 3d - - - 3d - - - 3d - - - 3d - - - 3d - - - 3d - - - 3d - - - 3d - - - 3d - - - 3d - - - 3d - - - 3d - - - 3d - - - 3d - - - - - 3d - - - 3d - - - 3d - - - 3d - - - 3d - - - 3d - - - 3d - - - 3d - - - 3d - - - 3d - - - 3d - - - 3d - - - 3d - - - 3d - - - 3d - - - 3d - - - 3d - - - 3d - - - 3d - - - \ No newline at end of file diff --git a/cocos/3d/proj.win32/libcocos3d.vcxproj.user b/cocos/3d/proj.win32/libcocos3d.vcxproj.user deleted file mode 100644 index a375ae3527..0000000000 --- a/cocos/3d/proj.win32/libcocos3d.vcxproj.user +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/cocos/Android.mk b/cocos/Android.mk index 7b2e999f32..dbd680a8c1 100644 --- a/cocos/Android.mk +++ b/cocos/Android.mk @@ -6,6 +6,8 @@ LOCAL_MODULE := cocos2dx_static LOCAL_MODULE_FILENAME := libcocos2d +LOCAL_SHORT_COMMANDS := true + LOCAL_SRC_FILES := \ cocos2d.cpp \ 2d/CCAction.cpp \ @@ -196,7 +198,6 @@ LOCAL_SRC_FILES += 3d/CCRay.cpp \ 3d/CCMesh.cpp \ 3d/CCMeshSkin.cpp \ 3d/CCMeshVertexIndexData.cpp \ - 3d/CCSprite3DMaterial.cpp \ 3d/CCObjLoader.cpp \ 3d/CCSkeleton3D.cpp \ 3d/CCSprite3D.cpp \ diff --git a/cocos/audio/android/Android.mk b/cocos/audio/android/Android.mk deleted file mode 100644 index 3854fa79d7..0000000000 --- a/cocos/audio/android/Android.mk +++ /dev/null @@ -1,18 +0,0 @@ -LOCAL_PATH := $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_MODULE := cocosdenshion_static - -LOCAL_MODULE_FILENAME := libcocosdenshion - -LOCAL_SRC_FILES := cddSimpleAudioEngine.cpp \ - ccdandroidUtils.cpp \ - jni/cddandroidAndroidJavaEngine.cpp - -LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../include - -LOCAL_C_INCLUDES := $(LOCAL_PATH)/../include \ - $(LOCAL_PATH)/../.. \ - $(LOCAL_PATH)/../../platform/android - -include $(BUILD_STATIC_LIBRARY) diff --git a/cocos/audio/proj.win32/libcocosdenshion.vcxproj b/cocos/audio/proj.win32/libcocosdenshion.vcxproj deleted file mode 100644 index d1d4ca0d67..0000000000 --- a/cocos/audio/proj.win32/libcocosdenshion.vcxproj +++ /dev/null @@ -1,132 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - libcocosdenshion - {F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6} - CocosDenshion.win32 - Win32Proj - - - - DynamicLibrary - NotSet - v100 - v110 - v110_xp - v120 - v120_xp - - - DynamicLibrary - NotSet - v100 - v110 - v110_xp - v120 - v120_xp - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(Configuration).win32\ - $(Configuration).win32\ - false - $(SolutionDir)$(Configuration).win32\ - $(Configuration).win32\ - false - AllRules.ruleset - - - AllRules.ruleset - - - - - $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\lib;$(LibraryPath) - - - $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\lib;$(LibraryPath) - - - - Disabled - $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;..\Include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_EXPORT_DLL_;%(PreprocessorDefinitions) - false - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - 4251 - true - - - winmm.lib;libcocos2d.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName).dll - true - Windows - $(OutDir)$(TargetName).lib - MachineX86 - $(OutDir) - - - - - $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;..\Include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_EXPORT_DLL_;%(PreprocessorDefinitions) - MultiThreadedDLL - - - Level3 - None - 4251 - true - MinSpace - false - - - winmm.lib;libcocos2d.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName).dll - true - Windows - true - true - $(OutDir)$(TargetName).lib - MachineX86 - $(OutDir) - - - - - {98a51ba8-fc3a-415b-ac8f-8c7bd464e93e} - - - - - - \ No newline at end of file diff --git a/cocos/audio/proj.win32/libcocosdenshion.vcxproj.filters b/cocos/audio/proj.win32/libcocosdenshion.vcxproj.filters deleted file mode 100644 index 78452f51a2..0000000000 --- a/cocos/audio/proj.win32/libcocosdenshion.vcxproj.filters +++ /dev/null @@ -1,9 +0,0 @@ - - - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx - - - \ No newline at end of file diff --git a/cocos/audio/proj.win32/libcocosdenshion.vcxproj.user b/cocos/audio/proj.win32/libcocosdenshion.vcxproj.user deleted file mode 100644 index ace9a86acb..0000000000 --- a/cocos/audio/proj.win32/libcocosdenshion.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/cocos/base/CCDirector.cpp b/cocos/base/CCDirector.cpp index 30518792db..fc5f588ee8 100644 --- a/cocos/base/CCDirector.cpp +++ b/cocos/base/CCDirector.cpp @@ -1166,9 +1166,15 @@ void Director::getFPSImageData(unsigned char** datapointer, ssize_t* length) void Director::createStatsLabel() { Texture2D *texture = nullptr; - + std::string fpsString = "00.0"; + std::string drawBatchString = "000"; + std::string drawVerticesString = "00000"; if (_FPSLabel) { + fpsString = _FPSLabel->getString(); + drawBatchString = _drawnBatchesLabel->getString(); + drawVerticesString = _drawnVerticesLabel->getString(); + CC_SAFE_RELEASE_NULL(_FPSLabel); CC_SAFE_RELEASE_NULL(_drawnBatchesLabel); CC_SAFE_RELEASE_NULL(_drawnVerticesLabel); @@ -1205,19 +1211,19 @@ void Director::createStatsLabel() _FPSLabel = LabelAtlas::create(); _FPSLabel->retain(); _FPSLabel->setIgnoreContentScaleFactor(true); - _FPSLabel->initWithString("00.0", texture, 12, 32 , '.'); + _FPSLabel->initWithString(fpsString, texture, 12, 32 , '.'); _FPSLabel->setScale(scaleFactor); _drawnBatchesLabel = LabelAtlas::create(); _drawnBatchesLabel->retain(); _drawnBatchesLabel->setIgnoreContentScaleFactor(true); - _drawnBatchesLabel->initWithString("000", texture, 12, 32, '.'); + _drawnBatchesLabel->initWithString(drawBatchString, texture, 12, 32, '.'); _drawnBatchesLabel->setScale(scaleFactor); _drawnVerticesLabel = LabelAtlas::create(); _drawnVerticesLabel->retain(); _drawnVerticesLabel->setIgnoreContentScaleFactor(true); - _drawnVerticesLabel->initWithString("00000", texture, 12, 32, '.'); + _drawnVerticesLabel->initWithString(drawVerticesString, texture, 12, 32, '.'); _drawnVerticesLabel->setScale(scaleFactor); diff --git a/cocos/cocos2d-prefix.pch b/cocos/cocos2d-prefix.pch index fec5647078..0ecf6d58e4 100644 --- a/cocos/cocos2d-prefix.pch +++ b/cocos/cocos2d-prefix.pch @@ -5,3 +5,7 @@ #ifdef __OBJC__ #import #endif + +#ifdef __cplusplus +#include "cocos2d.h" +#endif diff --git a/cocos/cocos2d.h b/cocos/cocos2d.h index 2998a244b6..0bd428f97d 100644 --- a/cocos/cocos2d.h +++ b/cocos/cocos2d.h @@ -278,6 +278,9 @@ THE SOFTWARE. // CCDeprecated.h must be included at the end #include "deprecated/CCDeprecated.h" +//3d +#include "3d/cocos3d.h" + NS_CC_BEGIN diff --git a/cocos/editor-support/cocosbuilder/Android.mk b/cocos/editor-support/cocosbuilder/Android.mk deleted file mode 100644 index 5bde8a025b..0000000000 --- a/cocos/editor-support/cocosbuilder/Android.mk +++ /dev/null @@ -1,43 +0,0 @@ -LOCAL_PATH := $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_MODULE := cocosbuilder_static - -LOCAL_MODULE_FILENAME := libcocosbuilder - -LOCAL_SRC_FILES := CCBAnimationManager.cpp \ -CCBFileLoader.cpp \ -CCBKeyframe.cpp \ -CCBReader.cpp \ -CCBSequence.cpp \ -CCBSequenceProperty.cpp \ -CCControlButtonLoader.cpp \ -CCControlLoader.cpp \ -CCLabelBMFontLoader.cpp \ -CCLabelTTFLoader.cpp \ -CCLayerColorLoader.cpp \ -CCLayerGradientLoader.cpp \ -CCLayerLoader.cpp \ -CCMenuItemImageLoader.cpp \ -CCMenuItemLoader.cpp \ -CCNode+CCBRelativePositioning.cpp \ -CCNodeLoader.cpp \ -CCNodeLoaderLibrary.cpp \ -CCParticleSystemQuadLoader.cpp \ -CCScale9SpriteLoader.cpp \ -CCScrollViewLoader.cpp \ -CCSpriteLoader.cpp - -LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/.. \ -$(LOCAL_PATH)/../../.. - -LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../2d \ -$(LOCAL_PATH) \ -$(LOCAL_PATH)/../../.. - - -LOCAL_STATIC_LIBRARIES := cocos_extension_static - -include $(BUILD_STATIC_LIBRARY) - -$(call import-module,extensions) diff --git a/cocos/editor-support/cocosbuilder/CCBAnimationManager.h b/cocos/editor-support/cocosbuilder/CCBAnimationManager.h index ceea8227a8..9d272d9585 100644 --- a/cocos/editor-support/cocosbuilder/CCBAnimationManager.h +++ b/cocos/editor-support/cocosbuilder/CCBAnimationManager.h @@ -13,14 +13,14 @@ namespace cocosbuilder { -class CCBAnimationManagerDelegate +class CC_DLL CCBAnimationManagerDelegate { public: virtual ~CCBAnimationManagerDelegate() {} virtual void completedAnimationSequenceNamed(const char *name) = 0; }; -class CCBAnimationManager : public cocos2d::Ref +class CC_DLL CCBAnimationManager : public cocos2d::Ref { public: bool _jsControlled; @@ -160,7 +160,7 @@ private: }; -class CCBSetSpriteFrame : public cocos2d::ActionInstant +class CC_DLL CCBSetSpriteFrame : public cocos2d::ActionInstant { public: /** creates a Place action with a position */ @@ -183,7 +183,7 @@ private: }; -class CCBSoundEffect : public cocos2d::ActionInstant +class CC_DLL CCBSoundEffect : public cocos2d::ActionInstant { public: static CCBSoundEffect* actionWithSoundFile(const std::string &file, float pitch, float pan, float gain); @@ -205,7 +205,7 @@ private: }; -class CCBRotateTo : public cocos2d::ActionInterval +class CC_DLL CCBRotateTo : public cocos2d::ActionInterval { public: static CCBRotateTo* create(float fDuration, float fAngle); @@ -224,7 +224,7 @@ private: }; -class CCBRotateXTo: public cocos2d::ActionInterval +class CC_DLL CCBRotateXTo: public cocos2d::ActionInterval { public: static CCBRotateXTo* create(float fDuration, float fAngle); @@ -243,7 +243,7 @@ private: }; -class CCBRotateYTo: public cocos2d::ActionInterval +class CC_DLL CCBRotateYTo: public cocos2d::ActionInterval { public: static CCBRotateYTo* create(float fDuration, float fAngle); @@ -262,7 +262,7 @@ private: }; -class CCBEaseInstant : public cocos2d::ActionEase +class CC_DLL CCBEaseInstant : public cocos2d::ActionEase { public: static CCBEaseInstant* create(cocos2d::ActionInterval *pAction); diff --git a/cocos/editor-support/cocosbuilder/CCBFileLoader.h b/cocos/editor-support/cocosbuilder/CCBFileLoader.h index 51e675b00e..9876a62ead 100644 --- a/cocos/editor-support/cocosbuilder/CCBFileLoader.h +++ b/cocos/editor-support/cocosbuilder/CCBFileLoader.h @@ -9,7 +9,7 @@ namespace cocosbuilder { /* Forward declaration. */ class CCBReader; -class CCBFileLoader : public NodeLoader { +class CC_DLL CCBFileLoader : public NodeLoader { public: /** * @js NA diff --git a/cocos/editor-support/cocosbuilder/CCBKeyframe.h b/cocos/editor-support/cocosbuilder/CCBKeyframe.h index 394cc51d5a..8fa9b898d1 100644 --- a/cocos/editor-support/cocosbuilder/CCBKeyframe.h +++ b/cocos/editor-support/cocosbuilder/CCBKeyframe.h @@ -7,7 +7,7 @@ namespace cocosbuilder { -class CCBKeyframe : public cocos2d::Ref +class CC_DLL CCBKeyframe : public cocos2d::Ref { public: enum class EasingType diff --git a/cocos/editor-support/cocosbuilder/CCBMemberVariableAssigner.h b/cocos/editor-support/cocosbuilder/CCBMemberVariableAssigner.h index aacaba03c3..9caf0fc5b3 100644 --- a/cocos/editor-support/cocosbuilder/CCBMemberVariableAssigner.h +++ b/cocos/editor-support/cocosbuilder/CCBMemberVariableAssigner.h @@ -23,7 +23,7 @@ namespace cocosbuilder { return true; \ } -class CCBMemberVariableAssigner { +class CC_DLL CCBMemberVariableAssigner { public: /** * @js NA diff --git a/cocos/editor-support/cocosbuilder/CCBReader.h b/cocos/editor-support/cocosbuilder/CCBReader.h index c321541ea6..5c05632583 100644 --- a/cocos/editor-support/cocosbuilder/CCBReader.h +++ b/cocos/editor-support/cocosbuilder/CCBReader.h @@ -8,6 +8,7 @@ #include "base/CCMap.h" #include "CCBSequence.h" #include "extensions/GUI/CCControlExtension/CCControl.h" +#include "cocosbuilder/CCBAnimationManager.h" #define CCB_STATIC_NEW_AUTORELEASE_OBJECT_METHOD(T, METHOD) static T * METHOD() { \ T * ptr = new T(); \ @@ -64,7 +65,7 @@ class CCBKeyframe; /** * @brief Parse CCBI file which is generated by CocosBuilder */ -class CCBReader : public cocos2d::Ref +class CC_DLL CCBReader : public cocos2d::Ref { public: enum class PropertyType { diff --git a/cocos/editor-support/cocosbuilder/CCBSelectorResolver.h b/cocos/editor-support/cocosbuilder/CCBSelectorResolver.h index e52e8bc94e..69cf6c73ff 100644 --- a/cocos/editor-support/cocosbuilder/CCBSelectorResolver.h +++ b/cocos/editor-support/cocosbuilder/CCBSelectorResolver.h @@ -18,7 +18,7 @@ namespace cocosbuilder { return callfuncN_selector(METHOD); \ } -class CCBSelectorResolver { +class CC_DLL CCBSelectorResolver { public: /** * @js NA @@ -31,7 +31,7 @@ class CCBSelectorResolver { }; -class CCBScriptOwnerProtocol { +class CC_DLL CCBScriptOwnerProtocol { public: /** * @js NA diff --git a/cocos/editor-support/cocosbuilder/CCBSequence.h b/cocos/editor-support/cocosbuilder/CCBSequence.h index abe70b1874..514b38a712 100644 --- a/cocos/editor-support/cocosbuilder/CCBSequence.h +++ b/cocos/editor-support/cocosbuilder/CCBSequence.h @@ -8,7 +8,7 @@ namespace cocosbuilder { -class CCBSequence : public cocos2d::Ref +class CC_DLL CCBSequence : public cocos2d::Ref { public: CCBSequence(); diff --git a/cocos/editor-support/cocosbuilder/CCBSequenceProperty.h b/cocos/editor-support/cocosbuilder/CCBSequenceProperty.h index f62ea71ee8..b01c722bea 100644 --- a/cocos/editor-support/cocosbuilder/CCBSequenceProperty.h +++ b/cocos/editor-support/cocosbuilder/CCBSequenceProperty.h @@ -7,7 +7,7 @@ namespace cocosbuilder { -class CCBSequenceProperty : public cocos2d::Ref +class CC_DLL CCBSequenceProperty : public cocos2d::Ref { public: /** diff --git a/cocos/editor-support/cocosbuilder/CCControlButtonLoader.h b/cocos/editor-support/cocosbuilder/CCControlButtonLoader.h index 2259f90470..5a0962ead8 100644 --- a/cocos/editor-support/cocosbuilder/CCControlButtonLoader.h +++ b/cocos/editor-support/cocosbuilder/CCControlButtonLoader.h @@ -9,7 +9,7 @@ namespace cocosbuilder { /* Forward declaration. */ class CCBReader; -class ControlButtonLoader : public ControlLoader { +class CC_DLL ControlButtonLoader : public ControlLoader { public: /** * @js NA diff --git a/cocos/editor-support/cocosbuilder/CCControlLoader.h b/cocos/editor-support/cocosbuilder/CCControlLoader.h index 83e2306e39..2330cf3025 100644 --- a/cocos/editor-support/cocosbuilder/CCControlLoader.h +++ b/cocos/editor-support/cocosbuilder/CCControlLoader.h @@ -9,7 +9,7 @@ namespace cocosbuilder { /* Forward declaration. */ class CCBReader; -class ControlLoader : public NodeLoader { +class CC_DLL ControlLoader : public NodeLoader { public: /** * @js NA diff --git a/cocos/editor-support/cocosbuilder/CCLabelBMFontLoader.h b/cocos/editor-support/cocosbuilder/CCLabelBMFontLoader.h index c6fb6808c2..a063f3ab8f 100644 --- a/cocos/editor-support/cocosbuilder/CCLabelBMFontLoader.h +++ b/cocos/editor-support/cocosbuilder/CCLabelBMFontLoader.h @@ -11,7 +11,7 @@ namespace cocosbuilder { /* Forward declaration. */ class CCBReader; -class LabelBMFontLoader : public NodeLoader { +class CC_DLL LabelBMFontLoader : public NodeLoader { public: /** * @js NA diff --git a/cocos/editor-support/cocosbuilder/CCLabelTTFLoader.h b/cocos/editor-support/cocosbuilder/CCLabelTTFLoader.h index 86408e1e78..f58789d9a8 100644 --- a/cocos/editor-support/cocosbuilder/CCLabelTTFLoader.h +++ b/cocos/editor-support/cocosbuilder/CCLabelTTFLoader.h @@ -11,7 +11,7 @@ namespace cocosbuilder { /* Forward declaration. */ class CCBReader; -class LabelTTFLoader : public NodeLoader { +class CC_DLL LabelTTFLoader : public NodeLoader { public: /** * @js NA diff --git a/cocos/editor-support/cocosbuilder/CCLayerColorLoader.h b/cocos/editor-support/cocosbuilder/CCLayerColorLoader.h index acea8b64da..6eb0b73061 100644 --- a/cocos/editor-support/cocosbuilder/CCLayerColorLoader.h +++ b/cocos/editor-support/cocosbuilder/CCLayerColorLoader.h @@ -8,7 +8,7 @@ namespace cocosbuilder { /* Forward declaration. */ class CCBReader; -class LayerColorLoader : public LayerLoader { +class CC_DLL LayerColorLoader : public LayerLoader { public: /** * @js NA diff --git a/cocos/editor-support/cocosbuilder/CCLayerGradientLoader.h b/cocos/editor-support/cocosbuilder/CCLayerGradientLoader.h index cf4222b0bd..ffa82d35ef 100644 --- a/cocos/editor-support/cocosbuilder/CCLayerGradientLoader.h +++ b/cocos/editor-support/cocosbuilder/CCLayerGradientLoader.h @@ -8,7 +8,7 @@ namespace cocosbuilder { /* Forward declaration. */ class CCBReader; -class LayerGradientLoader : public LayerLoader { +class CC_DLL LayerGradientLoader : public LayerLoader { public: /** * @js NA diff --git a/cocos/editor-support/cocosbuilder/CCLayerLoader.h b/cocos/editor-support/cocosbuilder/CCLayerLoader.h index 9d7f41fa25..1a98cf0a51 100644 --- a/cocos/editor-support/cocosbuilder/CCLayerLoader.h +++ b/cocos/editor-support/cocosbuilder/CCLayerLoader.h @@ -8,7 +8,7 @@ namespace cocosbuilder { /* Forward declaration. */ class CCBReader; -class LayerLoader : public NodeLoader { +class CC_DLL LayerLoader : public NodeLoader { public: /** * @js NA diff --git a/cocos/editor-support/cocosbuilder/CCMenuItemImageLoader.h b/cocos/editor-support/cocosbuilder/CCMenuItemImageLoader.h index d1c680227f..1ebfbee1d5 100644 --- a/cocos/editor-support/cocosbuilder/CCMenuItemImageLoader.h +++ b/cocos/editor-support/cocosbuilder/CCMenuItemImageLoader.h @@ -8,7 +8,7 @@ namespace cocosbuilder { /* Forward declaration. */ class CCBReader; -class MenuItemImageLoader : public MenuItemLoader { +class CC_DLL MenuItemImageLoader : public MenuItemLoader { public: /** * @js NA diff --git a/cocos/editor-support/cocosbuilder/CCMenuItemLoader.h b/cocos/editor-support/cocosbuilder/CCMenuItemLoader.h index 4b8a5b5893..c24df2db6a 100644 --- a/cocos/editor-support/cocosbuilder/CCMenuItemLoader.h +++ b/cocos/editor-support/cocosbuilder/CCMenuItemLoader.h @@ -11,7 +11,7 @@ namespace cocosbuilder { /* Forward declaration. */ class CCBReader; -class MenuItemLoader : public NodeLoader { +class CC_DLL MenuItemLoader : public NodeLoader { public: /** * @js NA diff --git a/cocos/editor-support/cocosbuilder/CCMenuLoader.h b/cocos/editor-support/cocosbuilder/CCMenuLoader.h index dce39dddc4..e0c70d6907 100644 --- a/cocos/editor-support/cocosbuilder/CCMenuLoader.h +++ b/cocos/editor-support/cocosbuilder/CCMenuLoader.h @@ -10,7 +10,7 @@ namespace cocosbuilder { /* Forward declaration. */ class CCBReader; -class MenuLoader : public LayerLoader { +class CC_DLL MenuLoader : public LayerLoader { public: /** * @js NA diff --git a/cocos/editor-support/cocosbuilder/CCNode+CCBRelativePositioning.cpp b/cocos/editor-support/cocosbuilder/CCNode+CCBRelativePositioning.cpp index 633237cd90..840d8fe54f 100644 --- a/cocos/editor-support/cocosbuilder/CCNode+CCBRelativePositioning.cpp +++ b/cocos/editor-support/cocosbuilder/CCNode+CCBRelativePositioning.cpp @@ -5,7 +5,7 @@ using namespace cocos2d; namespace cocosbuilder { -Vec2 getAbsolutePosition(const Vec2 &pt, CCBReader::PositionType type, const Size &containerSize, const std::string& propName) +CC_DLL Vec2 getAbsolutePosition(const Vec2 &pt, CCBReader::PositionType type, const Size &containerSize, const std::string& propName) { Vec2 absPt = Vec2(0,0); if (type == CCBReader::PositionType::RELATIVE_BOTTOM_LEFT) @@ -43,7 +43,7 @@ Vec2 getAbsolutePosition(const Vec2 &pt, CCBReader::PositionType type, const Siz return absPt; } -void setRelativeScale(Node *pNode, float scaleX, float scaleY, CCBReader::ScaleType type, const std::string& propName) +CC_DLL void setRelativeScale(Node *pNode, float scaleX, float scaleY, CCBReader::ScaleType type, const std::string& propName) { CCASSERT(pNode, "pNode should not be null"); diff --git a/cocos/editor-support/cocosbuilder/CCNode+CCBRelativePositioning.h b/cocos/editor-support/cocosbuilder/CCNode+CCBRelativePositioning.h index c451d2bfc2..37eaadc918 100644 --- a/cocos/editor-support/cocosbuilder/CCNode+CCBRelativePositioning.h +++ b/cocos/editor-support/cocosbuilder/CCNode+CCBRelativePositioning.h @@ -5,9 +5,9 @@ namespace cocosbuilder { -extern cocos2d::Vec2 getAbsolutePosition(const cocos2d::Vec2 &pt, CCBReader::PositionType type, const cocos2d::Size &containerSize, const std::string&propName); +extern CC_DLL cocos2d::Vec2 getAbsolutePosition(const cocos2d::Vec2 &pt, CCBReader::PositionType type, const cocos2d::Size &containerSize, const std::string&propName); -extern void setRelativeScale(cocos2d::Node *node, float scaleX, float scaleY, CCBReader::ScaleType type, const std::string& propName); +extern CC_DLL void setRelativeScale(cocos2d::Node *node, float scaleX, float scaleY, CCBReader::ScaleType type, const std::string& propName); } diff --git a/cocos/editor-support/cocosbuilder/CCNodeLoader.h b/cocos/editor-support/cocosbuilder/CCNodeLoader.h index 9c31637439..979ee210c8 100644 --- a/cocos/editor-support/cocosbuilder/CCNodeLoader.h +++ b/cocos/editor-support/cocosbuilder/CCNodeLoader.h @@ -42,7 +42,7 @@ struct BlockControlData { /* Forward declaration. */ class CCBReader; -class NodeLoader : public cocos2d::Ref { +class CC_DLL NodeLoader : public cocos2d::Ref { public: /** * @js NA diff --git a/cocos/editor-support/cocosbuilder/CCNodeLoaderLibrary.h b/cocos/editor-support/cocosbuilder/CCNodeLoaderLibrary.h index eeb20256a0..a64917d838 100644 --- a/cocos/editor-support/cocosbuilder/CCNodeLoaderLibrary.h +++ b/cocos/editor-support/cocosbuilder/CCNodeLoaderLibrary.h @@ -10,7 +10,7 @@ class NodeLoader; typedef std::map NodeLoaderMap; typedef std::pair NodeLoaderMapEntry; -class NodeLoaderLibrary : public cocos2d::Ref +class CC_DLL NodeLoaderLibrary : public cocos2d::Ref { public: /** diff --git a/cocos/editor-support/cocosbuilder/CCNodeLoaderListener.h b/cocos/editor-support/cocosbuilder/CCNodeLoaderListener.h index dedaafa51e..de6157b6cf 100644 --- a/cocos/editor-support/cocosbuilder/CCNodeLoaderListener.h +++ b/cocos/editor-support/cocosbuilder/CCNodeLoaderListener.h @@ -4,7 +4,7 @@ namespace cocosbuilder { -class NodeLoaderListener { +class CC_DLL NodeLoaderListener { public: /** * @js NA diff --git a/cocos/editor-support/cocosbuilder/CCParticleSystemQuadLoader.h b/cocos/editor-support/cocosbuilder/CCParticleSystemQuadLoader.h index e509a40f5c..51f463a4e0 100644 --- a/cocos/editor-support/cocosbuilder/CCParticleSystemQuadLoader.h +++ b/cocos/editor-support/cocosbuilder/CCParticleSystemQuadLoader.h @@ -11,7 +11,7 @@ namespace cocosbuilder { /* Forward declaration. */ class CCBReader; -class ParticleSystemQuadLoader : public NodeLoader { +class CC_DLL ParticleSystemQuadLoader : public NodeLoader { public: /** * @js NA diff --git a/cocos/editor-support/cocosbuilder/CCScale9SpriteLoader.h b/cocos/editor-support/cocosbuilder/CCScale9SpriteLoader.h index 33e13bba18..70f7e1816b 100644 --- a/cocos/editor-support/cocosbuilder/CCScale9SpriteLoader.h +++ b/cocos/editor-support/cocosbuilder/CCScale9SpriteLoader.h @@ -10,7 +10,7 @@ namespace cocosbuilder { /* Forward declaration. */ class CCBReader; -class Scale9SpriteLoader : public NodeLoader { +class CC_DLL Scale9SpriteLoader : public NodeLoader { public: /** * @js NA diff --git a/cocos/editor-support/cocosbuilder/CCScrollViewLoader.h b/cocos/editor-support/cocosbuilder/CCScrollViewLoader.h index 30ede8a8d2..d9167f37dd 100644 --- a/cocos/editor-support/cocosbuilder/CCScrollViewLoader.h +++ b/cocos/editor-support/cocosbuilder/CCScrollViewLoader.h @@ -9,7 +9,7 @@ namespace cocosbuilder { /* Forward declaration. */ class CCBReader; -class ScrollViewLoader : public NodeLoader { +class CC_DLL ScrollViewLoader : public NodeLoader { public: /** * @js NA diff --git a/cocos/editor-support/cocosbuilder/CCSpriteLoader.h b/cocos/editor-support/cocosbuilder/CCSpriteLoader.h index 466ee836bc..41a402bdbd 100644 --- a/cocos/editor-support/cocosbuilder/CCSpriteLoader.h +++ b/cocos/editor-support/cocosbuilder/CCSpriteLoader.h @@ -8,7 +8,7 @@ namespace cocosbuilder { /* Forward declaration. */ class CCBReader; -class SpriteLoader : public NodeLoader { +class CC_DLL SpriteLoader : public NodeLoader { public: /** * @js NA diff --git a/cocos/editor-support/cocosbuilder/proj.win32/libCocosBuilder.vcxproj.filters b/cocos/editor-support/cocosbuilder/proj.win32/libCocosBuilder.vcxproj.filters deleted file mode 100644 index 0fca5f92b7..0000000000 --- a/cocos/editor-support/cocosbuilder/proj.win32/libCocosBuilder.vcxproj.filters +++ /dev/null @@ -1,162 +0,0 @@ - - - - - {e4e3b3ff-6d85-4408-bbdf-38f296363698} - - - {e79db1b4-c859-48c0-ab1e-a31200c09923} - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - \ No newline at end of file diff --git a/cocos/editor-support/cocosbuilder/proj.win32/libCocosBuilder.vcxproj.user b/cocos/editor-support/cocosbuilder/proj.win32/libCocosBuilder.vcxproj.user deleted file mode 100644 index a375ae3527..0000000000 --- a/cocos/editor-support/cocosbuilder/proj.win32/libCocosBuilder.vcxproj.user +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/cocos/editor-support/cocosbuilder/proj.win32/libcocosbuilder.vcxproj b/cocos/editor-support/cocosbuilder/proj.win32/libcocosbuilder.vcxproj deleted file mode 100644 index 0ae7b405e5..0000000000 --- a/cocos/editor-support/cocosbuilder/proj.win32/libcocosbuilder.vcxproj +++ /dev/null @@ -1,156 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {811C0DAB-7B96-4BD3-A154-B7572B58E4AB} - libcocosbuilder - - - - StaticLibrary - true - v100 - v110 - v110_xp - v120 - v120_xp - Unicode - - - StaticLibrary - false - v100 - v110 - v110_xp - v120 - v120_xp - true - Unicode - - - - - - - - - - - - - - - $(SolutionDir)$(Configuration).win32\ - $(Configuration).win32\ - - - $(SolutionDir)$(Configuration).win32\ - $(Configuration).win32\ - - - - Level3 - Disabled - - - $(EngineRoot);$(EngineRoot)extensions;$(EngineRoot)cocos\audio\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - 4267;4251;4244;%(DisableSpecificWarnings) - false - OldStyle - - - true - - - - - Level3 - MinSpace - true - true - - - $(EngineRoot);$(EngineRoot)extensions;$(EngineRoot)cocos\audio\include;%(AdditionalIncludeDirectories) - WIN32;_WINDOWS;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - None - false - - - true - true - true - - - - - {98a51ba8-fc3a-415b-ac8f-8c7bd464e93e} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/cocos/editor-support/cocostudio/Android.mk b/cocos/editor-support/cocostudio/Android.mk deleted file mode 100644 index c6356d29c4..0000000000 --- a/cocos/editor-support/cocostudio/Android.mk +++ /dev/null @@ -1,81 +0,0 @@ -LOCAL_PATH := $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_MODULE := cocostudio_static - -LOCAL_MODULE_FILENAME := libcocostudio - -LOCAL_SRC_FILES := CCActionFrame.cpp \ -CCActionFrameEasing.cpp \ -CCActionManagerEx.cpp \ -CCActionNode.cpp \ -CCActionObject.cpp \ -CCArmature.cpp \ -CCBone.cpp \ -CCArmatureAnimation.cpp \ -CCProcessBase.cpp \ -CCTween.cpp \ -CCDatas.cpp \ -CCBatchNode.cpp \ -CCDecorativeDisplay.cpp \ -CCDisplayFactory.cpp \ -CCDisplayManager.cpp \ -CCSkin.cpp \ -CCColliderDetector.cpp \ -CCArmatureDataManager.cpp \ -CCArmatureDefine.cpp \ -CCDataReaderHelper.cpp \ -CCSpriteFrameCacheHelper.cpp \ -CCTransformHelp.cpp \ -CCUtilMath.cpp \ -CCComAttribute.cpp \ -CCComAudio.cpp \ -CCComController.cpp \ -CCComRender.cpp \ -CCInputDelegate.cpp \ -DictionaryHelper.cpp \ -CCSGUIReader.cpp \ -CCSSceneReader.cpp \ -TriggerBase.cpp \ -TriggerMng.cpp \ -TriggerObj.cpp \ -CocoLoader.cpp \ -WidgetReader/WidgetReader.cpp \ -WidgetReader/ButtonReader/ButtonReader.cpp \ -WidgetReader/CheckBoxReader/CheckBoxReader.cpp \ -WidgetReader/ImageViewReader/ImageViewReader.cpp \ -WidgetReader/LayoutReader/LayoutReader.cpp \ -WidgetReader/ListViewReader/ListViewReader.cpp \ -WidgetReader/LoadingBarReader/LoadingBarReader.cpp \ -WidgetReader/PageViewReader/PageViewReader.cpp \ -WidgetReader/ScrollViewReader/ScrollViewReader.cpp \ -WidgetReader/SliderReader/SliderReader.cpp \ -WidgetReader/TextAtlasReader/TextAtlasReader.cpp \ -WidgetReader/TextBMFontReader/TextBMFontReader.cpp \ -WidgetReader/TextFieldReader/TextFieldReader.cpp \ -WidgetReader/TextReader/TextReader.cpp \ -ActionTimeline/CCNodeReader.cpp \ -ActionTimeline/CCActionTimelineCache.cpp \ -ActionTimeline/CCFrame.cpp \ -ActionTimeline/CCTimeLine.cpp \ -ActionTimeline/CCActionTimeline.cpp - -LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/.. \ -$(LOCAL_PATH)/../../../external - -LOCAL_C_INCLUDES := $(LOCAL_PATH)/../.. \ -$(LOCAL_PATH)/../../../external \ -$(LOCAL_PATH)/.. \ -$(LOCAL_PATH)/../.. \ -$(LOCAL_PATH)/WidgetReader - -LOCAL_CFLAGS += -fexceptions - - -LOCAL_STATIC_LIBRARIES := cocos_ui_static -LOCAL_STATIC_LIBRARIES += cocosdenshion_static - -include $(BUILD_STATIC_LIBRARY) - -$(call import-module,ui) -$(call import-module,audio/android) diff --git a/cocos/editor-support/cocostudio/CCInputDelegate.cpp b/cocos/editor-support/cocostudio/CCInputDelegate.cpp index 7bc3d50526..774588e284 100644 --- a/cocos/editor-support/cocostudio/CCInputDelegate.cpp +++ b/cocos/editor-support/cocostudio/CCInputDelegate.cpp @@ -28,6 +28,7 @@ THE SOFTWARE. #include "base/CCEventListenerTouch.h" #include "base/CCEventListenerAcceleration.h" #include "base/CCEventListenerKeyboard.h" +#include "base/CCEventDispatcher.h" using namespace cocos2d; diff --git a/cocos/editor-support/cocostudio/proj.win32/libcocostudio.vcxproj b/cocos/editor-support/cocostudio/proj.win32/libcocostudio.vcxproj deleted file mode 100644 index 9f84d48a42..0000000000 --- a/cocos/editor-support/cocostudio/proj.win32/libcocostudio.vcxproj +++ /dev/null @@ -1,111 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - - {98a51ba8-fc3a-415b-ac8f-8c7bd464e93e} - - - {7e06e92c-537a-442b-9e4a-4761c84f8a1a} - - - - {B57CF53F-2E49-4031-9822-047CC0E6BDE2} - libcocostudio - libcocostudio - - - - DynamicLibrary - true - v100 - v110 - v110_xp - v120 - v120_xp - Unicode - - - DynamicLibrary - false - v100 - v110 - v110_xp - v120 - v120_xp - true - Unicode - - - - - - - - - - - - - - - $(SolutionDir)$(Configuration).win32\ - $(Configuration).win32\ - - - $(SolutionDir)$(Configuration).win32\ - $(Configuration).win32\ - - - - Level3 - Disabled - - - $(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos\editor-support;$(EngineRoot)external;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)extensions;$(EngineRoot)external\win32-specific\zlib\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRSTUDIODLL;GL_GLEXT_PROTOTYPES;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;COCOS2DXWIN32_EXPORTS;%(PreprocessorDefinitions) - true - 4267;4251;4244;%(DisableSpecificWarnings) - false - OldStyle - - - true - $(OutDir);%(AdditionalLibraryDirectories) - libzlib.lib;%(AdditionalDependencies) - - - - - Level3 - MinSpace - true - true - - - WIN32;_WINDOWS;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_USRSTUDIODLL;%(PreprocessorDefinitions) - $(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos\editor-support;$(EngineRoot)external;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)extensions;$(EngineRoot)external\win32-specific\zlib\include;%(AdditionalIncludeDirectories) - None - false - - - true - true - true - libzlib.lib;%(AdditionalDependencies) - $(OutDir);%(AdditionalLibraryDirectories) - - - - - - \ No newline at end of file diff --git a/cocos/editor-support/cocostudio/proj.win32/libcocostudio.vcxproj.filters b/cocos/editor-support/cocostudio/proj.win32/libcocostudio.vcxproj.filters deleted file mode 100644 index 9cd8510566..0000000000 --- a/cocos/editor-support/cocostudio/proj.win32/libcocostudio.vcxproj.filters +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/cocos/editor-support/cocostudio/proj.win32/libcocostudio.vcxproj.user b/cocos/editor-support/cocostudio/proj.win32/libcocostudio.vcxproj.user deleted file mode 100644 index a375ae3527..0000000000 --- a/cocos/editor-support/cocostudio/proj.win32/libcocostudio.vcxproj.user +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/cocos/editor-support/spine/Android.mk b/cocos/editor-support/spine/Android.mk deleted file mode 100644 index b7f3446e1b..0000000000 --- a/cocos/editor-support/spine/Android.mk +++ /dev/null @@ -1,43 +0,0 @@ -LOCAL_PATH := $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_MODULE := spine_static - -LOCAL_MODULE_FILENAME := libspine - -LOCAL_SRC_FILES := Animation.cpp \ -AnimationState.cpp \ -AnimationStateData.cpp \ -Atlas.cpp \ -AtlasAttachmentLoader.cpp \ -Attachment.cpp \ -AttachmentLoader.cpp \ -Bone.cpp \ -BoneData.cpp \ -CCSkeleton.cpp \ -CCSkeletonAnimation.cpp \ -Json.cpp \ -RegionAttachment.cpp \ -Skeleton.cpp \ -SkeletonData.cpp \ -SkeletonJson.cpp \ -Skin.cpp \ -Slot.cpp \ -SlotData.cpp \ -BoundingBoxAttachment.cpp \ -Event.cpp \ -EventData.cpp \ -SkeletonBounds.cpp \ -extension.cpp \ -spine-cocos2dx.cpp - -LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/.. - -LOCAL_C_INCLUDES := $(LOCAL_PATH)/../.. \ -$(LOCAL_PATH)/.. - -LOCAL_STATIC_LIBRARIES := cocos2dx_static - -include $(BUILD_STATIC_LIBRARY) - -$(call import-module,.) diff --git a/cocos/editor-support/spine/proj.win32/libSpine.vcxproj b/cocos/editor-support/spine/proj.win32/libSpine.vcxproj deleted file mode 100644 index 97c5d7e80f..0000000000 --- a/cocos/editor-support/spine/proj.win32/libSpine.vcxproj +++ /dev/null @@ -1,157 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - - {98a51ba8-fc3a-415b-ac8f-8c7bd464e93e} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {B7C2A162-DEC9-4418-972E-240AB3CBFCAE} - libspine - - - - StaticLibrary - true - v100 - v110 - v110_xp - v120 - v120_xp - Unicode - - - StaticLibrary - false - v100 - v110 - v110_xp - v120 - v120_xp - true - Unicode - - - - - - - - - - - - - - - $(SolutionDir)$(Configuration).win32\ - $(Configuration).win32\ - - - $(SolutionDir)$(Configuration).win32\ - $(Configuration).win32\ - - - - Level3 - Disabled - - - $(EngineRoot);$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos\editor-support;$(EngineRoot)extensions;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - 4267;4251;4244;%(DisableSpecificWarnings) - false - - - true - - - - - Level3 - MinSpace - true - true - - - WIN32;_WINDOWS;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - $(EngineRoot);$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos\editor-support;$(EngineRoot)extensions;%(AdditionalIncludeDirectories) - None - false - - - true - true - true - - - - - - \ No newline at end of file diff --git a/cocos/editor-support/spine/proj.win32/libSpine.vcxproj.filters b/cocos/editor-support/spine/proj.win32/libSpine.vcxproj.filters deleted file mode 100644 index c1ca27587c..0000000000 --- a/cocos/editor-support/spine/proj.win32/libSpine.vcxproj.filters +++ /dev/null @@ -1,168 +0,0 @@ - - - - - {3e21d10b-4a29-49c0-b21a-fa573a4e65c1} - - - {ca7b23a8-6f11-4059-b242-ba5102033974} - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - \ No newline at end of file diff --git a/cocos/editor-support/spine/proj.win32/libSpine.vcxproj.user b/cocos/editor-support/spine/proj.win32/libSpine.vcxproj.user deleted file mode 100644 index a375ae3527..0000000000 --- a/cocos/editor-support/spine/proj.win32/libSpine.vcxproj.user +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/cocos/network/Android.mk b/cocos/network/Android.mk deleted file mode 100644 index b47964af29..0000000000 --- a/cocos/network/Android.mk +++ /dev/null @@ -1,27 +0,0 @@ -LOCAL_PATH := $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_MODULE := cocos_network_static - -LOCAL_MODULE_FILENAME := libnetwork - -LOCAL_SRC_FILES := HttpClient.cpp \ -SocketIO.cpp \ -WebSocket.cpp - - -LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/.. - -LOCAL_C_INCLUDES := $(LOCAL_PATH)/../.. \ -$(LOCAL_PATH)/.. - - -LOCAL_STATIC_LIBRARIES := cocos2dx_static -LOCAL_STATIC_LIBRARIES += cocos_curl_static -LOCAL_STATIC_LIBRARIES += libwebsockets_static - -include $(BUILD_STATIC_LIBRARY) - -$(call import-module,.) -$(call import-module,curl/prebuilt/android) -$(call import-module,websockets/prebuilt/android) diff --git a/cocos/network/proj.win32/libnetwork.vcxproj b/cocos/network/proj.win32/libnetwork.vcxproj deleted file mode 100644 index 415969b650..0000000000 --- a/cocos/network/proj.win32/libnetwork.vcxproj +++ /dev/null @@ -1,130 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - - {98a51ba8-fc3a-415b-ac8f-8c7bd464e93e} - - - - libnetwork - {DF2638C0-8128-4847-867C-6EAFE3DEE7B5} - libnetwork.win32 - Win32Proj - - - - StaticLibrary - Unicode - v100 - v110 - v110_xp - v120 - v120_xp - - - StaticLibrary - NotSet - v100 - v110 - v110_xp - v120 - v120_xp - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(Configuration).win32\ - $(Configuration).win32\ - false - $(SolutionDir)$(Configuration).win32\ - $(Configuration).win32\ - false - AllRules.ruleset - - - AllRules.ruleset - - - - - $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\lib;$(LibraryPath) - - - $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\lib;$(LibraryPath) - - - - Disabled - $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;..\Include;$(EngineRoot)cocos;$(EngineRoot)external\websockets\include\win32;$(EngineRoot)external\curl\include\win32;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;COCOS2D_DEBUG=1;%(PreprocessorDefinitions) - false - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - EditAndContinue - 4251 - true - - - winmm.lib;libcocos2d.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName).dll - true - Windows - $(TargetDir)$(TargetName).lib - MachineX86 - $(OutDir) - - - - - $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;..\Include;$(EngineRoot)cocos;$(EngineRoot)external\websockets\include\win32;$(EngineRoot)external\curl\include\win32;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - MultiThreadedDLL - - - Level3 - None - 4251 - true - MinSpace - false - - - winmm.lib;libcocos2d.lib;%(AdditionalDependencies) - $(OutDir)$(ProjectName).dll - true - Windows - true - true - $(TargetDir)$(TargetName).lib - MachineX86 - $(OutDir) - - - - - - \ No newline at end of file diff --git a/cocos/network/proj.win32/libnetwork.vcxproj.filters b/cocos/network/proj.win32/libnetwork.vcxproj.filters deleted file mode 100644 index 78452f51a2..0000000000 --- a/cocos/network/proj.win32/libnetwork.vcxproj.filters +++ /dev/null @@ -1,9 +0,0 @@ - - - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx - - - \ No newline at end of file diff --git a/cocos/network/proj.win32/libnetwork.vcxproj.user b/cocos/network/proj.win32/libnetwork.vcxproj.user deleted file mode 100644 index ace9a86acb..0000000000 --- a/cocos/network/proj.win32/libnetwork.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxRenderer.java b/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxRenderer.java index 89752bae2a..360307ba18 100644 --- a/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxRenderer.java +++ b/cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxRenderer.java @@ -46,6 +46,7 @@ public class Cocos2dxRenderer implements GLSurfaceView.Renderer { private long mLastTickInNanoSeconds; private int mScreenWidth; private int mScreenHeight; + private boolean mNativeInitCompleted = false; // =========================================================== // Constructors @@ -72,6 +73,7 @@ public class Cocos2dxRenderer implements GLSurfaceView.Renderer { public void onSurfaceCreated(final GL10 pGL10, final EGLConfig pEGLConfig) { Cocos2dxRenderer.nativeInit(this.mScreenWidth, this.mScreenHeight); this.mLastTickInNanoSeconds = System.nanoTime(); + mNativeInitCompleted = true; } @Override @@ -141,6 +143,13 @@ public class Cocos2dxRenderer implements GLSurfaceView.Renderer { } public void handleOnPause() { + // onPause may be invoked before onSurfaceCreated + // and engine will be initialized correctly after + // onSurfaceCreated is invoked, can not invoke any + // native methed before onSurfaceCreated is invoked + if (! mNativeInitCompleted) + return; + Cocos2dxHelper.onEnterBackground(); Cocos2dxRenderer.nativeOnPause(); } diff --git a/cocos/platform/android/javaactivity.cpp b/cocos/platform/android/javaactivity.cpp index d5d2f7df69..74a26aed0c 100644 --- a/cocos/platform/android/javaactivity.cpp +++ b/cocos/platform/android/javaactivity.cpp @@ -29,8 +29,10 @@ THE SOFTWARE. #include "base/CCDirector.h" #include "base/CCEventCustom.h" #include "base/CCEventType.h" +#include "base/CCEventDispatcher.h" #include "renderer/CCGLProgramCache.h" #include "renderer/CCTextureCache.h" +#include "renderer/ccGLStateCache.h" #include "2d/CCDrawingPrimitives.h" #include "CCGLViewImpl.h" #include "platform/android/jni/JniHelper.h" diff --git a/cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxRenderer.cpp b/cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxRenderer.cpp index b3742e00e5..c413cc8a12 100644 --- a/cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxRenderer.cpp +++ b/cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxRenderer.cpp @@ -2,6 +2,7 @@ #include "base/CCDirector.h" #include "base/CCEventType.h" #include "base/CCEventCustom.h" +#include "base/CCEventDispatcher.h" #include "../CCApplication.h" #include "platform/CCFileUtils.h" #include "JniHelper.h" diff --git a/cocos/platform/android/jni/TouchesJni.cpp b/cocos/platform/android/jni/TouchesJni.cpp index b54362280f..69b759aabb 100644 --- a/cocos/platform/android/jni/TouchesJni.cpp +++ b/cocos/platform/android/jni/TouchesJni.cpp @@ -23,6 +23,7 @@ THE SOFTWARE. ****************************************************************************/ #include "base/CCDirector.h" #include "base/CCEventKeyboard.h" +#include "base/CCEventDispatcher.h" #include "CCGLViewImpl.h" #include diff --git a/cocos/renderer/CCGLProgramState.cpp b/cocos/renderer/CCGLProgramState.cpp index 6ce072b370..1a4ebad0c0 100644 --- a/cocos/renderer/CCGLProgramState.cpp +++ b/cocos/renderer/CCGLProgramState.cpp @@ -37,6 +37,7 @@ THE SOFTWARE. #include "base/CCEventListenerCustom.h" #include "base/CCEventType.h" #include "base/CCDirector.h" +#include "base/CCEventDispatcher.h" NS_CC_BEGIN diff --git a/cocos/renderer/CCRenderer.cpp b/cocos/renderer/CCRenderer.cpp index 2eca2d9ead..54d15f40bd 100644 --- a/cocos/renderer/CCRenderer.cpp +++ b/cocos/renderer/CCRenderer.cpp @@ -39,6 +39,8 @@ #include "base/CCEventDispatcher.h" #include "base/CCEventListenerCustom.h" #include "base/CCEventType.h" +#include "base/CCCamera.h" +#include "2d/CCScene.h" NS_CC_BEGIN @@ -549,6 +551,11 @@ void Renderer::flush3D() bool Renderer::checkVisibility(const Mat4 &transform, const Size &size) { + auto scene = Director::getInstance()->getRunningScene(); + // only cull the default camera. The culling algorithm is valid for default camera. + if (scene->_defaultCamera != Camera::getVisitingCamera()) + return true; + // half size of the screen Size screen_half = Director::getInstance()->getWinSize(); screen_half.width /= 2; diff --git a/cocos/renderer/CCVertexIndexBuffer.cpp b/cocos/renderer/CCVertexIndexBuffer.cpp index 44c1a70de9..a3cf1ac967 100644 --- a/cocos/renderer/CCVertexIndexBuffer.cpp +++ b/cocos/renderer/CCVertexIndexBuffer.cpp @@ -25,6 +25,7 @@ #include "renderer/CCVertexIndexBuffer.h" #include "base/CCEventType.h" #include "base/CCEventListenerCustom.h" +#include "base/CCEventDispatcher.h" NS_CC_BEGIN diff --git a/cocos/renderer/CCVertexIndexData.cpp b/cocos/renderer/CCVertexIndexData.cpp index cbad4d76ea..9e0e163d09 100644 --- a/cocos/renderer/CCVertexIndexData.cpp +++ b/cocos/renderer/CCVertexIndexData.cpp @@ -23,6 +23,8 @@ ****************************************************************************/ #include "renderer/CCVertexIndexData.h" +#include "renderer/ccGLStateCache.h" +#include "base/CCEventDispatcher.h" NS_CC_BEGIN VertexData* VertexData::create() diff --git a/cocos/scripting/lua-bindings/proj.win32/libluacocos2d.vcxproj b/cocos/scripting/lua-bindings/proj.win32/libluacocos2d.vcxproj index 374811cc96..a627dd490e 100644 --- a/cocos/scripting/lua-bindings/proj.win32/libluacocos2d.vcxproj +++ b/cocos/scripting/lua-bindings/proj.win32/libluacocos2d.vcxproj @@ -194,12 +194,6 @@ {98a51ba8-fc3a-415b-ac8f-8c7bd464e93e} - - {811c0dab-7b96-4bd3-a154-b7572b58e4ab} - - - {b7c2a162-dec9-4418-972e-240ab3cbfcae} - {9F2D6CE6-C893-4400-B50C-6DB70CC2562F} @@ -291,7 +285,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\..\..\external\lua\luajit\prebuilt\win32\*.*" "$ MinSpace true - $(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)external\lua\tolua;$(EngineRoot)external\lua\luajit\include;$(EngineRoot)external\lua;$(EngineRoot)cocos\scripting\lua-bindings\auto;$(EngineRoot)cocos\scripting\lua-bindings\manual;$(EngineRoot)cocos\2d;$(EngineRoot)cocos\3d;$(EngineRoot)cocos\scripting\lua-bindings\manual\extension;$(EngineRoot)cocos\scripting\lua-bindings\manual\cocostudio;$(EngineRoot)cocos\scripting\lua-bindings\manual\ui;$(EngineRoot)cocos\scripting\lua-bindings\manual\cocos2d;$(EngineRoot)extensions;$(EngineRoot)cocos\editor-support\cocostudio;$(EngineRoot)cocos\editor-support\spine;$(EngineRoot)cocos\editor-support\cocosbuilder;$(EngineRoot)cocos\audio\include;$(EngineRoot)external\libwebsockets\win32\include;$(EngineRoot)cocos\ui;$(EngineRoot)external;%(AdditionalIncludeDirectories) + $(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)external\lua\tolua;$(EngineRoot)external\lua\luajit\include;$(EngineRoot)external\lua;$(EngineRoot)cocos\scripting\lua-bindings\auto;$(EngineRoot)cocos\scripting\lua-bindings\manual;$(EngineRoot)cocos\2d;$(EngineRoot)cocos\3d;$(EngineRoot)cocos\scripting\lua-bindings\manual\extension;$(EngineRoot)cocos\scripting\lua-bindings\manual\cocostudio;$(EngineRoot)cocos\scripting\lua-bindings\manual\ui;$(EngineRoot)cocos\scripting\lua-bindings\manual\cocos2d;$(EngineRoot)extensions;$(EngineRoot)cocos\editor-support;$(EngineRoot)cocos\editor-support\cocostudio;$(EngineRoot)cocos\editor-support\spine;$(EngineRoot)cocos\editor-support\cocosbuilder;$(EngineRoot)cocos\audio\include;$(EngineRoot)external\libwebsockets\win32\include;$(EngineRoot)cocos\ui;$(EngineRoot)external;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;LIBLUA_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreadedDLL true diff --git a/cocos/ui/Android.mk b/cocos/ui/Android.mk deleted file mode 100644 index ab417448f1..0000000000 --- a/cocos/ui/Android.mk +++ /dev/null @@ -1,51 +0,0 @@ -LOCAL_PATH := $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_MODULE := cocos_ui_static - -LOCAL_MODULE_FILENAME := libui - -LOCAL_SRC_FILES := \ -UIWidget.cpp \ -UILayout.cpp \ -UILayoutParameter.cpp \ -UILayoutManager.cpp \ -CocosGUI.cpp \ -UIHelper.cpp \ -UIListView.cpp \ -UIPageView.cpp \ -UIScrollView.cpp \ -UIButton.cpp \ -UICheckBox.cpp \ -UIImageView.cpp \ -UIText.cpp \ -UITextAtlas.cpp \ -UITextBMFont.cpp \ -UILoadingBar.cpp \ -UISlider.cpp \ -UITextField.cpp \ -UIRichText.cpp \ -UIHBox.cpp \ -UIVBox.cpp \ -UIRelativeBox.cpp \ -UIVideoPlayerAndroid.cpp \ -UIDeprecated.cpp \ -UIScale9Sprite.cpp \ - -LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/.. \ -$(LOCAL_PATH)/../editor-support - -LOCAL_C_INCLUDES := $(LOCAL_PATH)/.. \ -$(LOCAL_PATH)/../../external \ -$(LOCAL_PATH)/.. \ -$(LOCAL_PATH)/../.. \ -$(LOCAL_PATH)/../editor-support - - -LOCAL_STATIC_LIBRARIES := cocos2dx_static -LOCAL_STATIC_LIBRARIES += cocos_extension_static - -include $(BUILD_STATIC_LIBRARY) - -$(call import-module,extensions) -$(call import-module,.) diff --git a/cocos/ui/UIWidget.cpp b/cocos/ui/UIWidget.cpp index c0544a33e2..e62a1b6ea1 100644 --- a/cocos/ui/UIWidget.cpp +++ b/cocos/ui/UIWidget.cpp @@ -29,6 +29,7 @@ THE SOFTWARE. #include "base/CCEventListenerKeyboard.h" #include "base/CCDirector.h" #include "base/CCEventFocus.h" +#include "base/CCEventDispatcher.h" NS_CC_BEGIN diff --git a/cocos/ui/proj.win32/libui.vcxproj b/cocos/ui/proj.win32/libui.vcxproj deleted file mode 100644 index 7392faf9a0..0000000000 --- a/cocos/ui/proj.win32/libui.vcxproj +++ /dev/null @@ -1,108 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - - {98a51ba8-fc3a-415b-ac8f-8c7bd464e93e} - - - - {7E06E92C-537A-442B-9E4A-4761C84F8A1A} - libui - libui - - - - DynamicLibrary - true - v100 - v110 - v110_xp - v120 - v120_xp - Unicode - - - DynamicLibrary - false - v100 - v110 - v110_xp - v120 - v120_xp - true - Unicode - - - - - - - - - - - - - - - $(SolutionDir)$(Configuration).win32\ - $(Configuration).win32\ - - - $(SolutionDir)$(Configuration).win32\ - $(Configuration).win32\ - - - - Level3 - Disabled - - - $(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos\editor-support;$(EngineRoot)external;$(EngineRoot)extensions;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_USEGUIDLL;%(PreprocessorDefinitions) - true - 4267;4251;4244;%(DisableSpecificWarnings) - false - OldStyle - - - true - $(OutDir);%(AdditionalLibraryDirectories) - opengl32.lib;glew32.lib;%(AdditionalDependencies) - - - - - Level3 - MinSpace - true - true - - - WIN32;_WINDOWS;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_USEGUIDLL;%(PreprocessorDefinitions) - $(EngineRoot);$(EngineRoot)cocos;$(EngineRoot)cocos\audio\include;$(EngineRoot)cocos\editor-support;$(EngineRoot)external;$(EngineRoot)extensions;%(AdditionalIncludeDirectories) - None - false - - - true - true - true - $(OutDir);%(AdditionalLibraryDirectories) - opengl32.lib;glew32.lib;%(AdditionalDependencies) - - - - - - \ No newline at end of file diff --git a/cocos/ui/proj.win32/libui.vcxproj.filters b/cocos/ui/proj.win32/libui.vcxproj.filters deleted file mode 100644 index 9cd8510566..0000000000 --- a/cocos/ui/proj.win32/libui.vcxproj.filters +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/cocos/ui/proj.win32/libui.vcxproj.user b/cocos/ui/proj.win32/libui.vcxproj.user deleted file mode 100644 index a375ae3527..0000000000 --- a/cocos/ui/proj.win32/libui.vcxproj.user +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/docs/RELEASE_NOTES.md b/docs/RELEASE_NOTES.md index 1db9ea49bc..f4af8fb588 100644 --- a/docs/RELEASE_NOTES.md +++ b/docs/RELEASE_NOTES.md @@ -26,6 +26,7 @@ - [RenderTexture save function](#user-content-rendertexture-save-function) - [Primitive](#user-content-primitive) - [Consistent way to set GL context attributes](#user-content-consistent-way-to-set-gl-context-attributes) + - [Only two libraries left](#user-content-only-two-libraries-left) # Misc Information @@ -127,6 +128,7 @@ Please refer to this document: [ReadMe](../README.md) * Primitive: Support Points, Lines and Triagles for rendering * SpriteFrameCache: support loading from plist file content data * Added a consistent way to set GL context attributes for all platforms +* Only two libraries in cocos2d-x, one for c++ codes, another one for lua-binding codes * Many other small features added and many bugs fixed # Features in detail @@ -344,3 +346,38 @@ void AppDelegate::initGLContextAttrs() ``` Now can only support setting bits of `r`, `g`, `b`, `a`, `depth buffer` and `stencil buffer`. We will support other attributes if needed. + +## Only two libraries left + +Now there are two libraries left: one for all c++ codes and another one for lua-bindings codes. + +If you are developing with c++, you only have to link to `libcocos2d`. `libcocos2d` includes all c++ codes: + +* cocos2d(including 2d and 3d) +* network +* cocosstudio +* ui +* cocosbuilder +* spine +* chipmunk +* box2d +* ... + +Not used codes will be stripped by linker. + +If you are developing with lua, you should link to `libcocos2d` and `libluacocos2d`. You can comment codes in `lua_module_register.h` if you don't want to some module. + +```c++ +int lua_module_register(lua_State* L) +{ + register_cocosdenshion_module(L); // comment this line to remove cocosdenshion + register_network_module(L); // comment this line to remove network + register_cocosbuilder_module(L); // comment this line to remove cocosbuilder + register_cocostudio_module(L); // comment this line to remove cocostudio + register_extension_module(L); // comment this line to remove extension + register_ui_moudle(L); // comment this line to remove ui + register_spine_module(L); // comment this line to remove spine + register_cocos3d_module(L); // comment this line to remove 3d + return 1; +} +``` diff --git a/extensions/Android.mk b/extensions/Android.mk deleted file mode 100644 index 66206c6331..0000000000 --- a/extensions/Android.mk +++ /dev/null @@ -1,48 +0,0 @@ -LOCAL_PATH := $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_MODULE := cocos_extension_static - -LOCAL_MODULE_FILENAME := libextension - -LOCAL_SRC_FILES := \ -assets-manager/AssetsManager.cpp \ -GUI/CCControlExtension/CCControl.cpp \ -GUI/CCControlExtension/CCControlButton.cpp \ -GUI/CCControlExtension/CCControlColourPicker.cpp \ -GUI/CCControlExtension/CCControlHuePicker.cpp \ -GUI/CCControlExtension/CCControlPotentiometer.cpp \ -GUI/CCControlExtension/CCControlSaturationBrightnessPicker.cpp \ -GUI/CCControlExtension/CCControlSlider.cpp \ -GUI/CCControlExtension/CCControlStepper.cpp \ -GUI/CCControlExtension/CCControlSwitch.cpp \ -GUI/CCControlExtension/CCControlUtils.cpp \ -GUI/CCControlExtension/CCInvocation.cpp \ -GUI/CCControlExtension/CCScale9Sprite.cpp \ -GUI/CCEditBox/CCEditBox.cpp \ -GUI/CCEditBox/CCEditBoxImplAndroid.cpp \ -GUI/CCEditBox/CCEditBoxImplNone.cpp \ -GUI/CCEditBox/CCEditBoxImplWin.cpp \ -GUI/CCScrollView/CCScrollView.cpp \ -GUI/CCScrollView/CCTableView.cpp \ -GUI/CCScrollView/CCTableViewCell.cpp \ -physics-nodes/CCPhysicsDebugNode.cpp \ -physics-nodes/CCPhysicsSprite.cpp - -LOCAL_WHOLE_STATIC_LIBRARIES := cocos2dx_static -LOCAL_WHOLE_STATIC_LIBRARIES += cocos_curl_static -LOCAL_WHOLE_STATIC_LIBRARIES += box2d_static - -LOCAL_CXXFLAGS += -fexceptions - -LOCAL_C_INCLUDES := $(LOCAL_PATH)/.. - -LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/.. \ - $(LOCAL_PATH)/GUI/CCControlExtension \ - $(LOCAL_PATH)/GUI/CCScrollView - -include $(BUILD_STATIC_LIBRARY) - -$(call import-module,.) -$(call import-module,curl/prebuilt/android) -$(call import-module,Box2D) diff --git a/extensions/GUI/CCScrollView/CCScrollView.cpp b/extensions/GUI/CCScrollView/CCScrollView.cpp index 4c698d5fbb..e6b851a65f 100644 --- a/extensions/GUI/CCScrollView/CCScrollView.cpp +++ b/extensions/GUI/CCScrollView/CCScrollView.cpp @@ -29,6 +29,7 @@ #include "2d/CCActionInterval.h" #include "2d/CCActionTween.h" #include "base/CCDirector.h" +#include "base/CCEventDispatcher.h" #include "renderer/CCRenderer.h" #include diff --git a/extensions/proj.win32/libextension.vcxproj b/extensions/proj.win32/libextension.vcxproj deleted file mode 100644 index 7ae80cb1fc..0000000000 --- a/extensions/proj.win32/libextension.vcxproj +++ /dev/null @@ -1,125 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - - {21B2C324-891F-48EA-AD1A-5AE13DE12E28} - libextension.win32 - Win32Proj - libextension - - - - DynamicLibrary - Unicode - v100 - v110 - v110_xp - v120 - v120_xp - - - DynamicLibrary - Unicode - v100 - v110 - v110_xp - v120 - v120_xp - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.40219.1 - $(SolutionDir)$(Configuration).win32\ - $(Configuration).win32\ - $(SolutionDir)$(Configuration).win32\ - $(Configuration).win32\ - AllRules.ruleset - - - AllRules.ruleset - - - - - $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\lib;$(LibraryPath) - - - $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\lib;$(LibraryPath) - - - - Disabled - $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;$(EngineRoot);$(EngineRoot)cocos\audio\include;$(EngineRoot)external;$(EngineRoot)external\unzip;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external\curl\include\win32;$(EngineRoot)external\sqlite3\include;$(EngineRoot)external\libwebsockets\win32\include;$(EngineRoot)external\win32-specific\zlib\include;..\;%(AdditionalIncludeDirectories) - WIN32;_WINDOWS;_DEBUG;COCOS2D_DEBUG=1;CC_ENABLE_CHIPMUNK_INTEGRATION=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_USREXDLL;%(PreprocessorDefinitions) - false - EnableFastChecks - MultiThreadedDebugDLL - - - Level3 - OldStyle - 4267;4251;4244;%(DisableSpecificWarnings) - true - - - libcocos2d.lib - $(OutDir);%(AdditionalLibraryDirectories) - - - $(OutDir);%(AdditionalLibraryDirectories) - libcocos2d.lib;opengl32.lib;glew32.lib;libcurl_imp.lib;libchipmunk.lib;libBox2D.lib;glfw3.lib;%(AdditionalDependencies) - - - - - MinSpace - true - $(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;$(EngineRoot);$(EngineRoot)cocos\audio\include;$(EngineRoot)external;$(EngineRoot)external\unzip;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external\curl\include\win32;$(EngineRoot)external\sqlite3\include;$(EngineRoot)external\libwebsockets\win32\include;$(EngineRoot)external\win32-specific\zlib\include;..\;%(AdditionalIncludeDirectories) - WIN32;_WINDOWS;NDEBUG;CC_ENABLE_CHIPMUNK_INTEGRATION=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;_USREXDLL;%(PreprocessorDefinitions) - MultiThreadedDLL - true - - - Level3 - None - 4267;4251;4244;%(DisableSpecificWarnings) - true - false - - - $(OutDir);%(AdditionalLibraryDirectories) - libcocos2d.lib;opengl32.lib;glew32.lib;libcurl_imp.lib;libchipmunk.lib;libBox2D.lib;glfw3.lib;%(AdditionalDependencies) - - - - - {98a51ba8-fc3a-415b-ac8f-8c7bd464e93e} - - - {929480e7-23c0-4df6-8456-096d71547116} - - - - - - \ No newline at end of file diff --git a/extensions/proj.win32/libextension.vcxproj.filters b/extensions/proj.win32/libextension.vcxproj.filters deleted file mode 100644 index 9cd8510566..0000000000 --- a/extensions/proj.win32/libextension.vcxproj.filters +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/extensions/proj.win32/libextension.vcxproj.user b/extensions/proj.win32/libextension.vcxproj.user deleted file mode 100644 index ace9a86acb..0000000000 --- a/extensions/proj.win32/libextension.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/external/Box2D/Android.mk b/external/Box2D/Android.mk deleted file mode 100644 index ca6cfca39e..0000000000 --- a/external/Box2D/Android.mk +++ /dev/null @@ -1,61 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_MODULE := box2d_static - -LOCAL_MODULE_FILENAME := libbox2d - -LOCAL_SRC_FILES := \ -Collision/b2BroadPhase.cpp \ -Collision/b2CollideCircle.cpp \ -Collision/b2CollideEdge.cpp \ -Collision/b2CollidePolygon.cpp \ -Collision/b2Collision.cpp \ -Collision/b2Distance.cpp \ -Collision/b2DynamicTree.cpp \ -Collision/b2TimeOfImpact.cpp \ -Collision/Shapes/b2ChainShape.cpp \ -Collision/Shapes/b2CircleShape.cpp \ -Collision/Shapes/b2EdgeShape.cpp \ -Collision/Shapes/b2PolygonShape.cpp \ -Common/b2BlockAllocator.cpp \ -Common/b2Draw.cpp \ -Common/b2Math.cpp \ -Common/b2Settings.cpp \ -Common/b2StackAllocator.cpp \ -Common/b2Timer.cpp \ -Dynamics/b2Body.cpp \ -Dynamics/b2ContactManager.cpp \ -Dynamics/b2Fixture.cpp \ -Dynamics/b2Island.cpp \ -Dynamics/b2World.cpp \ -Dynamics/b2WorldCallbacks.cpp \ -Dynamics/Contacts/b2ChainAndCircleContact.cpp \ -Dynamics/Contacts/b2ChainAndPolygonContact.cpp \ -Dynamics/Contacts/b2CircleContact.cpp \ -Dynamics/Contacts/b2Contact.cpp \ -Dynamics/Contacts/b2ContactSolver.cpp \ -Dynamics/Contacts/b2EdgeAndCircleContact.cpp \ -Dynamics/Contacts/b2EdgeAndPolygonContact.cpp \ -Dynamics/Contacts/b2PolygonAndCircleContact.cpp \ -Dynamics/Contacts/b2PolygonContact.cpp \ -Dynamics/Joints/b2DistanceJoint.cpp \ -Dynamics/Joints/b2FrictionJoint.cpp \ -Dynamics/Joints/b2GearJoint.cpp \ -Dynamics/Joints/b2Joint.cpp \ -Dynamics/Joints/b2MotorJoint.cpp \ -Dynamics/Joints/b2MouseJoint.cpp \ -Dynamics/Joints/b2PrismaticJoint.cpp \ -Dynamics/Joints/b2PulleyJoint.cpp \ -Dynamics/Joints/b2RevoluteJoint.cpp \ -Dynamics/Joints/b2RopeJoint.cpp \ -Dynamics/Joints/b2WeldJoint.cpp \ -Dynamics/Joints/b2WheelJoint.cpp \ -Rope/b2Rope.cpp - -LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/.. - -LOCAL_C_INCLUDES := $(LOCAL_PATH)/.. - -include $(BUILD_STATIC_LIBRARY) diff --git a/external/chipmunk/Android.mk b/external/chipmunk/Android.mk deleted file mode 100644 index e8441cd0d7..0000000000 --- a/external/chipmunk/Android.mk +++ /dev/null @@ -1,45 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_MODULE := chipmunk_static - -LOCAL_MODULE_FILENAME := libchipmunk - -LOCAL_SRC_FILES := \ -src/chipmunk.c \ -src/cpArbiter.c \ -src/cpArray.c \ -src/cpBB.c \ -src/cpBBTree.c \ -src/cpBody.c \ -src/cpCollision.c \ -src/cpHashSet.c \ -src/cpPolyShape.c \ -src/cpShape.c \ -src/cpSpace.c \ -src/cpSpaceComponent.c \ -src/cpSpaceHash.c \ -src/cpSpaceQuery.c \ -src/cpSpaceStep.c \ -src/cpSpatialIndex.c \ -src/cpSweep1D.c \ -src/cpVect.c \ -src/constraints/cpConstraint.c \ -src/constraints/cpDampedRotarySpring.c \ -src/constraints/cpDampedSpring.c \ -src/constraints/cpGearJoint.c \ -src/constraints/cpGrooveJoint.c \ -src/constraints/cpPinJoint.c \ -src/constraints/cpPivotJoint.c \ -src/constraints/cpRatchetJoint.c \ -src/constraints/cpRotaryLimitJoint.c \ -src/constraints/cpSimpleMotor.c \ -src/constraints/cpSlideJoint.c - -LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include/chipmunk - -LOCAL_C_INCLUDES := $(LOCAL_PATH)/include/chipmunk -LOCAL_CFLAGS := -std=c99 - -include $(BUILD_STATIC_LIBRARY) diff --git a/external/config.json b/external/config.json index 005d87dd6b..f8d5cd12a3 100644 --- a/external/config.json +++ b/external/config.json @@ -1,6 +1,6 @@ { - "version":"v3-deps-8", - "zip_file_size":"67964573", + "version":"v3-deps-9", + "zip_file_size":"73295462", "repo_name":"cocos2d-x-3rd-party-libs-bin", "repo_parent":"https://github.com/cocos2d/", "move_dirs":{ diff --git a/templates/cocos2dx_files.json b/templates/cocos2dx_files.json index 18839d4058..cfdf80abae 100644 --- a/templates/cocos2dx_files.json +++ b/templates/cocos2dx_files.json @@ -192,7 +192,6 @@ "cocos/2d/libcocos2d.vcxproj", "cocos/2d/libcocos2d.vcxproj.filters", "cocos/3d/3dExport.h", - "cocos/3d/Android.mk", "cocos/3d/CCAABB.cpp", "cocos/3d/CCAABB.h", "cocos/3d/CCAnimate3D.cpp", @@ -228,12 +227,8 @@ "cocos/3d/CCSprite3DMaterial.h", "cocos/3d/CMakeLists.txt", "cocos/3d/cocos3d.h", - "cocos/3d/proj.win32/libcocos3d.vcxproj", - "cocos/3d/proj.win32/libcocos3d.vcxproj.filters", - "cocos/3d/proj.win32/libcocos3d.vcxproj.user", "cocos/Android.mk", "cocos/CMakeLists.txt", - "cocos/audio/android/Android.mk", "cocos/audio/android/ccdandroidUtils.cpp", "cocos/audio/android/ccdandroidUtils.h", "cocos/audio/android/cddSimpleAudioEngine.cpp", @@ -270,9 +265,6 @@ "cocos/audio/openal/OpenALDecoder.cpp", "cocos/audio/openal/OpenALDecoder.h", "cocos/audio/openal/SimpleAudioEngineOpenAL.cpp", - "cocos/audio/proj.win32/libcocosdenshion.vcxproj", - "cocos/audio/proj.win32/libcocosdenshion.vcxproj.filters", - "cocos/audio/proj.win32/libcocosdenshion.vcxproj.user", "cocos/audio/proj.wp8/CocosDenshion.vcxproj", "cocos/audio/proj.wp8/CocosDenshion.vcxproj.filters", "cocos/audio/proj.wp8/CocosDenshion.vcxproj.user", @@ -422,7 +414,6 @@ "cocos/deprecated/CCSet.h", "cocos/deprecated/CCString.cpp", "cocos/deprecated/CCString.h", - "cocos/editor-support/cocosbuilder/Android.mk", "cocos/editor-support/cocosbuilder/CCBAnimationManager.cpp", "cocos/editor-support/cocosbuilder/CCBAnimationManager.h", "cocos/editor-support/cocosbuilder/CCBFileLoader.cpp", @@ -472,9 +463,6 @@ "cocos/editor-support/cocosbuilder/CCSpriteLoader.cpp", "cocos/editor-support/cocosbuilder/CCSpriteLoader.h", "cocos/editor-support/cocosbuilder/CocosBuilder.h", - "cocos/editor-support/cocosbuilder/proj.win32/libCocosBuilder.vcxproj.filters", - "cocos/editor-support/cocosbuilder/proj.win32/libCocosBuilder.vcxproj.user", - "cocos/editor-support/cocosbuilder/proj.win32/libcocosbuilder.vcxproj", "cocos/editor-support/cocosbuilder/proj.wp8/libCocosBuilder.vcxproj", "cocos/editor-support/cocosbuilder/proj.wp8/libCocosBuilder.vcxproj.filters", "cocos/editor-support/cocosbuilder/proj.wp8/libCocosBuilder.vcxproj.user", @@ -491,7 +479,6 @@ "cocos/editor-support/cocostudio/ActionTimeline/CCTimeLine.cpp", "cocos/editor-support/cocostudio/ActionTimeline/CCTimeLine.h", "cocos/editor-support/cocostudio/ActionTimeline/CCTimelineMacro.h", - "cocos/editor-support/cocostudio/Android.mk", "cocos/editor-support/cocostudio/CCActionFrame.cpp", "cocos/editor-support/cocostudio/CCActionFrame.h", "cocos/editor-support/cocostudio/CCActionFrameEasing.cpp", @@ -594,15 +581,11 @@ "cocos/editor-support/cocostudio/WidgetReader/WidgetReader.cpp", "cocos/editor-support/cocostudio/WidgetReader/WidgetReader.h", "cocos/editor-support/cocostudio/WidgetReader/WidgetReaderProtocol.h", - "cocos/editor-support/cocostudio/proj.win32/libcocostudio.vcxproj", - "cocos/editor-support/cocostudio/proj.win32/libcocostudio.vcxproj.filters", - "cocos/editor-support/cocostudio/proj.win32/libcocostudio.vcxproj.user", "cocos/editor-support/cocostudio/proj.wp8/libCocosStudio.vcxproj", "cocos/editor-support/cocostudio/proj.wp8/libCocosStudio.vcxproj.filters", "cocos/editor-support/cocostudio/proj.wp8/libCocosStudio.vcxproj.user", "cocos/editor-support/cocostudio/proj.wp8/pch.cpp", "cocos/editor-support/cocostudio/proj.wp8/pch.h", - "cocos/editor-support/spine/Android.mk", "cocos/editor-support/spine/Animation.cpp", "cocos/editor-support/spine/Animation.h", "cocos/editor-support/spine/AnimationState.cpp", @@ -652,9 +635,6 @@ "cocos/editor-support/spine/SlotData.h", "cocos/editor-support/spine/extension.cpp", "cocos/editor-support/spine/extension.h", - "cocos/editor-support/spine/proj.win32/libSpine.vcxproj", - "cocos/editor-support/spine/proj.win32/libSpine.vcxproj.filters", - "cocos/editor-support/spine/proj.win32/libSpine.vcxproj.user", "cocos/editor-support/spine/proj.wp8/libSpine.vcxproj", "cocos/editor-support/spine/proj.wp8/libSpine.vcxproj.filters", "cocos/editor-support/spine/proj.wp8/libSpine.vcxproj.user", @@ -693,7 +673,6 @@ "cocos/math/Vec4.cpp", "cocos/math/Vec4.h", "cocos/math/Vec4.inl", - "cocos/network/Android.mk", "cocos/network/HttpClient.cpp", "cocos/network/HttpClient.h", "cocos/network/HttpRequest.h", @@ -702,9 +681,6 @@ "cocos/network/SocketIO.h", "cocos/network/WebSocket.cpp", "cocos/network/WebSocket.h", - "cocos/network/proj.win32/libnetwork.vcxproj", - "cocos/network/proj.win32/libnetwork.vcxproj.filters", - "cocos/network/proj.win32/libnetwork.vcxproj.user", "cocos/network/proj.wp8/libNetwork.vcxproj", "cocos/network/proj.wp8/libNetwork.vcxproj.filters", "cocos/physics/CCPhysicsBody.cpp", @@ -1002,7 +978,6 @@ "cocos/storage/local-storage/LocalStorageAndroid.cpp", "cocos/storage/local-storage/proj.wp8/libLocalStorage.vcxproj", "cocos/storage/local-storage/proj.wp8/libLocalStorage.vcxproj.filters", - "cocos/ui/Android.mk", "cocos/ui/CocosGUI.cpp", "cocos/ui/CocosGUI.h", "cocos/ui/GUIDefine.h", @@ -1056,9 +1031,6 @@ "cocos/ui/UIVideoPlayerIOS.mm", "cocos/ui/UIWidget.cpp", "cocos/ui/UIWidget.h", - "cocos/ui/proj.win32/libui.vcxproj", - "cocos/ui/proj.win32/libui.vcxproj.filters", - "cocos/ui/proj.win32/libui.vcxproj.user", "cocos/ui/proj.wp8/libGUI.vcxproj", "cocos/ui/proj.wp8/libGUI.vcxproj.filters", "docs/CODING_STYLE.md", @@ -1068,7 +1040,6 @@ "docs/cocos2dx_portrait.png", "docs/doxygen.config", "download-deps.py", - "extensions/Android.mk", "extensions/CMakeLists.txt", "extensions/ExtensionExport.h", "extensions/ExtensionMacros.h", @@ -1126,14 +1097,10 @@ "extensions/physics-nodes/CCPhysicsSprite.h", "extensions/proj.win32/Win32InputBox.cpp", "extensions/proj.win32/Win32InputBox.h", - "extensions/proj.win32/libextension.vcxproj", - "extensions/proj.win32/libextension.vcxproj.filters", - "extensions/proj.win32/libextension.vcxproj.user", "extensions/proj.wp8/libExtensions.vcxproj", "extensions/proj.wp8/libExtensions.vcxproj.filters", "extensions/proj.wp8/pch.cpp", "extensions/proj.wp8/pch.h", - "external/Box2D/Android.mk", "external/Box2D/Box2D.h", "external/Box2D/Collision/Shapes/b2ChainShape.cpp", "external/Box2D/Collision/Shapes/b2ChainShape.h", @@ -1234,7 +1201,6 @@ "external/ConvertUTF/ConvertUTF.c", "external/ConvertUTF/ConvertUTF.h", "external/ConvertUTF/ConvertUTFWrapper.cpp", - "external/chipmunk/Android.mk", "external/chipmunk/LICENSE.txt", "external/chipmunk/README.txt", "external/chipmunk/chipmunk-docs.html", @@ -2203,6 +2169,10 @@ "external/websockets/prebuilt/wp8/arm/libwebsockets.lib", "external/websockets/prebuilt/wp8/win32/libwebsockets.dll", "external/websockets/prebuilt/wp8/win32/libwebsockets.lib", + "external/win32-specific/box2d/prebuilt/debug-lib/libbox2d.lib", + "external/win32-specific/box2d/prebuilt/release-lib/libbox2d.lib", + "external/win32-specific/chipmunk/prebuilt/debug-lib/libchipmunk.lib", + "external/win32-specific/chipmunk/prebuilt/release-lib/libchipmunk.lib", "external/win32-specific/gles/include/OGLES/GL/glew.h", "external/win32-specific/gles/include/OGLES/GL/glxew.h", "external/win32-specific/gles/include/OGLES/GL/wglew.h", @@ -2211,6 +2181,8 @@ "external/win32-specific/icon/include/iconv.h", "external/win32-specific/icon/prebuilt/iconv.dll", "external/win32-specific/icon/prebuilt/libiconv.lib", + "external/win32-specific/spine/prebuilt/debug-lib/libspine.lib", + "external/win32-specific/spine/prebuilt/release-lib/libspine.lib", "external/win32-specific/zlib/include/zconf.h", "external/win32-specific/zlib/include/zlib.h", "external/win32-specific/zlib/prebuilt/libzlib.lib", diff --git a/templates/cpp-template-default/proj.win32/HelloCpp.sln b/templates/cpp-template-default/proj.win32/HelloCpp.sln index 3bc2c2704e..1b451b8cc8 100644 --- a/templates/cpp-template-default/proj.win32/HelloCpp.sln +++ b/templates/cpp-template-default/proj.win32/HelloCpp.sln @@ -4,13 +4,10 @@ Microsoft Visual Studio Solution File, Format Version 12.00 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HelloCpp", "HelloCpp.vcxproj", "{76A39BB2-9B84-4C65-98A5-654D86B86F2A}" ProjectSection(ProjectDependencies) = postProject {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E} = {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E} - {207BC7A9-CCF1-4F2F-A04D-45F72242AE25} = {207BC7A9-CCF1-4F2F-A04D-45F72242AE25} EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocos2d", "..\cocos2d\cocos\2d\libcocos2d.vcxproj", "{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libchipmunk", "..\cocos2d\external\chipmunk\proj.win32\chipmunk.vcxproj", "{207BC7A9-CCF1-4F2F-A04D-45F72242AE25}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -25,10 +22,6 @@ Global {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Debug|Win32.Build.0 = Debug|Win32 {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Release|Win32.ActiveCfg = Release|Win32 {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Release|Win32.Build.0 = Release|Win32 - {207BC7A9-CCF1-4F2F-A04D-45F72242AE25}.Debug|Win32.ActiveCfg = Debug|Win32 - {207BC7A9-CCF1-4F2F-A04D-45F72242AE25}.Debug|Win32.Build.0 = Debug|Win32 - {207BC7A9-CCF1-4F2F-A04D-45F72242AE25}.Release|Win32.ActiveCfg = Release|Win32 - {207BC7A9-CCF1-4F2F-A04D-45F72242AE25}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/templates/cpp-template-default/proj.win32/HelloCpp.vcxproj b/templates/cpp-template-default/proj.win32/HelloCpp.vcxproj index a2eb592205..0fa88ddb90 100644 --- a/templates/cpp-template-default/proj.win32/HelloCpp.vcxproj +++ b/templates/cpp-template-default/proj.win32/HelloCpp.vcxproj @@ -151,9 +151,6 @@ xcopy /Y /Q "$(EngineRoot)external\websockets\prebuilt\win32\*.*" "$(OutDir)"{98a51ba8-fc3a-415b-ac8f-8c7bd464e93e} false - - {207bc7a9-ccf1-4f2f-a04d-45f72242ae25} - diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.android/jni/Android.mk b/templates/lua-template-default/frameworks/runtime-src/proj.android/jni/Android.mk index 8515d2a334..a35e293081 100644 --- a/templates/lua-template-default/frameworks/runtime-src/proj.android/jni/Android.mk +++ b/templates/lua-template-default/frameworks/runtime-src/proj.android/jni/Android.mk @@ -12,15 +12,7 @@ LOCAL_SRC_FILES := hellolua/main.cpp \ LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../Classes -LOCAL_WHOLE_STATIC_LIBRARIES := cocos2d_lua_static -LOCAL_WHOLE_STATIC_LIBRARIES += cocosdenshion_lua_static -LOCAL_WHOLE_STATIC_LIBRARIES += network_lua_static -LOCAL_WHOLE_STATIC_LIBRARIES += cocosbuilder_lua_static -LOCAL_WHOLE_STATIC_LIBRARIES += cocostudio_lua_static -LOCAL_WHOLE_STATIC_LIBRARIES += spine_lua_static -LOCAL_WHOLE_STATIC_LIBRARIES += extension_lua_static -LOCAL_WHOLE_STATIC_LIBRARIES += ui_lua_static -LOCAL_WHOLE_STATIC_LIBRARIES += cocos3d_lua_static +LOCAL_STATIC_LIBRARIES := cocos2d_lua_static include $(BUILD_SHARED_LIBRARY) diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj b/templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj index a40809f76f..3335c5b27e 100644 --- a/templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj +++ b/templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj @@ -9,42 +9,10 @@ /* Begin PBXBuildFile section */ 15427C5A198F1DF000DC375D /* libcocos2d iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15A8A4251834BDA200142BE0 /* libcocos2d iOS.a */; }; 15427C5B198F1E0100DC375D /* libluacocos2d iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427C59198F1DE400DC375D /* libluacocos2d iOS.a */; }; - 15427C5C198F1E1400DC375D /* libcocosdenshion iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15A8A42D1834BDA200142BE0 /* libcocosdenshion iOS.a */; }; - 15427C5D198F1E2100DC375D /* libluacocosdenshion iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427C57198F1DE400DC375D /* libluacocosdenshion iOS.a */; }; - 15427C5E198F1E2B00DC375D /* libnetwork iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427C29198F1DE400DC375D /* libnetwork iOS.a */; }; - 15427C5F198F1E3300DC375D /* libluanetwork iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427C55198F1DE400DC375D /* libluanetwork iOS.a */; }; 15427C78198F1F9900DC375D /* libcocos2d Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15A8A4171834BDA200142BE0 /* libcocos2d Mac.a */; }; 15427C79198F1FA200DC375D /* libluacocos2d Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427C49198F1DE400DC375D /* libluacocos2d Mac.a */; }; - 15427C7A198F1FB600DC375D /* libcocosdenshion Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15A8A41F1834BDA200142BE0 /* libcocosdenshion Mac.a */; }; - 15427C7B198F1FC100DC375D /* libluacocosdenshion Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427C47198F1DE400DC375D /* libluacocosdenshion Mac.a */; }; - 15427C7C198F1FCB00DC375D /* libnetwork Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427C1F198F1DE400DC375D /* libnetwork Mac.a */; }; - 15427C7D198F1FD800DC375D /* libluanetwork Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427C45198F1DE400DC375D /* libluanetwork Mac.a */; }; - 156B43D419A1F224002CBF18 /* libcocos3d iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 156B43C919A1F1EF002CBF18 /* libcocos3d iOS.a */; }; - 156B43D519A1F236002CBF18 /* libluacocos3d iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 156B43D119A1F1EF002CBF18 /* libluacocos3d iOS.a */; }; - 156B43DA19A1F256002CBF18 /* libcocos3d Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 156B43C719A1F1EF002CBF18 /* libcocos3d Mac.a */; }; - 156B43DB19A1F262002CBF18 /* libluacocos3d Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 156B43CF19A1F1EF002CBF18 /* libluacocos3d Mac.a */; }; 15A8A4491834C64F00142BE0 /* Icon-114.png in Resources */ = {isa = PBXBuildFile; fileRef = 5023810C17EBBCAC00990C9B /* Icon-114.png */; }; 15A8A4881834C90F00142BE0 /* libcurl.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 15A8A4871834C90E00142BE0 /* libcurl.dylib */; }; - 15AA968E199C627C00725633 /* libluaextension iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427C4B198F1DE400DC375D /* libluaextension iOS.a */; }; - 15AA969F199C628500725633 /* libextension iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15A8A4271834BDA200142BE0 /* libextension iOS.a */; }; - 15AA96A0199C628F00725633 /* libluacocosbuilder iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427C51198F1DE400DC375D /* libluacocosbuilder iOS.a */; }; - 15AA96A1199C629B00725633 /* libcocosbuilder iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427C25198F1DE400DC375D /* libcocosbuilder iOS.a */; }; - 15AA96A2199C62AE00725633 /* libcocostudio iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427C23198F1DE400DC375D /* libcocostudio iOS.a */; }; - 15AA96A3199C62B900725633 /* libluacocostudio iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427C4F198F1DE400DC375D /* libluacocostudio iOS.a */; }; - 15AA96A4199C62C500725633 /* libluaspine iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427C53198F1DE400DC375D /* libluaspine iOS.a */; }; - 15AA96A5199C62CF00725633 /* libspine iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427C27198F1DE400DC375D /* libspine iOS.a */; }; - 15AA96A6199C62F500725633 /* libluaui iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427C4D198F1DE400DC375D /* libluaui iOS.a */; }; - 15AA96A7199C62FE00725633 /* libui iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427C21198F1DE400DC375D /* libui iOS.a */; }; - 15AA96A8199C633700725633 /* libcocosbuilder Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427C1B198F1DE400DC375D /* libcocosbuilder Mac.a */; }; - 15AA96A9199C634600725633 /* libluacocosbuilder Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427C41198F1DE400DC375D /* libluacocosbuilder Mac.a */; }; - 15AA96AA199C64DF00725633 /* libcocostudio Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427C19198F1DE400DC375D /* libcocostudio Mac.a */; }; - 15AA96AB199C64F400725633 /* libluacocostudio Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427C3F198F1DE400DC375D /* libluacocostudio Mac.a */; }; - 15AA96AC199C64FD00725633 /* libspine Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427C1D198F1DE400DC375D /* libspine Mac.a */; }; - 15AA96AD199C650C00725633 /* libluaspine Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427C43198F1DE400DC375D /* libluaspine Mac.a */; }; - 15AA96AE199C652A00725633 /* libextension Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15A8A4191834BDA200142BE0 /* libextension Mac.a */; }; - 15AA96AF199C653300725633 /* libluaextension Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427C3B198F1DE400DC375D /* libluaextension Mac.a */; }; - 15AA96B0199C655200725633 /* libui Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427C17198F1DE400DC375D /* libui Mac.a */; }; - 15AA96B1199C655A00725633 /* libluaui Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427C3D198F1DE400DC375D /* libluaui Mac.a */; }; 15AA96B6199C668400725633 /* CCBReaderLoad.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15AA96B4199C668400725633 /* CCBReaderLoad.lua */; }; 15AA96B7199C668400725633 /* CCBReaderLoad.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15AA96B4199C668400725633 /* CCBReaderLoad.lua */; }; 15AA96B8199C668400725633 /* DeprecatedCocosBuilderClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15AA96B5199C668400725633 /* DeprecatedCocosBuilderClass.lua */; }; @@ -165,265 +133,6 @@ /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - 152A33CC199C93BF004B68DC /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 155CA2C71988C494006E0A08; - remoteInfo = "libluaextension iOS"; - }; - 152A33CE199C93BF004B68DC /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 15EFA300198B28A8000C57D3; - remoteInfo = "libluaui iOS"; - }; - 152A33D0199C93BF004B68DC /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 15EFA381198B2934000C57D3; - remoteInfo = "libluacocostudio iOS"; - }; - 152A33D2199C93BF004B68DC /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 15EFA27F198B2791000C57D3; - remoteInfo = "libluacocosbuilder iOS"; - }; - 152A33D4199C93BF004B68DC /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 15EFA407198B2AFD000C57D3; - remoteInfo = "libluaspine iOS"; - }; - 152A33F2199C93CD004B68DC /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = A07A4E111783867C0073F6A7; - remoteInfo = "libextension iOS"; - }; - 152A33F4199C93CD004B68DC /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = B24EEA2C19775E92004493CC; - remoteInfo = "libui iOS"; - }; - 152A33F6199C93CD004B68DC /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = B24EEA6719775EBB004493CC; - remoteInfo = "libcocostudio iOS"; - }; - 152A33F8199C93CD004B68DC /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = B24EEA6F19775ECE004493CC; - remoteInfo = "libcocosbuilder iOS"; - }; - 152A33FA199C93CD004B68DC /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = B24EEA7719775EE1004493CC; - remoteInfo = "libspine iOS"; - }; - 152A33FC199C93E7004B68DC /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 15C1BD5F1986538000A46ACC; - remoteInfo = "libluaextension Mac"; - }; - 152A33FE199C93E7004B68DC /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 15C1C0801987328E00A46ACC; - remoteInfo = "libluaui Mac"; - }; - 152A3400199C93E7004B68DC /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 15C1BF7219865C2000A46ACC; - remoteInfo = "libluacocostudio Mac"; - }; - 152A3402199C93E7004B68DC /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 15C1BE66198654BE00A46ACC; - remoteInfo = "libluacocosbuilder Mac"; - }; - 152A3404199C93E7004B68DC /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 15C1BFF819865E5F00A46ACC; - remoteInfo = "libluaspine Mac"; - }; - 152A3406199C93F4004B68DC /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = A03F2FC117814595006731B9; - remoteInfo = "libextension Mac"; - }; - 152A3408199C93F4004B68DC /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = B245F10019766132001920FD; - remoteInfo = "libui Mac"; - }; - 152A340A199C93F4004B68DC /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = B2DB48161976716E00411E16; - remoteInfo = "libcocostudio Mac"; - }; - 152A340C199C93F4004B68DC /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = B2DB479B197669A100411E16; - remoteInfo = "libcocosbuilder Mac"; - }; - 152A340E199C93F4004B68DC /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = B2DB48CA19767F1F00411E16; - remoteInfo = "libspine Mac"; - }; - 15427C16198F1DE400DC375D /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = B245F13A19766132001920FD; - remoteInfo = "libui Mac"; - }; - 15427C18198F1DE400DC375D /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = B2DB484D1976716E00411E16; - remoteInfo = "libcocostudio Mac"; - }; - 15427C1A198F1DE400DC375D /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = B2DB47D2197669A100411E16; - remoteInfo = "libcocosbuilder Mac"; - }; - 15427C1C198F1DE400DC375D /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = B2DB490119767F1F00411E16; - remoteInfo = "libspine Mac"; - }; - 15427C1E198F1DE400DC375D /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = B2DB49C4197686CB00411E16; - remoteInfo = "libnetwork Mac"; - }; - 15427C20198F1DE400DC375D /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = B24EEA6619775E92004493CC; - remoteInfo = "libui iOS"; - }; - 15427C22198F1DE400DC375D /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = B24EEA6E19775EBB004493CC; - remoteInfo = "libcocostudio iOS"; - }; - 15427C24198F1DE400DC375D /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = B24EEA7619775ECE004493CC; - remoteInfo = "libcocosbuilder iOS"; - }; - 15427C26198F1DE400DC375D /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = B24EEA7E19775EE1004493CC; - remoteInfo = "libspine iOS"; - }; - 15427C28198F1DE400DC375D /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = B24EEA8619775EF3004493CC; - remoteInfo = "libnetwork iOS"; - }; - 15427C3A198F1DE400DC375D /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 15C1BDDA1986538000A46ACC; - remoteInfo = "libluaextension Mac"; - }; - 15427C3C198F1DE400DC375D /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 15C1C0FB1987328E00A46ACC; - remoteInfo = "libluaui Mac"; - }; - 15427C3E198F1DE400DC375D /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 15C1BFED19865C2000A46ACC; - remoteInfo = "libluacocostudio Mac"; - }; - 15427C40198F1DE400DC375D /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 15C1BEE1198654BE00A46ACC; - remoteInfo = "libluacocosbuilder Mac"; - }; - 15427C42198F1DE400DC375D /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 15C1C07319865E5F00A46ACC; - remoteInfo = "libluaspine Mac"; - }; - 15427C44198F1DE400DC375D /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 15C1C1811987340C00A46ACC; - remoteInfo = "libluanetwork Mac"; - }; - 15427C46198F1DE400DC375D /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 15C1BF6919865A0600A46ACC; - remoteInfo = "libluacocosdenshion Mac"; - }; 15427C48198F1DE400DC375D /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; @@ -431,55 +140,6 @@ remoteGlobalIDString = 15C1C2CC198748D200A46ACC; remoteInfo = "libluacocos2d Mac"; }; - 15427C4A198F1DE400DC375D /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 155CA3431988C494006E0A08; - remoteInfo = "libluaextension iOS"; - }; - 15427C4C198F1DE400DC375D /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 15EFA37A198B28A8000C57D3; - remoteInfo = "libluaui iOS"; - }; - 15427C4E198F1DE400DC375D /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 15EFA3FB198B2934000C57D3; - remoteInfo = "libluacocostudio iOS"; - }; - 15427C50198F1DE400DC375D /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 15EFA2F9198B2791000C57D3; - remoteInfo = "libluacocosbuilder iOS"; - }; - 15427C52198F1DE400DC375D /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 15EFA47F198B2AFD000C57D3; - remoteInfo = "libluaspine iOS"; - }; - 15427C54198F1DE400DC375D /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 15EFA4FE198B2B9B000C57D3; - remoteInfo = "libluanetwork iOS"; - }; - 15427C56198F1DE400DC375D /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 15EFA59B198B2D13000C57D3; - remoteInfo = "libluacocosdenshion iOS"; - }; 15427C58198F1DE400DC375D /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; @@ -487,20 +147,6 @@ remoteGlobalIDString = 15EFA616198B2DAA000C57D3; remoteInfo = "libluacocos2d iOS"; }; - 15427C60198F1E7400DC375D /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 15EFA486198B2B9B000C57D3; - remoteInfo = "libluanetwork iOS"; - }; - 15427C62198F1E7400DC375D /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 15EFA523198B2D13000C57D3; - remoteInfo = "libluacocosdenshion iOS"; - }; 15427C64198F1E7400DC375D /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; @@ -515,34 +161,6 @@ remoteGlobalIDString = A07A4C241783777C0073F6A7; remoteInfo = "libcocos2d iOS"; }; - 15427C68198F1E7400DC375D /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = A07A4F9F178387730073F6A7; - remoteInfo = "libcocosdenshion iOS"; - }; - 15427C6A198F1E7400DC375D /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = B24EEA7F19775EF3004493CC; - remoteInfo = "libnetwork iOS"; - }; - 15427C6C198F1F4D00DC375D /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 15C1C1061987340C00A46ACC; - remoteInfo = "libluanetwork Mac"; - }; - 15427C6E198F1F4D00DC375D /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 15C1BEEE19865A0600A46ACC; - remoteInfo = "libluacocosdenshion Mac"; - }; 15427C70198F1F4D00DC375D /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; @@ -557,76 +175,6 @@ remoteGlobalIDString = 1551A33E158F2AB200E66CFE; remoteInfo = "libcocos2d Mac"; }; - 15427C74198F1F4D00DC375D /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = B2DB498D197686CB00411E16; - remoteInfo = "libnetwork Mac"; - }; - 15427C76198F1F4D00DC375D /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = A03F2E9817814268006731B9; - remoteInfo = "libcocosdenshion Mac"; - }; - 156B43BC19A1F1EF002CBF18 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 1516228319A0F45E006099B8; - remoteInfo = "libluacocos3d iOS"; - }; - 156B43C619A1F1EF002CBF18 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 1516200B199E7363006099B8; - remoteInfo = "libcocos3d Mac"; - }; - 156B43C819A1F1EF002CBF18 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 15162201199E7810006099B8; - remoteInfo = "libcocos3d iOS"; - }; - 156B43CE19A1F1EF002CBF18 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 1516227C19A0F32D006099B8; - remoteInfo = "libluacocos3d Mac"; - }; - 156B43D019A1F1EF002CBF18 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 151622BB19A0F45E006099B8; - remoteInfo = "libluacocos3d iOS"; - }; - 156B43D219A1F1FD002CBF18 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 15162030199E7810006099B8; - remoteInfo = "libcocos3d iOS"; - }; - 156B43D619A1F243002CBF18 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 1516224519A0F32D006099B8; - remoteInfo = "libluacocos3d Mac"; - }; - 156B43D819A1F249002CBF18 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 15161E42199E7362006099B8; - remoteInfo = "libcocos3d Mac"; - }; 15A8A4161834BDA200142BE0 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; @@ -634,34 +182,6 @@ remoteGlobalIDString = 1551A33F158F2AB200E66CFE; remoteInfo = "cocos2dx Mac"; }; - 15A8A4181834BDA200142BE0 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = A03F2FD617814595006731B9; - remoteInfo = "cocos2dx-extensions Mac"; - }; - 15A8A41A1834BDA200142BE0 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = A03F2CB81780BD04006731B9; - remoteInfo = "chipmunk Mac"; - }; - 15A8A41C1834BDA200142BE0 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = A03F2D9B1780BDF7006731B9; - remoteInfo = "box2d Mac"; - }; - 15A8A41E1834BDA200142BE0 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = A03F2ED617814268006731B9; - remoteInfo = "CocosDenshion Mac"; - }; 15A8A4241834BDA200142BE0 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; @@ -669,34 +189,6 @@ remoteGlobalIDString = A07A4D641783777C0073F6A7; remoteInfo = "cocos2dx iOS"; }; - 15A8A4261834BDA200142BE0 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = A07A4EFC1783867C0073F6A7; - remoteInfo = "cocos2dx-extensions iOS"; - }; - 15A8A4281834BDA200142BE0 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = A07A4F3B178387670073F6A7; - remoteInfo = "chipmunk iOS"; - }; - 15A8A42A1834BDA200142BE0 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = A07A4F9E1783876B0073F6A7; - remoteInfo = "box2d iOS"; - }; - 15A8A42C1834BDA200142BE0 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = A07A4FB4178387730073F6A7; - remoteInfo = "CocosDenshion iOS"; - }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ @@ -796,22 +288,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 156B43DB19A1F262002CBF18 /* libluacocos3d Mac.a in Frameworks */, - 156B43DA19A1F256002CBF18 /* libcocos3d Mac.a in Frameworks */, - 15AA96B1199C655A00725633 /* libluaui Mac.a in Frameworks */, - 15AA96B0199C655200725633 /* libui Mac.a in Frameworks */, - 15AA96AF199C653300725633 /* libluaextension Mac.a in Frameworks */, - 15AA96AE199C652A00725633 /* libextension Mac.a in Frameworks */, - 15AA96AD199C650C00725633 /* libluaspine Mac.a in Frameworks */, - 15AA96AC199C64FD00725633 /* libspine Mac.a in Frameworks */, - 15AA96AB199C64F400725633 /* libluacocostudio Mac.a in Frameworks */, - 15AA96AA199C64DF00725633 /* libcocostudio Mac.a in Frameworks */, - 15AA96A9199C634600725633 /* libluacocosbuilder Mac.a in Frameworks */, - 15AA96A8199C633700725633 /* libcocosbuilder Mac.a in Frameworks */, - 15427C7D198F1FD800DC375D /* libluanetwork Mac.a in Frameworks */, - 15427C7C198F1FCB00DC375D /* libnetwork Mac.a in Frameworks */, - 15427C7B198F1FC100DC375D /* libluacocosdenshion Mac.a in Frameworks */, - 15427C7A198F1FB600DC375D /* libcocosdenshion Mac.a in Frameworks */, 15427C79198F1FA200DC375D /* libluacocos2d Mac.a in Frameworks */, 15427C78198F1F9900DC375D /* libcocos2d Mac.a in Frameworks */, 15A8A4881834C90F00142BE0 /* libcurl.dylib in Frameworks */, @@ -832,22 +308,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 156B43D519A1F236002CBF18 /* libluacocos3d iOS.a in Frameworks */, - 156B43D419A1F224002CBF18 /* libcocos3d iOS.a in Frameworks */, - 15AA96A7199C62FE00725633 /* libui iOS.a in Frameworks */, - 15AA96A6199C62F500725633 /* libluaui iOS.a in Frameworks */, - 15AA96A5199C62CF00725633 /* libspine iOS.a in Frameworks */, - 15AA96A4199C62C500725633 /* libluaspine iOS.a in Frameworks */, - 15AA96A3199C62B900725633 /* libluacocostudio iOS.a in Frameworks */, - 15AA96A2199C62AE00725633 /* libcocostudio iOS.a in Frameworks */, - 15AA96A1199C629B00725633 /* libcocosbuilder iOS.a in Frameworks */, - 15AA96A0199C628F00725633 /* libluacocosbuilder iOS.a in Frameworks */, - 15AA969F199C628500725633 /* libextension iOS.a in Frameworks */, - 15AA968E199C627C00725633 /* libluaextension iOS.a in Frameworks */, - 15427C5F198F1E3300DC375D /* libluanetwork iOS.a in Frameworks */, - 15427C5E198F1E2B00DC375D /* libnetwork iOS.a in Frameworks */, - 15427C5D198F1E2100DC375D /* libluacocosdenshion iOS.a in Frameworks */, - 15427C5C198F1E1400DC375D /* libcocosdenshion iOS.a in Frameworks */, 15427C5B198F1E0100DC375D /* libluacocos2d iOS.a in Frameworks */, 15427C5A198F1DF000DC375D /* libcocos2d iOS.a in Frameworks */, 15AECE29195D482800907DB0 /* MediaPlayer.framework in Frameworks */, @@ -871,27 +331,7 @@ isa = PBXGroup; children = ( 15A8A4171834BDA200142BE0 /* libcocos2d Mac.a */, - 15A8A4191834BDA200142BE0 /* libextension Mac.a */, - 15427C17198F1DE400DC375D /* libui Mac.a */, - 15427C19198F1DE400DC375D /* libcocostudio Mac.a */, - 15427C1B198F1DE400DC375D /* libcocosbuilder Mac.a */, - 15427C1D198F1DE400DC375D /* libspine Mac.a */, - 15427C1F198F1DE400DC375D /* libnetwork Mac.a */, - 15A8A41B1834BDA200142BE0 /* libchipmunk Mac.a */, - 15A8A41D1834BDA200142BE0 /* libbox2d Mac.a */, - 15A8A41F1834BDA200142BE0 /* libcocosdenshion Mac.a */, - 156B43C719A1F1EF002CBF18 /* libcocos3d Mac.a */, 15A8A4251834BDA200142BE0 /* libcocos2d iOS.a */, - 15A8A4271834BDA200142BE0 /* libextension iOS.a */, - 15A8A4291834BDA200142BE0 /* libchipmunk iOS.a */, - 15A8A42B1834BDA200142BE0 /* libbox2d iOS.a */, - 15A8A42D1834BDA200142BE0 /* libcocosdenshion iOS.a */, - 15427C21198F1DE400DC375D /* libui iOS.a */, - 15427C23198F1DE400DC375D /* libcocostudio iOS.a */, - 15427C25198F1DE400DC375D /* libcocosbuilder iOS.a */, - 15427C27198F1DE400DC375D /* libspine iOS.a */, - 15427C29198F1DE400DC375D /* libnetwork iOS.a */, - 156B43C919A1F1EF002CBF18 /* libcocos3d iOS.a */, ); name = Products; sourceTree = ""; @@ -990,23 +430,7 @@ C03781AF18BF654500FE4F13 /* Products */ = { isa = PBXGroup; children = ( - 15427C3B198F1DE400DC375D /* libluaextension Mac.a */, - 15427C3D198F1DE400DC375D /* libluaui Mac.a */, - 15427C3F198F1DE400DC375D /* libluacocostudio Mac.a */, - 15427C41198F1DE400DC375D /* libluacocosbuilder Mac.a */, - 15427C43198F1DE400DC375D /* libluaspine Mac.a */, - 15427C45198F1DE400DC375D /* libluanetwork Mac.a */, - 15427C47198F1DE400DC375D /* libluacocosdenshion Mac.a */, - 156B43CF19A1F1EF002CBF18 /* libluacocos3d Mac.a */, 15427C49198F1DE400DC375D /* libluacocos2d Mac.a */, - 15427C4B198F1DE400DC375D /* libluaextension iOS.a */, - 15427C4D198F1DE400DC375D /* libluaui iOS.a */, - 15427C4F198F1DE400DC375D /* libluacocostudio iOS.a */, - 15427C51198F1DE400DC375D /* libluacocosbuilder iOS.a */, - 15427C53198F1DE400DC375D /* libluaspine iOS.a */, - 15427C55198F1DE400DC375D /* libluanetwork iOS.a */, - 15427C57198F1DE400DC375D /* libluacocosdenshion iOS.a */, - 156B43D119A1F1EF002CBF18 /* libluacocos3d iOS.a */, 15427C59198F1DE400DC375D /* libluacocos2d iOS.a */, ); name = Products; @@ -1096,24 +520,8 @@ buildRules = ( ); dependencies = ( - 156B43D919A1F249002CBF18 /* PBXTargetDependency */, - 156B43D719A1F243002CBF18 /* PBXTargetDependency */, - 152A3407199C93F4004B68DC /* PBXTargetDependency */, - 152A3409199C93F4004B68DC /* PBXTargetDependency */, - 152A340B199C93F4004B68DC /* PBXTargetDependency */, - 152A340D199C93F4004B68DC /* PBXTargetDependency */, - 152A340F199C93F4004B68DC /* PBXTargetDependency */, - 152A33FD199C93E7004B68DC /* PBXTargetDependency */, - 152A33FF199C93E7004B68DC /* PBXTargetDependency */, - 152A3401199C93E7004B68DC /* PBXTargetDependency */, - 152A3403199C93E7004B68DC /* PBXTargetDependency */, - 152A3405199C93E7004B68DC /* PBXTargetDependency */, - 15427C6D198F1F4D00DC375D /* PBXTargetDependency */, - 15427C6F198F1F4D00DC375D /* PBXTargetDependency */, 15427C71198F1F4D00DC375D /* PBXTargetDependency */, 15427C73198F1F4D00DC375D /* PBXTargetDependency */, - 15427C75198F1F4D00DC375D /* PBXTargetDependency */, - 15427C77198F1F4D00DC375D /* PBXTargetDependency */, ); name = "HelloLua Mac"; productName = HelloLua; @@ -1132,24 +540,8 @@ buildRules = ( ); dependencies = ( - 156B43D319A1F1FD002CBF18 /* PBXTargetDependency */, - 156B43BD19A1F1EF002CBF18 /* PBXTargetDependency */, - 152A33F3199C93CD004B68DC /* PBXTargetDependency */, - 152A33F5199C93CD004B68DC /* PBXTargetDependency */, - 152A33F7199C93CD004B68DC /* PBXTargetDependency */, - 152A33F9199C93CD004B68DC /* PBXTargetDependency */, - 152A33FB199C93CD004B68DC /* PBXTargetDependency */, - 152A33CD199C93BF004B68DC /* PBXTargetDependency */, - 152A33CF199C93BF004B68DC /* PBXTargetDependency */, - 152A33D1199C93BF004B68DC /* PBXTargetDependency */, - 152A33D3199C93BF004B68DC /* PBXTargetDependency */, - 152A33D5199C93BF004B68DC /* PBXTargetDependency */, - 15427C61198F1E7400DC375D /* PBXTargetDependency */, - 15427C63198F1E7400DC375D /* PBXTargetDependency */, 15427C65198F1E7400DC375D /* PBXTargetDependency */, 15427C67198F1E7400DC375D /* PBXTargetDependency */, - 15427C69198F1E7400DC375D /* PBXTargetDependency */, - 15427C6B198F1E7400DC375D /* PBXTargetDependency */, ); name = "HelloLua iOS"; productName = HelloLua; @@ -1198,125 +590,6 @@ /* End PBXProject section */ /* Begin PBXReferenceProxy section */ - 15427C17198F1DE400DC375D /* libui Mac.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libui Mac.a"; - remoteRef = 15427C16198F1DE400DC375D /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 15427C19198F1DE400DC375D /* libcocostudio Mac.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libcocostudio Mac.a"; - remoteRef = 15427C18198F1DE400DC375D /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 15427C1B198F1DE400DC375D /* libcocosbuilder Mac.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libcocosbuilder Mac.a"; - remoteRef = 15427C1A198F1DE400DC375D /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 15427C1D198F1DE400DC375D /* libspine Mac.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libspine Mac.a"; - remoteRef = 15427C1C198F1DE400DC375D /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 15427C1F198F1DE400DC375D /* libnetwork Mac.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libnetwork Mac.a"; - remoteRef = 15427C1E198F1DE400DC375D /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 15427C21198F1DE400DC375D /* libui iOS.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libui iOS.a"; - remoteRef = 15427C20198F1DE400DC375D /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 15427C23198F1DE400DC375D /* libcocostudio iOS.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libcocostudio iOS.a"; - remoteRef = 15427C22198F1DE400DC375D /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 15427C25198F1DE400DC375D /* libcocosbuilder iOS.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libcocosbuilder iOS.a"; - remoteRef = 15427C24198F1DE400DC375D /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 15427C27198F1DE400DC375D /* libspine iOS.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libspine iOS.a"; - remoteRef = 15427C26198F1DE400DC375D /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 15427C29198F1DE400DC375D /* libnetwork iOS.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libnetwork iOS.a"; - remoteRef = 15427C28198F1DE400DC375D /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 15427C3B198F1DE400DC375D /* libluaextension Mac.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libluaextension Mac.a"; - remoteRef = 15427C3A198F1DE400DC375D /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 15427C3D198F1DE400DC375D /* libluaui Mac.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libluaui Mac.a"; - remoteRef = 15427C3C198F1DE400DC375D /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 15427C3F198F1DE400DC375D /* libluacocostudio Mac.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libluacocostudio Mac.a"; - remoteRef = 15427C3E198F1DE400DC375D /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 15427C41198F1DE400DC375D /* libluacocosbuilder Mac.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libluacocosbuilder Mac.a"; - remoteRef = 15427C40198F1DE400DC375D /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 15427C43198F1DE400DC375D /* libluaspine Mac.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libluaspine Mac.a"; - remoteRef = 15427C42198F1DE400DC375D /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 15427C45198F1DE400DC375D /* libluanetwork Mac.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libluanetwork Mac.a"; - remoteRef = 15427C44198F1DE400DC375D /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 15427C47198F1DE400DC375D /* libluacocosdenshion Mac.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libluacocosdenshion Mac.a"; - remoteRef = 15427C46198F1DE400DC375D /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; 15427C49198F1DE400DC375D /* libluacocos2d Mac.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; @@ -1324,55 +597,6 @@ remoteRef = 15427C48198F1DE400DC375D /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 15427C4B198F1DE400DC375D /* libluaextension iOS.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libluaextension iOS.a"; - remoteRef = 15427C4A198F1DE400DC375D /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 15427C4D198F1DE400DC375D /* libluaui iOS.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libluaui iOS.a"; - remoteRef = 15427C4C198F1DE400DC375D /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 15427C4F198F1DE400DC375D /* libluacocostudio iOS.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libluacocostudio iOS.a"; - remoteRef = 15427C4E198F1DE400DC375D /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 15427C51198F1DE400DC375D /* libluacocosbuilder iOS.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libluacocosbuilder iOS.a"; - remoteRef = 15427C50198F1DE400DC375D /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 15427C53198F1DE400DC375D /* libluaspine iOS.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libluaspine iOS.a"; - remoteRef = 15427C52198F1DE400DC375D /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 15427C55198F1DE400DC375D /* libluanetwork iOS.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libluanetwork iOS.a"; - remoteRef = 15427C54198F1DE400DC375D /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 15427C57198F1DE400DC375D /* libluacocosdenshion iOS.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libluacocosdenshion iOS.a"; - remoteRef = 15427C56198F1DE400DC375D /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; 15427C59198F1DE400DC375D /* libluacocos2d iOS.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; @@ -1380,34 +604,6 @@ remoteRef = 15427C58198F1DE400DC375D /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 156B43C719A1F1EF002CBF18 /* libcocos3d Mac.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libcocos3d Mac.a"; - remoteRef = 156B43C619A1F1EF002CBF18 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 156B43C919A1F1EF002CBF18 /* libcocos3d iOS.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libcocos3d iOS.a"; - remoteRef = 156B43C819A1F1EF002CBF18 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 156B43CF19A1F1EF002CBF18 /* libluacocos3d Mac.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libluacocos3d Mac.a"; - remoteRef = 156B43CE19A1F1EF002CBF18 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 156B43D119A1F1EF002CBF18 /* libluacocos3d iOS.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libluacocos3d iOS.a"; - remoteRef = 156B43D019A1F1EF002CBF18 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; 15A8A4171834BDA200142BE0 /* libcocos2d Mac.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; @@ -1415,34 +611,6 @@ remoteRef = 15A8A4161834BDA200142BE0 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 15A8A4191834BDA200142BE0 /* libextension Mac.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libextension Mac.a"; - remoteRef = 15A8A4181834BDA200142BE0 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 15A8A41B1834BDA200142BE0 /* libchipmunk Mac.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libchipmunk Mac.a"; - remoteRef = 15A8A41A1834BDA200142BE0 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 15A8A41D1834BDA200142BE0 /* libbox2d Mac.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libbox2d Mac.a"; - remoteRef = 15A8A41C1834BDA200142BE0 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 15A8A41F1834BDA200142BE0 /* libcocosdenshion Mac.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libcocosdenshion Mac.a"; - remoteRef = 15A8A41E1834BDA200142BE0 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; 15A8A4251834BDA200142BE0 /* libcocos2d iOS.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; @@ -1450,34 +618,6 @@ remoteRef = 15A8A4241834BDA200142BE0 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 15A8A4271834BDA200142BE0 /* libextension iOS.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libextension iOS.a"; - remoteRef = 15A8A4261834BDA200142BE0 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 15A8A4291834BDA200142BE0 /* libchipmunk iOS.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libchipmunk iOS.a"; - remoteRef = 15A8A4281834BDA200142BE0 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 15A8A42B1834BDA200142BE0 /* libbox2d iOS.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libbox2d iOS.a"; - remoteRef = 15A8A42A1834BDA200142BE0 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 15A8A42D1834BDA200142BE0 /* libcocosdenshion iOS.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libcocosdenshion iOS.a"; - remoteRef = 15A8A42C1834BDA200142BE0 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; /* End PBXReferenceProxy section */ /* Begin PBXResourcesBuildPhase section */ @@ -1641,116 +781,6 @@ /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ - 152A33CD199C93BF004B68DC /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "libluaextension iOS"; - targetProxy = 152A33CC199C93BF004B68DC /* PBXContainerItemProxy */; - }; - 152A33CF199C93BF004B68DC /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "libluaui iOS"; - targetProxy = 152A33CE199C93BF004B68DC /* PBXContainerItemProxy */; - }; - 152A33D1199C93BF004B68DC /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "libluacocostudio iOS"; - targetProxy = 152A33D0199C93BF004B68DC /* PBXContainerItemProxy */; - }; - 152A33D3199C93BF004B68DC /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "libluacocosbuilder iOS"; - targetProxy = 152A33D2199C93BF004B68DC /* PBXContainerItemProxy */; - }; - 152A33D5199C93BF004B68DC /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "libluaspine iOS"; - targetProxy = 152A33D4199C93BF004B68DC /* PBXContainerItemProxy */; - }; - 152A33F3199C93CD004B68DC /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "libextension iOS"; - targetProxy = 152A33F2199C93CD004B68DC /* PBXContainerItemProxy */; - }; - 152A33F5199C93CD004B68DC /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "libui iOS"; - targetProxy = 152A33F4199C93CD004B68DC /* PBXContainerItemProxy */; - }; - 152A33F7199C93CD004B68DC /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "libcocostudio iOS"; - targetProxy = 152A33F6199C93CD004B68DC /* PBXContainerItemProxy */; - }; - 152A33F9199C93CD004B68DC /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "libcocosbuilder iOS"; - targetProxy = 152A33F8199C93CD004B68DC /* PBXContainerItemProxy */; - }; - 152A33FB199C93CD004B68DC /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "libspine iOS"; - targetProxy = 152A33FA199C93CD004B68DC /* PBXContainerItemProxy */; - }; - 152A33FD199C93E7004B68DC /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "libluaextension Mac"; - targetProxy = 152A33FC199C93E7004B68DC /* PBXContainerItemProxy */; - }; - 152A33FF199C93E7004B68DC /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "libluaui Mac"; - targetProxy = 152A33FE199C93E7004B68DC /* PBXContainerItemProxy */; - }; - 152A3401199C93E7004B68DC /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "libluacocostudio Mac"; - targetProxy = 152A3400199C93E7004B68DC /* PBXContainerItemProxy */; - }; - 152A3403199C93E7004B68DC /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "libluacocosbuilder Mac"; - targetProxy = 152A3402199C93E7004B68DC /* PBXContainerItemProxy */; - }; - 152A3405199C93E7004B68DC /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "libluaspine Mac"; - targetProxy = 152A3404199C93E7004B68DC /* PBXContainerItemProxy */; - }; - 152A3407199C93F4004B68DC /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "libextension Mac"; - targetProxy = 152A3406199C93F4004B68DC /* PBXContainerItemProxy */; - }; - 152A3409199C93F4004B68DC /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "libui Mac"; - targetProxy = 152A3408199C93F4004B68DC /* PBXContainerItemProxy */; - }; - 152A340B199C93F4004B68DC /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "libcocostudio Mac"; - targetProxy = 152A340A199C93F4004B68DC /* PBXContainerItemProxy */; - }; - 152A340D199C93F4004B68DC /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "libcocosbuilder Mac"; - targetProxy = 152A340C199C93F4004B68DC /* PBXContainerItemProxy */; - }; - 152A340F199C93F4004B68DC /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "libspine Mac"; - targetProxy = 152A340E199C93F4004B68DC /* PBXContainerItemProxy */; - }; - 15427C61198F1E7400DC375D /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "libluanetwork iOS"; - targetProxy = 15427C60198F1E7400DC375D /* PBXContainerItemProxy */; - }; - 15427C63198F1E7400DC375D /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "libluacocosdenshion iOS"; - targetProxy = 15427C62198F1E7400DC375D /* PBXContainerItemProxy */; - }; 15427C65198F1E7400DC375D /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = "libluacocos2d iOS"; @@ -1761,26 +791,6 @@ name = "libcocos2d iOS"; targetProxy = 15427C66198F1E7400DC375D /* PBXContainerItemProxy */; }; - 15427C69198F1E7400DC375D /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "libcocosdenshion iOS"; - targetProxy = 15427C68198F1E7400DC375D /* PBXContainerItemProxy */; - }; - 15427C6B198F1E7400DC375D /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "libnetwork iOS"; - targetProxy = 15427C6A198F1E7400DC375D /* PBXContainerItemProxy */; - }; - 15427C6D198F1F4D00DC375D /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "libluanetwork Mac"; - targetProxy = 15427C6C198F1F4D00DC375D /* PBXContainerItemProxy */; - }; - 15427C6F198F1F4D00DC375D /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "libluacocosdenshion Mac"; - targetProxy = 15427C6E198F1F4D00DC375D /* PBXContainerItemProxy */; - }; 15427C71198F1F4D00DC375D /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = "libluacocos2d Mac"; @@ -1791,36 +801,6 @@ name = "libcocos2d Mac"; targetProxy = 15427C72198F1F4D00DC375D /* PBXContainerItemProxy */; }; - 15427C75198F1F4D00DC375D /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "libnetwork Mac"; - targetProxy = 15427C74198F1F4D00DC375D /* PBXContainerItemProxy */; - }; - 15427C77198F1F4D00DC375D /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "libcocosdenshion Mac"; - targetProxy = 15427C76198F1F4D00DC375D /* PBXContainerItemProxy */; - }; - 156B43BD19A1F1EF002CBF18 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "libluacocos3d iOS"; - targetProxy = 156B43BC19A1F1EF002CBF18 /* PBXContainerItemProxy */; - }; - 156B43D319A1F1FD002CBF18 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "libcocos3d iOS"; - targetProxy = 156B43D219A1F1FD002CBF18 /* PBXContainerItemProxy */; - }; - 156B43D719A1F243002CBF18 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "libluacocos3d Mac"; - targetProxy = 156B43D619A1F243002CBF18 /* PBXContainerItemProxy */; - }; - 156B43D919A1F249002CBF18 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "libcocos3d Mac"; - targetProxy = 156B43D819A1F249002CBF18 /* PBXContainerItemProxy */; - }; /* End PBXTargetDependency section */ /* Begin XCBuildConfiguration section */ diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.sln b/templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.sln index c88e087e51..6dd45300a6 100644 --- a/templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.sln +++ b/templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.sln @@ -4,50 +4,12 @@ Microsoft Visual Studio Solution File, Format Version 12.00 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HelloLua", "HelloLua.vcxproj", "{4E6A7A0E-DDD8-4BAA-8B22-C964069364ED}" ProjectSection(ProjectDependencies) = postProject {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E} = {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E} - {207BC7A9-CCF1-4F2F-A04D-45F72242AE25} = {207BC7A9-CCF1-4F2F-A04D-45F72242AE25} - {F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6} = {F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libchipmunk", "..\..\cocos2d-x\external\chipmunk\proj.win32\chipmunk.vcxproj", "{207BC7A9-CCF1-4F2F-A04D-45F72242AE25}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocosdenshion", "..\..\cocos2d-x\cocos\audio\proj.win32\libcocosdenshion.vcxproj", "{F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocos2d", "..\..\cocos2d-x\cocos\2d\libcocos2d.vcxproj", "{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libluacocos2d", "..\..\cocos2d-x\cocos\scripting\lua-bindings\proj.win32\libluacocos2d.vcxproj", "{9F2D6CE6-C893-4400-B50C-6DB70CC2562F}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libluacocosdenshion", "..\..\cocos2d-x\cocos\scripting\lua-bindings\proj.win32\libluacocosdenshion.vcxproj", "{46A7D57A-7F25-4F52-823B-FFAC4FF3A624}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocosbuilder", "..\..\cocos2d-x\cocos\editor-support\cocosbuilder\proj.win32\libcocosbuilder.vcxproj", "{811C0DAB-7B96-4BD3-A154-B7572B58E4AB}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocostudio", "..\..\cocos2d-x\cocos\editor-support\cocostudio\proj.win32\libcocostudio.vcxproj", "{B57CF53F-2E49-4031-9822-047CC0E6BDE2}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libSpine", "..\..\cocos2d-x\cocos\editor-support\spine\proj.win32\libSpine.vcxproj", "{B7C2A162-DEC9-4418-972E-240AB3CBFCAE}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libnetwork", "..\..\cocos2d-x\cocos\network\proj.win32\libnetwork.vcxproj", "{DF2638C0-8128-4847-867C-6EAFE3DEE7B5}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libextension", "..\..\cocos2d-x\extensions\proj.win32\libextension.vcxproj", "{21B2C324-891F-48EA-AD1A-5AE13DE12E28}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libui", "..\..\cocos2d-x\cocos\ui\proj.win32\libui.vcxproj", "{7E06E92C-537A-442B-9E4A-4761C84F8A1A}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libluacocosbuilder", "..\..\cocos2d-x\cocos\scripting\lua-bindings\proj.win32\libluacocosbuilder.vcxproj", "{F8198014-F4F3-49F0-88AB-C1969A5829AF}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libluacocostudio", "..\..\cocos2d-x\cocos\scripting\lua-bindings\proj.win32\libluacocostudio.vcxproj", "{9640951E-C5D0-47B5-9C42-0BCADA261C50}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libluaextension", "..\..\cocos2d-x\cocos\scripting\lua-bindings\proj.win32\libluaextension.vcxproj", "{7068296E-38A4-4BCA-85DB-3A09BD014847}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libluanetwork", "..\..\cocos2d-x\cocos\scripting\lua-bindings\proj.win32\libluanetwork.vcxproj", "{65E52F4B-703F-419E-AD67-926241A10042}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libluaspine", "..\..\cocos2d-x\cocos\scripting\lua-bindings\proj.win32\libluaspine.vcxproj", "{31EF6AB1-0D9A-4BC6-99B8-2C482EA373C4}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libluaui", "..\..\cocos2d-x\cocos\scripting\lua-bindings\proj.win32\libluaui.vcxproj", "{FE78EEBB-3DBB-4713-8CBF-63D742C5BD82}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbox2d", "..\..\cocos2d-x\external\Box2D\proj.win32\libbox2d.vcxproj", "{929480E7-23C0-4DF6-8456-096D71547116}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocos3d", "..\..\cocos2d-x\cocos\3d\proj.win32\libcocos3d.vcxproj", "{E24950FA-5BC1-4AEE-A900-4F0259354BF0}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libluacocos3d", "..\..\cocos2d-x\cocos\scripting\lua-bindings\proj.win32\libluacocos3d.vcxproj", "{06840490-14A4-43D6-88BC-AAFA44D043EB}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -58,14 +20,6 @@ Global {4E6A7A0E-DDD8-4BAA-8B22-C964069364ED}.Debug|Win32.Build.0 = Debug|Win32 {4E6A7A0E-DDD8-4BAA-8B22-C964069364ED}.Release|Win32.ActiveCfg = Release|Win32 {4E6A7A0E-DDD8-4BAA-8B22-C964069364ED}.Release|Win32.Build.0 = Release|Win32 - {207BC7A9-CCF1-4F2F-A04D-45F72242AE25}.Debug|Win32.ActiveCfg = Debug|Win32 - {207BC7A9-CCF1-4F2F-A04D-45F72242AE25}.Debug|Win32.Build.0 = Debug|Win32 - {207BC7A9-CCF1-4F2F-A04D-45F72242AE25}.Release|Win32.ActiveCfg = Release|Win32 - {207BC7A9-CCF1-4F2F-A04D-45F72242AE25}.Release|Win32.Build.0 = Release|Win32 - {F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}.Debug|Win32.ActiveCfg = Debug|Win32 - {F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}.Debug|Win32.Build.0 = Debug|Win32 - {F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}.Release|Win32.ActiveCfg = Release|Win32 - {F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}.Release|Win32.Build.0 = Release|Win32 {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Debug|Win32.ActiveCfg = Debug|Win32 {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Debug|Win32.Build.0 = Debug|Win32 {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Release|Win32.ActiveCfg = Release|Win32 @@ -74,70 +28,6 @@ Global {9F2D6CE6-C893-4400-B50C-6DB70CC2562F}.Debug|Win32.Build.0 = Debug|Win32 {9F2D6CE6-C893-4400-B50C-6DB70CC2562F}.Release|Win32.ActiveCfg = Release|Win32 {9F2D6CE6-C893-4400-B50C-6DB70CC2562F}.Release|Win32.Build.0 = Release|Win32 - {46A7D57A-7F25-4F52-823B-FFAC4FF3A624}.Debug|Win32.ActiveCfg = Debug|Win32 - {46A7D57A-7F25-4F52-823B-FFAC4FF3A624}.Debug|Win32.Build.0 = Debug|Win32 - {46A7D57A-7F25-4F52-823B-FFAC4FF3A624}.Release|Win32.ActiveCfg = Release|Win32 - {46A7D57A-7F25-4F52-823B-FFAC4FF3A624}.Release|Win32.Build.0 = Release|Win32 - {811C0DAB-7B96-4BD3-A154-B7572B58E4AB}.Debug|Win32.ActiveCfg = Debug|Win32 - {811C0DAB-7B96-4BD3-A154-B7572B58E4AB}.Debug|Win32.Build.0 = Debug|Win32 - {811C0DAB-7B96-4BD3-A154-B7572B58E4AB}.Release|Win32.ActiveCfg = Release|Win32 - {811C0DAB-7B96-4BD3-A154-B7572B58E4AB}.Release|Win32.Build.0 = Release|Win32 - {B57CF53F-2E49-4031-9822-047CC0E6BDE2}.Debug|Win32.ActiveCfg = Debug|Win32 - {B57CF53F-2E49-4031-9822-047CC0E6BDE2}.Debug|Win32.Build.0 = Debug|Win32 - {B57CF53F-2E49-4031-9822-047CC0E6BDE2}.Release|Win32.ActiveCfg = Release|Win32 - {B57CF53F-2E49-4031-9822-047CC0E6BDE2}.Release|Win32.Build.0 = Release|Win32 - {B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Debug|Win32.ActiveCfg = Debug|Win32 - {B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Debug|Win32.Build.0 = Debug|Win32 - {B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Release|Win32.ActiveCfg = Release|Win32 - {B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Release|Win32.Build.0 = Release|Win32 - {DF2638C0-8128-4847-867C-6EAFE3DEE7B5}.Debug|Win32.ActiveCfg = Debug|Win32 - {DF2638C0-8128-4847-867C-6EAFE3DEE7B5}.Debug|Win32.Build.0 = Debug|Win32 - {DF2638C0-8128-4847-867C-6EAFE3DEE7B5}.Release|Win32.ActiveCfg = Release|Win32 - {DF2638C0-8128-4847-867C-6EAFE3DEE7B5}.Release|Win32.Build.0 = Release|Win32 - {21B2C324-891F-48EA-AD1A-5AE13DE12E28}.Debug|Win32.ActiveCfg = Debug|Win32 - {21B2C324-891F-48EA-AD1A-5AE13DE12E28}.Debug|Win32.Build.0 = Debug|Win32 - {21B2C324-891F-48EA-AD1A-5AE13DE12E28}.Release|Win32.ActiveCfg = Release|Win32 - {21B2C324-891F-48EA-AD1A-5AE13DE12E28}.Release|Win32.Build.0 = Release|Win32 - {7E06E92C-537A-442B-9E4A-4761C84F8A1A}.Debug|Win32.ActiveCfg = Debug|Win32 - {7E06E92C-537A-442B-9E4A-4761C84F8A1A}.Debug|Win32.Build.0 = Debug|Win32 - {7E06E92C-537A-442B-9E4A-4761C84F8A1A}.Release|Win32.ActiveCfg = Release|Win32 - {7E06E92C-537A-442B-9E4A-4761C84F8A1A}.Release|Win32.Build.0 = Release|Win32 - {F8198014-F4F3-49F0-88AB-C1969A5829AF}.Debug|Win32.ActiveCfg = Debug|Win32 - {F8198014-F4F3-49F0-88AB-C1969A5829AF}.Debug|Win32.Build.0 = Debug|Win32 - {F8198014-F4F3-49F0-88AB-C1969A5829AF}.Release|Win32.ActiveCfg = Release|Win32 - {F8198014-F4F3-49F0-88AB-C1969A5829AF}.Release|Win32.Build.0 = Release|Win32 - {9640951E-C5D0-47B5-9C42-0BCADA261C50}.Debug|Win32.ActiveCfg = Debug|Win32 - {9640951E-C5D0-47B5-9C42-0BCADA261C50}.Debug|Win32.Build.0 = Debug|Win32 - {9640951E-C5D0-47B5-9C42-0BCADA261C50}.Release|Win32.ActiveCfg = Release|Win32 - {9640951E-C5D0-47B5-9C42-0BCADA261C50}.Release|Win32.Build.0 = Release|Win32 - {7068296E-38A4-4BCA-85DB-3A09BD014847}.Debug|Win32.ActiveCfg = Debug|Win32 - {7068296E-38A4-4BCA-85DB-3A09BD014847}.Debug|Win32.Build.0 = Debug|Win32 - {7068296E-38A4-4BCA-85DB-3A09BD014847}.Release|Win32.ActiveCfg = Release|Win32 - {7068296E-38A4-4BCA-85DB-3A09BD014847}.Release|Win32.Build.0 = Release|Win32 - {65E52F4B-703F-419E-AD67-926241A10042}.Debug|Win32.ActiveCfg = Debug|Win32 - {65E52F4B-703F-419E-AD67-926241A10042}.Debug|Win32.Build.0 = Debug|Win32 - {65E52F4B-703F-419E-AD67-926241A10042}.Release|Win32.ActiveCfg = Release|Win32 - {65E52F4B-703F-419E-AD67-926241A10042}.Release|Win32.Build.0 = Release|Win32 - {31EF6AB1-0D9A-4BC6-99B8-2C482EA373C4}.Debug|Win32.ActiveCfg = Debug|Win32 - {31EF6AB1-0D9A-4BC6-99B8-2C482EA373C4}.Debug|Win32.Build.0 = Debug|Win32 - {31EF6AB1-0D9A-4BC6-99B8-2C482EA373C4}.Release|Win32.ActiveCfg = Release|Win32 - {31EF6AB1-0D9A-4BC6-99B8-2C482EA373C4}.Release|Win32.Build.0 = Release|Win32 - {FE78EEBB-3DBB-4713-8CBF-63D742C5BD82}.Debug|Win32.ActiveCfg = Debug|Win32 - {FE78EEBB-3DBB-4713-8CBF-63D742C5BD82}.Debug|Win32.Build.0 = Debug|Win32 - {FE78EEBB-3DBB-4713-8CBF-63D742C5BD82}.Release|Win32.ActiveCfg = Release|Win32 - {FE78EEBB-3DBB-4713-8CBF-63D742C5BD82}.Release|Win32.Build.0 = Release|Win32 - {929480E7-23C0-4DF6-8456-096D71547116}.Debug|Win32.ActiveCfg = Debug|Win32 - {929480E7-23C0-4DF6-8456-096D71547116}.Debug|Win32.Build.0 = Debug|Win32 - {929480E7-23C0-4DF6-8456-096D71547116}.Release|Win32.ActiveCfg = Release|Win32 - {929480E7-23C0-4DF6-8456-096D71547116}.Release|Win32.Build.0 = Release|Win32 - {E24950FA-5BC1-4AEE-A900-4F0259354BF0}.Debug|Win32.ActiveCfg = Debug|Win32 - {E24950FA-5BC1-4AEE-A900-4F0259354BF0}.Debug|Win32.Build.0 = Debug|Win32 - {E24950FA-5BC1-4AEE-A900-4F0259354BF0}.Release|Win32.ActiveCfg = Release|Win32 - {E24950FA-5BC1-4AEE-A900-4F0259354BF0}.Release|Win32.Build.0 = Release|Win32 - {06840490-14A4-43D6-88BC-AAFA44D043EB}.Debug|Win32.ActiveCfg = Debug|Win32 - {06840490-14A4-43D6-88BC-AAFA44D043EB}.Debug|Win32.Build.0 = Debug|Win32 - {06840490-14A4-43D6-88BC-AAFA44D043EB}.Release|Win32.ActiveCfg = Release|Win32 - {06840490-14A4-43D6-88BC-AAFA44D043EB}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.vcxproj b/templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.vcxproj index 11a3924224..a1437c569a 100644 --- a/templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.vcxproj +++ b/templates/lua-template-default/frameworks/runtime-src/proj.win32/HelloLua.vcxproj @@ -190,30 +190,6 @@ xcopy "$(ProjectDir)..\..\cocos2d-x\cocos\scripting\lua-bindings\script\ui" "$(P {9f2d6ce6-c893-4400-b50c-6db70cc2562f} - - {06840490-14a4-43d6-88bc-aafa44d043eb} - - - {f8198014-f4f3-49f0-88ab-c1969a5829af} - - - {46a7d57a-7f25-4f52-823b-ffac4ff3a624} - - - {9640951e-c5d0-47b5-9c42-0bcada261c50} - - - {7068296e-38a4-4bca-85db-3a09bd014847} - - - {65e52f4b-703f-419e-ad67-926241a10042} - - - {31ef6ab1-0d9a-4bc6-99b8-2c482ea373c4} - - - {fe78eebb-3dbb-4713-8cbf-63d742c5bd82} - diff --git a/templates/lua-template-runtime/frameworks/runtime-src/proj.android/jni/Android.mk b/templates/lua-template-runtime/frameworks/runtime-src/proj.android/jni/Android.mk index 15ac1b1602..709c81abae 100644 --- a/templates/lua-template-runtime/frameworks/runtime-src/proj.android/jni/Android.mk +++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.android/jni/Android.mk @@ -40,15 +40,7 @@ $(LOCAL_PATH)/../../Classes/runtime \ $(LOCAL_PATH)/../../Classes \ $(LOCAL_PATH)/../../../cocos2d-x/external -LOCAL_WHOLE_STATIC_LIBRARIES := cocos2d_lua_static -LOCAL_WHOLE_STATIC_LIBRARIES += cocosdenshion_lua_static -LOCAL_WHOLE_STATIC_LIBRARIES += network_lua_static -LOCAL_WHOLE_STATIC_LIBRARIES += cocosbuilder_lua_static -LOCAL_WHOLE_STATIC_LIBRARIES += cocostudio_lua_static -LOCAL_WHOLE_STATIC_LIBRARIES += spine_lua_static -LOCAL_WHOLE_STATIC_LIBRARIES += extension_lua_static -LOCAL_WHOLE_STATIC_LIBRARIES += ui_lua_static -LOCAL_WHOLE_STATIC_LIBRARIES += cocos3d_lua_static +LOCAL_STATIC_LIBRARIES := cocos2d_lua_static include $(BUILD_SHARED_LIBRARY) diff --git a/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj b/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj index e18faea777..36cda4b14c 100644 --- a/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj +++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj @@ -35,44 +35,12 @@ 152A3479199CE5CE004B68DC /* experimentalUIConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 152A3472199CE5CE004B68DC /* experimentalUIConstants.lua */; }; 152A347A199CE5CE004B68DC /* GuiConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 152A3473199CE5CE004B68DC /* GuiConstants.lua */; }; 152A347B199CE5CE004B68DC /* GuiConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 152A3473199CE5CE004B68DC /* GuiConstants.lua */; }; - 152A347C199CE60E004B68DC /* libluacocosbuilder iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427CCA198F220600DC375D /* libluacocosbuilder iOS.a */; }; - 152A347D199CE60E004B68DC /* libluacocostudio iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427CC8198F220600DC375D /* libluacocostudio iOS.a */; }; - 152A347E199CE60E004B68DC /* libluaextension iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427CC4198F220600DC375D /* libluaextension iOS.a */; }; - 152A347F199CE60E004B68DC /* libluaspine iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427CCC198F220600DC375D /* libluaspine iOS.a */; }; - 152A3480199CE60E004B68DC /* libluaui iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427CC6198F220600DC375D /* libluaui iOS.a */; }; - 152A3481199CE624004B68DC /* libcocosbuilder iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427C9E198F220600DC375D /* libcocosbuilder iOS.a */; }; - 152A3482199CE62F004B68DC /* libcocostudio iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427C9C198F220600DC375D /* libcocostudio iOS.a */; }; - 152A3483199CE63A004B68DC /* libextension iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15A8A4271834BDA200142BE0 /* libextension iOS.a */; }; - 152A3484199CE64A004B68DC /* libspine iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427CA0198F220600DC375D /* libspine iOS.a */; }; - 152A3485199CE64A004B68DC /* libui iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427C9A198F220600DC375D /* libui iOS.a */; }; - 152A3486199CE6B4004B68DC /* libcocosbuilder Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427C94198F220600DC375D /* libcocosbuilder Mac.a */; }; - 152A3487199CE6B4004B68DC /* libcocostudio Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427C92198F220600DC375D /* libcocostudio Mac.a */; }; - 152A3488199CE6B4004B68DC /* libextension Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15A8A4191834BDA200142BE0 /* libextension Mac.a */; }; - 152A3489199CE6B4004B68DC /* libluacocosbuilder Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427CBA198F220600DC375D /* libluacocosbuilder Mac.a */; }; - 152A348A199CE6B4004B68DC /* libluacocostudio Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427CB8198F220600DC375D /* libluacocostudio Mac.a */; }; - 152A348B199CE6B4004B68DC /* libluaextension Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427CB4198F220600DC375D /* libluaextension Mac.a */; }; - 152A348C199CE6B4004B68DC /* libluaspine Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427CBC198F220600DC375D /* libluaspine Mac.a */; }; - 152A348D199CE6B4004B68DC /* libluaui Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427CB6198F220600DC375D /* libluaui Mac.a */; }; - 152A348E199CE6B4004B68DC /* libspine Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427C96198F220600DC375D /* libspine Mac.a */; }; - 152A348F199CE6B4004B68DC /* libui Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427C90198F220600DC375D /* libui Mac.a */; }; 15427CD3198F221400DC375D /* libcocos2d iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15A8A4251834BDA200142BE0 /* libcocos2d iOS.a */; }; - 15427CD4198F221400DC375D /* libcocosdenshion iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15A8A42D1834BDA200142BE0 /* libcocosdenshion iOS.a */; }; 15427CD5198F222200DC375D /* libluacocos2d iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427CD2198F220600DC375D /* libluacocos2d iOS.a */; }; - 15427CD6198F222200DC375D /* libluacocosdenshion iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427CD0198F220600DC375D /* libluacocosdenshion iOS.a */; }; - 15427CE3198F23A100DC375D /* libnetwork iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427CA2198F220600DC375D /* libnetwork iOS.a */; }; 15427CEC198F24A600DC375D /* libluacocos2d Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427CC2198F220600DC375D /* libluacocos2d Mac.a */; }; - 15427CED198F24A600DC375D /* libluacocosdenshion Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427CC0198F220600DC375D /* libluacocosdenshion Mac.a */; }; 15427CEE198F24AF00DC375D /* libcocos2d Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15A8A4171834BDA200142BE0 /* libcocos2d Mac.a */; }; - 15427CEF198F24BD00DC375D /* libcocosdenshion Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15A8A41F1834BDA200142BE0 /* libcocosdenshion Mac.a */; }; - 15427CF0198F24C400DC375D /* libnetwork Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427C98198F220600DC375D /* libnetwork Mac.a */; }; - 1571D9C219A1F733005A1DC2 /* libcocos3d iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1571D9B919A1F714005A1DC2 /* libcocos3d iOS.a */; }; - 1571D9C319A1F733005A1DC2 /* libluacocos3d iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1571D9C119A1F714005A1DC2 /* libluacocos3d iOS.a */; }; - 1571D9C419A1F74B005A1DC2 /* libcocos3d Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1571D9B719A1F714005A1DC2 /* libcocos3d Mac.a */; }; - 1571D9C519A1F74B005A1DC2 /* libluacocos3d Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1571D9BF19A1F714005A1DC2 /* libluacocos3d Mac.a */; }; 15A8A4491834C64F00142BE0 /* Icon-114.png in Resources */ = {isa = PBXBuildFile; fileRef = 5023810C17EBBCAC00990C9B /* Icon-114.png */; }; 15A8A4881834C90F00142BE0 /* libcurl.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 15A8A4871834C90E00142BE0 /* libcurl.dylib */; }; - 15AA7D36199B513100725633 /* libluanetwork iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427CCE198F220600DC375D /* libluanetwork iOS.a */; }; - 15AA7D47199B514300725633 /* libluanetwork Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15427CBE198F220600DC375D /* libluanetwork Mac.a */; }; 15AA7D52199B51F000725633 /* ftp.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15AA7D48199B51F000725633 /* ftp.lua */; }; 15AA7D53199B51F000725633 /* ftp.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15AA7D48199B51F000725633 /* ftp.lua */; }; 15AA7D54199B51F000725633 /* headers.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15AA7D49199B51F000725633 /* headers.lua */; }; @@ -235,55 +203,6 @@ /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - 152A3490199CE727004B68DC /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 155CA2C71988C494006E0A08; - remoteInfo = "libluaextension iOS"; - }; - 152A3492199CE727004B68DC /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 15EFA300198B28A8000C57D3; - remoteInfo = "libluaui iOS"; - }; - 152A3494199CE727004B68DC /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 15EFA381198B2934000C57D3; - remoteInfo = "libluacocostudio iOS"; - }; - 152A3496199CE727004B68DC /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 15EFA27F198B2791000C57D3; - remoteInfo = "libluacocosbuilder iOS"; - }; - 152A3498199CE727004B68DC /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 15EFA407198B2AFD000C57D3; - remoteInfo = "libluaspine iOS"; - }; - 152A349A199CE72E004B68DC /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 15EFA486198B2B9B000C57D3; - remoteInfo = "libluanetwork iOS"; - }; - 152A349C199CE72E004B68DC /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 15EFA523198B2D13000C57D3; - remoteInfo = "libluacocosdenshion iOS"; - }; 152A349E199CE72E004B68DC /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; @@ -291,90 +210,6 @@ remoteGlobalIDString = 15EFA59E198B2DAA000C57D3; remoteInfo = "libluacocos2d iOS"; }; - 152A34A0199CE741004B68DC /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = A07A4E111783867C0073F6A7; - remoteInfo = "libextension iOS"; - }; - 152A34A2199CE741004B68DC /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = B24EEA2C19775E92004493CC; - remoteInfo = "libui iOS"; - }; - 152A34A4199CE741004B68DC /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = B24EEA6719775EBB004493CC; - remoteInfo = "libcocostudio iOS"; - }; - 152A34A6199CE741004B68DC /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = B24EEA6F19775ECE004493CC; - remoteInfo = "libcocosbuilder iOS"; - }; - 152A34A8199CE741004B68DC /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = B24EEA7719775EE1004493CC; - remoteInfo = "libspine iOS"; - }; - 152A34AA199CE758004B68DC /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 15C1BD5F1986538000A46ACC; - remoteInfo = "libluaextension Mac"; - }; - 152A34AC199CE758004B68DC /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 15C1C0801987328E00A46ACC; - remoteInfo = "libluaui Mac"; - }; - 152A34AE199CE758004B68DC /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 15C1BF7219865C2000A46ACC; - remoteInfo = "libluacocostudio Mac"; - }; - 152A34B0199CE758004B68DC /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 15C1BE66198654BE00A46ACC; - remoteInfo = "libluacocosbuilder Mac"; - }; - 152A34B2199CE758004B68DC /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 15C1BFF819865E5F00A46ACC; - remoteInfo = "libluaspine Mac"; - }; - 152A34B4199CE758004B68DC /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 15C1C1061987340C00A46ACC; - remoteInfo = "libluanetwork Mac"; - }; - 152A34B6199CE758004B68DC /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 15C1BEEE19865A0600A46ACC; - remoteInfo = "libluacocosdenshion Mac"; - }; 152A34B8199CE758004B68DC /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; @@ -382,160 +217,6 @@ remoteGlobalIDString = 15C1C255198748D200A46ACC; remoteInfo = "libluacocos2d Mac"; }; - 152A34BA199CE766004B68DC /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = A03F2FC117814595006731B9; - remoteInfo = "libextension Mac"; - }; - 152A34BC199CE766004B68DC /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = B245F10019766132001920FD; - remoteInfo = "libui Mac"; - }; - 152A34BE199CE766004B68DC /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = B2DB48161976716E00411E16; - remoteInfo = "libcocostudio Mac"; - }; - 152A34C0199CE766004B68DC /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = B2DB479B197669A100411E16; - remoteInfo = "libcocosbuilder Mac"; - }; - 152A34C2199CE766004B68DC /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = B2DB48CA19767F1F00411E16; - remoteInfo = "libspine Mac"; - }; - 15427C8F198F220600DC375D /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = B245F13A19766132001920FD; - remoteInfo = "libui Mac"; - }; - 15427C91198F220600DC375D /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = B2DB484D1976716E00411E16; - remoteInfo = "libcocostudio Mac"; - }; - 15427C93198F220600DC375D /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = B2DB47D2197669A100411E16; - remoteInfo = "libcocosbuilder Mac"; - }; - 15427C95198F220600DC375D /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = B2DB490119767F1F00411E16; - remoteInfo = "libspine Mac"; - }; - 15427C97198F220600DC375D /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = B2DB49C4197686CB00411E16; - remoteInfo = "libnetwork Mac"; - }; - 15427C99198F220600DC375D /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = B24EEA6619775E92004493CC; - remoteInfo = "libui iOS"; - }; - 15427C9B198F220600DC375D /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = B24EEA6E19775EBB004493CC; - remoteInfo = "libcocostudio iOS"; - }; - 15427C9D198F220600DC375D /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = B24EEA7619775ECE004493CC; - remoteInfo = "libcocosbuilder iOS"; - }; - 15427C9F198F220600DC375D /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = B24EEA7E19775EE1004493CC; - remoteInfo = "libspine iOS"; - }; - 15427CA1198F220600DC375D /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = B24EEA8619775EF3004493CC; - remoteInfo = "libnetwork iOS"; - }; - 15427CB3198F220600DC375D /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 15C1BDDA1986538000A46ACC; - remoteInfo = "libluaextension Mac"; - }; - 15427CB5198F220600DC375D /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 15C1C0FB1987328E00A46ACC; - remoteInfo = "libluaui Mac"; - }; - 15427CB7198F220600DC375D /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 15C1BFED19865C2000A46ACC; - remoteInfo = "libluacocostudio Mac"; - }; - 15427CB9198F220600DC375D /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 15C1BEE1198654BE00A46ACC; - remoteInfo = "libluacocosbuilder Mac"; - }; - 15427CBB198F220600DC375D /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 15C1C07319865E5F00A46ACC; - remoteInfo = "libluaspine Mac"; - }; - 15427CBD198F220600DC375D /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 15C1C1811987340C00A46ACC; - remoteInfo = "libluanetwork Mac"; - }; - 15427CBF198F220600DC375D /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 15C1BF6919865A0600A46ACC; - remoteInfo = "libluacocosdenshion Mac"; - }; 15427CC1198F220600DC375D /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; @@ -543,55 +224,6 @@ remoteGlobalIDString = 15C1C2CC198748D200A46ACC; remoteInfo = "libluacocos2d Mac"; }; - 15427CC3198F220600DC375D /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 155CA3431988C494006E0A08; - remoteInfo = "libluaextension iOS"; - }; - 15427CC5198F220600DC375D /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 15EFA37A198B28A8000C57D3; - remoteInfo = "libluaui iOS"; - }; - 15427CC7198F220600DC375D /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 15EFA3FB198B2934000C57D3; - remoteInfo = "libluacocostudio iOS"; - }; - 15427CC9198F220600DC375D /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 15EFA2F9198B2791000C57D3; - remoteInfo = "libluacocosbuilder iOS"; - }; - 15427CCB198F220600DC375D /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 15EFA47F198B2AFD000C57D3; - remoteInfo = "libluaspine iOS"; - }; - 15427CCD198F220600DC375D /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 15EFA4FE198B2B9B000C57D3; - remoteInfo = "libluanetwork iOS"; - }; - 15427CCF198F220600DC375D /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 15EFA59B198B2D13000C57D3; - remoteInfo = "libluacocosdenshion iOS"; - }; 15427CD1198F220600DC375D /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; @@ -599,62 +231,6 @@ remoteGlobalIDString = 15EFA616198B2DAA000C57D3; remoteInfo = "libluacocos2d iOS"; }; - 15427CE4198F23B300DC375D /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = B24EEA7F19775EF3004493CC; - remoteInfo = "libnetwork iOS"; - }; - 15427CE6198F23E600DC375D /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = B2DB498D197686CB00411E16; - remoteInfo = "libnetwork Mac"; - }; - 1571D9AA19A1F714005A1DC2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 1516228319A0F45E006099B8; - remoteInfo = "libluacocos3d iOS"; - }; - 1571D9AC19A1F714005A1DC2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 15162030199E7810006099B8; - remoteInfo = "libcocos3d iOS"; - }; - 1571D9B619A1F714005A1DC2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 1516200B199E7363006099B8; - remoteInfo = "libcocos3d Mac"; - }; - 1571D9B819A1F714005A1DC2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 15162201199E7810006099B8; - remoteInfo = "libcocos3d iOS"; - }; - 1571D9BE19A1F714005A1DC2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 1516227C19A0F32D006099B8; - remoteInfo = "libluacocos3d Mac"; - }; - 1571D9C019A1F714005A1DC2 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = C03781AE18BF654500FE4F13 /* cocos2d_lua_bindings.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 151622BB19A0F45E006099B8; - remoteInfo = "libluacocos3d iOS"; - }; 15A8A4161834BDA200142BE0 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; @@ -662,34 +238,6 @@ remoteGlobalIDString = 1551A33F158F2AB200E66CFE; remoteInfo = "cocos2dx Mac"; }; - 15A8A4181834BDA200142BE0 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = A03F2FD617814595006731B9; - remoteInfo = "cocos2dx-extensions Mac"; - }; - 15A8A41A1834BDA200142BE0 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = A03F2CB81780BD04006731B9; - remoteInfo = "chipmunk Mac"; - }; - 15A8A41C1834BDA200142BE0 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = A03F2D9B1780BDF7006731B9; - remoteInfo = "box2d Mac"; - }; - 15A8A41E1834BDA200142BE0 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = A03F2ED617814268006731B9; - remoteInfo = "CocosDenshion Mac"; - }; 15A8A4241834BDA200142BE0 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; @@ -697,34 +245,6 @@ remoteGlobalIDString = A07A4D641783777C0073F6A7; remoteInfo = "cocos2dx iOS"; }; - 15A8A4261834BDA200142BE0 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = A07A4EFC1783867C0073F6A7; - remoteInfo = "cocos2dx-extensions iOS"; - }; - 15A8A4281834BDA200142BE0 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = A07A4F3B178387670073F6A7; - remoteInfo = "chipmunk iOS"; - }; - 15A8A42A1834BDA200142BE0 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = A07A4F9E1783876B0073F6A7; - remoteInfo = "box2d iOS"; - }; - 15A8A42C1834BDA200142BE0 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = A07A4FB4178387730073F6A7; - remoteInfo = "CocosDenshion iOS"; - }; 15D1F3081994BBCA00302043 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; @@ -732,20 +252,6 @@ remoteGlobalIDString = A07A4C241783777C0073F6A7; remoteInfo = "libcocos2d iOS"; }; - 15D1F30A1994BBE500302043 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = A07A4F9F178387730073F6A7; - remoteInfo = "libcocosdenshion iOS"; - }; - C0A2F03C18975FEB0072A7AB /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = A03F2E9817814268006731B9; - remoteInfo = "CocosDenshion Mac"; - }; C0A2F04018975FF80072A7AB /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */; @@ -921,24 +427,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 1571D9C419A1F74B005A1DC2 /* libcocos3d Mac.a in Frameworks */, - 1571D9C519A1F74B005A1DC2 /* libluacocos3d Mac.a in Frameworks */, - 152A3486199CE6B4004B68DC /* libcocosbuilder Mac.a in Frameworks */, - 152A3487199CE6B4004B68DC /* libcocostudio Mac.a in Frameworks */, - 152A3488199CE6B4004B68DC /* libextension Mac.a in Frameworks */, - 152A348C199CE6B4004B68DC /* libluaspine Mac.a in Frameworks */, - 152A348F199CE6B4004B68DC /* libui Mac.a in Frameworks */, - 15427CF0198F24C400DC375D /* libnetwork Mac.a in Frameworks */, - 15427CEF198F24BD00DC375D /* libcocosdenshion Mac.a in Frameworks */, 15427CEE198F24AF00DC375D /* libcocos2d Mac.a in Frameworks */, - 152A348E199CE6B4004B68DC /* libspine Mac.a in Frameworks */, - 152A3489199CE6B4004B68DC /* libluacocosbuilder Mac.a in Frameworks */, - 152A348B199CE6B4004B68DC /* libluaextension Mac.a in Frameworks */, - 152A348A199CE6B4004B68DC /* libluacocostudio Mac.a in Frameworks */, - 152A348D199CE6B4004B68DC /* libluaui Mac.a in Frameworks */, - 15AA7D47199B514300725633 /* libluanetwork Mac.a in Frameworks */, 15427CEC198F24A600DC375D /* libluacocos2d Mac.a in Frameworks */, - 15427CED198F24A600DC375D /* libluacocosdenshion Mac.a in Frameworks */, 15A8A4881834C90F00142BE0 /* libcurl.dylib in Frameworks */, 50D7C97017EBBEEC005D0B91 /* IOKit.framework in Frameworks */, 50D7C96E17EBBEE6005D0B91 /* AppKit.framework in Frameworks */, @@ -957,24 +447,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 1571D9C219A1F733005A1DC2 /* libcocos3d iOS.a in Frameworks */, - 1571D9C319A1F733005A1DC2 /* libluacocos3d iOS.a in Frameworks */, - 152A3484199CE64A004B68DC /* libspine iOS.a in Frameworks */, - 152A3485199CE64A004B68DC /* libui iOS.a in Frameworks */, - 152A3483199CE63A004B68DC /* libextension iOS.a in Frameworks */, - 152A3482199CE62F004B68DC /* libcocostudio iOS.a in Frameworks */, - 152A3481199CE624004B68DC /* libcocosbuilder iOS.a in Frameworks */, - 152A347C199CE60E004B68DC /* libluacocosbuilder iOS.a in Frameworks */, - 152A347D199CE60E004B68DC /* libluacocostudio iOS.a in Frameworks */, - 152A347E199CE60E004B68DC /* libluaextension iOS.a in Frameworks */, - 152A347F199CE60E004B68DC /* libluaspine iOS.a in Frameworks */, - 152A3480199CE60E004B68DC /* libluaui iOS.a in Frameworks */, - 15AA7D36199B513100725633 /* libluanetwork iOS.a in Frameworks */, - 15427CE3198F23A100DC375D /* libnetwork iOS.a in Frameworks */, 15427CD5198F222200DC375D /* libluacocos2d iOS.a in Frameworks */, - 15427CD6198F222200DC375D /* libluacocosdenshion iOS.a in Frameworks */, 15427CD3198F221400DC375D /* libcocos2d iOS.a in Frameworks */, - 15427CD4198F221400DC375D /* libcocosdenshion iOS.a in Frameworks */, 3EEEDB61197107C0006A9FF8 /* MediaPlayer.framework in Frameworks */, D6B061351803AC000077942B /* CoreMotion.framework in Frameworks */, 1AF4C403178663F200122817 /* libz.dylib in Frameworks */, @@ -996,27 +470,7 @@ isa = PBXGroup; children = ( 15A8A4171834BDA200142BE0 /* libcocos2d Mac.a */, - 15A8A4191834BDA200142BE0 /* libextension Mac.a */, - 15427C90198F220600DC375D /* libui Mac.a */, - 15427C92198F220600DC375D /* libcocostudio Mac.a */, - 15427C94198F220600DC375D /* libcocosbuilder Mac.a */, - 15427C96198F220600DC375D /* libspine Mac.a */, - 15427C98198F220600DC375D /* libnetwork Mac.a */, - 15A8A41B1834BDA200142BE0 /* libchipmunk Mac.a */, - 15A8A41D1834BDA200142BE0 /* libbox2d Mac.a */, - 15A8A41F1834BDA200142BE0 /* libcocosdenshion Mac.a */, - 1571D9B719A1F714005A1DC2 /* libcocos3d Mac.a */, 15A8A4251834BDA200142BE0 /* libcocos2d iOS.a */, - 15A8A4271834BDA200142BE0 /* libextension iOS.a */, - 15A8A4291834BDA200142BE0 /* libchipmunk iOS.a */, - 15A8A42B1834BDA200142BE0 /* libbox2d iOS.a */, - 15A8A42D1834BDA200142BE0 /* libcocosdenshion iOS.a */, - 15427C9A198F220600DC375D /* libui iOS.a */, - 15427C9C198F220600DC375D /* libcocostudio iOS.a */, - 15427C9E198F220600DC375D /* libcocosbuilder iOS.a */, - 15427CA0198F220600DC375D /* libspine iOS.a */, - 15427CA2198F220600DC375D /* libnetwork iOS.a */, - 1571D9B919A1F714005A1DC2 /* libcocos3d iOS.a */, ); name = Products; sourceTree = ""; @@ -1226,23 +680,7 @@ C03781AF18BF654500FE4F13 /* Products */ = { isa = PBXGroup; children = ( - 15427CB4198F220600DC375D /* libluaextension Mac.a */, - 15427CB6198F220600DC375D /* libluaui Mac.a */, - 15427CB8198F220600DC375D /* libluacocostudio Mac.a */, - 15427CBA198F220600DC375D /* libluacocosbuilder Mac.a */, - 15427CBC198F220600DC375D /* libluaspine Mac.a */, - 15427CBE198F220600DC375D /* libluanetwork Mac.a */, - 15427CC0198F220600DC375D /* libluacocosdenshion Mac.a */, - 1571D9BF19A1F714005A1DC2 /* libluacocos3d Mac.a */, 15427CC2198F220600DC375D /* libluacocos2d Mac.a */, - 15427CC4198F220600DC375D /* libluaextension iOS.a */, - 15427CC6198F220600DC375D /* libluaui iOS.a */, - 15427CC8198F220600DC375D /* libluacocostudio iOS.a */, - 15427CCA198F220600DC375D /* libluacocosbuilder iOS.a */, - 15427CCC198F220600DC375D /* libluaspine iOS.a */, - 15427CCE198F220600DC375D /* libluanetwork iOS.a */, - 15427CD0198F220600DC375D /* libluacocosdenshion iOS.a */, - 1571D9C119A1F714005A1DC2 /* libluacocos3d iOS.a */, 15427CD2198F220600DC375D /* libluacocos2d iOS.a */, ); name = Products; @@ -1340,22 +778,8 @@ buildRules = ( ); dependencies = ( - 152A34BB199CE766004B68DC /* PBXTargetDependency */, - 152A34BD199CE766004B68DC /* PBXTargetDependency */, - 152A34BF199CE766004B68DC /* PBXTargetDependency */, - 152A34C1199CE766004B68DC /* PBXTargetDependency */, - 152A34C3199CE766004B68DC /* PBXTargetDependency */, - 152A34AB199CE758004B68DC /* PBXTargetDependency */, - 152A34AD199CE758004B68DC /* PBXTargetDependency */, - 152A34AF199CE758004B68DC /* PBXTargetDependency */, - 152A34B1199CE758004B68DC /* PBXTargetDependency */, - 152A34B3199CE758004B68DC /* PBXTargetDependency */, - 152A34B5199CE758004B68DC /* PBXTargetDependency */, - 152A34B7199CE758004B68DC /* PBXTargetDependency */, 152A34B9199CE758004B68DC /* PBXTargetDependency */, - 15427CE7198F23E600DC375D /* PBXTargetDependency */, C0A2F04118975FF80072A7AB /* PBXTargetDependency */, - C0A2F03D18975FEB0072A7AB /* PBXTargetDependency */, ); name = "HelloLua Mac"; productName = HelloLua; @@ -1374,24 +798,8 @@ buildRules = ( ); dependencies = ( - 1571D9AB19A1F714005A1DC2 /* PBXTargetDependency */, - 1571D9AD19A1F714005A1DC2 /* PBXTargetDependency */, - 152A349B199CE72E004B68DC /* PBXTargetDependency */, - 152A349D199CE72E004B68DC /* PBXTargetDependency */, 152A349F199CE72E004B68DC /* PBXTargetDependency */, - 152A3491199CE727004B68DC /* PBXTargetDependency */, - 152A3493199CE727004B68DC /* PBXTargetDependency */, - 152A3495199CE727004B68DC /* PBXTargetDependency */, - 152A3497199CE727004B68DC /* PBXTargetDependency */, - 152A3499199CE727004B68DC /* PBXTargetDependency */, - 152A34A1199CE741004B68DC /* PBXTargetDependency */, - 152A34A3199CE741004B68DC /* PBXTargetDependency */, - 152A34A5199CE741004B68DC /* PBXTargetDependency */, - 152A34A7199CE741004B68DC /* PBXTargetDependency */, - 152A34A9199CE741004B68DC /* PBXTargetDependency */, - 15D1F30B1994BBE500302043 /* PBXTargetDependency */, 15D1F3091994BBCA00302043 /* PBXTargetDependency */, - 15427CE5198F23B300DC375D /* PBXTargetDependency */, ); name = "HelloLua iOS"; productName = HelloLua; @@ -1440,125 +848,6 @@ /* End PBXProject section */ /* Begin PBXReferenceProxy section */ - 15427C90198F220600DC375D /* libui Mac.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libui Mac.a"; - remoteRef = 15427C8F198F220600DC375D /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 15427C92198F220600DC375D /* libcocostudio Mac.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libcocostudio Mac.a"; - remoteRef = 15427C91198F220600DC375D /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 15427C94198F220600DC375D /* libcocosbuilder Mac.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libcocosbuilder Mac.a"; - remoteRef = 15427C93198F220600DC375D /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 15427C96198F220600DC375D /* libspine Mac.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libspine Mac.a"; - remoteRef = 15427C95198F220600DC375D /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 15427C98198F220600DC375D /* libnetwork Mac.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libnetwork Mac.a"; - remoteRef = 15427C97198F220600DC375D /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 15427C9A198F220600DC375D /* libui iOS.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libui iOS.a"; - remoteRef = 15427C99198F220600DC375D /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 15427C9C198F220600DC375D /* libcocostudio iOS.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libcocostudio iOS.a"; - remoteRef = 15427C9B198F220600DC375D /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 15427C9E198F220600DC375D /* libcocosbuilder iOS.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libcocosbuilder iOS.a"; - remoteRef = 15427C9D198F220600DC375D /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 15427CA0198F220600DC375D /* libspine iOS.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libspine iOS.a"; - remoteRef = 15427C9F198F220600DC375D /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 15427CA2198F220600DC375D /* libnetwork iOS.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libnetwork iOS.a"; - remoteRef = 15427CA1198F220600DC375D /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 15427CB4198F220600DC375D /* libluaextension Mac.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libluaextension Mac.a"; - remoteRef = 15427CB3198F220600DC375D /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 15427CB6198F220600DC375D /* libluaui Mac.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libluaui Mac.a"; - remoteRef = 15427CB5198F220600DC375D /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 15427CB8198F220600DC375D /* libluacocostudio Mac.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libluacocostudio Mac.a"; - remoteRef = 15427CB7198F220600DC375D /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 15427CBA198F220600DC375D /* libluacocosbuilder Mac.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libluacocosbuilder Mac.a"; - remoteRef = 15427CB9198F220600DC375D /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 15427CBC198F220600DC375D /* libluaspine Mac.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libluaspine Mac.a"; - remoteRef = 15427CBB198F220600DC375D /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 15427CBE198F220600DC375D /* libluanetwork Mac.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libluanetwork Mac.a"; - remoteRef = 15427CBD198F220600DC375D /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 15427CC0198F220600DC375D /* libluacocosdenshion Mac.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libluacocosdenshion Mac.a"; - remoteRef = 15427CBF198F220600DC375D /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; 15427CC2198F220600DC375D /* libluacocos2d Mac.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; @@ -1566,55 +855,6 @@ remoteRef = 15427CC1198F220600DC375D /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 15427CC4198F220600DC375D /* libluaextension iOS.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libluaextension iOS.a"; - remoteRef = 15427CC3198F220600DC375D /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 15427CC6198F220600DC375D /* libluaui iOS.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libluaui iOS.a"; - remoteRef = 15427CC5198F220600DC375D /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 15427CC8198F220600DC375D /* libluacocostudio iOS.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libluacocostudio iOS.a"; - remoteRef = 15427CC7198F220600DC375D /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 15427CCA198F220600DC375D /* libluacocosbuilder iOS.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libluacocosbuilder iOS.a"; - remoteRef = 15427CC9198F220600DC375D /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 15427CCC198F220600DC375D /* libluaspine iOS.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libluaspine iOS.a"; - remoteRef = 15427CCB198F220600DC375D /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 15427CCE198F220600DC375D /* libluanetwork iOS.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libluanetwork iOS.a"; - remoteRef = 15427CCD198F220600DC375D /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 15427CD0198F220600DC375D /* libluacocosdenshion iOS.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libluacocosdenshion iOS.a"; - remoteRef = 15427CCF198F220600DC375D /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; 15427CD2198F220600DC375D /* libluacocos2d iOS.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; @@ -1622,34 +862,6 @@ remoteRef = 15427CD1198F220600DC375D /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 1571D9B719A1F714005A1DC2 /* libcocos3d Mac.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libcocos3d Mac.a"; - remoteRef = 1571D9B619A1F714005A1DC2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 1571D9B919A1F714005A1DC2 /* libcocos3d iOS.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libcocos3d iOS.a"; - remoteRef = 1571D9B819A1F714005A1DC2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 1571D9BF19A1F714005A1DC2 /* libluacocos3d Mac.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libluacocos3d Mac.a"; - remoteRef = 1571D9BE19A1F714005A1DC2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 1571D9C119A1F714005A1DC2 /* libluacocos3d iOS.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libluacocos3d iOS.a"; - remoteRef = 1571D9C019A1F714005A1DC2 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; 15A8A4171834BDA200142BE0 /* libcocos2d Mac.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; @@ -1657,34 +869,6 @@ remoteRef = 15A8A4161834BDA200142BE0 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 15A8A4191834BDA200142BE0 /* libextension Mac.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libextension Mac.a"; - remoteRef = 15A8A4181834BDA200142BE0 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 15A8A41B1834BDA200142BE0 /* libchipmunk Mac.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libchipmunk Mac.a"; - remoteRef = 15A8A41A1834BDA200142BE0 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 15A8A41D1834BDA200142BE0 /* libbox2d Mac.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libbox2d Mac.a"; - remoteRef = 15A8A41C1834BDA200142BE0 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 15A8A41F1834BDA200142BE0 /* libcocosdenshion Mac.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libcocosdenshion Mac.a"; - remoteRef = 15A8A41E1834BDA200142BE0 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; 15A8A4251834BDA200142BE0 /* libcocos2d iOS.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; @@ -1692,34 +876,6 @@ remoteRef = 15A8A4241834BDA200142BE0 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 15A8A4271834BDA200142BE0 /* libextension iOS.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libextension iOS.a"; - remoteRef = 15A8A4261834BDA200142BE0 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 15A8A4291834BDA200142BE0 /* libchipmunk iOS.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libchipmunk iOS.a"; - remoteRef = 15A8A4281834BDA200142BE0 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 15A8A42B1834BDA200142BE0 /* libbox2d iOS.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libbox2d iOS.a"; - remoteRef = 15A8A42A1834BDA200142BE0 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 15A8A42D1834BDA200142BE0 /* libcocosdenshion iOS.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libcocosdenshion iOS.a"; - remoteRef = 15A8A42C1834BDA200142BE0 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; /* End PBXReferenceProxy section */ /* Begin PBXResourcesBuildPhase section */ @@ -1953,171 +1109,21 @@ /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ - 152A3491199CE727004B68DC /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "libluaextension iOS"; - targetProxy = 152A3490199CE727004B68DC /* PBXContainerItemProxy */; - }; - 152A3493199CE727004B68DC /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "libluaui iOS"; - targetProxy = 152A3492199CE727004B68DC /* PBXContainerItemProxy */; - }; - 152A3495199CE727004B68DC /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "libluacocostudio iOS"; - targetProxy = 152A3494199CE727004B68DC /* PBXContainerItemProxy */; - }; - 152A3497199CE727004B68DC /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "libluacocosbuilder iOS"; - targetProxy = 152A3496199CE727004B68DC /* PBXContainerItemProxy */; - }; - 152A3499199CE727004B68DC /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "libluaspine iOS"; - targetProxy = 152A3498199CE727004B68DC /* PBXContainerItemProxy */; - }; - 152A349B199CE72E004B68DC /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "libluanetwork iOS"; - targetProxy = 152A349A199CE72E004B68DC /* PBXContainerItemProxy */; - }; - 152A349D199CE72E004B68DC /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "libluacocosdenshion iOS"; - targetProxy = 152A349C199CE72E004B68DC /* PBXContainerItemProxy */; - }; 152A349F199CE72E004B68DC /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = "libluacocos2d iOS"; targetProxy = 152A349E199CE72E004B68DC /* PBXContainerItemProxy */; }; - 152A34A1199CE741004B68DC /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "libextension iOS"; - targetProxy = 152A34A0199CE741004B68DC /* PBXContainerItemProxy */; - }; - 152A34A3199CE741004B68DC /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "libui iOS"; - targetProxy = 152A34A2199CE741004B68DC /* PBXContainerItemProxy */; - }; - 152A34A5199CE741004B68DC /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "libcocostudio iOS"; - targetProxy = 152A34A4199CE741004B68DC /* PBXContainerItemProxy */; - }; - 152A34A7199CE741004B68DC /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "libcocosbuilder iOS"; - targetProxy = 152A34A6199CE741004B68DC /* PBXContainerItemProxy */; - }; - 152A34A9199CE741004B68DC /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "libspine iOS"; - targetProxy = 152A34A8199CE741004B68DC /* PBXContainerItemProxy */; - }; - 152A34AB199CE758004B68DC /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "libluaextension Mac"; - targetProxy = 152A34AA199CE758004B68DC /* PBXContainerItemProxy */; - }; - 152A34AD199CE758004B68DC /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "libluaui Mac"; - targetProxy = 152A34AC199CE758004B68DC /* PBXContainerItemProxy */; - }; - 152A34AF199CE758004B68DC /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "libluacocostudio Mac"; - targetProxy = 152A34AE199CE758004B68DC /* PBXContainerItemProxy */; - }; - 152A34B1199CE758004B68DC /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "libluacocosbuilder Mac"; - targetProxy = 152A34B0199CE758004B68DC /* PBXContainerItemProxy */; - }; - 152A34B3199CE758004B68DC /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "libluaspine Mac"; - targetProxy = 152A34B2199CE758004B68DC /* PBXContainerItemProxy */; - }; - 152A34B5199CE758004B68DC /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "libluanetwork Mac"; - targetProxy = 152A34B4199CE758004B68DC /* PBXContainerItemProxy */; - }; - 152A34B7199CE758004B68DC /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "libluacocosdenshion Mac"; - targetProxy = 152A34B6199CE758004B68DC /* PBXContainerItemProxy */; - }; 152A34B9199CE758004B68DC /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = "libluacocos2d Mac"; targetProxy = 152A34B8199CE758004B68DC /* PBXContainerItemProxy */; }; - 152A34BB199CE766004B68DC /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "libextension Mac"; - targetProxy = 152A34BA199CE766004B68DC /* PBXContainerItemProxy */; - }; - 152A34BD199CE766004B68DC /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "libui Mac"; - targetProxy = 152A34BC199CE766004B68DC /* PBXContainerItemProxy */; - }; - 152A34BF199CE766004B68DC /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "libcocostudio Mac"; - targetProxy = 152A34BE199CE766004B68DC /* PBXContainerItemProxy */; - }; - 152A34C1199CE766004B68DC /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "libcocosbuilder Mac"; - targetProxy = 152A34C0199CE766004B68DC /* PBXContainerItemProxy */; - }; - 152A34C3199CE766004B68DC /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "libspine Mac"; - targetProxy = 152A34C2199CE766004B68DC /* PBXContainerItemProxy */; - }; - 15427CE5198F23B300DC375D /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "libnetwork iOS"; - targetProxy = 15427CE4198F23B300DC375D /* PBXContainerItemProxy */; - }; - 15427CE7198F23E600DC375D /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "libnetwork Mac"; - targetProxy = 15427CE6198F23E600DC375D /* PBXContainerItemProxy */; - }; - 1571D9AB19A1F714005A1DC2 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "libluacocos3d iOS"; - targetProxy = 1571D9AA19A1F714005A1DC2 /* PBXContainerItemProxy */; - }; - 1571D9AD19A1F714005A1DC2 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "libcocos3d iOS"; - targetProxy = 1571D9AC19A1F714005A1DC2 /* PBXContainerItemProxy */; - }; 15D1F3091994BBCA00302043 /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = "libcocos2d iOS"; targetProxy = 15D1F3081994BBCA00302043 /* PBXContainerItemProxy */; }; - 15D1F30B1994BBE500302043 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "libcocosdenshion iOS"; - targetProxy = 15D1F30A1994BBE500302043 /* PBXContainerItemProxy */; - }; - C0A2F03D18975FEB0072A7AB /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "CocosDenshion Mac"; - targetProxy = C0A2F03C18975FEB0072A7AB /* PBXContainerItemProxy */; - }; C0A2F04118975FF80072A7AB /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = "cocos2dx Mac"; diff --git a/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/HelloLua.sln b/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/HelloLua.sln index 9951b3aa26..6dd45300a6 100644 --- a/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/HelloLua.sln +++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/HelloLua.sln @@ -4,50 +4,12 @@ Microsoft Visual Studio Solution File, Format Version 12.00 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HelloLua", "HelloLua.vcxproj", "{4E6A7A0E-DDD8-4BAA-8B22-C964069364ED}" ProjectSection(ProjectDependencies) = postProject {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E} = {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E} - {207BC7A9-CCF1-4F2F-A04D-45F72242AE25} = {207BC7A9-CCF1-4F2F-A04D-45F72242AE25} - {F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6} = {F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libchipmunk", "..\..\cocos2d-x\external\chipmunk\proj.win32\chipmunk.vcxproj", "{207BC7A9-CCF1-4F2F-A04D-45F72242AE25}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libnetwork", "..\..\cocos2d-x\cocos\network\proj.win32\libNetwork.vcxproj", "{DF2638C0-8128-4847-867C-6EAFE3DEE7B5}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocos2d", "..\..\cocos2d-x\cocos\2d\libcocos2d.vcxproj", "{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocosdenshion", "..\..\cocos2d-x\cocos\audio\proj.win32\libcocosdenshion.vcxproj", "{F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libluacocos2d", "..\..\cocos2d-x\cocos\scripting\lua-bindings\proj.win32\libluacocos2d.vcxproj", "{9F2D6CE6-C893-4400-B50C-6DB70CC2562F}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libluacocosdenshion", "..\..\cocos2d-x\cocos\scripting\lua-bindings\proj.win32\libluacocosdenshion.vcxproj", "{46A7D57A-7F25-4F52-823B-FFAC4FF3A624}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libluanetwork", "..\..\cocos2d-x\cocos\scripting\lua-bindings\proj.win32\libluanetwork.vcxproj", "{65E52F4B-703F-419E-AD67-926241A10042}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocosbuilder", "..\..\cocos2d-x\cocos\editor-support\cocosbuilder\proj.win32\libcocosbuilder.vcxproj", "{811C0DAB-7B96-4BD3-A154-B7572B58E4AB}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocostudio", "..\..\cocos2d-x\cocos\editor-support\cocostudio\proj.win32\libcocostudio.vcxproj", "{B57CF53F-2E49-4031-9822-047CC0E6BDE2}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libSpine", "..\..\cocos2d-x\cocos\editor-support\spine\proj.win32\libSpine.vcxproj", "{B7C2A162-DEC9-4418-972E-240AB3CBFCAE}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libui", "..\..\cocos2d-x\cocos\ui\proj.win32\libui.vcxproj", "{7E06E92C-537A-442B-9E4A-4761C84F8A1A}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbox2d", "..\..\cocos2d-x\external\Box2D\proj.win32\libbox2d.vcxproj", "{929480E7-23C0-4DF6-8456-096D71547116}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libextension", "..\..\cocos2d-x\extensions\proj.win32\libextension.vcxproj", "{21B2C324-891F-48EA-AD1A-5AE13DE12E28}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libluacocosbuilder", "..\..\cocos2d-x\cocos\scripting\lua-bindings\proj.win32\libluacocosbuilder.vcxproj", "{F8198014-F4F3-49F0-88AB-C1969A5829AF}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libluacocostudio", "..\..\cocos2d-x\cocos\scripting\lua-bindings\proj.win32\libluacocostudio.vcxproj", "{9640951E-C5D0-47B5-9C42-0BCADA261C50}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libluaextension", "..\..\cocos2d-x\cocos\scripting\lua-bindings\proj.win32\libluaextension.vcxproj", "{7068296E-38A4-4BCA-85DB-3A09BD014847}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libluaspine", "..\..\cocos2d-x\cocos\scripting\lua-bindings\proj.win32\libluaspine.vcxproj", "{31EF6AB1-0D9A-4BC6-99B8-2C482EA373C4}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libluaui", "..\..\cocos2d-x\cocos\scripting\lua-bindings\proj.win32\libluaui.vcxproj", "{FE78EEBB-3DBB-4713-8CBF-63D742C5BD82}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocos3d", "..\..\cocos2d-x\cocos\3d\proj.win32\libcocos3d.vcxproj", "{E24950FA-5BC1-4AEE-A900-4F0259354BF0}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libluacocos3d", "..\..\cocos2d-x\cocos\scripting\lua-bindings\proj.win32\libluacocos3d.vcxproj", "{06840490-14A4-43D6-88BC-AAFA44D043EB}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -58,86 +20,14 @@ Global {4E6A7A0E-DDD8-4BAA-8B22-C964069364ED}.Debug|Win32.Build.0 = Debug|Win32 {4E6A7A0E-DDD8-4BAA-8B22-C964069364ED}.Release|Win32.ActiveCfg = Release|Win32 {4E6A7A0E-DDD8-4BAA-8B22-C964069364ED}.Release|Win32.Build.0 = Release|Win32 - {207BC7A9-CCF1-4F2F-A04D-45F72242AE25}.Debug|Win32.ActiveCfg = Debug|Win32 - {207BC7A9-CCF1-4F2F-A04D-45F72242AE25}.Debug|Win32.Build.0 = Debug|Win32 - {207BC7A9-CCF1-4F2F-A04D-45F72242AE25}.Release|Win32.ActiveCfg = Release|Win32 - {207BC7A9-CCF1-4F2F-A04D-45F72242AE25}.Release|Win32.Build.0 = Release|Win32 - {DF2638C0-8128-4847-867C-6EAFE3DEE7B5}.Debug|Win32.ActiveCfg = Debug|Win32 - {DF2638C0-8128-4847-867C-6EAFE3DEE7B5}.Debug|Win32.Build.0 = Debug|Win32 - {DF2638C0-8128-4847-867C-6EAFE3DEE7B5}.Release|Win32.ActiveCfg = Release|Win32 - {DF2638C0-8128-4847-867C-6EAFE3DEE7B5}.Release|Win32.Build.0 = Release|Win32 {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Debug|Win32.ActiveCfg = Debug|Win32 {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Debug|Win32.Build.0 = Debug|Win32 {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Release|Win32.ActiveCfg = Release|Win32 {98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Release|Win32.Build.0 = Release|Win32 - {F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}.Debug|Win32.ActiveCfg = Debug|Win32 - {F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}.Debug|Win32.Build.0 = Debug|Win32 - {F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}.Release|Win32.ActiveCfg = Release|Win32 - {F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}.Release|Win32.Build.0 = Release|Win32 {9F2D6CE6-C893-4400-B50C-6DB70CC2562F}.Debug|Win32.ActiveCfg = Debug|Win32 {9F2D6CE6-C893-4400-B50C-6DB70CC2562F}.Debug|Win32.Build.0 = Debug|Win32 {9F2D6CE6-C893-4400-B50C-6DB70CC2562F}.Release|Win32.ActiveCfg = Release|Win32 {9F2D6CE6-C893-4400-B50C-6DB70CC2562F}.Release|Win32.Build.0 = Release|Win32 - {46A7D57A-7F25-4F52-823B-FFAC4FF3A624}.Debug|Win32.ActiveCfg = Debug|Win32 - {46A7D57A-7F25-4F52-823B-FFAC4FF3A624}.Debug|Win32.Build.0 = Debug|Win32 - {46A7D57A-7F25-4F52-823B-FFAC4FF3A624}.Release|Win32.ActiveCfg = Release|Win32 - {46A7D57A-7F25-4F52-823B-FFAC4FF3A624}.Release|Win32.Build.0 = Release|Win32 - {65E52F4B-703F-419E-AD67-926241A10042}.Debug|Win32.ActiveCfg = Debug|Win32 - {65E52F4B-703F-419E-AD67-926241A10042}.Debug|Win32.Build.0 = Debug|Win32 - {65E52F4B-703F-419E-AD67-926241A10042}.Release|Win32.ActiveCfg = Release|Win32 - {65E52F4B-703F-419E-AD67-926241A10042}.Release|Win32.Build.0 = Release|Win32 - {811C0DAB-7B96-4BD3-A154-B7572B58E4AB}.Debug|Win32.ActiveCfg = Debug|Win32 - {811C0DAB-7B96-4BD3-A154-B7572B58E4AB}.Debug|Win32.Build.0 = Debug|Win32 - {811C0DAB-7B96-4BD3-A154-B7572B58E4AB}.Release|Win32.ActiveCfg = Release|Win32 - {811C0DAB-7B96-4BD3-A154-B7572B58E4AB}.Release|Win32.Build.0 = Release|Win32 - {B57CF53F-2E49-4031-9822-047CC0E6BDE2}.Debug|Win32.ActiveCfg = Debug|Win32 - {B57CF53F-2E49-4031-9822-047CC0E6BDE2}.Debug|Win32.Build.0 = Debug|Win32 - {B57CF53F-2E49-4031-9822-047CC0E6BDE2}.Release|Win32.ActiveCfg = Release|Win32 - {B57CF53F-2E49-4031-9822-047CC0E6BDE2}.Release|Win32.Build.0 = Release|Win32 - {B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Debug|Win32.ActiveCfg = Debug|Win32 - {B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Debug|Win32.Build.0 = Debug|Win32 - {B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Release|Win32.ActiveCfg = Release|Win32 - {B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Release|Win32.Build.0 = Release|Win32 - {7E06E92C-537A-442B-9E4A-4761C84F8A1A}.Debug|Win32.ActiveCfg = Debug|Win32 - {7E06E92C-537A-442B-9E4A-4761C84F8A1A}.Debug|Win32.Build.0 = Debug|Win32 - {7E06E92C-537A-442B-9E4A-4761C84F8A1A}.Release|Win32.ActiveCfg = Release|Win32 - {7E06E92C-537A-442B-9E4A-4761C84F8A1A}.Release|Win32.Build.0 = Release|Win32 - {929480E7-23C0-4DF6-8456-096D71547116}.Debug|Win32.ActiveCfg = Debug|Win32 - {929480E7-23C0-4DF6-8456-096D71547116}.Debug|Win32.Build.0 = Debug|Win32 - {929480E7-23C0-4DF6-8456-096D71547116}.Release|Win32.ActiveCfg = Release|Win32 - {929480E7-23C0-4DF6-8456-096D71547116}.Release|Win32.Build.0 = Release|Win32 - {21B2C324-891F-48EA-AD1A-5AE13DE12E28}.Debug|Win32.ActiveCfg = Debug|Win32 - {21B2C324-891F-48EA-AD1A-5AE13DE12E28}.Debug|Win32.Build.0 = Debug|Win32 - {21B2C324-891F-48EA-AD1A-5AE13DE12E28}.Release|Win32.ActiveCfg = Release|Win32 - {21B2C324-891F-48EA-AD1A-5AE13DE12E28}.Release|Win32.Build.0 = Release|Win32 - {F8198014-F4F3-49F0-88AB-C1969A5829AF}.Debug|Win32.ActiveCfg = Debug|Win32 - {F8198014-F4F3-49F0-88AB-C1969A5829AF}.Debug|Win32.Build.0 = Debug|Win32 - {F8198014-F4F3-49F0-88AB-C1969A5829AF}.Release|Win32.ActiveCfg = Release|Win32 - {F8198014-F4F3-49F0-88AB-C1969A5829AF}.Release|Win32.Build.0 = Release|Win32 - {9640951E-C5D0-47B5-9C42-0BCADA261C50}.Debug|Win32.ActiveCfg = Debug|Win32 - {9640951E-C5D0-47B5-9C42-0BCADA261C50}.Debug|Win32.Build.0 = Debug|Win32 - {9640951E-C5D0-47B5-9C42-0BCADA261C50}.Release|Win32.ActiveCfg = Release|Win32 - {9640951E-C5D0-47B5-9C42-0BCADA261C50}.Release|Win32.Build.0 = Release|Win32 - {7068296E-38A4-4BCA-85DB-3A09BD014847}.Debug|Win32.ActiveCfg = Debug|Win32 - {7068296E-38A4-4BCA-85DB-3A09BD014847}.Debug|Win32.Build.0 = Debug|Win32 - {7068296E-38A4-4BCA-85DB-3A09BD014847}.Release|Win32.ActiveCfg = Release|Win32 - {7068296E-38A4-4BCA-85DB-3A09BD014847}.Release|Win32.Build.0 = Release|Win32 - {31EF6AB1-0D9A-4BC6-99B8-2C482EA373C4}.Debug|Win32.ActiveCfg = Debug|Win32 - {31EF6AB1-0D9A-4BC6-99B8-2C482EA373C4}.Debug|Win32.Build.0 = Debug|Win32 - {31EF6AB1-0D9A-4BC6-99B8-2C482EA373C4}.Release|Win32.ActiveCfg = Release|Win32 - {31EF6AB1-0D9A-4BC6-99B8-2C482EA373C4}.Release|Win32.Build.0 = Release|Win32 - {FE78EEBB-3DBB-4713-8CBF-63D742C5BD82}.Debug|Win32.ActiveCfg = Debug|Win32 - {FE78EEBB-3DBB-4713-8CBF-63D742C5BD82}.Debug|Win32.Build.0 = Debug|Win32 - {FE78EEBB-3DBB-4713-8CBF-63D742C5BD82}.Release|Win32.ActiveCfg = Release|Win32 - {FE78EEBB-3DBB-4713-8CBF-63D742C5BD82}.Release|Win32.Build.0 = Release|Win32 - {E24950FA-5BC1-4AEE-A900-4F0259354BF0}.Debug|Win32.ActiveCfg = Debug|Win32 - {E24950FA-5BC1-4AEE-A900-4F0259354BF0}.Debug|Win32.Build.0 = Debug|Win32 - {E24950FA-5BC1-4AEE-A900-4F0259354BF0}.Release|Win32.ActiveCfg = Release|Win32 - {E24950FA-5BC1-4AEE-A900-4F0259354BF0}.Release|Win32.Build.0 = Release|Win32 - {06840490-14A4-43D6-88BC-AAFA44D043EB}.Debug|Win32.ActiveCfg = Debug|Win32 - {06840490-14A4-43D6-88BC-AAFA44D043EB}.Debug|Win32.Build.0 = Debug|Win32 - {06840490-14A4-43D6-88BC-AAFA44D043EB}.Release|Win32.ActiveCfg = Release|Win32 - {06840490-14A4-43D6-88BC-AAFA44D043EB}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/HelloLua.vcxproj b/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/HelloLua.vcxproj index 86b88da24f..8d8a33029c 100644 --- a/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/HelloLua.vcxproj +++ b/templates/lua-template-runtime/frameworks/runtime-src/proj.win32/HelloLua.vcxproj @@ -263,27 +263,6 @@ xcopy "$(ProjectDir)..\..\cocos2d-x\cocos\scripting\lua-bindings\script\cocostud {9f2d6ce6-c893-4400-b50c-6db70cc2562f} - - {f8198014-f4f3-49f0-88ab-c1969a5829af} - - - {46a7d57a-7f25-4f52-823b-ffac4ff3a624} - - - {9640951e-c5d0-47b5-9c42-0bcada261c50} - - - {7068296e-38a4-4bca-85db-3a09bd014847} - - - {65e52f4b-703f-419e-ad67-926241a10042} - - - {31ef6ab1-0d9a-4bc6-99b8-2c482ea373c4} - - - {fe78eebb-3dbb-4713-8cbf-63d742c5bd82} - diff --git a/tests/cpp-empty-test/proj.win32/cpp-empty-test.vcxproj b/tests/cpp-empty-test/proj.win32/cpp-empty-test.vcxproj index 1f791caf44..38b48664c1 100644 --- a/tests/cpp-empty-test/proj.win32/cpp-empty-test.vcxproj +++ b/tests/cpp-empty-test/proj.win32/cpp-empty-test.vcxproj @@ -140,9 +140,6 @@ {98a51ba8-fc3a-415b-ac8f-8c7bd464e93e} - - {207bc7a9-ccf1-4f2f-a04d-45f72242ae25} - diff --git a/tests/cpp-tests/Classes/Camera3DTest/Camera3DTest.cpp b/tests/cpp-tests/Classes/Camera3DTest/Camera3DTest.cpp index d381e4c2a5..6754895447 100644 --- a/tests/cpp-tests/Classes/Camera3DTest/Camera3DTest.cpp +++ b/tests/cpp-tests/Classes/Camera3DTest/Camera3DTest.cpp @@ -363,34 +363,12 @@ void Camera3DTestDemo::addNewSpriteWithCoords(Vec3 p,std::string fileName,bool p if (animation) { auto animate = Animate3D::create(animation); - bool inverse = (std::rand() % 3 == 0); - - int rand2 = std::rand(); - float speed = 1.0f; - if(rand2 % 3 == 1) - { - speed = animate->getSpeed() + CCRANDOM_0_1(); - } - else if(rand2 % 3 == 2) - { - speed = animate->getSpeed() - 0.5 * CCRANDOM_0_1(); - } - animate->setSpeed(inverse ? -speed : speed); sprite->runAction(RepeatForever::create(animate)); - //auto sp = Sprite3D::create("Sprite3DTest/axe.c3b"); - // sprite->getAttachNode("Bip001 R Hand")->addChild(sp); } } if(bindCamera) { _sprite3D=sprite; - // auto sp = Sprite3D::create("Sprite3DTest/axe.c3b"); - // sp->setScale(3); - //sprite->getAttachNode("Bip001 R Hand")->addChild(sp); - //ParticleSystem3D* particleSystem3D = ParticleSystem3D::create("CameraTest/particle3Dtest1.particle"); - //particleSystem3D->start(); - //sprite->getAttachNode("Bip001 R Hand")->addChild(particleSystem3D); - } sprite->setScale(scale); diff --git a/tests/cpp-tests/Classes/ClippingNodeTest/ClippingNodeTest.cpp b/tests/cpp-tests/Classes/ClippingNodeTest/ClippingNodeTest.cpp index 5f40e0dbc7..0842b6eeef 100644 --- a/tests/cpp-tests/Classes/ClippingNodeTest/ClippingNodeTest.cpp +++ b/tests/cpp-tests/Classes/ClippingNodeTest/ClippingNodeTest.cpp @@ -1,5 +1,5 @@ // -// Clipping Demo +// ClippingNodeTest // // // by Pierre-David Bélanger @@ -31,7 +31,8 @@ static std::function createFunctions[] = { CL(RawStencilBufferTest3), CL(RawStencilBufferTest4), CL(RawStencilBufferTest5), - CL(RawStencilBufferTest6) + CL(RawStencilBufferTest6), + CL(ClippingToRenderTextureTest), }; static int sceneIdx=-1; @@ -890,6 +891,143 @@ void RawStencilBufferTest6::setupStencilForDrawingOnPlane(GLint plane) //#endif // COCOS2D_DEBUG > 1 +//ClippingToRenderTextureTest + +std::string ClippingToRenderTextureTest::title() const +{ + return "Clipping to RenderTexture"; +} + +std::string ClippingToRenderTextureTest::subtitle() const +{ + return "Both should look the same"; +} + +void ClippingToRenderTextureTest::setup() +{ + auto button = MenuItemFont::create("Reproduce bug", [&](Ref *sender) { + enumerateChildren("remove me [0-9]", [&](Node *node) { + this->removeChild(node); + this->reproduceBug(); + return false; + } + ); + }); + + auto s = Director::getInstance()->getWinSize(); + // create menu, it's an autorelease object + auto menu = Menu::create(button, NULL); + menu->setPosition(Point(s.width/2, s.height/2)); + this->addChild(menu, 1); + + expectedBehaviour(); +} + +void ClippingToRenderTextureTest::expectedBehaviour() +{ + auto director = Director::getInstance(); + Size visibleSize = director->getVisibleSize(); + Point origin = director->getVisibleOrigin(); + + + // add "HelloWorld" splash screen" + auto sprite = Sprite::create("Images/grossini.png"); + + // position the sprite on the center of the screen + sprite->setPosition(Point(visibleSize.width/2 + origin.x, visibleSize.height/2 + origin.y)); + + // add the sprite as a child to this layer + this->addChild(sprite, 0); + sprite->setName("remove me 0"); + + // container node that will contain the clippingNode + auto container = Node::create(); + this->addChild(container); + container->setName("remove me 1"); + + auto stencil = DrawNode::create(); + Point triangle[3]; + triangle[0] = Point(-50, -50); + triangle[1] = Point(50, -50); + triangle[2] = Point(0, 50); + Color4F green(0, 1, 0, 1); + stencil->drawPolygon(triangle, 3, green, 0, green); + + auto clipper = ClippingNode::create(); + clipper->setAnchorPoint(Point(0.5, 0.5)); + clipper->setPosition( Point(visibleSize.width/2, visibleSize.height/2) ); + clipper->setStencil(stencil); + clipper->setInverted(true); + container->addChild(clipper, 1); + + + auto img = DrawNode::create(); + triangle[0] = Point(-200, -200); + triangle[1] = Point(200, -200); + triangle[2] = Point(0, 200); + Color4F red(1, 0, 0, 1); + img->drawPolygon(triangle, 3, red, 0, red); + clipper->addChild(img); +} + +void ClippingToRenderTextureTest::reproduceBug() +{ + auto director = Director::getInstance(); + Size visibleSize = director->getVisibleSize(); + Point origin = director->getVisibleOrigin(); + + + // add "HelloWorld" splash screen" + auto sprite = Sprite::create("Images/grossini.png"); + + // position the sprite on the center of the screen + sprite->setPosition(Point(visibleSize.width/2 + origin.x, visibleSize.height/2 + origin.y)); + + // add the sprite as a child to this layer + this->addChild(sprite, 0); + + + // container node that will contain the clippingNode + auto container = Node::create(); + container->retain(); + + auto stencil = DrawNode::create(); + Point triangle[3]; + triangle[0] = Point(-50, -50); + triangle[1] = Point(50, -50); + triangle[2] = Point(0, 50); + Color4F green(0, 1, 0, 1); + stencil->drawPolygon(triangle, 3, green, 0, green); + + auto clipper = ClippingNode::create(); + clipper->setAnchorPoint(Point(0.5, 0.5)); + clipper->setPosition( Point(visibleSize.width/2, visibleSize.height/2) ); + clipper->setStencil(stencil); + clipper->setInverted(true); + container->addChild(clipper, 1); + + + auto img = DrawNode::create(); + triangle[0] = Point(-200, -200); + triangle[1] = Point(200, -200); + triangle[2] = Point(0, 200); + Color4F red(1, 0, 0, 1); + img->drawPolygon(triangle, 3, red, 0, red); + clipper->addChild(img); + + // container rendered on Texture the size of the screen + RenderTexture* rt = RenderTexture::create(visibleSize.width, visibleSize.height); + rt->setPosition(visibleSize.width/2, visibleSize.height/2); + this->addChild(rt); + + rt->beginWithClear(0.3, 0, 0, 1); + container->visit(); + rt->end(); +} + + +// main entry point + void ClippingNodeTestScene::runThisTest() { auto layer = nextAction(); diff --git a/tests/cpp-tests/Classes/ClippingNodeTest/ClippingNodeTest.h b/tests/cpp-tests/Classes/ClippingNodeTest/ClippingNodeTest.h index cda23e9062..4b9faa13cb 100644 --- a/tests/cpp-tests/Classes/ClippingNodeTest/ClippingNodeTest.h +++ b/tests/cpp-tests/Classes/ClippingNodeTest/ClippingNodeTest.h @@ -30,7 +30,7 @@ public: virtual std::string title() const override; virtual std::string subtitle() const override; - virtual void setup(); + virtual void setup() override; virtual Action* actionRotate(); virtual Action* actionScale(); @@ -219,14 +219,32 @@ class RawStencilBufferTest6 : public RawStencilBufferTestAlphaTest { public: CREATE_FUNC(RawStencilBufferTest6); - virtual void setup() override; - virtual std::string subtitle() const override; + virtual void setupStencilForClippingOnPlane(GLint plane); virtual void setupStencilForDrawingOnPlane(GLint plane); + + // override + virtual void setup() override; + virtual std::string subtitle() const override; }; //#endif //COCOS2D_DEBUG > 1 +class ClippingToRenderTextureTest : public BaseClippingNodeTest +{ +public: + CREATE_FUNC(ClippingToRenderTextureTest); + + void expectedBehaviour(); + void reproduceBug(); + + // override + virtual void setup() override; + virtual std::string title() const override; + virtual std::string subtitle() const override; +}; + + class ClippingNodeTestScene : public TestScene { public: diff --git a/tests/cpp-tests/Classes/Sprite3DTest/DrawNode3D.cpp b/tests/cpp-tests/Classes/Sprite3DTest/DrawNode3D.cpp index acb88b95e9..ced50721c7 100644 --- a/tests/cpp-tests/Classes/Sprite3DTest/DrawNode3D.cpp +++ b/tests/cpp-tests/Classes/Sprite3DTest/DrawNode3D.cpp @@ -29,6 +29,7 @@ #include "renderer/CCCustomCommand.h" #include "renderer/CCRenderer.h" #include "renderer/CCGLProgramState.h" +#include "renderer/ccGLStateCache.h" #include "base/CCDirector.h" #include "base/CCEventListenerCustom.h" #include "base/CCEventDispatcher.h" diff --git a/tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp b/tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp index d817e0e348..1ec8d15e5d 100644 --- a/tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp +++ b/tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp @@ -1056,7 +1056,7 @@ void Sprite3DReskinTest::menuCallback_switchHair(Ref* sender) } void Sprite3DReskinTest::menuCallback_switchGlasses(Ref* sender) { - auto subMesh = _sprite->getMeshByName("Girl_Yanjing_01"); + auto subMesh = _sprite->getMeshByName("Girl_Glasses01"); if(subMesh) { if(subMesh->isVisible()) @@ -1159,14 +1159,14 @@ std::string Sprite3DReskinTest::subtitle() const void Sprite3DReskinTest::addNewSpriteWithCoords(Vec2 p) { - _girlPants[0]= "Girl_Xiashen_01"; - _girlPants[1]= "Girl_Xiashen_02"; - _girlUpperBody[0] = "Girl_Shangshen_01"; - _girlUpperBody[1] = "Girl_Shangshen_02"; - _girlShoes[0] = "Girl_Xie_01"; - _girlShoes[1] = "Girl_Xie_02"; - _girlHair[0]= "Girl_Toufa_01"; - _girlHair[1]= "Girl_Toufa_02"; + _girlPants[0]= "Girl_LowerBody01"; + _girlPants[1]= "Girl_LowerBody02"; + _girlUpperBody[0] = "Girl_UpperBody01"; + _girlUpperBody[1] = "Girl_UpperBody02"; + _girlShoes[0] = "Girl_Shoes01"; + _girlShoes[1] = "Girl_Shoes02"; + _girlHair[0]= "Girl_Hair01"; + _girlHair[1]= "Girl_Hair02"; _usePantsId = 0; _useUpBodyId = 0; _useShoesId =0; diff --git a/tests/cpp-tests/Resources/Sprite3DTest/Girl_Lian.png b/tests/cpp-tests/Resources/Sprite3DTest/Girl_Face.png similarity index 100% rename from tests/cpp-tests/Resources/Sprite3DTest/Girl_Lian.png rename to tests/cpp-tests/Resources/Sprite3DTest/Girl_Face.png diff --git a/tests/cpp-tests/Resources/Sprite3DTest/Girl_Yanjing_01.png b/tests/cpp-tests/Resources/Sprite3DTest/Girl_Glasses01.png similarity index 100% rename from tests/cpp-tests/Resources/Sprite3DTest/Girl_Yanjing_01.png rename to tests/cpp-tests/Resources/Sprite3DTest/Girl_Glasses01.png diff --git a/tests/cpp-tests/Resources/Sprite3DTest/Girl_Toufa_01.png b/tests/cpp-tests/Resources/Sprite3DTest/Girl_Hair01.png similarity index 100% rename from tests/cpp-tests/Resources/Sprite3DTest/Girl_Toufa_01.png rename to tests/cpp-tests/Resources/Sprite3DTest/Girl_Hair01.png diff --git a/tests/cpp-tests/Resources/Sprite3DTest/Girl_Toufa_02.png b/tests/cpp-tests/Resources/Sprite3DTest/Girl_Hair02.png similarity index 100% rename from tests/cpp-tests/Resources/Sprite3DTest/Girl_Toufa_02.png rename to tests/cpp-tests/Resources/Sprite3DTest/Girl_Hair02.png diff --git a/tests/cpp-tests/Resources/Sprite3DTest/Girl_Shou_01.png b/tests/cpp-tests/Resources/Sprite3DTest/Girl_Hand.png similarity index 100% rename from tests/cpp-tests/Resources/Sprite3DTest/Girl_Shou_01.png rename to tests/cpp-tests/Resources/Sprite3DTest/Girl_Hand.png diff --git a/tests/cpp-tests/Resources/Sprite3DTest/Girl_Xiashen_01.png b/tests/cpp-tests/Resources/Sprite3DTest/Girl_LowerBody01.png similarity index 100% rename from tests/cpp-tests/Resources/Sprite3DTest/Girl_Xiashen_01.png rename to tests/cpp-tests/Resources/Sprite3DTest/Girl_LowerBody01.png diff --git a/tests/cpp-tests/Resources/Sprite3DTest/Girl_Xiashen_02.png b/tests/cpp-tests/Resources/Sprite3DTest/Girl_LowerBody02.png similarity index 100% rename from tests/cpp-tests/Resources/Sprite3DTest/Girl_Xiashen_02.png rename to tests/cpp-tests/Resources/Sprite3DTest/Girl_LowerBody02.png diff --git a/tests/cpp-tests/Resources/Sprite3DTest/Girl_Maozi_01.png b/tests/cpp-tests/Resources/Sprite3DTest/Girl_Maozi_01.png deleted file mode 100644 index d7d47ac29f..0000000000 Binary files a/tests/cpp-tests/Resources/Sprite3DTest/Girl_Maozi_01.png and /dev/null differ diff --git a/tests/cpp-tests/Resources/Sprite3DTest/Girl_Shangshen_03.png b/tests/cpp-tests/Resources/Sprite3DTest/Girl_Shangshen_03.png deleted file mode 100644 index 0e8821b78d..0000000000 Binary files a/tests/cpp-tests/Resources/Sprite3DTest/Girl_Shangshen_03.png and /dev/null differ diff --git a/tests/cpp-tests/Resources/Sprite3DTest/Girl_Xie_01.png b/tests/cpp-tests/Resources/Sprite3DTest/Girl_Shoes01.png similarity index 100% rename from tests/cpp-tests/Resources/Sprite3DTest/Girl_Xie_01.png rename to tests/cpp-tests/Resources/Sprite3DTest/Girl_Shoes01.png diff --git a/tests/cpp-tests/Resources/Sprite3DTest/Girl_Xie_02.png b/tests/cpp-tests/Resources/Sprite3DTest/Girl_Shoes02.png similarity index 100% rename from tests/cpp-tests/Resources/Sprite3DTest/Girl_Xie_02.png rename to tests/cpp-tests/Resources/Sprite3DTest/Girl_Shoes02.png diff --git a/tests/cpp-tests/Resources/Sprite3DTest/Girl_Shangshen_01.png b/tests/cpp-tests/Resources/Sprite3DTest/Girl_UpperBody01.png similarity index 100% rename from tests/cpp-tests/Resources/Sprite3DTest/Girl_Shangshen_01.png rename to tests/cpp-tests/Resources/Sprite3DTest/Girl_UpperBody01.png diff --git a/tests/cpp-tests/Resources/Sprite3DTest/Girl_Shangshen_02.png b/tests/cpp-tests/Resources/Sprite3DTest/Girl_UpperBody02.png similarity index 100% rename from tests/cpp-tests/Resources/Sprite3DTest/Girl_Shangshen_02.png rename to tests/cpp-tests/Resources/Sprite3DTest/Girl_UpperBody02.png diff --git a/tests/cpp-tests/Resources/Sprite3DTest/ReskinGirl.c3b b/tests/cpp-tests/Resources/Sprite3DTest/ReskinGirl.c3b index 001818417f..06e51a31a0 100644 Binary files a/tests/cpp-tests/Resources/Sprite3DTest/ReskinGirl.c3b and b/tests/cpp-tests/Resources/Sprite3DTest/ReskinGirl.c3b differ diff --git a/tests/cpp-tests/proj.win32/cpp-tests.vcxproj b/tests/cpp-tests/proj.win32/cpp-tests.vcxproj index e7bb3492ae..33ac755560 100644 --- a/tests/cpp-tests/proj.win32/cpp-tests.vcxproj +++ b/tests/cpp-tests/proj.win32/cpp-tests.vcxproj @@ -569,18 +569,6 @@ {98a51ba8-fc3a-415b-ac8f-8c7bd464e93e} - - {811c0dab-7b96-4bd3-a154-b7572b58e4ab} - - - {b7c2a162-dec9-4418-972e-240ab3cbfcae} - - - {929480e7-23c0-4df6-8456-096d71547116} - - - {207bc7a9-ccf1-4f2f-a04d-45f72242ae25} - diff --git a/tests/game-controller-test/proj.android/jni/Android.mk b/tests/game-controller-test/proj.android/jni/Android.mk index fbb8613e91..dadc927957 100644 --- a/tests/game-controller-test/proj.android/jni/Android.mk +++ b/tests/game-controller-test/proj.android/jni/Android.mk @@ -13,9 +13,8 @@ LOCAL_SRC_FILES := main.cpp \ LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../Classes \ $(LOCAL_PATH)/../../../../external -LOCAL_STATIC_LIBRARIES := cocos2dx_static cocosdenshion_static +LOCAL_STATIC_LIBRARIES := cocos2dx_static include $(BUILD_SHARED_LIBRARY) $(call import-module,.) -$(call import-module,audio/android) diff --git a/tools/tolua/cocos2dx.ini b/tools/tolua/cocos2dx.ini index 70a3fe7618..2d59d96980 100644 --- a/tools/tolua/cocos2dx.ini +++ b/tools/tolua/cocos2dx.ini @@ -126,7 +126,17 @@ skip = Node::[setGLServerState description getUserObject .*UserData getGLServerS TurnOffTiles::[shuffle], LabelTTF::[*], LabelBMFont::[*], - Scene::[getCameras] + Scene::[getCameras], + Animate3D::[*], + Sprite3D::[*], + AttachNode::[*], + Animation3D::[*], + Skeleton3D::[*], + Mesh::[*], + Animation3DCache::[*], + Sprite3DMaterialCache::[*], + Sprite3DCache::[*], + Bone3D::[*] rename_functions = SpriteFrameCache::[addSpriteFramesWithFile=addSpriteFrames getSpriteFrameByName=getSpriteFrame], ProgressTimer::[setReverseProgress=setReverseDirection],