diff --git a/spine-cocos2dx/example/proj.ios/ExampleSpine.xcodeproj/project.pbxproj b/spine-cocos2dx/example/proj.ios/ExampleSpine.xcodeproj/project.pbxproj index 9e66270b9..c1d68762d 100755 --- a/spine-cocos2dx/example/proj.ios/ExampleSpine.xcodeproj/project.pbxproj +++ b/spine-cocos2dx/example/proj.ios/ExampleSpine.xcodeproj/project.pbxproj @@ -7,7 +7,6 @@ objects = { /* Begin PBXBuildFile section */ - 15A3D7B91682F609002FB0C5 /* libcocos2dx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15A3D7B61682F5ED002FB0C5 /* libcocos2dx.a */; }; 1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; }; 1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */; }; 288765A50DF7441C002DB57D /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 288765A40DF7441C002DB57D /* CoreGraphics.framework */; }; @@ -41,6 +40,7 @@ 2FEE85D6170033410013E4C9 /* Skin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2FEE85C9170033410013E4C9 /* Skin.cpp */; }; 2FEE85D7170033410013E4C9 /* Slot.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2FEE85CA170033410013E4C9 /* Slot.cpp */; }; 2FEE85D8170033410013E4C9 /* SlotData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2FEE85CB170033410013E4C9 /* SlotData.cpp */; }; + 4319B8781700D68D00C1D7A9 /* libcocos2dx.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4319B8771700D66C00C1D7A9 /* libcocos2dx.a */; }; BF1373EF128A898400D9F789 /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF492D4B1289302400A09262 /* OpenGLES.framework */; }; BF1373F0128A899500D9F789 /* libxml2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = BF492C21128924A800A09262 /* libxml2.dylib */; }; BF1373F1128A899E00D9F789 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = BF492B6912891AC600A09262 /* libz.dylib */; }; @@ -50,7 +50,7 @@ D446FD79161028E9000ADA7B /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = D446FD78161028E9000ADA7B /* Default.png */; }; D446FD7B161028ED000ADA7B /* Default@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D446FD7A161028ED000ADA7B /* Default@2x.png */; }; D446FD7D161028F4000ADA7B /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D446FD7C161028F4000ADA7B /* Default-568h@2x.png */; }; - D4ABB4B313B4395300552E6E /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = D4ABB4B213B4395300552E6E /* main.m */; }; + D4ABB4B313B4395300552E6E /* main.mm in Sources */ = {isa = PBXBuildFile; fileRef = D4ABB4B213B4395300552E6E /* main.mm */; }; D4EF94E815BD319200D803EB /* Icon-57.png in Resources */ = {isa = PBXBuildFile; fileRef = D4EF94E715BD319200D803EB /* Icon-57.png */; }; D4EF94EA15BD319500D803EB /* Icon-114.png in Resources */ = {isa = PBXBuildFile; fileRef = D4EF94E915BD319500D803EB /* Icon-114.png */; }; D4EF94EC15BD319B00D803EB /* Icon-72.png in Resources */ = {isa = PBXBuildFile; fileRef = D4EF94EB15BD319B00D803EB /* Icon-72.png */; }; @@ -58,24 +58,16 @@ /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - 15A3D7B51682F5ED002FB0C5 /* PBXContainerItemProxy */ = { + 4319B8761700D66C00C1D7A9 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; - containerPortal = 15A3D7AE1682F5EC002FB0C5 /* cocos2dx.xcodeproj */; + containerPortal = 4319B86F1700D66C00C1D7A9 /* cocos2dx.xcodeproj */; proxyType = 2; remoteGlobalIDString = 1551A33F158F2AB200E66CFE; remoteInfo = cocos2dx; }; - 15A3D7B71682F600002FB0C5 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 15A3D7AE1682F5EC002FB0C5 /* cocos2dx.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 1551A33E158F2AB200E66CFE; - remoteInfo = cocos2dx; - }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ - 15A3D7AE1682F5EC002FB0C5 /* cocos2dx.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = cocos2dx.xcodeproj; path = ../../../../cocos2dx/proj.ios/cocos2dx.xcodeproj; sourceTree = ""; }; 1D30AB110D05D00D00671497 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; 1D6058910D05DD3D006BFB54 /* ExampleSpine.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ExampleSpine.app; sourceTree = BUILT_PRODUCTS_DIR; }; 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; @@ -144,6 +136,7 @@ 2FEE85C9170033410013E4C9 /* Skin.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Skin.cpp; path = "../../../spine-cpp/src/spine/Skin.cpp"; sourceTree = ""; }; 2FEE85CA170033410013E4C9 /* Slot.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Slot.cpp; path = "../../../spine-cpp/src/spine/Slot.cpp"; sourceTree = ""; }; 2FEE85CB170033410013E4C9 /* SlotData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SlotData.cpp; path = "../../../spine-cpp/src/spine/SlotData.cpp"; sourceTree = ""; }; + 4319B86F1700D66C00C1D7A9 /* cocos2dx.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = cocos2dx.xcodeproj; path = ../../cocos2dx/proj.ios/cocos2dx.xcodeproj; sourceTree = ""; }; 781C33B11547F06B00633F88 /* OpenAL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenAL.framework; path = System/Library/Frameworks/OpenAL.framework; sourceTree = SDKROOT; }; 781C33B31547F06B00633F88 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; }; 781C33B51547F06B00633F88 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; }; @@ -158,7 +151,7 @@ D446FD78161028E9000ADA7B /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Default.png; path = ../proj.ios/Default.png; sourceTree = ""; }; D446FD7A161028ED000ADA7B /* Default@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default@2x.png"; path = "../proj.ios/Default@2x.png"; sourceTree = ""; }; D446FD7C161028F4000ADA7B /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default-568h@2x.png"; path = "../proj.ios/Default-568h@2x.png"; sourceTree = ""; }; - D4ABB4B213B4395300552E6E /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; + D4ABB4B213B4395300552E6E /* main.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = main.mm; sourceTree = ""; }; D4EF94E715BD319200D803EB /* Icon-57.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon-57.png"; path = "../proj.ios/Icon-57.png"; sourceTree = ""; }; D4EF94E915BD319500D803EB /* Icon-114.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon-114.png"; path = "../proj.ios/Icon-114.png"; sourceTree = ""; }; D4EF94EB15BD319B00D803EB /* Icon-72.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon-72.png"; path = "../proj.ios/Icon-72.png"; sourceTree = ""; }; @@ -170,7 +163,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 15A3D7B91682F609002FB0C5 /* libcocos2dx.a in Frameworks */, + 4319B8781700D68D00C1D7A9 /* libcocos2dx.a in Frameworks */, 1D60589F0D05DD5A006BFB54 /* Foundation.framework in Frameworks */, 1DF5F4E00D08C38300B7A737 /* UIKit.framework in Frameworks */, 288765A50DF7441C002DB57D /* CoreGraphics.framework in Frameworks */, @@ -184,14 +177,6 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 15A3D7AF1682F5EC002FB0C5 /* Products */ = { - isa = PBXGroup; - children = ( - 15A3D7B61682F5ED002FB0C5 /* libcocos2dx.a */, - ); - name = Products; - sourceTree = ""; - }; 19C28FACFE9D520D11CA2CBB /* Products */ = { isa = PBXGroup; children = ( @@ -203,7 +188,7 @@ 29B97314FDCFA39411CA2CEA /* CustomTemplate */ = { isa = PBXGroup; children = ( - 15A3D7AE1682F5EC002FB0C5 /* cocos2dx.xcodeproj */, + 4319B86F1700D66C00C1D7A9 /* cocos2dx.xcodeproj */, BF23D4E2143315EB00657E08 /* Classes */, 29B97323FDCFA39411CA2CEA /* Frameworks */, BF5681CC1313A84D0055EEAC /* ios */, @@ -325,6 +310,14 @@ name = spine; sourceTree = ""; }; + 4319B8701700D66C00C1D7A9 /* Products */ = { + isa = PBXGroup; + children = ( + 4319B8771700D66C00C1D7A9 /* libcocos2dx.a */, + ); + name = Products; + sourceTree = ""; + }; 784521C214EBA449009D533B /* Resources */ = { isa = PBXGroup; children = ( @@ -360,7 +353,7 @@ BF5681CC1313A84D0055EEAC /* ios */ = { isa = PBXGroup; children = ( - D4ABB4B213B4395300552E6E /* main.m */, + D4ABB4B213B4395300552E6E /* main.mm */, BF365AA612A103F70050DCF4 /* AppController.h */, BF365AA712A103F70050DCF4 /* AppController.mm */, BF4DE6AB138BB89600CF907D /* RootViewController.h */, @@ -383,7 +376,6 @@ buildRules = ( ); dependencies = ( - 15A3D7B81682F600002FB0C5 /* PBXTargetDependency */, ); name = ExampleSpine; productName = ExampleSpine; @@ -412,8 +404,8 @@ projectDirPath = ""; projectReferences = ( { - ProductGroup = 15A3D7AF1682F5EC002FB0C5 /* Products */; - ProjectRef = 15A3D7AE1682F5EC002FB0C5 /* cocos2dx.xcodeproj */; + ProductGroup = 4319B8701700D66C00C1D7A9 /* Products */; + ProjectRef = 4319B86F1700D66C00C1D7A9 /* cocos2dx.xcodeproj */; }, ); projectRoot = ""; @@ -424,11 +416,11 @@ /* End PBXProject section */ /* Begin PBXReferenceProxy section */ - 15A3D7B61682F5ED002FB0C5 /* libcocos2dx.a */ = { + 4319B8771700D66C00C1D7A9 /* libcocos2dx.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; path = libcocos2dx.a; - remoteRef = 15A3D7B51682F5ED002FB0C5 /* PBXContainerItemProxy */; + remoteRef = 4319B8761700D66C00C1D7A9 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXReferenceProxy section */ @@ -463,7 +455,7 @@ files = ( BF365AA812A103F70050DCF4 /* AppController.mm in Sources */, BF4DE6AD138BB89600CF907D /* RootViewController.mm in Sources */, - D4ABB4B313B4395300552E6E /* main.m in Sources */, + D4ABB4B313B4395300552E6E /* main.mm in Sources */, 2FEE8527170030A20013E4C9 /* AppDelegate.cpp in Sources */, 2FEE8528170030A20013E4C9 /* ExampleScene.cpp in Sources */, 2FEE85931700331D0013E4C9 /* Atlas.cpp in Sources */, @@ -493,14 +485,6 @@ }; /* End PBXSourcesBuildPhase section */ -/* Begin PBXTargetDependency section */ - 15A3D7B81682F600002FB0C5 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = cocos2dx; - targetProxy = 15A3D7B71682F600002FB0C5 /* PBXContainerItemProxy */; - }; -/* End PBXTargetDependency section */ - /* Begin XCBuildConfiguration section */ 1D6058940D05DD3E006BFB54 /* Debug */ = { isa = XCBuildConfiguration; @@ -560,10 +544,10 @@ GCC_VERSION = ""; HEADER_SEARCH_PATHS = ( "\"$(SDKROOT)/usr/include/libxml2/\"", - "\"$(SRCROOT)/../../../../cocos2dx/include\"", - "\"$(SRCROOT)/../../../../cocos2dx\"", - "\"$(SRCROOT)/../../../../cocos2dx/platform/ios\"", - "\"$(SRCROOT)/../../../../cocos2dx/kazmath/include\"", + "\"$(SRCROOT)/../../cocos2dx/include\"", + "\"$(SRCROOT)/../../cocos2dx\"", + "\"$(SRCROOT)/../../cocos2dx/platform/ios\"", + "\"$(SRCROOT)/../../cocos2dx/kazmath/include\"", "\"$(SRCROOT)/../../../spine-cpp/include\"", "\"$(SRCROOT)/../../../spine-cocos2dx/include\"", ); diff --git a/spine-cocos2dx/example/proj.ios/main.m b/spine-cocos2dx/example/proj.ios/main.m deleted file mode 100755 index bd577a036..000000000 --- a/spine-cocos2dx/example/proj.ios/main.m +++ /dev/null @@ -1,17 +0,0 @@ -// -// main.m -// iphone -// -// Created by Walzer on 10-11-16. -// Copyright 2010 __MyCompanyName__. All rights reserved. -// - -#import - -int main(int argc, char *argv[]) { - - NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init]; - int retVal = UIApplicationMain(argc, argv, nil, @"AppController"); - [pool release]; - return retVal; -} diff --git a/spine-cocos2dx/example/proj.ios/main.mm b/spine-cocos2dx/example/proj.ios/main.mm new file mode 100644 index 000000000..ec5681a70 --- /dev/null +++ b/spine-cocos2dx/example/proj.ios/main.mm @@ -0,0 +1,17 @@ + +#import +#import +#import + +int main(int argc, char *argv[]) { + NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init]; + int retVal = 0; + try { + retVal = UIApplicationMain(argc, argv, nil, @"AppController"); + } catch (const std::exception &ex) { + std::cout << "Unhandled exception:"; + std::cout << ex.what(); + } + [pool release]; + return retVal; +}