diff --git a/build/cocos2d_libs.xcodeproj/project.pbxproj b/build/cocos2d_libs.xcodeproj/project.pbxproj index 1e8bcbe765..e0e6014740 100644 --- a/build/cocos2d_libs.xcodeproj/project.pbxproj +++ b/build/cocos2d_libs.xcodeproj/project.pbxproj @@ -1952,7 +1952,7 @@ 06CAAABF186AD63B0012A414 /* TriggerMng.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TriggerMng.h; sourceTree = ""; }; 06CAAAC0186AD63B0012A414 /* TriggerObj.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TriggerObj.cpp; sourceTree = ""; }; 06CAAAC1186AD63B0012A414 /* TriggerObj.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TriggerObj.h; sourceTree = ""; }; - 1551A33F158F2AB200E66CFE /* libcocos2dx Mac.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libcocos2dx Mac.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 1551A33F158F2AB200E66CFE /* libcocos2d Mac.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libcocos2d Mac.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 1551A342158F2AB200E66CFE /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; 1A01C67618F57BE800EFE3A6 /* CCArray.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCArray.cpp; sourceTree = ""; }; 1A01C67718F57BE800EFE3A6 /* CCArray.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCArray.h; sourceTree = ""; }; @@ -2866,13 +2866,13 @@ 50FCEB9218C72017004AD434 /* WidgetReaderProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WidgetReaderProtocol.h; sourceTree = ""; }; A03F2CB81780BD04006731B9 /* libchipmunk Mac.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libchipmunk Mac.a"; sourceTree = BUILT_PRODUCTS_DIR; }; A03F2D9B1780BDF7006731B9 /* libbox2d Mac.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libbox2d Mac.a"; sourceTree = BUILT_PRODUCTS_DIR; }; - A03F2ED617814268006731B9 /* libCocosDenshion Mac.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libCocosDenshion Mac.a"; sourceTree = BUILT_PRODUCTS_DIR; }; - A03F2FD617814595006731B9 /* libcocos2dx-extensions Mac.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libcocos2dx-extensions Mac.a"; sourceTree = BUILT_PRODUCTS_DIR; }; - A07A4D641783777C0073F6A7 /* libcocos2dx iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libcocos2dx iOS.a"; sourceTree = BUILT_PRODUCTS_DIR; }; - A07A4EFC1783867C0073F6A7 /* libcocos2dx-extensions iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libcocos2dx-extensions iOS.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + A03F2ED617814268006731B9 /* libcocosdenshion Mac.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libcocosdenshion Mac.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + A03F2FD617814595006731B9 /* libextension Mac.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libextension Mac.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + A07A4D641783777C0073F6A7 /* libcocos2d iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libcocos2d iOS.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + A07A4EFC1783867C0073F6A7 /* libextension iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libextension iOS.a"; sourceTree = BUILT_PRODUCTS_DIR; }; A07A4F3B178387670073F6A7 /* libchipmunk iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libchipmunk iOS.a"; sourceTree = BUILT_PRODUCTS_DIR; }; A07A4F9E1783876B0073F6A7 /* libbox2d iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libbox2d iOS.a"; sourceTree = BUILT_PRODUCTS_DIR; }; - A07A4FB4178387730073F6A7 /* libCocosDenshion iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libCocosDenshion iOS.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + A07A4FB4178387730073F6A7 /* libcocosdenshion iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libcocosdenshion iOS.a"; sourceTree = BUILT_PRODUCTS_DIR; }; B217703B1977ECB4009EE11B /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; }; B217703D1977ECC1009EE11B /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; }; B217703F1977ECE6009EE11B /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = System/Library/Frameworks/OpenGL.framework; sourceTree = SDKROOT; }; @@ -2882,16 +2882,16 @@ B21770481977ED4C009EE11B /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; }; B217704A1977ED55009EE11B /* libcurl.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcurl.dylib; path = usr/lib/libcurl.dylib; sourceTree = SDKROOT; }; B217704C1977ED8B009EE11B /* libsqlite3.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libsqlite3.dylib; path = usr/lib/libsqlite3.dylib; sourceTree = SDKROOT; }; - B245F13A19766132001920FD /* libcocosGUI Mac.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libcocosGUI Mac.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + B245F13A19766132001920FD /* libui Mac.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libui Mac.a"; sourceTree = BUILT_PRODUCTS_DIR; }; B24AA981195A675C007B4522 /* CCFastTMXLayer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCFastTMXLayer.cpp; sourceTree = ""; }; B24AA982195A675C007B4522 /* CCFastTMXLayer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCFastTMXLayer.h; sourceTree = ""; }; B24AA983195A675C007B4522 /* CCFastTMXTiledMap.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCFastTMXTiledMap.cpp; sourceTree = ""; }; B24AA984195A675C007B4522 /* CCFastTMXTiledMap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCFastTMXTiledMap.h; sourceTree = ""; }; - B24EEA6619775E92004493CC /* libcocosGUI iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libcocosGUI iOS.a"; sourceTree = BUILT_PRODUCTS_DIR; }; - B24EEA6E19775EBB004493CC /* libcocosStudio iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libcocosStudio iOS.a"; sourceTree = BUILT_PRODUCTS_DIR; }; - B24EEA7619775ECE004493CC /* libcocosBuilder iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libcocosBuilder iOS.a"; sourceTree = BUILT_PRODUCTS_DIR; }; - B24EEA7E19775EE1004493CC /* libcocosSpine iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libcocosSpine iOS.a"; sourceTree = BUILT_PRODUCTS_DIR; }; - B24EEA8619775EF3004493CC /* libcocosNetwork iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libcocosNetwork iOS.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + B24EEA6619775E92004493CC /* libui iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libui iOS.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + B24EEA6E19775EBB004493CC /* libcocostudio iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libcocostudio iOS.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + B24EEA7619775ECE004493CC /* libcocosbuilder iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libcocosbuilder iOS.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + B24EEA7E19775EE1004493CC /* libspine iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libspine iOS.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + B24EEA8619775EF3004493CC /* libnetwork iOS.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libnetwork iOS.a"; sourceTree = BUILT_PRODUCTS_DIR; }; B282B47C1980E02B00666787 /* CCEditBoxImplMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = CCEditBoxImplMac.mm; sourceTree = ""; }; B282B47D1980E02B00666787 /* CCEditBoxImplMac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCEditBoxImplMac.h; sourceTree = ""; }; B29594AF1926D5D9003EEF37 /* ccShader_3D_Color.frag */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; path = ccShader_3D_Color.frag; sourceTree = ""; }; @@ -2908,10 +2908,10 @@ B29594BF1926D61F003EEF37 /* CCSprite3DMaterial.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCSprite3DMaterial.cpp; sourceTree = ""; }; B29594C01926D61F003EEF37 /* CCSprite3DMaterial.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCSprite3DMaterial.h; sourceTree = ""; }; B2D3D3B81948613300BA4831 /* CCBundle3DData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCBundle3DData.h; sourceTree = ""; }; - B2DB47D2197669A100411E16 /* libcocosBuilder Mac.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libcocosBuilder Mac.a"; sourceTree = BUILT_PRODUCTS_DIR; }; - B2DB484D1976716E00411E16 /* libcocosStudio Mac.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libcocosStudio Mac.a"; sourceTree = BUILT_PRODUCTS_DIR; }; - B2DB490119767F1F00411E16 /* libcocosSpine Mac.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libcocosSpine Mac.a"; sourceTree = BUILT_PRODUCTS_DIR; }; - B2DB49C4197686CB00411E16 /* libcocosNetwork Mac.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libcocosNetwork Mac.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + B2DB47D2197669A100411E16 /* libcocosbuilder Mac.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libcocosbuilder Mac.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + B2DB484D1976716E00411E16 /* libcocostudio Mac.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libcocostudio Mac.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + B2DB490119767F1F00411E16 /* libspine Mac.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libspine Mac.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + B2DB49C4197686CB00411E16 /* libnetwork Mac.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libnetwork Mac.a"; sourceTree = BUILT_PRODUCTS_DIR; }; B37510451823AC7B00B3BA6A /* CCPhysicsBodyInfo_chipmunk.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCPhysicsBodyInfo_chipmunk.cpp; sourceTree = ""; }; B37510461823AC7B00B3BA6A /* CCPhysicsBodyInfo_chipmunk.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCPhysicsBodyInfo_chipmunk.h; sourceTree = ""; }; B37510471823AC7B00B3BA6A /* CCPhysicsContactInfo_chipmunk.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCPhysicsContactInfo_chipmunk.cpp; sourceTree = ""; }; @@ -3157,26 +3157,26 @@ 1551A340158F2AB200E66CFE /* Products */ = { isa = PBXGroup; children = ( - 1551A33F158F2AB200E66CFE /* libcocos2dx Mac.a */, + 1551A33F158F2AB200E66CFE /* libcocos2d Mac.a */, A03F2CB81780BD04006731B9 /* libchipmunk Mac.a */, A03F2D9B1780BDF7006731B9 /* libbox2d Mac.a */, - A03F2ED617814268006731B9 /* libCocosDenshion Mac.a */, - A03F2FD617814595006731B9 /* libcocos2dx-extensions Mac.a */, - A07A4D641783777C0073F6A7 /* libcocos2dx iOS.a */, - A07A4EFC1783867C0073F6A7 /* libcocos2dx-extensions iOS.a */, + A03F2ED617814268006731B9 /* libcocosdenshion Mac.a */, + A03F2FD617814595006731B9 /* libextension Mac.a */, + A07A4D641783777C0073F6A7 /* libcocos2d iOS.a */, + A07A4EFC1783867C0073F6A7 /* libextension iOS.a */, A07A4F3B178387670073F6A7 /* libchipmunk iOS.a */, A07A4F9E1783876B0073F6A7 /* libbox2d iOS.a */, - A07A4FB4178387730073F6A7 /* libCocosDenshion iOS.a */, - B245F13A19766132001920FD /* libcocosGUI Mac.a */, - B2DB47D2197669A100411E16 /* libcocosBuilder Mac.a */, - B2DB484D1976716E00411E16 /* libcocosStudio Mac.a */, - B2DB490119767F1F00411E16 /* libcocosSpine Mac.a */, - B2DB49C4197686CB00411E16 /* libcocosNetwork Mac.a */, - B24EEA6619775E92004493CC /* libcocosGUI iOS.a */, - B24EEA6E19775EBB004493CC /* libcocosStudio iOS.a */, - B24EEA7619775ECE004493CC /* libcocosBuilder iOS.a */, - B24EEA7E19775EE1004493CC /* libcocosSpine iOS.a */, - B24EEA8619775EF3004493CC /* libcocosNetwork iOS.a */, + A07A4FB4178387730073F6A7 /* libcocosdenshion iOS.a */, + B245F13A19766132001920FD /* libui Mac.a */, + B2DB47D2197669A100411E16 /* libcocosbuilder Mac.a */, + B2DB484D1976716E00411E16 /* libcocostudio Mac.a */, + B2DB490119767F1F00411E16 /* libspine Mac.a */, + B2DB49C4197686CB00411E16 /* libnetwork Mac.a */, + B24EEA6619775E92004493CC /* libui iOS.a */, + B24EEA6E19775EBB004493CC /* libcocostudio iOS.a */, + B24EEA7619775ECE004493CC /* libcocosbuilder iOS.a */, + B24EEA7E19775EE1004493CC /* libspine iOS.a */, + B24EEA8619775EF3004493CC /* libnetwork iOS.a */, ); name = Products; sourceTree = ""; @@ -6194,9 +6194,9 @@ /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ - 1551A33E158F2AB200E66CFE /* cocos2dx Mac */ = { + 1551A33E158F2AB200E66CFE /* libcocos2d Mac */ = { isa = PBXNativeTarget; - buildConfigurationList = 1551A34C158F2AB200E66CFE /* Build configuration list for PBXNativeTarget "cocos2dx Mac" */; + buildConfigurationList = 1551A34C158F2AB200E66CFE /* Build configuration list for PBXNativeTarget "libcocos2d Mac" */; buildPhases = ( 1551A33B158F2AB200E66CFE /* Sources */, 1551A33C158F2AB200E66CFE /* Frameworks */, @@ -6207,14 +6207,14 @@ dependencies = ( 460E44F41807E241000CDD6D /* PBXTargetDependency */, ); - name = "cocos2dx Mac"; + name = "libcocos2d Mac"; productName = cocos2dx; - productReference = 1551A33F158F2AB200E66CFE /* libcocos2dx Mac.a */; + productReference = 1551A33F158F2AB200E66CFE /* libcocos2d Mac.a */; productType = "com.apple.product-type.library.static"; }; - A03F2B781780BD04006731B9 /* chipmunk Mac */ = { + A03F2B781780BD04006731B9 /* libchipmunk Mac */ = { isa = PBXNativeTarget; - buildConfigurationList = A03F2CB51780BD04006731B9 /* Build configuration list for PBXNativeTarget "chipmunk Mac" */; + buildConfigurationList = A03F2CB51780BD04006731B9 /* Build configuration list for PBXNativeTarget "libchipmunk Mac" */; buildPhases = ( A03F2B791780BD04006731B9 /* Sources */, A03F2C011780BD04006731B9 /* Frameworks */, @@ -6224,14 +6224,14 @@ ); dependencies = ( ); - name = "chipmunk Mac"; + name = "libchipmunk Mac"; productName = cocos2dx; productReference = A03F2CB81780BD04006731B9 /* libchipmunk Mac.a */; productType = "com.apple.product-type.library.static"; }; - A03F2D5D1780BDF7006731B9 /* box2d Mac */ = { + A03F2D5D1780BDF7006731B9 /* libbox2d Mac */ = { isa = PBXNativeTarget; - buildConfigurationList = A03F2D981780BDF7006731B9 /* Build configuration list for PBXNativeTarget "box2d Mac" */; + buildConfigurationList = A03F2D981780BDF7006731B9 /* Build configuration list for PBXNativeTarget "libbox2d Mac" */; buildPhases = ( A03F2D5E1780BDF7006731B9 /* Sources */, A03F2D7C1780BDF7006731B9 /* Frameworks */, @@ -6241,14 +6241,14 @@ ); dependencies = ( ); - name = "box2d Mac"; + name = "libbox2d Mac"; productName = cocos2dx; productReference = A03F2D9B1780BDF7006731B9 /* libbox2d Mac.a */; productType = "com.apple.product-type.library.static"; }; - A03F2E9817814268006731B9 /* CocosDenshion Mac */ = { + A03F2E9817814268006731B9 /* libcocosdenshion Mac */ = { isa = PBXNativeTarget; - buildConfigurationList = A03F2ED317814268006731B9 /* Build configuration list for PBXNativeTarget "CocosDenshion Mac" */; + buildConfigurationList = A03F2ED317814268006731B9 /* Build configuration list for PBXNativeTarget "libcocosdenshion Mac" */; buildPhases = ( A03F2E9917814268006731B9 /* Sources */, A03F2EB717814268006731B9 /* Frameworks */, @@ -6258,14 +6258,14 @@ ); dependencies = ( ); - name = "CocosDenshion Mac"; + name = "libcocosdenshion Mac"; productName = cocos2dx; - productReference = A03F2ED617814268006731B9 /* libCocosDenshion Mac.a */; + productReference = A03F2ED617814268006731B9 /* libcocosdenshion Mac.a */; productType = "com.apple.product-type.library.static"; }; - A03F2FC117814595006731B9 /* cocos2dx-extensions Mac */ = { + A03F2FC117814595006731B9 /* libextension Mac */ = { isa = PBXNativeTarget; - buildConfigurationList = A03F2FD317814595006731B9 /* Build configuration list for PBXNativeTarget "cocos2dx-extensions Mac" */; + buildConfigurationList = A03F2FD317814595006731B9 /* Build configuration list for PBXNativeTarget "libextension Mac" */; buildPhases = ( A03F2FC217814595006731B9 /* Sources */, A03F2FC917814595006731B9 /* Frameworks */, @@ -6275,14 +6275,14 @@ ); dependencies = ( ); - name = "cocos2dx-extensions Mac"; + name = "libextension Mac"; productName = cocos2dx; - productReference = A03F2FD617814595006731B9 /* libcocos2dx-extensions Mac.a */; + productReference = A03F2FD617814595006731B9 /* libextension Mac.a */; productType = "com.apple.product-type.library.static"; }; - A07A4C241783777C0073F6A7 /* cocos2dx iOS */ = { + A07A4C241783777C0073F6A7 /* libcocos2d iOS */ = { isa = PBXNativeTarget; - buildConfigurationList = A07A4D611783777C0073F6A7 /* Build configuration list for PBXNativeTarget "cocos2dx iOS" */; + buildConfigurationList = A07A4D611783777C0073F6A7 /* Build configuration list for PBXNativeTarget "libcocos2d iOS" */; buildPhases = ( A07A4C251783777C0073F6A7 /* Sources */, A07A4CAD1783777C0073F6A7 /* Frameworks */, @@ -6293,14 +6293,14 @@ dependencies = ( 46A173D31807D330005B8026 /* PBXTargetDependency */, ); - name = "cocos2dx iOS"; + name = "libcocos2d iOS"; productName = cocos2dx; - productReference = A07A4D641783777C0073F6A7 /* libcocos2dx iOS.a */; + productReference = A07A4D641783777C0073F6A7 /* libcocos2d iOS.a */; productType = "com.apple.product-type.library.static"; }; - A07A4E111783867C0073F6A7 /* cocos2dx-extensions iOS */ = { + A07A4E111783867C0073F6A7 /* libextension iOS */ = { isa = PBXNativeTarget; - buildConfigurationList = A07A4EF91783867C0073F6A7 /* Build configuration list for PBXNativeTarget "cocos2dx-extensions iOS" */; + buildConfigurationList = A07A4EF91783867C0073F6A7 /* Build configuration list for PBXNativeTarget "libextension iOS" */; buildPhases = ( A07A4E121783867C0073F6A7 /* Sources */, A07A4E7B1783867C0073F6A7 /* Frameworks */, @@ -6310,14 +6310,14 @@ ); dependencies = ( ); - name = "cocos2dx-extensions iOS"; + name = "libextension iOS"; productName = cocos2dx; - productReference = A07A4EFC1783867C0073F6A7 /* libcocos2dx-extensions iOS.a */; + productReference = A07A4EFC1783867C0073F6A7 /* libextension iOS.a */; productType = "com.apple.product-type.library.static"; }; - A07A4EFD178387670073F6A7 /* chipmunk iOS */ = { + A07A4EFD178387670073F6A7 /* libchipmunk iOS */ = { isa = PBXNativeTarget; - buildConfigurationList = A07A4F38178387670073F6A7 /* Build configuration list for PBXNativeTarget "chipmunk iOS" */; + buildConfigurationList = A07A4F38178387670073F6A7 /* Build configuration list for PBXNativeTarget "libchipmunk iOS" */; buildPhases = ( A07A4EFE178387670073F6A7 /* Sources */, A07A4F1C178387670073F6A7 /* Frameworks */, @@ -6327,14 +6327,14 @@ ); dependencies = ( ); - name = "chipmunk iOS"; + name = "libchipmunk iOS"; productName = cocos2dx; productReference = A07A4F3B178387670073F6A7 /* libchipmunk iOS.a */; productType = "com.apple.product-type.library.static"; }; - A07A4F3C1783876B0073F6A7 /* box2d iOS */ = { + A07A4F3C1783876B0073F6A7 /* libbox2d iOS */ = { isa = PBXNativeTarget; - buildConfigurationList = A07A4F9B1783876B0073F6A7 /* Build configuration list for PBXNativeTarget "box2d iOS" */; + buildConfigurationList = A07A4F9B1783876B0073F6A7 /* Build configuration list for PBXNativeTarget "libbox2d iOS" */; buildPhases = ( A07A4F3D1783876B0073F6A7 /* Sources */, A07A4F6B1783876B0073F6A7 /* Frameworks */, @@ -6344,14 +6344,14 @@ ); dependencies = ( ); - name = "box2d iOS"; + name = "libbox2d iOS"; productName = cocos2dx; productReference = A07A4F9E1783876B0073F6A7 /* libbox2d iOS.a */; productType = "com.apple.product-type.library.static"; }; - A07A4F9F178387730073F6A7 /* CocosDenshion iOS */ = { + A07A4F9F178387730073F6A7 /* libcocosdenshion iOS */ = { isa = PBXNativeTarget; - buildConfigurationList = A07A4FB1178387730073F6A7 /* Build configuration list for PBXNativeTarget "CocosDenshion iOS" */; + buildConfigurationList = A07A4FB1178387730073F6A7 /* Build configuration list for PBXNativeTarget "libcocosdenshion iOS" */; buildPhases = ( A07A4FA0178387730073F6A7 /* Sources */, A07A4FA7178387730073F6A7 /* Frameworks */, @@ -6361,14 +6361,14 @@ ); dependencies = ( ); - name = "CocosDenshion iOS"; + name = "libcocosdenshion iOS"; productName = cocos2dx; - productReference = A07A4FB4178387730073F6A7 /* libCocosDenshion iOS.a */; + productReference = A07A4FB4178387730073F6A7 /* libcocosdenshion iOS.a */; productType = "com.apple.product-type.library.static"; }; - B245F10019766132001920FD /* cocosGUI Mac */ = { + B245F10019766132001920FD /* libui Mac */ = { isa = PBXNativeTarget; - buildConfigurationList = B245F13719766132001920FD /* Build configuration list for PBXNativeTarget "cocosGUI Mac" */; + buildConfigurationList = B245F13719766132001920FD /* Build configuration list for PBXNativeTarget "libui Mac" */; buildPhases = ( B245F10119766132001920FD /* Sources */, B245F11A19766132001920FD /* Frameworks */, @@ -6378,14 +6378,14 @@ ); dependencies = ( ); - name = "cocosGUI Mac"; + name = "libui Mac"; productName = cocos2dx; - productReference = B245F13A19766132001920FD /* libcocosGUI Mac.a */; + productReference = B245F13A19766132001920FD /* libui Mac.a */; productType = "com.apple.product-type.library.static"; }; - B24EEA2C19775E92004493CC /* cocosGUI iOS */ = { + B24EEA2C19775E92004493CC /* libui iOS */ = { isa = PBXNativeTarget; - buildConfigurationList = B24EEA6319775E92004493CC /* Build configuration list for PBXNativeTarget "cocosGUI iOS" */; + buildConfigurationList = B24EEA6319775E92004493CC /* Build configuration list for PBXNativeTarget "libui iOS" */; buildPhases = ( B24EEA2D19775E92004493CC /* Sources */, B24EEA4619775E92004493CC /* Frameworks */, @@ -6395,14 +6395,14 @@ ); dependencies = ( ); - name = "cocosGUI iOS"; + name = "libui iOS"; productName = cocos2dx; - productReference = B24EEA6619775E92004493CC /* libcocosGUI iOS.a */; + productReference = B24EEA6619775E92004493CC /* libui iOS.a */; productType = "com.apple.product-type.library.static"; }; - B24EEA6719775EBB004493CC /* cocosStudio iOS */ = { + B24EEA6719775EBB004493CC /* libcocostudio iOS */ = { isa = PBXNativeTarget; - buildConfigurationList = B24EEA6B19775EBB004493CC /* Build configuration list for PBXNativeTarget "cocosStudio iOS" */; + buildConfigurationList = B24EEA6B19775EBB004493CC /* Build configuration list for PBXNativeTarget "libcocostudio iOS" */; buildPhases = ( B24EEA6819775EBB004493CC /* Sources */, B24EEA6919775EBB004493CC /* Frameworks */, @@ -6412,14 +6412,14 @@ ); dependencies = ( ); - name = "cocosStudio iOS"; + name = "libcocostudio iOS"; productName = cocos2dx; - productReference = B24EEA6E19775EBB004493CC /* libcocosStudio iOS.a */; + productReference = B24EEA6E19775EBB004493CC /* libcocostudio iOS.a */; productType = "com.apple.product-type.library.static"; }; - B24EEA6F19775ECE004493CC /* cocosBuilder iOS */ = { + B24EEA6F19775ECE004493CC /* libcocosbuilder iOS */ = { isa = PBXNativeTarget; - buildConfigurationList = B24EEA7319775ECE004493CC /* Build configuration list for PBXNativeTarget "cocosBuilder iOS" */; + buildConfigurationList = B24EEA7319775ECE004493CC /* Build configuration list for PBXNativeTarget "libcocosbuilder iOS" */; buildPhases = ( B24EEA7019775ECE004493CC /* Sources */, B24EEA7119775ECE004493CC /* Frameworks */, @@ -6429,14 +6429,14 @@ ); dependencies = ( ); - name = "cocosBuilder iOS"; + name = "libcocosbuilder iOS"; productName = cocos2dx; - productReference = B24EEA7619775ECE004493CC /* libcocosBuilder iOS.a */; + productReference = B24EEA7619775ECE004493CC /* libcocosbuilder iOS.a */; productType = "com.apple.product-type.library.static"; }; - B24EEA7719775EE1004493CC /* cocosSpine iOS */ = { + B24EEA7719775EE1004493CC /* libspine iOS */ = { isa = PBXNativeTarget; - buildConfigurationList = B24EEA7B19775EE1004493CC /* Build configuration list for PBXNativeTarget "cocosSpine iOS" */; + buildConfigurationList = B24EEA7B19775EE1004493CC /* Build configuration list for PBXNativeTarget "libspine iOS" */; buildPhases = ( B24EEA7819775EE1004493CC /* Sources */, B24EEA7919775EE1004493CC /* Frameworks */, @@ -6446,14 +6446,14 @@ ); dependencies = ( ); - name = "cocosSpine iOS"; + name = "libspine iOS"; productName = cocos2dx; - productReference = B24EEA7E19775EE1004493CC /* libcocosSpine iOS.a */; + productReference = B24EEA7E19775EE1004493CC /* libspine iOS.a */; productType = "com.apple.product-type.library.static"; }; - B24EEA7F19775EF3004493CC /* cocosNetwork iOS */ = { + B24EEA7F19775EF3004493CC /* libnetwork iOS */ = { isa = PBXNativeTarget; - buildConfigurationList = B24EEA8319775EF3004493CC /* Build configuration list for PBXNativeTarget "cocosNetwork iOS" */; + buildConfigurationList = B24EEA8319775EF3004493CC /* Build configuration list for PBXNativeTarget "libnetwork iOS" */; buildPhases = ( B24EEA8019775EF3004493CC /* Sources */, B24EEA8119775EF3004493CC /* Frameworks */, @@ -6463,14 +6463,14 @@ ); dependencies = ( ); - name = "cocosNetwork iOS"; + name = "libnetwork iOS"; productName = cocos2dx; - productReference = B24EEA8619775EF3004493CC /* libcocosNetwork iOS.a */; + productReference = B24EEA8619775EF3004493CC /* libnetwork iOS.a */; productType = "com.apple.product-type.library.static"; }; - B2DB479B197669A100411E16 /* cocosBuilder Mac */ = { + B2DB479B197669A100411E16 /* libcocosbuilder Mac */ = { isa = PBXNativeTarget; - buildConfigurationList = B2DB47CF197669A100411E16 /* Build configuration list for PBXNativeTarget "cocosBuilder Mac" */; + buildConfigurationList = B2DB47CF197669A100411E16 /* Build configuration list for PBXNativeTarget "libcocosbuilder Mac" */; buildPhases = ( B2DB479C197669A100411E16 /* Sources */, B2DB47B5197669A100411E16 /* Frameworks */, @@ -6480,14 +6480,14 @@ ); dependencies = ( ); - name = "cocosBuilder Mac"; + name = "libcocosbuilder Mac"; productName = cocos2dx; - productReference = B2DB47D2197669A100411E16 /* libcocosBuilder Mac.a */; + productReference = B2DB47D2197669A100411E16 /* libcocosbuilder Mac.a */; productType = "com.apple.product-type.library.static"; }; - B2DB48161976716E00411E16 /* cocosStudio Mac */ = { + B2DB48161976716E00411E16 /* libcocostudio Mac */ = { isa = PBXNativeTarget; - buildConfigurationList = B2DB484A1976716E00411E16 /* Build configuration list for PBXNativeTarget "cocosStudio Mac" */; + buildConfigurationList = B2DB484A1976716E00411E16 /* Build configuration list for PBXNativeTarget "libcocostudio Mac" */; buildPhases = ( B2DB48171976716E00411E16 /* Sources */, B2DB48301976716E00411E16 /* Frameworks */, @@ -6497,14 +6497,14 @@ ); dependencies = ( ); - name = "cocosStudio Mac"; + name = "libcocostudio Mac"; productName = cocos2dx; - productReference = B2DB484D1976716E00411E16 /* libcocosStudio Mac.a */; + productReference = B2DB484D1976716E00411E16 /* libcocostudio Mac.a */; productType = "com.apple.product-type.library.static"; }; - B2DB48CA19767F1F00411E16 /* cocosSpine Mac */ = { + B2DB48CA19767F1F00411E16 /* libspine Mac */ = { isa = PBXNativeTarget; - buildConfigurationList = B2DB48FE19767F1F00411E16 /* Build configuration list for PBXNativeTarget "cocosSpine Mac" */; + buildConfigurationList = B2DB48FE19767F1F00411E16 /* Build configuration list for PBXNativeTarget "libspine Mac" */; buildPhases = ( B2DB48CB19767F1F00411E16 /* Sources */, B2DB48E419767F1F00411E16 /* Frameworks */, @@ -6514,14 +6514,14 @@ ); dependencies = ( ); - name = "cocosSpine Mac"; + name = "libspine Mac"; productName = cocos2dx; - productReference = B2DB490119767F1F00411E16 /* libcocosSpine Mac.a */; + productReference = B2DB490119767F1F00411E16 /* libspine Mac.a */; productType = "com.apple.product-type.library.static"; }; - B2DB498D197686CB00411E16 /* cocosNetwork Mac */ = { + B2DB498D197686CB00411E16 /* libnetwork Mac */ = { isa = PBXNativeTarget; - buildConfigurationList = B2DB49C1197686CB00411E16 /* Build configuration list for PBXNativeTarget "cocosNetwork Mac" */; + buildConfigurationList = B2DB49C1197686CB00411E16 /* Build configuration list for PBXNativeTarget "libnetwork Mac" */; buildPhases = ( B2DB498E197686CB00411E16 /* Sources */, B2DB49A7197686CB00411E16 /* Frameworks */, @@ -6531,9 +6531,9 @@ ); dependencies = ( ); - name = "cocosNetwork Mac"; + name = "libnetwork Mac"; productName = cocos2dx; - productReference = B2DB49C4197686CB00411E16 /* libcocosNetwork Mac.a */; + productReference = B2DB49C4197686CB00411E16 /* libnetwork Mac.a */; productType = "com.apple.product-type.library.static"; }; /* End PBXNativeTarget section */ @@ -6558,27 +6558,27 @@ projectRoot = ""; targets = ( A03F2E8E178141C1006731B9 /* build all libs Mac */, - 1551A33E158F2AB200E66CFE /* cocos2dx Mac */, - A03F2FC117814595006731B9 /* cocos2dx-extensions Mac */, - B245F10019766132001920FD /* cocosGUI Mac */, - B2DB48161976716E00411E16 /* cocosStudio Mac */, - B2DB479B197669A100411E16 /* cocosBuilder Mac */, - B2DB48CA19767F1F00411E16 /* cocosSpine Mac */, - B2DB498D197686CB00411E16 /* cocosNetwork Mac */, - A03F2B781780BD04006731B9 /* chipmunk Mac */, - A03F2D5D1780BDF7006731B9 /* box2d Mac */, - A03F2E9817814268006731B9 /* CocosDenshion Mac */, + 1551A33E158F2AB200E66CFE /* libcocos2d Mac */, + A03F2FC117814595006731B9 /* libextension Mac */, + B245F10019766132001920FD /* libui Mac */, + B2DB48161976716E00411E16 /* libcocostudio Mac */, + B2DB479B197669A100411E16 /* libcocosbuilder Mac */, + B2DB48CA19767F1F00411E16 /* libspine Mac */, + B2DB498D197686CB00411E16 /* libnetwork Mac */, + A03F2B781780BD04006731B9 /* libchipmunk Mac */, + A03F2D5D1780BDF7006731B9 /* libbox2d Mac */, + A03F2E9817814268006731B9 /* libcocosdenshion Mac */, A07A4E0B178386390073F6A7 /* build all libs iOS */, - A07A4C241783777C0073F6A7 /* cocos2dx iOS */, - A07A4E111783867C0073F6A7 /* cocos2dx-extensions iOS */, - A07A4EFD178387670073F6A7 /* chipmunk iOS */, - A07A4F3C1783876B0073F6A7 /* box2d iOS */, - A07A4F9F178387730073F6A7 /* CocosDenshion iOS */, - B24EEA2C19775E92004493CC /* cocosGUI iOS */, - B24EEA6719775EBB004493CC /* cocosStudio iOS */, - B24EEA6F19775ECE004493CC /* cocosBuilder iOS */, - B24EEA7719775EE1004493CC /* cocosSpine iOS */, - B24EEA7F19775EF3004493CC /* cocosNetwork iOS */, + A07A4C241783777C0073F6A7 /* libcocos2d iOS */, + A07A4E111783867C0073F6A7 /* libextension iOS */, + A07A4EFD178387670073F6A7 /* libchipmunk iOS */, + A07A4F3C1783876B0073F6A7 /* libbox2d iOS */, + A07A4F9F178387730073F6A7 /* libcocosdenshion iOS */, + B24EEA2C19775E92004493CC /* libui iOS */, + B24EEA6719775EBB004493CC /* libcocostudio iOS */, + B24EEA6F19775ECE004493CC /* libcocosbuilder iOS */, + B24EEA7719775EE1004493CC /* libspine iOS */, + B24EEA7F19775EF3004493CC /* libnetwork iOS */, ); }; /* End PBXProject section */ @@ -7564,62 +7564,62 @@ /* Begin PBXTargetDependency section */ 460E44F41807E241000CDD6D /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = A03F2B781780BD04006731B9 /* chipmunk Mac */; + target = A03F2B781780BD04006731B9 /* libchipmunk Mac */; targetProxy = 460E44F31807E241000CDD6D /* PBXContainerItemProxy */; }; 46A173D31807D330005B8026 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = A07A4EFD178387670073F6A7 /* chipmunk iOS */; + target = A07A4EFD178387670073F6A7 /* libchipmunk iOS */; targetProxy = 46A173D21807D330005B8026 /* PBXContainerItemProxy */; }; A03F2E93178141D1006731B9 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 1551A33E158F2AB200E66CFE /* cocos2dx Mac */; + target = 1551A33E158F2AB200E66CFE /* libcocos2d Mac */; targetProxy = A03F2E92178141D1006731B9 /* PBXContainerItemProxy */; }; A03F2E95178141D1006731B9 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = A03F2B781780BD04006731B9 /* chipmunk Mac */; + target = A03F2B781780BD04006731B9 /* libchipmunk Mac */; targetProxy = A03F2E94178141D1006731B9 /* PBXContainerItemProxy */; }; A03F2E97178141D1006731B9 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = A03F2D5D1780BDF7006731B9 /* box2d Mac */; + target = A03F2D5D1780BDF7006731B9 /* libbox2d Mac */; targetProxy = A03F2E96178141D1006731B9 /* PBXContainerItemProxy */; }; A03F2FC01781458C006731B9 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = A03F2E9817814268006731B9 /* CocosDenshion Mac */; + target = A03F2E9817814268006731B9 /* libcocosdenshion Mac */; targetProxy = A03F2FBF1781458C006731B9 /* PBXContainerItemProxy */; }; A03F31FF178147CB006731B9 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = A03F2FC117814595006731B9 /* cocos2dx-extensions Mac */; + target = A03F2FC117814595006731B9 /* libextension Mac */; targetProxy = A03F31FE178147CB006731B9 /* PBXContainerItemProxy */; }; A07A4E10178386520073F6A7 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = A07A4C241783777C0073F6A7 /* cocos2dx iOS */; + target = A07A4C241783777C0073F6A7 /* libcocos2d iOS */; targetProxy = A07A4E0F178386520073F6A7 /* PBXContainerItemProxy */; }; A07A5047178389710073F6A7 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = A07A4E111783867C0073F6A7 /* cocos2dx-extensions iOS */; + target = A07A4E111783867C0073F6A7 /* libextension iOS */; targetProxy = A07A5046178389710073F6A7 /* PBXContainerItemProxy */; }; A07A5049178389710073F6A7 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = A07A4EFD178387670073F6A7 /* chipmunk iOS */; + target = A07A4EFD178387670073F6A7 /* libchipmunk iOS */; targetProxy = A07A5048178389710073F6A7 /* PBXContainerItemProxy */; }; A07A504B178389710073F6A7 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = A07A4F3C1783876B0073F6A7 /* box2d iOS */; + target = A07A4F3C1783876B0073F6A7 /* libbox2d iOS */; targetProxy = A07A504A178389710073F6A7 /* PBXContainerItemProxy */; }; A07A504D178389710073F6A7 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = A07A4F9F178387730073F6A7 /* CocosDenshion iOS */; + target = A07A4F9F178387730073F6A7 /* libcocosdenshion iOS */; targetProxy = A07A504C178389710073F6A7 /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ @@ -7704,6 +7704,7 @@ ALWAYS_SEARCH_USER_PATHS = YES; ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; EXECUTABLE_EXTENSION = a; + EXECUTABLE_PREFIX = ""; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "../cocos/cocos2d-prefix.pch"; GCC_PREPROCESSOR_DEFINITIONS = ( @@ -7714,7 +7715,7 @@ ); GCC_TREAT_WARNINGS_AS_ERRORS = NO; HEADER_SEARCH_PATHS = ""; - LD_DYLIB_INSTALL_NAME = "@rpath/../Frameworks/lib$(TARGET_NAME).dylib"; + LD_DYLIB_INSTALL_NAME = ""; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "\"$(SRCROOT)/../external/glfw3/prebuilt/mac\"", @@ -7736,6 +7737,7 @@ ALWAYS_SEARCH_USER_PATHS = YES; ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; EXECUTABLE_EXTENSION = a; + EXECUTABLE_PREFIX = ""; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "../cocos/cocos2d-prefix.pch"; @@ -7747,7 +7749,7 @@ ); GCC_TREAT_WARNINGS_AS_ERRORS = NO; HEADER_SEARCH_PATHS = ""; - LD_DYLIB_INSTALL_NAME = "@rpath/../Frameworks/lib$(TARGET_NAME).dylib"; + LD_DYLIB_INSTALL_NAME = ""; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "\"$(SRCROOT)/../external/glfw3/prebuilt/mac\"", @@ -7766,6 +7768,7 @@ A03F2CB61780BD04006731B9 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + EXECUTABLE_PREFIX = ""; GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO; HEADER_SEARCH_PATHS = ""; USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../external/chipmunk/include/chipmunk/"; @@ -7775,6 +7778,7 @@ A03F2CB71780BD04006731B9 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + EXECUTABLE_PREFIX = ""; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO; HEADER_SEARCH_PATHS = ""; @@ -7787,6 +7791,7 @@ buildSettings = { CLANG_WARN_BOOL_CONVERSION = NO; CLANG_WARN_CONSTANT_CONVERSION = NO; + EXECUTABLE_PREFIX = ""; GCC_WARN_64_TO_32_BIT_CONVERSION = NO; GCC_WARN_SHADOW = NO; GCC_WARN_UNUSED_VALUE = NO; @@ -7801,6 +7806,7 @@ buildSettings = { CLANG_WARN_BOOL_CONVERSION = NO; CLANG_WARN_CONSTANT_CONVERSION = NO; + EXECUTABLE_PREFIX = ""; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_WARN_64_TO_32_BIT_CONVERSION = NO; GCC_WARN_SHADOW = NO; @@ -7841,6 +7847,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = YES; + EXECUTABLE_PREFIX = ""; GCC_PREPROCESSOR_DEFINITIONS = CC_TARGET_OS_MAC; GCC_TREAT_WARNINGS_AS_ERRORS = NO; HEADER_SEARCH_PATHS = ""; @@ -7852,6 +7859,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = YES; + EXECUTABLE_PREFIX = ""; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_PREPROCESSOR_DEFINITIONS = CC_TARGET_OS_MAC; GCC_TREAT_WARNINGS_AS_ERRORS = NO; @@ -7865,6 +7873,7 @@ buildSettings = { ALWAYS_SEARCH_USER_PATHS = YES; CODE_SIGN_IDENTITY = ""; + EXECUTABLE_PREFIX = ""; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", CC_TARGET_OS_MAC, @@ -7882,6 +7891,7 @@ buildSettings = { ALWAYS_SEARCH_USER_PATHS = YES; CODE_SIGN_IDENTITY = ""; + EXECUTABLE_PREFIX = ""; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", @@ -7900,6 +7910,7 @@ buildSettings = { ALWAYS_SEARCH_USER_PATHS = YES; ARCHS = "$(ARCHS_STANDARD)"; + EXECUTABLE_PREFIX = ""; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "../cocos/cocos2d-prefix.pch"; GCC_PREPROCESSOR_DEFINITIONS = ( @@ -7929,6 +7940,7 @@ buildSettings = { ALWAYS_SEARCH_USER_PATHS = YES; ARCHS = "$(ARCHS_STANDARD)"; + EXECUTABLE_PREFIX = ""; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "../cocos/cocos2d-prefix.pch"; @@ -7979,6 +7991,7 @@ buildSettings = { ALWAYS_SEARCH_USER_PATHS = YES; ARCHS = "$(ARCHS_STANDARD)"; + EXECUTABLE_PREFIX = ""; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", CC_TARGET_OS_IPHONE, @@ -7998,6 +8011,7 @@ buildSettings = { ALWAYS_SEARCH_USER_PATHS = YES; ARCHS = "$(ARCHS_STANDARD)"; + EXECUTABLE_PREFIX = ""; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", @@ -8017,6 +8031,7 @@ isa = XCBuildConfiguration; buildSettings = { ARCHS = "$(ARCHS_STANDARD)"; + EXECUTABLE_PREFIX = ""; HEADER_SEARCH_PATHS = ""; IPHONEOS_DEPLOYMENT_TARGET = 5.1.1; SDKROOT = iphoneos; @@ -8029,6 +8044,7 @@ isa = XCBuildConfiguration; buildSettings = { ARCHS = "$(ARCHS_STANDARD)"; + EXECUTABLE_PREFIX = ""; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; HEADER_SEARCH_PATHS = ""; IPHONEOS_DEPLOYMENT_TARGET = 5.1.1; @@ -8044,6 +8060,7 @@ ARCHS = "$(ARCHS_STANDARD)"; CLANG_WARN_BOOL_CONVERSION = NO; CLANG_WARN_CONSTANT_CONVERSION = NO; + EXECUTABLE_PREFIX = ""; GCC_WARN_64_TO_32_BIT_CONVERSION = NO; GCC_WARN_SHADOW = NO; GCC_WARN_UNUSED_VALUE = NO; @@ -8062,6 +8079,7 @@ ARCHS = "$(ARCHS_STANDARD)"; CLANG_WARN_BOOL_CONVERSION = NO; CLANG_WARN_CONSTANT_CONVERSION = NO; + EXECUTABLE_PREFIX = ""; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_WARN_64_TO_32_BIT_CONVERSION = NO; GCC_WARN_SHADOW = NO; @@ -8080,6 +8098,7 @@ buildSettings = { ALWAYS_SEARCH_USER_PATHS = YES; ARCHS = "$(ARCHS_STANDARD)"; + EXECUTABLE_PREFIX = ""; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", CC_TARGET_OS_IPHONE, @@ -8098,6 +8117,7 @@ buildSettings = { ALWAYS_SEARCH_USER_PATHS = YES; ARCHS = "$(ARCHS_STANDARD)"; + EXECUTABLE_PREFIX = ""; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", @@ -8116,6 +8136,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = YES; + EXECUTABLE_PREFIX = ""; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", CC_TARGET_OS_MAC, @@ -8133,6 +8154,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = YES; + EXECUTABLE_PREFIX = ""; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", @@ -8152,6 +8174,7 @@ buildSettings = { ALWAYS_SEARCH_USER_PATHS = YES; ARCHS = "$(ARCHS_STANDARD)"; + EXECUTABLE_PREFIX = ""; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", CC_TARGET_OS_IPHONE, @@ -8172,6 +8195,7 @@ buildSettings = { ALWAYS_SEARCH_USER_PATHS = YES; ARCHS = "$(ARCHS_STANDARD)"; + EXECUTABLE_PREFIX = ""; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", @@ -8193,6 +8217,7 @@ buildSettings = { ALWAYS_SEARCH_USER_PATHS = YES; ARCHS = "$(ARCHS_STANDARD)"; + EXECUTABLE_PREFIX = ""; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", CC_TARGET_OS_IPHONE, @@ -8213,6 +8238,7 @@ buildSettings = { ALWAYS_SEARCH_USER_PATHS = YES; ARCHS = "$(ARCHS_STANDARD)"; + EXECUTABLE_PREFIX = ""; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", @@ -8234,6 +8260,7 @@ buildSettings = { ALWAYS_SEARCH_USER_PATHS = YES; ARCHS = "$(ARCHS_STANDARD)"; + EXECUTABLE_PREFIX = ""; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", CC_TARGET_OS_IPHONE, @@ -8254,6 +8281,7 @@ buildSettings = { ALWAYS_SEARCH_USER_PATHS = YES; ARCHS = "$(ARCHS_STANDARD)"; + EXECUTABLE_PREFIX = ""; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", @@ -8275,6 +8303,7 @@ buildSettings = { ALWAYS_SEARCH_USER_PATHS = YES; ARCHS = "$(ARCHS_STANDARD)"; + EXECUTABLE_PREFIX = ""; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", CC_TARGET_OS_IPHONE, @@ -8295,6 +8324,7 @@ buildSettings = { ALWAYS_SEARCH_USER_PATHS = YES; ARCHS = "$(ARCHS_STANDARD)"; + EXECUTABLE_PREFIX = ""; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", @@ -8316,6 +8346,7 @@ buildSettings = { ALWAYS_SEARCH_USER_PATHS = YES; ARCHS = "$(ARCHS_STANDARD)"; + EXECUTABLE_PREFIX = ""; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", CC_TARGET_OS_IPHONE, @@ -8339,6 +8370,7 @@ buildSettings = { ALWAYS_SEARCH_USER_PATHS = YES; ARCHS = "$(ARCHS_STANDARD)"; + EXECUTABLE_PREFIX = ""; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", @@ -8362,6 +8394,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = YES; + EXECUTABLE_PREFIX = ""; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", CC_TARGET_OS_MAC, @@ -8379,6 +8412,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = YES; + EXECUTABLE_PREFIX = ""; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", @@ -8397,6 +8431,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = YES; + EXECUTABLE_PREFIX = ""; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", CC_TARGET_OS_MAC, @@ -8414,6 +8449,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = YES; + EXECUTABLE_PREFIX = ""; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", @@ -8432,6 +8468,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = YES; + EXECUTABLE_PREFIX = ""; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", CC_TARGET_OS_MAC, @@ -8449,6 +8486,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = YES; + EXECUTABLE_PREFIX = ""; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", @@ -8467,6 +8505,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = YES; + EXECUTABLE_PREFIX = ""; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", CC_TARGET_OS_MAC, @@ -8487,6 +8526,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = YES; + EXECUTABLE_PREFIX = ""; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_PREPROCESSOR_DEFINITIONS = ( "$(inherited)", @@ -8516,7 +8556,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 1551A34C158F2AB200E66CFE /* Build configuration list for PBXNativeTarget "cocos2dx Mac" */ = { + 1551A34C158F2AB200E66CFE /* Build configuration list for PBXNativeTarget "libcocos2d Mac" */ = { isa = XCConfigurationList; buildConfigurations = ( 1551A34D158F2AB200E66CFE /* Debug */, @@ -8525,7 +8565,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - A03F2CB51780BD04006731B9 /* Build configuration list for PBXNativeTarget "chipmunk Mac" */ = { + A03F2CB51780BD04006731B9 /* Build configuration list for PBXNativeTarget "libchipmunk Mac" */ = { isa = XCConfigurationList; buildConfigurations = ( A03F2CB61780BD04006731B9 /* Debug */, @@ -8534,7 +8574,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - A03F2D981780BDF7006731B9 /* Build configuration list for PBXNativeTarget "box2d Mac" */ = { + A03F2D981780BDF7006731B9 /* Build configuration list for PBXNativeTarget "libbox2d Mac" */ = { isa = XCConfigurationList; buildConfigurations = ( A03F2D991780BDF7006731B9 /* Debug */, @@ -8552,7 +8592,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - A03F2ED317814268006731B9 /* Build configuration list for PBXNativeTarget "CocosDenshion Mac" */ = { + A03F2ED317814268006731B9 /* Build configuration list for PBXNativeTarget "libcocosdenshion Mac" */ = { isa = XCConfigurationList; buildConfigurations = ( A03F2ED417814268006731B9 /* Debug */, @@ -8561,7 +8601,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - A03F2FD317814595006731B9 /* Build configuration list for PBXNativeTarget "cocos2dx-extensions Mac" */ = { + A03F2FD317814595006731B9 /* Build configuration list for PBXNativeTarget "libextension Mac" */ = { isa = XCConfigurationList; buildConfigurations = ( A03F2FD417814595006731B9 /* Debug */, @@ -8570,7 +8610,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - A07A4D611783777C0073F6A7 /* Build configuration list for PBXNativeTarget "cocos2dx iOS" */ = { + A07A4D611783777C0073F6A7 /* Build configuration list for PBXNativeTarget "libcocos2d iOS" */ = { isa = XCConfigurationList; buildConfigurations = ( A07A4D621783777C0073F6A7 /* Debug */, @@ -8588,7 +8628,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - A07A4EF91783867C0073F6A7 /* Build configuration list for PBXNativeTarget "cocos2dx-extensions iOS" */ = { + A07A4EF91783867C0073F6A7 /* Build configuration list for PBXNativeTarget "libextension iOS" */ = { isa = XCConfigurationList; buildConfigurations = ( A07A4EFA1783867C0073F6A7 /* Debug */, @@ -8597,7 +8637,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - A07A4F38178387670073F6A7 /* Build configuration list for PBXNativeTarget "chipmunk iOS" */ = { + A07A4F38178387670073F6A7 /* Build configuration list for PBXNativeTarget "libchipmunk iOS" */ = { isa = XCConfigurationList; buildConfigurations = ( A07A4F39178387670073F6A7 /* Debug */, @@ -8606,7 +8646,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - A07A4F9B1783876B0073F6A7 /* Build configuration list for PBXNativeTarget "box2d iOS" */ = { + A07A4F9B1783876B0073F6A7 /* Build configuration list for PBXNativeTarget "libbox2d iOS" */ = { isa = XCConfigurationList; buildConfigurations = ( A07A4F9C1783876B0073F6A7 /* Debug */, @@ -8615,7 +8655,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - A07A4FB1178387730073F6A7 /* Build configuration list for PBXNativeTarget "CocosDenshion iOS" */ = { + A07A4FB1178387730073F6A7 /* Build configuration list for PBXNativeTarget "libcocosdenshion iOS" */ = { isa = XCConfigurationList; buildConfigurations = ( A07A4FB2178387730073F6A7 /* Debug */, @@ -8624,7 +8664,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - B245F13719766132001920FD /* Build configuration list for PBXNativeTarget "cocosGUI Mac" */ = { + B245F13719766132001920FD /* Build configuration list for PBXNativeTarget "libui Mac" */ = { isa = XCConfigurationList; buildConfigurations = ( B245F13819766132001920FD /* Debug */, @@ -8633,7 +8673,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - B24EEA6319775E92004493CC /* Build configuration list for PBXNativeTarget "cocosGUI iOS" */ = { + B24EEA6319775E92004493CC /* Build configuration list for PBXNativeTarget "libui iOS" */ = { isa = XCConfigurationList; buildConfigurations = ( B24EEA6419775E92004493CC /* Debug */, @@ -8642,7 +8682,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - B24EEA6B19775EBB004493CC /* Build configuration list for PBXNativeTarget "cocosStudio iOS" */ = { + B24EEA6B19775EBB004493CC /* Build configuration list for PBXNativeTarget "libcocostudio iOS" */ = { isa = XCConfigurationList; buildConfigurations = ( B24EEA6C19775EBB004493CC /* Debug */, @@ -8651,7 +8691,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - B24EEA7319775ECE004493CC /* Build configuration list for PBXNativeTarget "cocosBuilder iOS" */ = { + B24EEA7319775ECE004493CC /* Build configuration list for PBXNativeTarget "libcocosbuilder iOS" */ = { isa = XCConfigurationList; buildConfigurations = ( B24EEA7419775ECE004493CC /* Debug */, @@ -8660,7 +8700,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - B24EEA7B19775EE1004493CC /* Build configuration list for PBXNativeTarget "cocosSpine iOS" */ = { + B24EEA7B19775EE1004493CC /* Build configuration list for PBXNativeTarget "libspine iOS" */ = { isa = XCConfigurationList; buildConfigurations = ( B24EEA7C19775EE1004493CC /* Debug */, @@ -8669,7 +8709,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - B24EEA8319775EF3004493CC /* Build configuration list for PBXNativeTarget "cocosNetwork iOS" */ = { + B24EEA8319775EF3004493CC /* Build configuration list for PBXNativeTarget "libnetwork iOS" */ = { isa = XCConfigurationList; buildConfigurations = ( B24EEA8419775EF3004493CC /* Debug */, @@ -8678,7 +8718,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - B2DB47CF197669A100411E16 /* Build configuration list for PBXNativeTarget "cocosBuilder Mac" */ = { + B2DB47CF197669A100411E16 /* Build configuration list for PBXNativeTarget "libcocosbuilder Mac" */ = { isa = XCConfigurationList; buildConfigurations = ( B2DB47D0197669A100411E16 /* Debug */, @@ -8687,7 +8727,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - B2DB484A1976716E00411E16 /* Build configuration list for PBXNativeTarget "cocosStudio Mac" */ = { + B2DB484A1976716E00411E16 /* Build configuration list for PBXNativeTarget "libcocostudio Mac" */ = { isa = XCConfigurationList; buildConfigurations = ( B2DB484B1976716E00411E16 /* Debug */, @@ -8696,7 +8736,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - B2DB48FE19767F1F00411E16 /* Build configuration list for PBXNativeTarget "cocosSpine Mac" */ = { + B2DB48FE19767F1F00411E16 /* Build configuration list for PBXNativeTarget "libspine Mac" */ = { isa = XCConfigurationList; buildConfigurations = ( B2DB48FF19767F1F00411E16 /* Debug */, @@ -8705,7 +8745,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - B2DB49C1197686CB00411E16 /* Build configuration list for PBXNativeTarget "cocosNetwork Mac" */ = { + B2DB49C1197686CB00411E16 /* Build configuration list for PBXNativeTarget "libnetwork Mac" */ = { isa = XCConfigurationList; buildConfigurations = ( B2DB49C2197686CB00411E16 /* Debug */, diff --git a/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/CocosDenshion Mac.xcscheme b/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/CocosDenshion Mac.xcscheme index 8a9de3e3c5..dbf36bb025 100644 --- a/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/CocosDenshion Mac.xcscheme +++ b/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/CocosDenshion Mac.xcscheme @@ -16,7 +16,7 @@ BuildableIdentifier = "primary" BlueprintIdentifier = "A03F2E9817814268006731B9" BuildableName = "libCocosDenshion Mac.a" - BlueprintName = "CocosDenshion Mac" + BlueprintName = "libcocosdenshion Mac" ReferencedContainer = "container:cocos2d_libs.xcodeproj"> diff --git a/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/CocosDenshion iOS.xcscheme b/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/CocosDenshion iOS.xcscheme index cf3f3de3c1..c74eed7e60 100644 --- a/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/CocosDenshion iOS.xcscheme +++ b/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/CocosDenshion iOS.xcscheme @@ -16,7 +16,7 @@ BuildableIdentifier = "primary" BlueprintIdentifier = "A07A4F9F178387730073F6A7" BuildableName = "libCocosDenshion iOS.a" - BlueprintName = "CocosDenshion iOS" + BlueprintName = "libcocosdenshion iOS" ReferencedContainer = "container:cocos2d_libs.xcodeproj"> diff --git a/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/box2d Mac.xcscheme b/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/box2d Mac.xcscheme index 1d7292c24c..f0be0b3387 100644 --- a/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/box2d Mac.xcscheme +++ b/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/box2d Mac.xcscheme @@ -16,7 +16,7 @@ BuildableIdentifier = "primary" BlueprintIdentifier = "A03F2D5D1780BDF7006731B9" BuildableName = "libbox2d Mac.a" - BlueprintName = "box2d Mac" + BlueprintName = "libbox2d Mac" ReferencedContainer = "container:cocos2d_libs.xcodeproj"> diff --git a/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/box2d iOS.xcscheme b/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/box2d iOS.xcscheme index 4955632930..5e6d46462b 100644 --- a/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/box2d iOS.xcscheme +++ b/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/box2d iOS.xcscheme @@ -16,7 +16,7 @@ BuildableIdentifier = "primary" BlueprintIdentifier = "A07A4F3C1783876B0073F6A7" BuildableName = "libbox2d iOS.a" - BlueprintName = "box2d iOS" + BlueprintName = "libbox2d iOS" ReferencedContainer = "container:cocos2d_libs.xcodeproj"> diff --git a/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/chipmunk Mac.xcscheme b/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/chipmunk Mac.xcscheme index 47d4160634..cae588170f 100644 --- a/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/chipmunk Mac.xcscheme +++ b/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/chipmunk Mac.xcscheme @@ -16,7 +16,7 @@ BuildableIdentifier = "primary" BlueprintIdentifier = "A03F2B781780BD04006731B9" BuildableName = "libchipmunk Mac.a" - BlueprintName = "chipmunk Mac" + BlueprintName = "libchipmunk Mac" ReferencedContainer = "container:cocos2d_libs.xcodeproj"> diff --git a/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/chipmunk iOS.xcscheme b/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/chipmunk iOS.xcscheme index 01693d09de..e433af4505 100644 --- a/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/chipmunk iOS.xcscheme +++ b/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/chipmunk iOS.xcscheme @@ -16,7 +16,7 @@ BuildableIdentifier = "primary" BlueprintIdentifier = "A07A4EFD178387670073F6A7" BuildableName = "libchipmunk iOS.a" - BlueprintName = "chipmunk iOS" + BlueprintName = "libchipmunk iOS" ReferencedContainer = "container:cocos2d_libs.xcodeproj"> diff --git a/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/cocos2dx Mac.xcscheme b/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/cocos2dx Mac.xcscheme index 4c1792021c..1edbfaa4c2 100644 --- a/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/cocos2dx Mac.xcscheme +++ b/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/cocos2dx Mac.xcscheme @@ -16,7 +16,7 @@ BuildableIdentifier = "primary" BlueprintIdentifier = "1551A33E158F2AB200E66CFE" BuildableName = "libcocos2dx Mac.a" - BlueprintName = "cocos2dx Mac" + BlueprintName = "libcocos2d Mac" ReferencedContainer = "container:cocos2d_libs.xcodeproj"> diff --git a/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/cocos2dx iOS.xcscheme b/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/cocos2dx iOS.xcscheme index b98e514fc3..82675f8fea 100644 --- a/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/cocos2dx iOS.xcscheme +++ b/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/cocos2dx iOS.xcscheme @@ -16,7 +16,7 @@ BuildableIdentifier = "primary" BlueprintIdentifier = "A07A4C241783777C0073F6A7" BuildableName = "libcocos2dx iOS.a" - BlueprintName = "cocos2dx iOS" + BlueprintName = "libcocos2d iOS" ReferencedContainer = "container:cocos2d_libs.xcodeproj"> diff --git a/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/cocos2dx-extensions Mac.xcscheme b/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/cocos2dx-extensions Mac.xcscheme index 3a52b29fbd..6f6c9a919d 100644 --- a/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/cocos2dx-extensions Mac.xcscheme +++ b/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/cocos2dx-extensions Mac.xcscheme @@ -16,7 +16,7 @@ BuildableIdentifier = "primary" BlueprintIdentifier = "A03F2FC117814595006731B9" BuildableName = "libcocos2dx-extensions Mac.a" - BlueprintName = "cocos2dx-extensions Mac" + BlueprintName = "libextension Mac" ReferencedContainer = "container:cocos2d_libs.xcodeproj"> diff --git a/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/cocos2dx-extensions iOS.xcscheme b/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/cocos2dx-extensions iOS.xcscheme index c57c7ea425..9d554e8913 100644 --- a/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/cocos2dx-extensions iOS.xcscheme +++ b/build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/cocos2dx-extensions iOS.xcscheme @@ -16,7 +16,7 @@ BuildableIdentifier = "primary" BlueprintIdentifier = "A07A4E111783867C0073F6A7" BuildableName = "libcocos2dx-extensions iOS.a" - BlueprintName = "cocos2dx-extensions iOS" + BlueprintName = "libextension iOS" ReferencedContainer = "container:cocos2d_libs.xcodeproj"> diff --git a/build/cocos2d_tests.xcodeproj/project.pbxproj b/build/cocos2d_tests.xcodeproj/project.pbxproj index f06bd9c0c8..76baf0ed45 100644 --- a/build/cocos2d_tests.xcodeproj/project.pbxproj +++ b/build/cocos2d_tests.xcodeproj/project.pbxproj @@ -861,7 +861,6 @@ 38FA2E77194AECF800FF2BE4 /* ActionTimeline in Resources */ = {isa = PBXBuildFile; fileRef = 38FA2E75194AECF800FF2BE4 /* ActionTimeline */; }; 3E6177211960FAED00DE83F5 /* libchipmunk iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FC21807A4F9005B8026 /* libchipmunk iOS.a */; }; 3E6177221960FAED00DE83F5 /* libcocos2dx iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FBE1807A4F9005B8026 /* libcocos2dx iOS.a */; }; - 3E6177231960FAED00DE83F5 /* libCocosDenshion iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FC61807A4F9005B8026 /* libCocosDenshion iOS.a */; }; 3E6177241960FAED00DE83F5 /* CoreMotion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D60AE43317F7FFE100757E4B /* CoreMotion.framework */; }; 3E6177251960FAED00DE83F5 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C6482E165F399D007D4F18 /* libz.dylib */; }; 3E6177261960FAED00DE83F5 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C64832165F3AFD007D4F18 /* Foundation.framework */; }; @@ -919,6 +918,11 @@ B24024DD1978EC0700FDE433 /* libcocos2dx Mac.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 46A15FB01807A4F9005B8026 /* libcocos2dx Mac.dylib */; }; B24024E31978ED5200FDE433 /* libcocos2dx Mac.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 46A15FB01807A4F9005B8026 /* libcocos2dx Mac.dylib */; }; B24024E51978ED5F00FDE433 /* libcocos2dx Mac.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 46A15FB01807A4F9005B8026 /* libcocos2dx Mac.dylib */; }; + B2411C9E19822FBD00E093E2 /* libcocosStudio iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B2CC503B197763A20041958E /* libcocosStudio iOS.a */; }; + B2411CA119822FDD00E093E2 /* libcocosBuilder iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B2CC503D197763A20041958E /* libcocosBuilder iOS.a */; }; + B2411CA419822FF100E093E2 /* libcocosSpine iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B2CC503F197763A20041958E /* libcocosSpine iOS.a */; }; + B2411CA71982301400E093E2 /* libcocosGUI iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B2CC5039197763A20041958E /* libcocosGUI iOS.a */; }; + B2411CAA1982302700E093E2 /* libcocosNetwork iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B2CC5041197763A20041958E /* libcocosNetwork iOS.a */; }; B244F3171976878E00ED1926 /* libcocosNetwork Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B244F3161976878700ED1926 /* libcocosNetwork Mac.a */; }; B2507B6B192589AF00FA4972 /* Shaders3D in Resources */ = {isa = PBXBuildFile; fileRef = B2507B6A192589AF00FA4972 /* Shaders3D */; }; B2507B6C192589AF00FA4972 /* Shaders3D in Resources */ = {isa = PBXBuildFile; fileRef = B2507B6A192589AF00FA4972 /* Shaders3D */; }; @@ -1319,20 +1323,6 @@ remoteGlobalIDString = A07A4EFD178387670073F6A7; remoteInfo = "chipmunk iOS"; }; - 3E6177051960FAED00DE83F5 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = A07A4F9F178387730073F6A7; - remoteInfo = "CocosDenshion iOS"; - }; - 3E6177441960FE1E00DE83F5 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = A07A4E111783867C0073F6A7; - remoteInfo = "cocos2dx-extensions iOS"; - }; 46A15FAF1807A4F9005B8026 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; @@ -1417,6 +1407,41 @@ remoteGlobalIDString = A07A517F1783A1D20073F6A7; remoteInfo = "Test cpp iOS"; }; + B2411C9C19822FB600E093E2 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = B24EEA6719775EBB004493CC; + remoteInfo = "libcocostudio iOS"; + }; + B2411C9F19822FD300E093E2 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = B24EEA6F19775ECE004493CC; + remoteInfo = "libcocosbuilder iOS"; + }; + B2411CA219822FEA00E093E2 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = B24EEA7719775EE1004493CC; + remoteInfo = "libspine iOS"; + }; + B2411CA51982300F00E093E2 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = B24EEA2C19775E92004493CC; + remoteInfo = "libui iOS"; + }; + B2411CA81982301E00E093E2 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = B24EEA7F19775EF3004493CC; + remoteInfo = "libnetwork iOS"; + }; B244F3101976878700ED1926 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; @@ -3544,6 +3569,11 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + B2411CAA1982302700E093E2 /* libcocosNetwork iOS.a in Frameworks */, + B2411CA71982301400E093E2 /* libcocosGUI iOS.a in Frameworks */, + B2411CA419822FF100E093E2 /* libcocosSpine iOS.a in Frameworks */, + B2411CA119822FDD00E093E2 /* libcocosBuilder iOS.a in Frameworks */, + B2411C9E19822FBD00E093E2 /* libcocosStudio iOS.a in Frameworks */, 15CBA9E0196EEBD4005877BB /* MediaPlayer.framework in Frameworks */, 15CBA9DE196EEAF8005877BB /* GameController.framework in Frameworks */, 15CBA9DD196EEAA6005877BB /* libz.dylib in Frameworks */, @@ -3748,7 +3778,6 @@ 3E61773D1960FBD200DE83F5 /* GameController.framework in Frameworks */, 3E6177211960FAED00DE83F5 /* libchipmunk iOS.a in Frameworks */, 3E6177221960FAED00DE83F5 /* libcocos2dx iOS.a in Frameworks */, - 3E6177231960FAED00DE83F5 /* libCocosDenshion iOS.a in Frameworks */, 3E6177241960FAED00DE83F5 /* CoreMotion.framework in Frameworks */, 3E6177251960FAED00DE83F5 /* libz.dylib in Frameworks */, 3E6177261960FAED00DE83F5 /* Foundation.framework in Frameworks */, @@ -7772,6 +7801,11 @@ buildRules = ( ); dependencies = ( + B2411CA91982301E00E093E2 /* PBXTargetDependency */, + B2411CA61982300F00E093E2 /* PBXTargetDependency */, + B2411CA319822FEA00E093E2 /* PBXTargetDependency */, + B2411CA019822FD300E093E2 /* PBXTargetDependency */, + B2411C9D19822FB600E093E2 /* PBXTargetDependency */, 15CBA016196EE56C005877BB /* PBXTargetDependency */, 15CBA018196EE56C005877BB /* PBXTargetDependency */, 15CBA01A196EE56C005877BB /* PBXTargetDependency */, @@ -7973,10 +8007,8 @@ buildRules = ( ); dependencies = ( - 3E6177451960FE1E00DE83F5 /* PBXTargetDependency */, 3E6177001960FAED00DE83F5 /* PBXTargetDependency */, 3E6177021960FAED00DE83F5 /* PBXTargetDependency */, - 3E6177041960FAED00DE83F5 /* PBXTargetDependency */, ); name = "game-controller-test IOS"; productName = iphone; @@ -9346,16 +9378,6 @@ name = "chipmunk iOS"; targetProxy = 3E6177031960FAED00DE83F5 /* PBXContainerItemProxy */; }; - 3E6177041960FAED00DE83F5 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "CocosDenshion iOS"; - targetProxy = 3E6177051960FAED00DE83F5 /* PBXContainerItemProxy */; - }; - 3E6177451960FE1E00DE83F5 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "cocos2dx-extensions iOS"; - targetProxy = 3E6177441960FE1E00DE83F5 /* PBXContainerItemProxy */; - }; A035ACC0178246BD00987F6C /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 1D6058900D05DD3D006BFB54 /* cpp-tests Mac */; @@ -9366,6 +9388,31 @@ target = A07A517F1783A1D20073F6A7 /* cpp-tests iOS */; targetProxy = A07A526C1783AB980073F6A7 /* PBXContainerItemProxy */; }; + B2411C9D19822FB600E093E2 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "libcocostudio iOS"; + targetProxy = B2411C9C19822FB600E093E2 /* PBXContainerItemProxy */; + }; + B2411CA019822FD300E093E2 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "libcocosbuilder iOS"; + targetProxy = B2411C9F19822FD300E093E2 /* PBXContainerItemProxy */; + }; + B2411CA319822FEA00E093E2 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "libspine iOS"; + targetProxy = B2411CA219822FEA00E093E2 /* PBXContainerItemProxy */; + }; + B2411CA61982300F00E093E2 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "libui iOS"; + targetProxy = B2411CA51982300F00E093E2 /* PBXContainerItemProxy */; + }; + B2411CA91982301E00E093E2 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "libnetwork iOS"; + targetProxy = B2411CA81982301E00E093E2 /* PBXContainerItemProxy */; + }; B244F3111976878700ED1926 /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = "cocosNetwork Mac";