From d6675df75b22c4ee7340d73bad3358b17925fccf Mon Sep 17 00:00:00 2001 From: Ricardo Quesada Date: Thu, 19 Sep 2013 11:44:20 -0700 Subject: [PATCH 02/10] Adds iOS7 icons in SimpleGame and HelloCpp --- samples/samples.xcodeproj/project.pbxproj.REMOVED.git-id | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/samples.xcodeproj/project.pbxproj.REMOVED.git-id b/samples/samples.xcodeproj/project.pbxproj.REMOVED.git-id index 615caf5731..80d63f3cbc 100644 --- a/samples/samples.xcodeproj/project.pbxproj.REMOVED.git-id +++ b/samples/samples.xcodeproj/project.pbxproj.REMOVED.git-id @@ -1 +1 @@ -62b59e31b4ba04dcf7f0194c181a1f224877be5f \ No newline at end of file +2a3cefc05af08962d7b69b8f364870a77bc86e35 \ No newline at end of file From 3427ed71c419fee5232c7b919b464f15e92f41b0 Mon Sep 17 00:00:00 2001 From: Ricardo Quesada Date: Thu, 19 Sep 2013 11:51:33 -0700 Subject: [PATCH 03/10] Adds iOS7 icons to ios template --- .../proj.ios/HelloCpp.xcodeproj/project.pbxproj | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/template/multi-platform-cpp/proj.ios/HelloCpp.xcodeproj/project.pbxproj b/template/multi-platform-cpp/proj.ios/HelloCpp.xcodeproj/project.pbxproj index 66e87292fc..7e6adfccc6 100644 --- a/template/multi-platform-cpp/proj.ios/HelloCpp.xcodeproj/project.pbxproj +++ b/template/multi-platform-cpp/proj.ios/HelloCpp.xcodeproj/project.pbxproj @@ -24,6 +24,9 @@ 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 */; }; + 5087E72F17EB7E0200C73F5D /* Icon-76.png in Resources */ = {isa = PBXBuildFile; fileRef = 5087E72C17EB7E0200C73F5D /* Icon-76.png */; }; + 5087E73017EB7E0200C73F5D /* Icon-120.png in Resources */ = {isa = PBXBuildFile; fileRef = 5087E72D17EB7E0200C73F5D /* Icon-120.png */; }; + 5087E73117EB7E0200C73F5D /* Icon-152.png in Resources */ = {isa = PBXBuildFile; fileRef = 5087E72E17EB7E0200C73F5D /* Icon-152.png */; }; 7855E0E1153FEF240059DD9A /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = 7855E0DF153FEF240059DD9A /* Default.png */; }; BF171245129291EC00B8313A /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF170DB012928DE900B8313A /* OpenGLES.framework */; }; BF1712471292920000B8313A /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = BF170DB412928DE900B8313A /* libz.dylib */; }; @@ -195,6 +198,9 @@ 1D6058910D05DD3D006BFB54 /* HelloCpp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = HelloCpp.app; sourceTree = BUILT_PRODUCTS_DIR; }; 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; 288765A40DF7441C002DB57D /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; + 5087E72C17EB7E0200C73F5D /* Icon-76.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-76.png"; sourceTree = SOURCE_ROOT; }; + 5087E72D17EB7E0200C73F5D /* Icon-120.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-120.png"; sourceTree = SOURCE_ROOT; }; + 5087E72E17EB7E0200C73F5D /* Icon-152.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-152.png"; sourceTree = SOURCE_ROOT; }; 7855E0DF153FEF240059DD9A /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Default.png; sourceTree = SOURCE_ROOT; }; BF170DB012928DE900B8313A /* OpenGLES.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGLES.framework; path = System/Library/Frameworks/OpenGLES.framework; sourceTree = SDKROOT; }; BF170DB412928DE900B8313A /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; }; @@ -336,6 +342,9 @@ D4EF949F15BD2D9800D803EB /* Icon-144.png */, D4EF949915BD2D8B00D803EB /* Icon-57.png */, D4EF949D15BD2D9600D803EB /* Icon-72.png */, + 5087E72C17EB7E0200C73F5D /* Icon-76.png */, + 5087E72D17EB7E0200C73F5D /* Icon-120.png */, + 5087E72E17EB7E0200C73F5D /* Icon-152.png */, ); name = Resources; path = ../Resources; @@ -506,11 +515,14 @@ buildActionMask = 2147483647; files = ( 7855E0E1153FEF240059DD9A /* Default.png in Resources */, + 5087E73117EB7E0200C73F5D /* Icon-152.png in Resources */, D4EF949A15BD2D8B00D803EB /* Icon-57.png in Resources */, D4EF949C15BD2D8E00D803EB /* Icon-114.png in Resources */, D4EF949E15BD2D9600D803EB /* Icon-72.png in Resources */, + 5087E73017EB7E0200C73F5D /* Icon-120.png in Resources */, D4EF94A015BD2D9800D803EB /* Icon-144.png in Resources */, D41A0AD1160F154A004552AE /* Default-568h@2x.png in Resources */, + 5087E72F17EB7E0200C73F5D /* Icon-76.png in Resources */, D446FD6E16102124000ADA7B /* Default@2x.png in Resources */, 1AFAF8BC16D35E4900DB1158 /* CloseNormal.png in Resources */, 1AFAF8BD16D35E4900DB1158 /* CloseSelected.png in Resources */, From c9a1cd49fe83986aa7bda856520af566d2be1912 Mon Sep 17 00:00:00 2001 From: Ricardo Quesada Date: Thu, 19 Sep 2013 14:59:44 -0700 Subject: [PATCH 04/10] unifies ios and mac templates into one. iOS and Mac templates unified into one Xcode project. It is much easier to mantian an to develop games by having everything in one Xcode project --- .../HelloCpp.xcodeproj/project.pbxproj | 459 +++++++--- .../ios}/AppController.h | 0 .../ios}/AppController.mm | 0 .../ios}/Default-568h@2x.png.REMOVED.git-id | 0 .../ios}/Default@2x.png.REMOVED.git-id | 0 .../{proj.ios => proj.ios_mac/ios}/Prefix.pch | 0 .../ios}/RootViewController.h | 0 .../ios}/RootViewController.mm | 0 .../{proj.ios => proj.ios_mac/ios}/main.m | 0 .../{proj.mac => proj.ios_mac/mac}/Icon.icns | Bin .../{proj.mac => proj.ios_mac/mac}/Prefix.pch | 0 .../{proj.mac => proj.ios_mac/mac}/main.cpp | 2 +- .../HelloCpp.xcodeproj/project.pbxproj | 714 --------------- .../proj.mac/en.lproj/InfoPlist.strings | 2 - .../proj.mac/en.lproj/MainMenu.xib | 812 ------------------ 15 files changed, 360 insertions(+), 1629 deletions(-) rename template/multi-platform-cpp/{proj.ios => proj.ios_mac}/HelloCpp.xcodeproj/project.pbxproj (58%) rename template/multi-platform-cpp/{proj.ios => proj.ios_mac/ios}/AppController.h (100%) rename template/multi-platform-cpp/{proj.ios => proj.ios_mac/ios}/AppController.mm (100%) rename template/multi-platform-cpp/{proj.ios => proj.ios_mac/ios}/Default-568h@2x.png.REMOVED.git-id (100%) rename template/multi-platform-cpp/{proj.ios => proj.ios_mac/ios}/Default@2x.png.REMOVED.git-id (100%) rename template/multi-platform-cpp/{proj.ios => proj.ios_mac/ios}/Prefix.pch (100%) rename template/multi-platform-cpp/{proj.ios => proj.ios_mac/ios}/RootViewController.h (100%) rename template/multi-platform-cpp/{proj.ios => proj.ios_mac/ios}/RootViewController.mm (100%) rename template/multi-platform-cpp/{proj.ios => proj.ios_mac/ios}/main.m (100%) rename template/multi-platform-cpp/{proj.mac => proj.ios_mac/mac}/Icon.icns (100%) rename template/multi-platform-cpp/{proj.mac => proj.ios_mac/mac}/Prefix.pch (100%) rename template/multi-platform-cpp/{proj.mac => proj.ios_mac/mac}/main.cpp (97%) delete mode 100644 template/multi-platform-cpp/proj.mac/HelloCpp.xcodeproj/project.pbxproj delete mode 100644 template/multi-platform-cpp/proj.mac/en.lproj/InfoPlist.strings delete mode 100644 template/multi-platform-cpp/proj.mac/en.lproj/MainMenu.xib diff --git a/template/multi-platform-cpp/proj.ios/HelloCpp.xcodeproj/project.pbxproj b/template/multi-platform-cpp/proj.ios_mac/HelloCpp.xcodeproj/project.pbxproj similarity index 58% rename from template/multi-platform-cpp/proj.ios/HelloCpp.xcodeproj/project.pbxproj rename to template/multi-platform-cpp/proj.ios_mac/HelloCpp.xcodeproj/project.pbxproj index 7e6adfccc6..d94d4a00b6 100644 --- a/template/multi-platform-cpp/proj.ios/HelloCpp.xcodeproj/project.pbxproj +++ b/template/multi-platform-cpp/proj.ios_mac/HelloCpp.xcodeproj/project.pbxproj @@ -7,8 +7,6 @@ objects = { /* Begin PBXBuildFile section */ - 1AC3624916D4A1E8000847F2 /* AppController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AC3624316D4A1E8000847F2 /* AppController.mm */; }; - 1AC3624B16D4A1E8000847F2 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 1AC3624516D4A1E8000847F2 /* main.m */; }; 1ACB3244164770DE00914215 /* libcurl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1ACB3243164770DE00914215 /* libcurl.a */; }; 1AF4C2F417865DCB00122817 /* libbox2d iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AF4C2E317865D9500122817 /* libbox2d iOS.a */; }; 1AF4C2F517865DCB00122817 /* libchipmunk iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AF4C2E117865D9500122817 /* libchipmunk iOS.a */; }; @@ -20,26 +18,51 @@ 1AFAF8BC16D35E4900DB1158 /* CloseNormal.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AFAF8B916D35E4900DB1158 /* CloseNormal.png */; }; 1AFAF8BD16D35E4900DB1158 /* CloseSelected.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AFAF8BA16D35E4900DB1158 /* CloseSelected.png */; }; 1AFAF8BE16D35E4900DB1158 /* HelloWorld.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AFAF8BB16D35E4900DB1158 /* HelloWorld.png */; }; - 1AFCDA8216D4A25900906EA6 /* RootViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AFCDA8116D4A25900906EA6 /* RootViewController.mm */; }; 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 */; }; - 5087E72F17EB7E0200C73F5D /* Icon-76.png in Resources */ = {isa = PBXBuildFile; fileRef = 5087E72C17EB7E0200C73F5D /* Icon-76.png */; }; - 5087E73017EB7E0200C73F5D /* Icon-120.png in Resources */ = {isa = PBXBuildFile; fileRef = 5087E72D17EB7E0200C73F5D /* Icon-120.png */; }; - 5087E73117EB7E0200C73F5D /* Icon-152.png in Resources */ = {isa = PBXBuildFile; fileRef = 5087E72E17EB7E0200C73F5D /* Icon-152.png */; }; - 7855E0E1153FEF240059DD9A /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = 7855E0DF153FEF240059DD9A /* Default.png */; }; + 503AE0F817EB97AB00D1A890 /* Icon.icns in Resources */ = {isa = PBXBuildFile; fileRef = 503AE0F617EB97AB00D1A890 /* Icon.icns */; }; + 503AE10017EB989F00D1A890 /* AppController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 503AE0FB17EB989F00D1A890 /* AppController.mm */; }; + 503AE10117EB989F00D1A890 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 503AE0FC17EB989F00D1A890 /* main.m */; }; + 503AE10217EB989F00D1A890 /* RootViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 503AE0FF17EB989F00D1A890 /* RootViewController.mm */; }; + 503AE10517EB98FF00D1A890 /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 503AE10317EB98FF00D1A890 /* main.cpp */; }; + 503AE11217EB99EE00D1A890 /* libcurl.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 503AE11117EB99EE00D1A890 /* libcurl.dylib */; }; + 503AE11317EB9C0700D1A890 /* libbox2d Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AF4C2D517865D9500122817 /* libbox2d Mac.a */; }; + 503AE11417EB9C0700D1A890 /* libchipmunk Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AF4C2D317865D9500122817 /* libchipmunk Mac.a */; }; + 503AE11517EB9C0700D1A890 /* libcocos2dx Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AF4C2CF17865D9500122817 /* libcocos2dx Mac.a */; }; + 503AE11617EB9C0700D1A890 /* libcocos2dx-extensions Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AF4C2D117865D9500122817 /* libcocos2dx-extensions Mac.a */; }; + 503AE11717EB9C0700D1A890 /* libCocosDenshion Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AF4C2D717865D9500122817 /* libCocosDenshion Mac.a */; }; + 503AE11B17EB9C5A00D1A890 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 503AE11A17EB9C5A00D1A890 /* IOKit.framework */; }; + 5087E75317EB910900C73F5D /* CloseNormal.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AFAF8B916D35E4900DB1158 /* CloseNormal.png */; }; + 5087E75417EB910900C73F5D /* CloseSelected.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AFAF8BA16D35E4900DB1158 /* CloseSelected.png */; }; + 5087E75517EB910900C73F5D /* HelloWorld.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AFAF8BB16D35E4900DB1158 /* HelloWorld.png */; }; + 5087E75717EB910900C73F5D /* AppDelegate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AFAF8B316D35DE700DB1158 /* AppDelegate.cpp */; }; + 5087E75817EB910900C73F5D /* HelloWorldScene.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AFAF8B516D35DE700DB1158 /* HelloWorldScene.cpp */; }; + 5087E76317EB910900C73F5D /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1D30AB110D05D00D00671497 /* Foundation.framework */; }; + 5087E76517EB910900C73F5D /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 288765A40DF7441C002DB57D /* CoreGraphics.framework */; }; + 5087E76717EB910900C73F5D /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = BF170DB412928DE900B8313A /* libz.dylib */; }; + 5087E76817EB910900C73F5D /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF1C47EA1293683800B63C5D /* QuartzCore.framework */; }; + 5087E76917EB910900C73F5D /* OpenAL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D44C620B132DFF330009C878 /* OpenAL.framework */; }; + 5087E76A17EB910900C73F5D /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D44C620D132DFF430009C878 /* AVFoundation.framework */; }; + 5087E76B17EB910900C73F5D /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D44C620F132DFF4E0009C878 /* AudioToolbox.framework */; }; + 5087E77D17EB970100C73F5D /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 5087E77217EB970100C73F5D /* Default-568h@2x.png */; }; + 5087E77E17EB970100C73F5D /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = 5087E77317EB970100C73F5D /* Default.png */; }; + 5087E77F17EB970100C73F5D /* Default@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 5087E77417EB970100C73F5D /* Default@2x.png */; }; + 5087E78017EB970100C73F5D /* Icon-114.png in Resources */ = {isa = PBXBuildFile; fileRef = 5087E77517EB970100C73F5D /* Icon-114.png */; }; + 5087E78117EB970100C73F5D /* Icon-120.png in Resources */ = {isa = PBXBuildFile; fileRef = 5087E77617EB970100C73F5D /* Icon-120.png */; }; + 5087E78217EB970100C73F5D /* Icon-144.png in Resources */ = {isa = PBXBuildFile; fileRef = 5087E77717EB970100C73F5D /* Icon-144.png */; }; + 5087E78317EB970100C73F5D /* Icon-152.png in Resources */ = {isa = PBXBuildFile; fileRef = 5087E77817EB970100C73F5D /* Icon-152.png */; }; + 5087E78417EB970100C73F5D /* Icon-57.png in Resources */ = {isa = PBXBuildFile; fileRef = 5087E77917EB970100C73F5D /* Icon-57.png */; }; + 5087E78517EB970100C73F5D /* Icon-72.png in Resources */ = {isa = PBXBuildFile; fileRef = 5087E77A17EB970100C73F5D /* Icon-72.png */; }; + 5087E78617EB970100C73F5D /* Icon-76.png in Resources */ = {isa = PBXBuildFile; fileRef = 5087E77B17EB970100C73F5D /* Icon-76.png */; }; + 5087E78917EB974C00C73F5D /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5087E78817EB974C00C73F5D /* AppKit.framework */; }; + 5087E78B17EB975400C73F5D /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5087E78A17EB975400C73F5D /* OpenGL.framework */; }; BF171245129291EC00B8313A /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF170DB012928DE900B8313A /* OpenGLES.framework */; }; BF1712471292920000B8313A /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = BF170DB412928DE900B8313A /* libz.dylib */; }; BF1C47F01293687400B63C5D /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BF1C47EA1293683800B63C5D /* QuartzCore.framework */; }; - D41A0AD1160F154A004552AE /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D41A0AD0160F154A004552AE /* Default-568h@2x.png */; }; - D446FD6E16102124000ADA7B /* Default@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D446FD6D16102124000ADA7B /* Default@2x.png */; }; D44C620C132DFF330009C878 /* OpenAL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D44C620B132DFF330009C878 /* OpenAL.framework */; }; D44C620E132DFF430009C878 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D44C620D132DFF430009C878 /* AVFoundation.framework */; }; D44C6210132DFF4E0009C878 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D44C620F132DFF4E0009C878 /* AudioToolbox.framework */; }; - D4EF949A15BD2D8B00D803EB /* Icon-57.png in Resources */ = {isa = PBXBuildFile; fileRef = D4EF949915BD2D8B00D803EB /* Icon-57.png */; }; - D4EF949C15BD2D8E00D803EB /* Icon-114.png in Resources */ = {isa = PBXBuildFile; fileRef = D4EF949B15BD2D8E00D803EB /* Icon-114.png */; }; - D4EF949E15BD2D9600D803EB /* Icon-72.png in Resources */ = {isa = PBXBuildFile; fileRef = D4EF949D15BD2D9600D803EB /* Icon-72.png */; }; - D4EF94A015BD2D9800D803EB /* Icon-144.png in Resources */ = {isa = PBXBuildFile; fileRef = D4EF949F15BD2D9800D803EB /* Icon-144.png */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -176,13 +199,44 @@ remoteGlobalIDString = A07A4F9F178387730073F6A7; remoteInfo = "CocosDenshion iOS"; }; + 503AE10717EB99BC00D1A890 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1AF4C2BB17865D9500122817 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 1551A33E158F2AB200E66CFE; + remoteInfo = "cocos2dx Mac"; + }; + 503AE10917EB99BC00D1A890 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1AF4C2BB17865D9500122817 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = A03F2FC117814595006731B9; + remoteInfo = "cocos2dx-extensions Mac"; + }; + 503AE10B17EB99BC00D1A890 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1AF4C2BB17865D9500122817 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = A03F2B781780BD04006731B9; + remoteInfo = "chipmunk Mac"; + }; + 503AE10D17EB99BC00D1A890 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1AF4C2BB17865D9500122817 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = A03F2D5D1780BDF7006731B9; + remoteInfo = "box2d Mac"; + }; + 503AE10F17EB99BC00D1A890 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 1AF4C2BB17865D9500122817 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = A03F2E9817814268006731B9; + remoteInfo = "CocosDenshion Mac"; + }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ - 1AC3624216D4A1E8000847F2 /* AppController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppController.h; sourceTree = SOURCE_ROOT; }; - 1AC3624316D4A1E8000847F2 /* AppController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AppController.mm; sourceTree = SOURCE_ROOT; }; - 1AC3624516D4A1E8000847F2 /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = SOURCE_ROOT; }; - 1AC3624616D4A1E8000847F2 /* Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Prefix.pch; sourceTree = SOURCE_ROOT; }; 1ACB3243164770DE00914215 /* libcurl.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcurl.a; path = ../../cocos2dx/platform/third_party/ios/libraries/libcurl.a; sourceTree = ""; }; 1AF4C2BB17865D9500122817 /* cocos2d_libs.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = cocos2d_libs.xcodeproj; path = ../../../cocos2d_libs.xcodeproj; sourceTree = ""; }; 1AFAF8B316D35DE700DB1158 /* AppDelegate.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AppDelegate.cpp; path = ../Classes/AppDelegate.cpp; sourceTree = ""; }; @@ -192,29 +246,42 @@ 1AFAF8B916D35E4900DB1158 /* CloseNormal.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = CloseNormal.png; sourceTree = ""; }; 1AFAF8BA16D35E4900DB1158 /* CloseSelected.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = CloseSelected.png; sourceTree = ""; }; 1AFAF8BB16D35E4900DB1158 /* HelloWorld.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = HelloWorld.png; sourceTree = ""; }; - 1AFCDA8016D4A25900906EA6 /* RootViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RootViewController.h; sourceTree = SOURCE_ROOT; }; - 1AFCDA8116D4A25900906EA6 /* RootViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RootViewController.mm; sourceTree = SOURCE_ROOT; }; 1D30AB110D05D00D00671497 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; 1D6058910D05DD3D006BFB54 /* HelloCpp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = HelloCpp.app; sourceTree = BUILT_PRODUCTS_DIR; }; 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; 288765A40DF7441C002DB57D /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; - 5087E72C17EB7E0200C73F5D /* Icon-76.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-76.png"; sourceTree = SOURCE_ROOT; }; - 5087E72D17EB7E0200C73F5D /* Icon-120.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-120.png"; sourceTree = SOURCE_ROOT; }; - 5087E72E17EB7E0200C73F5D /* Icon-152.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-152.png"; sourceTree = SOURCE_ROOT; }; - 7855E0DF153FEF240059DD9A /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Default.png; sourceTree = SOURCE_ROOT; }; + 503AE0F617EB97AB00D1A890 /* Icon.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = Icon.icns; sourceTree = ""; }; + 503AE0F717EB97AB00D1A890 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 503AE0FA17EB989F00D1A890 /* AppController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppController.h; path = ios/AppController.h; sourceTree = SOURCE_ROOT; }; + 503AE0FB17EB989F00D1A890 /* AppController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = AppController.mm; path = ios/AppController.mm; sourceTree = SOURCE_ROOT; }; + 503AE0FC17EB989F00D1A890 /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = ios/main.m; sourceTree = SOURCE_ROOT; }; + 503AE0FD17EB989F00D1A890 /* Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Prefix.pch; path = ios/Prefix.pch; sourceTree = SOURCE_ROOT; }; + 503AE0FE17EB989F00D1A890 /* RootViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RootViewController.h; path = ios/RootViewController.h; sourceTree = SOURCE_ROOT; }; + 503AE0FF17EB989F00D1A890 /* RootViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = RootViewController.mm; path = ios/RootViewController.mm; sourceTree = SOURCE_ROOT; }; + 503AE10317EB98FF00D1A890 /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = main.cpp; path = mac/main.cpp; sourceTree = ""; }; + 503AE10417EB98FF00D1A890 /* Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Prefix.pch; path = mac/Prefix.pch; sourceTree = ""; }; + 503AE11117EB99EE00D1A890 /* libcurl.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcurl.dylib; path = usr/lib/libcurl.dylib; sourceTree = SDKROOT; }; + 503AE11A17EB9C5A00D1A890 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; }; + 5087E76F17EB910900C73F5D /* HelloCpp - Mac.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "HelloCpp - Mac.app"; sourceTree = BUILT_PRODUCTS_DIR; }; + 5087E77217EB970100C73F5D /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = ""; }; + 5087E77317EB970100C73F5D /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Default.png; sourceTree = ""; }; + 5087E77417EB970100C73F5D /* Default@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default@2x.png"; sourceTree = ""; }; + 5087E77517EB970100C73F5D /* Icon-114.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-114.png"; sourceTree = ""; }; + 5087E77617EB970100C73F5D /* Icon-120.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-120.png"; sourceTree = ""; }; + 5087E77717EB970100C73F5D /* Icon-144.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-144.png"; sourceTree = ""; }; + 5087E77817EB970100C73F5D /* Icon-152.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-152.png"; sourceTree = ""; }; + 5087E77917EB970100C73F5D /* Icon-57.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-57.png"; sourceTree = ""; }; + 5087E77A17EB970100C73F5D /* Icon-72.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-72.png"; sourceTree = ""; }; + 5087E77B17EB970100C73F5D /* Icon-76.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-76.png"; sourceTree = ""; }; + 5087E77C17EB970100C73F5D /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 5087E78817EB974C00C73F5D /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; }; + 5087E78A17EB975400C73F5D /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = System/Library/Frameworks/OpenGL.framework; sourceTree = SDKROOT; }; BF170DB012928DE900B8313A /* OpenGLES.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGLES.framework; path = System/Library/Frameworks/OpenGLES.framework; sourceTree = SDKROOT; }; BF170DB412928DE900B8313A /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; }; BF1C47EA1293683800B63C5D /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; }; - D41A0AD0160F154A004552AE /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default-568h@2x.png"; path = "../proj.ios/Default-568h@2x.png"; sourceTree = ""; }; - D446FD6D16102124000ADA7B /* Default@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default@2x.png"; path = "../proj.ios/Default@2x.png"; sourceTree = ""; }; D44C620B132DFF330009C878 /* OpenAL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenAL.framework; path = System/Library/Frameworks/OpenAL.framework; sourceTree = SDKROOT; }; D44C620D132DFF430009C878 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; }; D44C620F132DFF4E0009C878 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; }; - D4EF949915BD2D8B00D803EB /* Icon-57.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon-57.png"; path = "../proj.ios/Icon-57.png"; sourceTree = ""; }; - D4EF949B15BD2D8E00D803EB /* Icon-114.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon-114.png"; path = "../proj.ios/Icon-114.png"; sourceTree = ""; }; - D4EF949D15BD2D9600D803EB /* Icon-72.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon-72.png"; path = "../proj.ios/Icon-72.png"; sourceTree = ""; }; - D4EF949F15BD2D9800D803EB /* Icon-144.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon-144.png"; path = "../proj.ios/Icon-144.png"; sourceTree = ""; }; - D4F9F37B12E54555005CA6D2 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = SOURCE_ROOT; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -240,19 +307,42 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 5087E75C17EB910900C73F5D /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 503AE11317EB9C0700D1A890 /* libbox2d Mac.a in Frameworks */, + 503AE11417EB9C0700D1A890 /* libchipmunk Mac.a in Frameworks */, + 503AE11517EB9C0700D1A890 /* libcocos2dx Mac.a in Frameworks */, + 503AE11617EB9C0700D1A890 /* libcocos2dx-extensions Mac.a in Frameworks */, + 503AE11717EB9C0700D1A890 /* libCocosDenshion Mac.a in Frameworks */, + 503AE11217EB99EE00D1A890 /* libcurl.dylib in Frameworks */, + 5087E76717EB910900C73F5D /* libz.dylib in Frameworks */, + 503AE11B17EB9C5A00D1A890 /* IOKit.framework in Frameworks */, + 5087E78B17EB975400C73F5D /* OpenGL.framework in Frameworks */, + 5087E78917EB974C00C73F5D /* AppKit.framework in Frameworks */, + 5087E76317EB910900C73F5D /* Foundation.framework in Frameworks */, + 5087E76517EB910900C73F5D /* CoreGraphics.framework in Frameworks */, + 5087E76817EB910900C73F5D /* QuartzCore.framework in Frameworks */, + 5087E76917EB910900C73F5D /* OpenAL.framework in Frameworks */, + 5087E76A17EB910900C73F5D /* AVFoundation.framework in Frameworks */, + 5087E76B17EB910900C73F5D /* AudioToolbox.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ 080E96DDFE201D6D7F000001 /* ios */ = { isa = PBXGroup; children = ( - 1AC3624216D4A1E8000847F2 /* AppController.h */, - 1AC3624316D4A1E8000847F2 /* AppController.mm */, - D4F9F37B12E54555005CA6D2 /* Info.plist */, - 1AC3624516D4A1E8000847F2 /* main.m */, - 1AC3624616D4A1E8000847F2 /* Prefix.pch */, - 1AFCDA8016D4A25900906EA6 /* RootViewController.h */, - 1AFCDA8116D4A25900906EA6 /* RootViewController.mm */, + 5087E77117EB970100C73F5D /* Icons */, + 503AE0FA17EB989F00D1A890 /* AppController.h */, + 503AE0FB17EB989F00D1A890 /* AppController.mm */, + 503AE0FC17EB989F00D1A890 /* main.m */, + 503AE0FD17EB989F00D1A890 /* Prefix.pch */, + 503AE0FE17EB989F00D1A890 /* RootViewController.h */, + 503AE0FF17EB989F00D1A890 /* RootViewController.mm */, ); name = ios; path = Classes; @@ -274,6 +364,7 @@ isa = PBXGroup; children = ( 1D6058910D05DD3D006BFB54 /* HelloCpp.app */, + 5087E76F17EB910900C73F5D /* HelloCpp - Mac.app */, ); name = Products; sourceTree = ""; @@ -306,6 +397,7 @@ 15AA9C4015B7EC450033D6C2 /* Classes */, 29B97323FDCFA39411CA2CEA /* Frameworks */, 080E96DDFE201D6D7F000001 /* ios */, + 503AE10617EB990700D1A890 /* mac */, 19C28FACFE9D520D11CA2CBB /* Products */, 78C7DDAA14EBA5050085D0C2 /* Resources */, ); @@ -315,6 +407,10 @@ 29B97323FDCFA39411CA2CEA /* Frameworks */ = { isa = PBXGroup; children = ( + 503AE11A17EB9C5A00D1A890 /* IOKit.framework */, + 503AE11117EB99EE00D1A890 /* libcurl.dylib */, + 5087E78A17EB975400C73F5D /* OpenGL.framework */, + 5087E78817EB974C00C73F5D /* AppKit.framework */, 1ACB3243164770DE00914215 /* libcurl.a */, BF170DB412928DE900B8313A /* libz.dylib */, D44C620F132DFF4E0009C878 /* AudioToolbox.framework */, @@ -329,22 +425,51 @@ name = Frameworks; sourceTree = ""; }; + 503AE0F517EB97AB00D1A890 /* Icons */ = { + isa = PBXGroup; + children = ( + 503AE0F617EB97AB00D1A890 /* Icon.icns */, + 503AE0F717EB97AB00D1A890 /* Info.plist */, + ); + name = Icons; + path = mac; + sourceTree = SOURCE_ROOT; + }; + 503AE10617EB990700D1A890 /* mac */ = { + isa = PBXGroup; + children = ( + 503AE0F517EB97AB00D1A890 /* Icons */, + 503AE10317EB98FF00D1A890 /* main.cpp */, + 503AE10417EB98FF00D1A890 /* Prefix.pch */, + ); + name = mac; + sourceTree = ""; + }; + 5087E77117EB970100C73F5D /* Icons */ = { + isa = PBXGroup; + children = ( + 5087E77217EB970100C73F5D /* Default-568h@2x.png */, + 5087E77317EB970100C73F5D /* Default.png */, + 5087E77417EB970100C73F5D /* Default@2x.png */, + 5087E77517EB970100C73F5D /* Icon-114.png */, + 5087E77617EB970100C73F5D /* Icon-120.png */, + 5087E77717EB970100C73F5D /* Icon-144.png */, + 5087E77817EB970100C73F5D /* Icon-152.png */, + 5087E77917EB970100C73F5D /* Icon-57.png */, + 5087E77A17EB970100C73F5D /* Icon-72.png */, + 5087E77B17EB970100C73F5D /* Icon-76.png */, + 5087E77C17EB970100C73F5D /* Info.plist */, + ); + name = Icons; + path = ios; + sourceTree = SOURCE_ROOT; + }; 78C7DDAA14EBA5050085D0C2 /* Resources */ = { isa = PBXGroup; children = ( 1AFAF8B916D35E4900DB1158 /* CloseNormal.png */, 1AFAF8BA16D35E4900DB1158 /* CloseSelected.png */, 1AFAF8BB16D35E4900DB1158 /* HelloWorld.png */, - D41A0AD0160F154A004552AE /* Default-568h@2x.png */, - 7855E0DF153FEF240059DD9A /* Default.png */, - D446FD6D16102124000ADA7B /* Default@2x.png */, - D4EF949B15BD2D8E00D803EB /* Icon-114.png */, - D4EF949F15BD2D9800D803EB /* Icon-144.png */, - D4EF949915BD2D8B00D803EB /* Icon-57.png */, - D4EF949D15BD2D9600D803EB /* Icon-72.png */, - 5087E72C17EB7E0200C73F5D /* Icon-76.png */, - 5087E72D17EB7E0200C73F5D /* Icon-120.png */, - 5087E72E17EB7E0200C73F5D /* Icon-152.png */, ); name = Resources; path = ../Resources; @@ -353,9 +478,9 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - 1D6058900D05DD3D006BFB54 /* HelloCpp */ = { + 1D6058900D05DD3D006BFB54 /* HelloCpp - iOS */ = { isa = PBXNativeTarget; - buildConfigurationList = 1D6058960D05DD3E006BFB54 /* Build configuration list for PBXNativeTarget "HelloCpp" */; + buildConfigurationList = 1D6058960D05DD3E006BFB54 /* Build configuration list for PBXNativeTarget "HelloCpp - iOS" */; buildPhases = ( 1D60588D0D05DD3D006BFB54 /* Resources */, 1D60588E0D05DD3D006BFB54 /* Sources */, @@ -370,11 +495,33 @@ 1AF4C2F117865DB400122817 /* PBXTargetDependency */, 1AF4C2F317865DB400122817 /* PBXTargetDependency */, ); - name = HelloCpp; + name = "HelloCpp - iOS"; productName = iphone; productReference = 1D6058910D05DD3D006BFB54 /* HelloCpp.app */; productType = "com.apple.product-type.application"; }; + 5087E73D17EB910900C73F5D /* HelloCpp - Mac */ = { + isa = PBXNativeTarget; + buildConfigurationList = 5087E76C17EB910900C73F5D /* Build configuration list for PBXNativeTarget "HelloCpp - Mac" */; + buildPhases = ( + 5087E74817EB910900C73F5D /* Resources */, + 5087E75617EB910900C73F5D /* Sources */, + 5087E75C17EB910900C73F5D /* Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + 503AE10817EB99BC00D1A890 /* PBXTargetDependency */, + 503AE10A17EB99BC00D1A890 /* PBXTargetDependency */, + 503AE10C17EB99BC00D1A890 /* PBXTargetDependency */, + 503AE10E17EB99BC00D1A890 /* PBXTargetDependency */, + 503AE11017EB99BC00D1A890 /* PBXTargetDependency */, + ); + name = "HelloCpp - Mac"; + productName = iphone; + productReference = 5087E76F17EB910900C73F5D /* HelloCpp - Mac.app */; + productType = "com.apple.product-type.application"; + }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ @@ -403,7 +550,8 @@ ); projectRoot = ""; targets = ( - 1D6058900D05DD3D006BFB54 /* HelloCpp */, + 1D6058900D05DD3D006BFB54 /* HelloCpp - iOS */, + 5087E73D17EB910900C73F5D /* HelloCpp - Mac */, ); }; /* End PBXProject section */ @@ -514,19 +662,30 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 7855E0E1153FEF240059DD9A /* Default.png in Resources */, - 5087E73117EB7E0200C73F5D /* Icon-152.png in Resources */, - D4EF949A15BD2D8B00D803EB /* Icon-57.png in Resources */, - D4EF949C15BD2D8E00D803EB /* Icon-114.png in Resources */, - D4EF949E15BD2D9600D803EB /* Icon-72.png in Resources */, - 5087E73017EB7E0200C73F5D /* Icon-120.png in Resources */, - D4EF94A015BD2D9800D803EB /* Icon-144.png in Resources */, - D41A0AD1160F154A004552AE /* Default-568h@2x.png in Resources */, - 5087E72F17EB7E0200C73F5D /* Icon-76.png in Resources */, - D446FD6E16102124000ADA7B /* Default@2x.png in Resources */, + 5087E78117EB970100C73F5D /* Icon-120.png in Resources */, + 5087E78617EB970100C73F5D /* Icon-76.png in Resources */, + 5087E77F17EB970100C73F5D /* Default@2x.png in Resources */, 1AFAF8BC16D35E4900DB1158 /* CloseNormal.png in Resources */, + 5087E78317EB970100C73F5D /* Icon-152.png in Resources */, + 5087E77D17EB970100C73F5D /* Default-568h@2x.png in Resources */, + 5087E78517EB970100C73F5D /* Icon-72.png in Resources */, 1AFAF8BD16D35E4900DB1158 /* CloseSelected.png in Resources */, + 5087E78017EB970100C73F5D /* Icon-114.png in Resources */, 1AFAF8BE16D35E4900DB1158 /* HelloWorld.png in Resources */, + 5087E78217EB970100C73F5D /* Icon-144.png in Resources */, + 5087E78417EB970100C73F5D /* Icon-57.png in Resources */, + 5087E77E17EB970100C73F5D /* Default.png in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 5087E74817EB910900C73F5D /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 5087E75317EB910900C73F5D /* CloseNormal.png in Resources */, + 503AE0F817EB97AB00D1A890 /* Icon.icns in Resources */, + 5087E75417EB910900C73F5D /* CloseSelected.png in Resources */, + 5087E75517EB910900C73F5D /* HelloWorld.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -537,11 +696,21 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + 503AE10017EB989F00D1A890 /* AppController.mm in Sources */, + 503AE10217EB989F00D1A890 /* RootViewController.mm in Sources */, 1AFAF8B716D35DE700DB1158 /* AppDelegate.cpp in Sources */, + 503AE10117EB989F00D1A890 /* main.m in Sources */, 1AFAF8B816D35DE700DB1158 /* HelloWorldScene.cpp in Sources */, - 1AC3624916D4A1E8000847F2 /* AppController.mm in Sources */, - 1AC3624B16D4A1E8000847F2 /* main.m in Sources */, - 1AFCDA8216D4A25900906EA6 /* RootViewController.mm in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 5087E75617EB910900C73F5D /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 5087E75717EB910900C73F5D /* AppDelegate.cpp in Sources */, + 5087E75817EB910900C73F5D /* HelloWorldScene.cpp in Sources */, + 503AE10517EB98FF00D1A890 /* main.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -573,6 +742,31 @@ name = "CocosDenshion iOS"; targetProxy = 1AF4C2F217865DB400122817 /* PBXContainerItemProxy */; }; + 503AE10817EB99BC00D1A890 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "cocos2dx Mac"; + targetProxy = 503AE10717EB99BC00D1A890 /* PBXContainerItemProxy */; + }; + 503AE10A17EB99BC00D1A890 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "cocos2dx-extensions Mac"; + targetProxy = 503AE10917EB99BC00D1A890 /* PBXContainerItemProxy */; + }; + 503AE10C17EB99BC00D1A890 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "chipmunk Mac"; + targetProxy = 503AE10B17EB99BC00D1A890 /* PBXContainerItemProxy */; + }; + 503AE10E17EB99BC00D1A890 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "box2d Mac"; + targetProxy = 503AE10D17EB99BC00D1A890 /* PBXContainerItemProxy */; + }; + 503AE11017EB99BC00D1A890 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "CocosDenshion Mac"; + targetProxy = 503AE10F17EB99BC00D1A890 /* PBXContainerItemProxy */; + }; /* End PBXTargetDependency section */ /* Begin XCBuildConfiguration section */ @@ -580,16 +774,11 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; - CLANG_CXX_LIBRARY = "libc++"; CODE_SIGN_IDENTITY = "iPhone Developer"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - COPY_PHASE_STRIP = NO; GCC_DYNAMIC_NO_PIC = NO; GCC_INLINES_ARE_PRIVATE_EXTERN = NO; - GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = Prefix.pch; + GCC_PREFIX_HEADER = ios/Prefix.pch; GCC_PREPROCESSOR_DEFINITIONS = ( USE_FILE32API, CC_TARGET_OS_IPHONE, @@ -597,7 +786,6 @@ "CC_ENABLE_CHIPMUNK_INTEGRATION=1", ); GCC_SYMBOLS_PRIVATE_EXTERN = NO; - GCC_VERSION = ""; HEADER_SEARCH_PATHS = ( "$(SRCROOT)/../../../CocosDenshion/include", "\"$(SRCROOT)/../../../external/chipmunk/include/constraints\"", @@ -611,21 +799,17 @@ "\"$(SRCROOT)/../../../cocos2dx/platform/ios\"", "\"$(SRCROOT)/../../../cocos2dx/platform/ios/Simulation\"", ); - INFOPLIST_FILE = Info.plist; + INFOPLIST_FILE = ios/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 5.0; LIBRARY_SEARCH_PATHS = ( "\"$(SRCROOT)/../../../cocos2dx/platform/third_party/ios/libraries\"", "\"$(SRCROOT)/../../../external/libwebsockets/ios/lib\"", ); - ONLY_ACTIVE_ARCH = YES; OTHER_CFLAGS = "-O2"; PRODUCT_NAME = HelloCpp; - PROVISIONING_PROFILE = ""; - "PROVISIONING_PROFILE[sdk=iphoneos*]" = ""; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; USER_HEADER_SEARCH_PATHS = ""; - VALID_ARCHS = "armv6 armv7 armv7s i386"; }; name = Debug; }; @@ -633,22 +817,16 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; - CLANG_CXX_LIBRARY = "libc++"; CODE_SIGN_IDENTITY = "iPhone Developer"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - COPY_PHASE_STRIP = YES; GCC_INLINES_ARE_PRIVATE_EXTERN = NO; - GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = Prefix.pch; + GCC_PREFIX_HEADER = ios/Prefix.pch; GCC_PREPROCESSOR_DEFINITIONS = ( USE_FILE32API, CC_TARGET_OS_IPHONE, "CC_ENABLE_CHIPMUNK_INTEGRATION=1", ); GCC_SYMBOLS_PRIVATE_EXTERN = NO; - GCC_VERSION = ""; HEADER_SEARCH_PATHS = ( "$(SRCROOT)/../../../CocosDenshion/include", "\"$(SRCROOT)/../../../external/chipmunk/include/constraints\"", @@ -662,56 +840,128 @@ "\"$(SRCROOT)/../../../cocos2dx/platform/ios\"", "\"$(SRCROOT)/../../../cocos2dx/platform/ios/Simulation\"", ); - INFOPLIST_FILE = Info.plist; + INFOPLIST_FILE = ios/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 5.0; LIBRARY_SEARCH_PATHS = ( "\"$(SRCROOT)/../../../cocos2dx/platform/third_party/ios/libraries\"", "\"$(SRCROOT)/../../../external/libwebsockets/ios/lib\"", ); - ONLY_ACTIVE_ARCH = YES; PRODUCT_NAME = HelloCpp; - PROVISIONING_PROFILE = ""; - "PROVISIONING_PROFILE[sdk=iphoneos*]" = ""; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; USER_HEADER_SEARCH_PATHS = ""; - VALIDATE_PRODUCT = YES; - VALID_ARCHS = "armv6 armv7 armv7s i386"; + }; + name = Release; + }; + 5087E76D17EB910900C73F5D /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; + CLANG_CXX_LIBRARY = "libc++"; + GCC_DYNAMIC_NO_PIC = NO; + GCC_INLINES_ARE_PRIVATE_EXTERN = NO; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = mac/Prefix.pch; + GCC_PREPROCESSOR_DEFINITIONS = ( + USE_FILE32API, + CC_TARGET_OS_MAC, + "COCOS2D_DEBUG=1", + "CC_ENABLE_CHIPMUNK_INTEGRATION=1", + ); + GCC_SYMBOLS_PRIVATE_EXTERN = NO; + HEADER_SEARCH_PATHS = ( + "$(SRCROOT)/../../../CocosDenshion/include", + "\"$(SRCROOT)/../../../external/chipmunk/include/constraints\"", + "\"$(SRCROOT)/../../../external/chipmunk/include/chipmunk\"", + "\"$(SRCROOT)/../../../extensions\"", + "\"$(SRCROOT)/../../../cocos2dx/kazmath/include\"", + "\"$(SRCROOT)/../../../external\"", + "\"$(SRCROOT)/../../../cocos2dx\"", + "\"$(SRCROOT)/../../../cocos2dx/include\"", + "\"$(SRCROOT)/../../../cocos2dx/platform/third_party/mac\"", + "\"$(SRCROOT)/../../../cocos2dx/platform/mac\"", + ); + INFOPLIST_FILE = mac/Info.plist; + LIBRARY_SEARCH_PATHS = ( + "\"$(SRCROOT)/../../../cocos2dx/platform/third_party/mac/libraries\"", + "\"$(SRCROOT)/../../../external/libwebsockets/mac/lib\"", + ); + PRODUCT_NAME = "HelloCpp - Mac"; + USER_HEADER_SEARCH_PATHS = ""; + }; + name = Debug; + }; + 5087E76E17EB910900C73F5D /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; + CLANG_CXX_LIBRARY = "libc++"; + GCC_INLINES_ARE_PRIVATE_EXTERN = NO; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = mac/Prefix.pch; + GCC_PREPROCESSOR_DEFINITIONS = ( + USE_FILE32API, + CC_TARGET_OS_MAC, + "CC_ENABLE_CHIPMUNK_INTEGRATION=1", + ); + GCC_SYMBOLS_PRIVATE_EXTERN = NO; + HEADER_SEARCH_PATHS = ( + "$(SRCROOT)/../../../CocosDenshion/include", + "\"$(SRCROOT)/../../../external/chipmunk/include/constraints\"", + "\"$(SRCROOT)/../../../external/chipmunk/include/chipmunk\"", + "\"$(SRCROOT)/../../../extensions\"", + "\"$(SRCROOT)/../../../cocos2dx/kazmath/include\"", + "\"$(SRCROOT)/../../../external\"", + "\"$(SRCROOT)/../../../cocos2dx\"", + "\"$(SRCROOT)/../../../cocos2dx/include\"", + "\"$(SRCROOT)/../../../cocos2dx/platform/third_party/mac\"", + "\"$(SRCROOT)/../../../cocos2dx/platform/mac\"", + ); + INFOPLIST_FILE = mac/Info.plist; + LIBRARY_SEARCH_PATHS = ( + "\"$(SRCROOT)/../../../cocos2dx/platform/third_party/mac/libraries\"", + "\"$(SRCROOT)/../../../external/libwebsockets/mac/lib\"", + ); + PRODUCT_NAME = "HelloCpp - Mac"; + USER_HEADER_SEARCH_PATHS = ""; }; name = Release; }; C01FCF4F08A954540054247B /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - COMPRESS_PNG_FILES = NO; - GCC_C_LANGUAGE_STANDARD = c99; - GCC_VERSION = ""; + CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; + CLANG_CXX_LIBRARY = "libc++"; + COPY_PHASE_STRIP = NO; + GCC_OPTIMIZATION_LEVEL = 0; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; ONLY_ACTIVE_ARCH = YES; - SDKROOT = iphoneos; - VALID_ARCHS = "armv6 armv7 i386"; + SDKROOT = macosx; }; name = Debug; }; C01FCF5008A954540054247B /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - COMPRESS_PNG_FILES = NO; - GCC_C_LANGUAGE_STANDARD = c99; - GCC_VERSION = ""; + CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; + CLANG_CXX_LIBRARY = "libc++"; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1"; - SDKROOT = iphoneos; - VALID_ARCHS = "armv6 armv7 i386"; + SDKROOT = macosx; + VALIDATE_PRODUCT = YES; }; name = Release; }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 1D6058960D05DD3E006BFB54 /* Build configuration list for PBXNativeTarget "HelloCpp" */ = { + 1D6058960D05DD3E006BFB54 /* Build configuration list for PBXNativeTarget "HelloCpp - iOS" */ = { isa = XCConfigurationList; buildConfigurations = ( 1D6058940D05DD3E006BFB54 /* Debug */, @@ -720,6 +970,15 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Debug; }; + 5087E76C17EB910900C73F5D /* Build configuration list for PBXNativeTarget "HelloCpp - Mac" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 5087E76D17EB910900C73F5D /* Debug */, + 5087E76E17EB910900C73F5D /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Debug; + }; C01FCF4E08A954540054247B /* Build configuration list for PBXProject "HelloCpp" */ = { isa = XCConfigurationList; buildConfigurations = ( diff --git a/template/multi-platform-cpp/proj.ios/AppController.h b/template/multi-platform-cpp/proj.ios_mac/ios/AppController.h similarity index 100% rename from template/multi-platform-cpp/proj.ios/AppController.h rename to template/multi-platform-cpp/proj.ios_mac/ios/AppController.h diff --git a/template/multi-platform-cpp/proj.ios/AppController.mm b/template/multi-platform-cpp/proj.ios_mac/ios/AppController.mm similarity index 100% rename from template/multi-platform-cpp/proj.ios/AppController.mm rename to template/multi-platform-cpp/proj.ios_mac/ios/AppController.mm diff --git a/template/multi-platform-cpp/proj.ios/Default-568h@2x.png.REMOVED.git-id b/template/multi-platform-cpp/proj.ios_mac/ios/Default-568h@2x.png.REMOVED.git-id similarity index 100% rename from template/multi-platform-cpp/proj.ios/Default-568h@2x.png.REMOVED.git-id rename to template/multi-platform-cpp/proj.ios_mac/ios/Default-568h@2x.png.REMOVED.git-id diff --git a/template/multi-platform-cpp/proj.ios/Default@2x.png.REMOVED.git-id b/template/multi-platform-cpp/proj.ios_mac/ios/Default@2x.png.REMOVED.git-id similarity index 100% rename from template/multi-platform-cpp/proj.ios/Default@2x.png.REMOVED.git-id rename to template/multi-platform-cpp/proj.ios_mac/ios/Default@2x.png.REMOVED.git-id diff --git a/template/multi-platform-cpp/proj.ios/Prefix.pch b/template/multi-platform-cpp/proj.ios_mac/ios/Prefix.pch similarity index 100% rename from template/multi-platform-cpp/proj.ios/Prefix.pch rename to template/multi-platform-cpp/proj.ios_mac/ios/Prefix.pch diff --git a/template/multi-platform-cpp/proj.ios/RootViewController.h b/template/multi-platform-cpp/proj.ios_mac/ios/RootViewController.h similarity index 100% rename from template/multi-platform-cpp/proj.ios/RootViewController.h rename to template/multi-platform-cpp/proj.ios_mac/ios/RootViewController.h diff --git a/template/multi-platform-cpp/proj.ios/RootViewController.mm b/template/multi-platform-cpp/proj.ios_mac/ios/RootViewController.mm similarity index 100% rename from template/multi-platform-cpp/proj.ios/RootViewController.mm rename to template/multi-platform-cpp/proj.ios_mac/ios/RootViewController.mm diff --git a/template/multi-platform-cpp/proj.ios/main.m b/template/multi-platform-cpp/proj.ios_mac/ios/main.m similarity index 100% rename from template/multi-platform-cpp/proj.ios/main.m rename to template/multi-platform-cpp/proj.ios_mac/ios/main.m diff --git a/template/multi-platform-cpp/proj.mac/Icon.icns b/template/multi-platform-cpp/proj.ios_mac/mac/Icon.icns similarity index 100% rename from template/multi-platform-cpp/proj.mac/Icon.icns rename to template/multi-platform-cpp/proj.ios_mac/mac/Icon.icns diff --git a/template/multi-platform-cpp/proj.mac/Prefix.pch b/template/multi-platform-cpp/proj.ios_mac/mac/Prefix.pch similarity index 100% rename from template/multi-platform-cpp/proj.mac/Prefix.pch rename to template/multi-platform-cpp/proj.ios_mac/mac/Prefix.pch diff --git a/template/multi-platform-cpp/proj.mac/main.cpp b/template/multi-platform-cpp/proj.ios_mac/mac/main.cpp similarity index 97% rename from template/multi-platform-cpp/proj.mac/main.cpp rename to template/multi-platform-cpp/proj.ios_mac/mac/main.cpp index 061f7b6874..1d6fd403f1 100644 --- a/template/multi-platform-cpp/proj.mac/main.cpp +++ b/template/multi-platform-cpp/proj.ios_mac/mac/main.cpp @@ -31,6 +31,6 @@ int main(int argc, char *argv[]) { AppDelegate app; EGLView eglView; - eglView.init("TestCPP",900,640); + eglView.init("Hello World",900,640); return Application::getInstance()->run(); } diff --git a/template/multi-platform-cpp/proj.mac/HelloCpp.xcodeproj/project.pbxproj b/template/multi-platform-cpp/proj.mac/HelloCpp.xcodeproj/project.pbxproj deleted file mode 100644 index cb196c341a..0000000000 --- a/template/multi-platform-cpp/proj.mac/HelloCpp.xcodeproj/project.pbxproj +++ /dev/null @@ -1,714 +0,0 @@ -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = { - }; - objectVersion = 46; - objects = { - -/* Begin PBXBuildFile section */ - 15C64823165F391E007D4F18 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C64822165F391E007D4F18 /* Cocoa.framework */; }; - 15C64825165F3934007D4F18 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C64824165F3934007D4F18 /* OpenGL.framework */; }; - 15C64827165F394E007D4F18 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C64826165F394E007D4F18 /* QuartzCore.framework */; }; - 15C64829165F396B007D4F18 /* OpenAL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C64828165F396B007D4F18 /* OpenAL.framework */; }; - 15C6482B165F3979007D4F18 /* ApplicationServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C6482A165F3979007D4F18 /* ApplicationServices.framework */; }; - 15C6482D165F3988007D4F18 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C6482C165F3988007D4F18 /* AudioToolbox.framework */; }; - 15C6482F165F399D007D4F18 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C6482E165F399D007D4F18 /* libz.dylib */; }; - 15C64831165F39AB007D4F18 /* libxml2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C64830165F39AB007D4F18 /* libxml2.dylib */; }; - 15C64833165F3AFD007D4F18 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C64832165F3AFD007D4F18 /* Foundation.framework */; }; - 15C6498716633E65007D4F18 /* libcurl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C6498616633E65007D4F18 /* libcurl.a */; }; - 1AF4C39717865FD400122817 /* libbox2d Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AF4C37817865FB200122817 /* libbox2d Mac.a */; }; - 1AF4C39817865FD400122817 /* libchipmunk Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AF4C37617865FB200122817 /* libchipmunk Mac.a */; }; - 1AF4C39917865FD400122817 /* libcocos2dx Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AF4C37217865FB200122817 /* libcocos2dx Mac.a */; }; - 1AF4C39A17865FD400122817 /* libcocos2dx-extensions Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AF4C37417865FB200122817 /* libcocos2dx-extensions Mac.a */; }; - 1AF4C39B17865FD400122817 /* libCocosDenshion Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AF4C37A17865FB200122817 /* libCocosDenshion Mac.a */; }; - 1AFAF8C316D3884900DB1158 /* CloseNormal.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AFAF8C016D3884900DB1158 /* CloseNormal.png */; }; - 1AFAF8C416D3884900DB1158 /* CloseSelected.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AFAF8C116D3884900DB1158 /* CloseSelected.png */; }; - 1AFAF8C516D3884900DB1158 /* HelloWorld.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AFAF8C216D3884900DB1158 /* HelloWorld.png */; }; - 1AFAF8CA16D3886000DB1158 /* AppDelegate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AFAF8C616D3886000DB1158 /* AppDelegate.cpp */; }; - 1AFAF8CB16D3886000DB1158 /* HelloWorldScene.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AFAF8C816D3886000DB1158 /* HelloWorldScene.cpp */; }; - 41BC70E515BF81A5006A0A6C /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 41BC70DC15BF81A5006A0A6C /* InfoPlist.strings */; }; - 41BC70E615BF81A5006A0A6C /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 41BC70DE15BF81A5006A0A6C /* MainMenu.xib */; }; - 41BC70E715BF81A5006A0A6C /* Icon.icns in Resources */ = {isa = PBXBuildFile; fileRef = 41BC70E015BF81A5006A0A6C /* Icon.icns */; }; - 41BC70E815BF81A5006A0A6C /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 41BC70E115BF81A5006A0A6C /* main.cpp */; }; - ED4D1B3D17D445F10058FC68 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ED4D1B3C17D445F10058FC68 /* IOKit.framework */; }; -/* End PBXBuildFile section */ - -/* Begin PBXContainerItemProxy section */ - 1AF4C37117865FB200122817 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 1AF4C35E17865FB100122817 /* cocos2d_libs.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 1551A33F158F2AB200E66CFE; - remoteInfo = "cocos2dx Mac"; - }; - 1AF4C37317865FB200122817 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 1AF4C35E17865FB100122817 /* cocos2d_libs.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = A03F2FD617814595006731B9; - remoteInfo = "cocos2dx-extensions Mac"; - }; - 1AF4C37517865FB200122817 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 1AF4C35E17865FB100122817 /* cocos2d_libs.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = A03F2CB81780BD04006731B9; - remoteInfo = "chipmunk Mac"; - }; - 1AF4C37717865FB200122817 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 1AF4C35E17865FB100122817 /* cocos2d_libs.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = A03F2D9B1780BDF7006731B9; - remoteInfo = "box2d Mac"; - }; - 1AF4C37917865FB200122817 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 1AF4C35E17865FB100122817 /* cocos2d_libs.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = A03F2ED617814268006731B9; - remoteInfo = "CocosDenshion Mac"; - }; - 1AF4C37B17865FB200122817 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 1AF4C35E17865FB100122817 /* cocos2d_libs.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = A03F31FD1781479B006731B9; - remoteInfo = "jsbindings Mac"; - }; - 1AF4C37D17865FB200122817 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 1AF4C35E17865FB100122817 /* cocos2d_libs.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 1A6FB53017854BC300CDF010; - remoteInfo = "luabindings Mac"; - }; - 1AF4C37F17865FB200122817 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 1AF4C35E17865FB100122817 /* cocos2d_libs.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = A07A4D641783777C0073F6A7; - remoteInfo = "cocos2dx iOS"; - }; - 1AF4C38117865FB200122817 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 1AF4C35E17865FB100122817 /* cocos2d_libs.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = A07A4EFC1783867C0073F6A7; - remoteInfo = "cocos2dx-extensions iOS"; - }; - 1AF4C38317865FB200122817 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 1AF4C35E17865FB100122817 /* cocos2d_libs.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = A07A4F3B178387670073F6A7; - remoteInfo = "chipmunk iOS"; - }; - 1AF4C38517865FB200122817 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 1AF4C35E17865FB100122817 /* cocos2d_libs.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = A07A4F9E1783876B0073F6A7; - remoteInfo = "box2d iOS"; - }; - 1AF4C38717865FB200122817 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 1AF4C35E17865FB100122817 /* cocos2d_libs.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = A07A4FB4178387730073F6A7; - remoteInfo = "CocosDenshion iOS"; - }; - 1AF4C38917865FB200122817 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 1AF4C35E17865FB100122817 /* cocos2d_libs.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = A07A5030178387750073F6A7; - remoteInfo = "jsbindings iOS"; - }; - 1AF4C38B17865FB200122817 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 1AF4C35E17865FB100122817 /* cocos2d_libs.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 1A119791178526AA00D62A44; - remoteInfo = "luabindings iOS"; - }; - 1AF4C38D17865FC700122817 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 1AF4C35E17865FB100122817 /* cocos2d_libs.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 1551A33E158F2AB200E66CFE; - remoteInfo = "cocos2dx Mac"; - }; - 1AF4C38F17865FC700122817 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 1AF4C35E17865FB100122817 /* cocos2d_libs.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = A03F2FC117814595006731B9; - remoteInfo = "cocos2dx-extensions Mac"; - }; - 1AF4C39117865FC700122817 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 1AF4C35E17865FB100122817 /* cocos2d_libs.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = A03F2B781780BD04006731B9; - remoteInfo = "chipmunk Mac"; - }; - 1AF4C39317865FC700122817 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 1AF4C35E17865FB100122817 /* cocos2d_libs.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = A03F2D5D1780BDF7006731B9; - remoteInfo = "box2d Mac"; - }; - 1AF4C39517865FC700122817 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 1AF4C35E17865FB100122817 /* cocos2d_libs.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = A03F2E9817814268006731B9; - remoteInfo = "CocosDenshion Mac"; - }; -/* End PBXContainerItemProxy section */ - -/* Begin PBXFileReference section */ - 15C64822165F391E007D4F18 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Cocoa.framework; sourceTree = DEVELOPER_DIR; }; - 15C64824165F3934007D4F18 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/OpenGL.framework; sourceTree = DEVELOPER_DIR; }; - 15C64826165F394E007D4F18 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/QuartzCore.framework; sourceTree = DEVELOPER_DIR; }; - 15C64828165F396B007D4F18 /* OpenAL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenAL.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/OpenAL.framework; sourceTree = DEVELOPER_DIR; }; - 15C6482A165F3979007D4F18 /* ApplicationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ApplicationServices.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/ApplicationServices.framework; sourceTree = DEVELOPER_DIR; }; - 15C6482C165F3988007D4F18 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/AudioToolbox.framework; sourceTree = DEVELOPER_DIR; }; - 15C6482E165F399D007D4F18 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/usr/lib/libz.dylib; sourceTree = DEVELOPER_DIR; }; - 15C64830165F39AB007D4F18 /* libxml2.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libxml2.dylib; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/usr/lib/libxml2.dylib; sourceTree = DEVELOPER_DIR; }; - 15C64832165F3AFD007D4F18 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; }; - 15C6498616633E65007D4F18 /* libcurl.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcurl.a; path = ../../cocos2dx/platform/third_party/ios/libraries/libcurl.a; sourceTree = ""; }; - 1AF4C35E17865FB100122817 /* cocos2d_libs.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = cocos2d_libs.xcodeproj; path = ../../../cocos2d_libs.xcodeproj; sourceTree = ""; }; - 1AFAF8C016D3884900DB1158 /* CloseNormal.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = CloseNormal.png; sourceTree = ""; }; - 1AFAF8C116D3884900DB1158 /* CloseSelected.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = CloseSelected.png; sourceTree = ""; }; - 1AFAF8C216D3884900DB1158 /* HelloWorld.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = HelloWorld.png; sourceTree = ""; }; - 1AFAF8C616D3886000DB1158 /* AppDelegate.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AppDelegate.cpp; path = ../Classes/AppDelegate.cpp; sourceTree = ""; }; - 1AFAF8C716D3886000DB1158 /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = ../Classes/AppDelegate.h; sourceTree = ""; }; - 1AFAF8C816D3886000DB1158 /* HelloWorldScene.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = HelloWorldScene.cpp; path = ../Classes/HelloWorldScene.cpp; sourceTree = ""; }; - 1AFAF8C916D3886000DB1158 /* HelloWorldScene.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HelloWorldScene.h; path = ../Classes/HelloWorldScene.h; sourceTree = ""; }; - 1D6058910D05DD3D006BFB54 /* HelloCpp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = HelloCpp.app; sourceTree = BUILT_PRODUCTS_DIR; }; - 41BC70DD15BF81A5006A0A6C /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = InfoPlist.strings; sourceTree = ""; }; - 41BC70DF15BF81A5006A0A6C /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = MainMenu.xib; sourceTree = ""; }; - 41BC70E015BF81A5006A0A6C /* Icon.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = Icon.icns; sourceTree = SOURCE_ROOT; }; - 41BC70E115BF81A5006A0A6C /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = main.cpp; sourceTree = SOURCE_ROOT; }; - 41BC70E215BF81A5006A0A6C /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = SOURCE_ROOT; }; - 41BC70E315BF81A5006A0A6C /* Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Prefix.pch; sourceTree = SOURCE_ROOT; }; - ED4D1B3C17D445F10058FC68 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; }; -/* End PBXFileReference section */ - -/* Begin PBXFrameworksBuildPhase section */ - 1D60588F0D05DD3D006BFB54 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ED4D1B3D17D445F10058FC68 /* IOKit.framework in Frameworks */, - 1AF4C39717865FD400122817 /* libbox2d Mac.a in Frameworks */, - 1AF4C39817865FD400122817 /* libchipmunk Mac.a in Frameworks */, - 1AF4C39917865FD400122817 /* libcocos2dx Mac.a in Frameworks */, - 1AF4C39A17865FD400122817 /* libcocos2dx-extensions Mac.a in Frameworks */, - 1AF4C39B17865FD400122817 /* libCocosDenshion Mac.a in Frameworks */, - 15C6498716633E65007D4F18 /* libcurl.a in Frameworks */, - 15C64833165F3AFD007D4F18 /* Foundation.framework in Frameworks */, - 15C64831165F39AB007D4F18 /* libxml2.dylib in Frameworks */, - 15C6482F165F399D007D4F18 /* libz.dylib in Frameworks */, - 15C6482D165F3988007D4F18 /* AudioToolbox.framework in Frameworks */, - 15C6482B165F3979007D4F18 /* ApplicationServices.framework in Frameworks */, - 15C64829165F396B007D4F18 /* OpenAL.framework in Frameworks */, - 15C64827165F394E007D4F18 /* QuartzCore.framework in Frameworks */, - 15C64825165F3934007D4F18 /* OpenGL.framework in Frameworks */, - 15C64823165F391E007D4F18 /* Cocoa.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - -/* Begin PBXGroup section */ - 15AA9C4015B7EC450033D6C2 /* Classes */ = { - isa = PBXGroup; - children = ( - 1AFAF8C616D3886000DB1158 /* AppDelegate.cpp */, - 1AFAF8C716D3886000DB1158 /* AppDelegate.h */, - 1AFAF8C816D3886000DB1158 /* HelloWorldScene.cpp */, - 1AFAF8C916D3886000DB1158 /* HelloWorldScene.h */, - ); - name = Classes; - path = ../classes; - sourceTree = ""; - }; - 19C28FACFE9D520D11CA2CBB /* Products */ = { - isa = PBXGroup; - children = ( - 1D6058910D05DD3D006BFB54 /* HelloCpp.app */, - ); - name = Products; - sourceTree = ""; - }; - 1AF4C35F17865FB100122817 /* Products */ = { - isa = PBXGroup; - children = ( - 1AF4C37217865FB200122817 /* libcocos2dx Mac.a */, - 1AF4C37417865FB200122817 /* libcocos2dx-extensions Mac.a */, - 1AF4C37617865FB200122817 /* libchipmunk Mac.a */, - 1AF4C37817865FB200122817 /* libbox2d Mac.a */, - 1AF4C37A17865FB200122817 /* libCocosDenshion Mac.a */, - 1AF4C37C17865FB200122817 /* libjsbindings Mac.a */, - 1AF4C37E17865FB200122817 /* libluabindings Mac.a */, - 1AF4C38017865FB200122817 /* libcocos2dx iOS.a */, - 1AF4C38217865FB200122817 /* libcocos2dx-extensions iOS.a */, - 1AF4C38417865FB200122817 /* libchipmunk iOS.a */, - 1AF4C38617865FB200122817 /* libbox2d iOS.a */, - 1AF4C38817865FB200122817 /* libCocosDenshion iOS.a */, - 1AF4C38A17865FB200122817 /* libjsbindings iOS.a */, - 1AF4C38C17865FB200122817 /* libluabindings iOS.a */, - ); - name = Products; - sourceTree = ""; - }; - 29B97314FDCFA39411CA2CEA /* CustomTemplate */ = { - isa = PBXGroup; - children = ( - 1AF4C35E17865FB100122817 /* cocos2d_libs.xcodeproj */, - 15AA9C4015B7EC450033D6C2 /* Classes */, - 29B97323FDCFA39411CA2CEA /* Frameworks */, - 41BC70D815BF818D006A0A6C /* mac */, - 19C28FACFE9D520D11CA2CBB /* Products */, - 78C7DDAA14EBA5050085D0C2 /* Resources */, - ); - name = CustomTemplate; - sourceTree = ""; - }; - 29B97323FDCFA39411CA2CEA /* Frameworks */ = { - isa = PBXGroup; - children = ( - ED4D1B3C17D445F10058FC68 /* IOKit.framework */, - 15C6498616633E65007D4F18 /* libcurl.a */, - 15C64830165F39AB007D4F18 /* libxml2.dylib */, - 15C6482E165F399D007D4F18 /* libz.dylib */, - 15C6482C165F3988007D4F18 /* AudioToolbox.framework */, - 15C6482A165F3979007D4F18 /* ApplicationServices.framework */, - 15C64828165F396B007D4F18 /* OpenAL.framework */, - 15C64826165F394E007D4F18 /* QuartzCore.framework */, - 15C64824165F3934007D4F18 /* OpenGL.framework */, - 15C64822165F391E007D4F18 /* Cocoa.framework */, - 15C64832165F3AFD007D4F18 /* Foundation.framework */, - ); - name = Frameworks; - sourceTree = ""; - }; - 41BC70D815BF818D006A0A6C /* mac */ = { - isa = PBXGroup; - children = ( - 41BC70DB15BF81A5006A0A6C /* en.lproj */, - 41BC70E015BF81A5006A0A6C /* Icon.icns */, - 41BC70E115BF81A5006A0A6C /* main.cpp */, - 41BC70E215BF81A5006A0A6C /* Info.plist */, - 41BC70E315BF81A5006A0A6C /* Prefix.pch */, - ); - name = mac; - path = ../Resources; - sourceTree = ""; - }; - 41BC70DB15BF81A5006A0A6C /* en.lproj */ = { - isa = PBXGroup; - children = ( - 41BC70DC15BF81A5006A0A6C /* InfoPlist.strings */, - 41BC70DE15BF81A5006A0A6C /* MainMenu.xib */, - ); - path = en.lproj; - sourceTree = SOURCE_ROOT; - }; - 78C7DDAA14EBA5050085D0C2 /* Resources */ = { - isa = PBXGroup; - children = ( - 1AFAF8C016D3884900DB1158 /* CloseNormal.png */, - 1AFAF8C116D3884900DB1158 /* CloseSelected.png */, - 1AFAF8C216D3884900DB1158 /* HelloWorld.png */, - ); - name = Resources; - path = ../Resources; - sourceTree = ""; - }; -/* End PBXGroup section */ - -/* Begin PBXNativeTarget section */ - 1D6058900D05DD3D006BFB54 /* HelloCpp */ = { - isa = PBXNativeTarget; - buildConfigurationList = 1D6058960D05DD3E006BFB54 /* Build configuration list for PBXNativeTarget "HelloCpp" */; - buildPhases = ( - 1D60588D0D05DD3D006BFB54 /* Resources */, - 1D60588E0D05DD3D006BFB54 /* Sources */, - 1D60588F0D05DD3D006BFB54 /* Frameworks */, - ); - buildRules = ( - ); - dependencies = ( - 1AF4C38E17865FC700122817 /* PBXTargetDependency */, - 1AF4C39017865FC700122817 /* PBXTargetDependency */, - 1AF4C39217865FC700122817 /* PBXTargetDependency */, - 1AF4C39417865FC700122817 /* PBXTargetDependency */, - 1AF4C39617865FC700122817 /* PBXTargetDependency */, - ); - name = HelloCpp; - productName = iphone; - productReference = 1D6058910D05DD3D006BFB54 /* HelloCpp.app */; - productType = "com.apple.product-type.application"; - }; -/* End PBXNativeTarget section */ - -/* Begin PBXProject section */ - 29B97313FDCFA39411CA2CEA /* Project object */ = { - isa = PBXProject; - attributes = { - LastUpgradeCheck = 0500; - }; - buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "HelloCpp" */; - compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; - hasScannedForEncodings = 1; - knownRegions = ( - English, - Japanese, - French, - German, - en, - ); - mainGroup = 29B97314FDCFA39411CA2CEA /* CustomTemplate */; - projectDirPath = ""; - projectReferences = ( - { - ProductGroup = 1AF4C35F17865FB100122817 /* Products */; - ProjectRef = 1AF4C35E17865FB100122817 /* cocos2d_libs.xcodeproj */; - }, - ); - projectRoot = ""; - targets = ( - 1D6058900D05DD3D006BFB54 /* HelloCpp */, - ); - }; -/* End PBXProject section */ - -/* Begin PBXReferenceProxy section */ - 1AF4C37217865FB200122817 /* libcocos2dx Mac.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libcocos2dx Mac.a"; - remoteRef = 1AF4C37117865FB200122817 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 1AF4C37417865FB200122817 /* libcocos2dx-extensions Mac.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libcocos2dx-extensions Mac.a"; - remoteRef = 1AF4C37317865FB200122817 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 1AF4C37617865FB200122817 /* libchipmunk Mac.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libchipmunk Mac.a"; - remoteRef = 1AF4C37517865FB200122817 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 1AF4C37817865FB200122817 /* libbox2d Mac.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libbox2d Mac.a"; - remoteRef = 1AF4C37717865FB200122817 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 1AF4C37A17865FB200122817 /* libCocosDenshion Mac.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libCocosDenshion Mac.a"; - remoteRef = 1AF4C37917865FB200122817 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 1AF4C37C17865FB200122817 /* libjsbindings Mac.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libjsbindings Mac.a"; - remoteRef = 1AF4C37B17865FB200122817 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 1AF4C37E17865FB200122817 /* libluabindings Mac.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libluabindings Mac.a"; - remoteRef = 1AF4C37D17865FB200122817 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 1AF4C38017865FB200122817 /* libcocos2dx iOS.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libcocos2dx iOS.a"; - remoteRef = 1AF4C37F17865FB200122817 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 1AF4C38217865FB200122817 /* libcocos2dx-extensions iOS.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libcocos2dx-extensions iOS.a"; - remoteRef = 1AF4C38117865FB200122817 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 1AF4C38417865FB200122817 /* libchipmunk iOS.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libchipmunk iOS.a"; - remoteRef = 1AF4C38317865FB200122817 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 1AF4C38617865FB200122817 /* libbox2d iOS.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libbox2d iOS.a"; - remoteRef = 1AF4C38517865FB200122817 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 1AF4C38817865FB200122817 /* libCocosDenshion iOS.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libCocosDenshion iOS.a"; - remoteRef = 1AF4C38717865FB200122817 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 1AF4C38A17865FB200122817 /* libjsbindings iOS.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libjsbindings iOS.a"; - remoteRef = 1AF4C38917865FB200122817 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 1AF4C38C17865FB200122817 /* libluabindings iOS.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libluabindings iOS.a"; - remoteRef = 1AF4C38B17865FB200122817 /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; -/* End PBXReferenceProxy section */ - -/* Begin PBXResourcesBuildPhase section */ - 1D60588D0D05DD3D006BFB54 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 41BC70E515BF81A5006A0A6C /* InfoPlist.strings in Resources */, - 41BC70E615BF81A5006A0A6C /* MainMenu.xib in Resources */, - 41BC70E715BF81A5006A0A6C /* Icon.icns in Resources */, - 1AFAF8C316D3884900DB1158 /* CloseNormal.png in Resources */, - 1AFAF8C416D3884900DB1158 /* CloseSelected.png in Resources */, - 1AFAF8C516D3884900DB1158 /* HelloWorld.png in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXResourcesBuildPhase section */ - -/* Begin PBXSourcesBuildPhase section */ - 1D60588E0D05DD3D006BFB54 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 41BC70E815BF81A5006A0A6C /* main.cpp in Sources */, - 1AFAF8CA16D3886000DB1158 /* AppDelegate.cpp in Sources */, - 1AFAF8CB16D3886000DB1158 /* HelloWorldScene.cpp in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXSourcesBuildPhase section */ - -/* Begin PBXTargetDependency section */ - 1AF4C38E17865FC700122817 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "cocos2dx Mac"; - targetProxy = 1AF4C38D17865FC700122817 /* PBXContainerItemProxy */; - }; - 1AF4C39017865FC700122817 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "cocos2dx-extensions Mac"; - targetProxy = 1AF4C38F17865FC700122817 /* PBXContainerItemProxy */; - }; - 1AF4C39217865FC700122817 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "chipmunk Mac"; - targetProxy = 1AF4C39117865FC700122817 /* PBXContainerItemProxy */; - }; - 1AF4C39417865FC700122817 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "box2d Mac"; - targetProxy = 1AF4C39317865FC700122817 /* PBXContainerItemProxy */; - }; - 1AF4C39617865FC700122817 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "CocosDenshion Mac"; - targetProxy = 1AF4C39517865FC700122817 /* PBXContainerItemProxy */; - }; -/* End PBXTargetDependency section */ - -/* Begin PBXVariantGroup section */ - 41BC70DC15BF81A5006A0A6C /* InfoPlist.strings */ = { - isa = PBXVariantGroup; - children = ( - 41BC70DD15BF81A5006A0A6C /* en */, - ); - name = InfoPlist.strings; - sourceTree = ""; - }; - 41BC70DE15BF81A5006A0A6C /* MainMenu.xib */ = { - isa = PBXVariantGroup; - children = ( - 41BC70DF15BF81A5006A0A6C /* en */, - ); - name = MainMenu.xib; - sourceTree = ""; - }; -/* End PBXVariantGroup section */ - -/* Begin XCBuildConfiguration section */ - 1D6058940D05DD3E006BFB54 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CODE_SIGN_IDENTITY = ""; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; - COMBINE_HIDPI_IMAGES = YES; - COPY_PHASE_STRIP = NO; - GCC_DYNAMIC_NO_PIC = NO; - GCC_INLINES_ARE_PRIVATE_EXTERN = NO; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = Prefix.pch; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - USE_FILE32API, - CC_TARGET_OS_MAC, - "COCOS2D_DEBUG=1", - "CC_ENABLE_CHIPMUNK_INTEGRATION=1", - CC_KEYBOARD_SUPPORT, - ); - GCC_SYMBOLS_PRIVATE_EXTERN = NO; - GCC_VERSION = ""; - HEADER_SEARCH_PATHS = ( - "$(SRCROOT)/../../../CocosDenshion/include", - "\"$(SRCROOT)/../../../external/chipmunk/include/constraints\"", - "\"$(SRCROOT)/../../../external/chipmunk/include/chipmunk\"", - "\"$(SRCROOT)/../../../cocos2dx/kazmath/include\"", - "\"$(SRCROOT)/../../../extensions\"", - "\"$(SRCROOT)/../../../external\"", - "\"$(SRCROOT)/../../../cocos2dx\"", - "\"$(SRCROOT)/../../../cocos2dx/include\"", - "\"$(SRCROOT)/../../../cocos2dx/platform/mac\"", - ); - INFOPLIST_FILE = Info.plist; - LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../../../cocos2dx/platform/third_party/mac/libraries\""; - MACOSX_DEPLOYMENT_TARGET = 10.7; - ONLY_ACTIVE_ARCH = YES; - OTHER_CFLAGS = "-O2"; - PRODUCT_NAME = HelloCpp; - SDKROOT = macosx; - USER_HEADER_SEARCH_PATHS = ""; - VALID_ARCHS = "i386 x86_64"; - }; - name = Debug; - }; - 1D6058950D05DD3E006BFB54 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CODE_SIGN_IDENTITY = ""; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; - COMBINE_HIDPI_IMAGES = YES; - COPY_PHASE_STRIP = YES; - GCC_INLINES_ARE_PRIVATE_EXTERN = NO; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = Prefix.pch; - GCC_PREPROCESSOR_DEFINITIONS = ( - NDEBUG, - CC_TARGET_OS_MAC, - USE_FILE32API, - "CC_ENABLE_CHIPMUNK_INTEGRATION=1", - CC_KEYBOARD_SUPPORT, - ); - GCC_SYMBOLS_PRIVATE_EXTERN = NO; - GCC_VERSION = ""; - HEADER_SEARCH_PATHS = ( - "$(SRCROOT)/../../../CocosDenshion/include", - "\"$(SRCROOT)/../../../external/chipmunk/include/constraints\"", - "\"$(SRCROOT)/../../../external/chipmunk/include/chipmunk\"", - "\"$(SRCROOT)/../../../cocos2dx/kazmath/include\"", - "\"$(SRCROOT)/../../../extensions\"", - "\"$(SRCROOT)/../../../external\"", - "\"$(SRCROOT)/../../../cocos2dx\"", - "\"$(SRCROOT)/../../../cocos2dx/include\"", - "\"$(SRCROOT)/../../../cocos2dx/platform/mac\"", - ); - INFOPLIST_FILE = Info.plist; - LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../../../cocos2dx/platform/third_party/mac/libraries\""; - MACOSX_DEPLOYMENT_TARGET = 10.7; - PRODUCT_NAME = HelloCpp; - SDKROOT = macosx; - USER_HEADER_SEARCH_PATHS = ""; - VALIDATE_PRODUCT = YES; - VALID_ARCHS = "i386 x86_64"; - }; - name = Release; - }; - C01FCF4F08A954540054247B /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - GCC_C_LANGUAGE_STANDARD = c99; - GCC_VERSION = ""; - GCC_WARN_ABOUT_RETURN_TYPE = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - ONLY_ACTIVE_ARCH = YES; - SDKROOT = macosx; - VALID_ARCHS = "x86_64 i386"; - }; - name = Debug; - }; - C01FCF5008A954540054247B /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - GCC_C_LANGUAGE_STANDARD = c99; - GCC_VERSION = ""; - GCC_WARN_ABOUT_RETURN_TYPE = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1"; - SDKROOT = macosx; - VALID_ARCHS = "x86_64 i386"; - }; - name = Release; - }; -/* End XCBuildConfiguration section */ - -/* Begin XCConfigurationList section */ - 1D6058960D05DD3E006BFB54 /* Build configuration list for PBXNativeTarget "HelloCpp" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 1D6058940D05DD3E006BFB54 /* Debug */, - 1D6058950D05DD3E006BFB54 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Debug; - }; - C01FCF4E08A954540054247B /* Build configuration list for PBXProject "HelloCpp" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - C01FCF4F08A954540054247B /* Debug */, - C01FCF5008A954540054247B /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Debug; - }; -/* End XCConfigurationList section */ - }; - rootObject = 29B97313FDCFA39411CA2CEA /* Project object */; -} diff --git a/template/multi-platform-cpp/proj.mac/en.lproj/InfoPlist.strings b/template/multi-platform-cpp/proj.mac/en.lproj/InfoPlist.strings deleted file mode 100644 index 477b28ff8f..0000000000 --- a/template/multi-platform-cpp/proj.mac/en.lproj/InfoPlist.strings +++ /dev/null @@ -1,2 +0,0 @@ -/* Localized versions of Info.plist keys */ - diff --git a/template/multi-platform-cpp/proj.mac/en.lproj/MainMenu.xib b/template/multi-platform-cpp/proj.mac/en.lproj/MainMenu.xib deleted file mode 100644 index 3404839035..0000000000 --- a/template/multi-platform-cpp/proj.mac/en.lproj/MainMenu.xib +++ /dev/null @@ -1,812 +0,0 @@ - - - - 1060 - 10K549 - 1938 - 1038.36 - 461.00 - - com.apple.InterfaceBuilder.CocoaPlugin - 1938 - - - YES - NSMenuItem - NSCustomObject - NSMenu - - - YES - com.apple.InterfaceBuilder.CocoaPlugin - - - PluginDependencyRecalculationVersion - - - - YES - - NSApplication - - - FirstResponder - - - NSApplication - - - AMainMenu - - YES - - - HelloCpp - - 1048576 - 2147483647 - - NSImage - NSMenuCheckmark - - - NSImage - NSMenuMixedState - - submenuAction: - - HelloCpp - - YES - - - About HelloCpp - - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Preferences… - , - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Services - - 1048576 - 2147483647 - - - submenuAction: - - Services - - YES - - _NSServicesMenu - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Hide HelloCpp - h - 1048576 - 2147483647 - - - - - - Hide Others - h - 1572864 - 2147483647 - - - - - - Show All - - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Quit HelloCpp - q - 1048576 - 2147483647 - - - - - _NSAppleMenu - - - - - View - - 1048576 - 2147483647 - - - submenuAction: - - View - - YES - - - Toggle Fullscreen - f - 1048576 - 2147483647 - - - - - - - - - Window - - 1048576 - 2147483647 - - - submenuAction: - - Window - - YES - - - Minimize - m - 1048576 - 2147483647 - - - - - - Zoom - - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Bring All to Front - - 1048576 - 2147483647 - - - - - _NSWindowsMenu - - - - - Help - - 2147483647 - - - submenuAction: - - Help - - YES - - - HelloCpp Help - ? - 1048576 - 2147483647 - - - - - _NSHelpMenu - - - - _NSMainMenu - - - AppController - - - NSFontManager - - - - - YES - - - terminate: - - - - 449 - - - - orderFrontStandardAboutPanel: - - - - 142 - - - - delegate - - - - 495 - - - - performMiniaturize: - - - - 37 - - - - arrangeInFront: - - - - 39 - - - - performZoom: - - - - 240 - - - - hide: - - - - 367 - - - - hideOtherApplications: - - - - 368 - - - - unhideAllApplications: - - - - 370 - - - - showHelp: - - - - 493 - - - - toggleFullScreen: - - - - 537 - - - - - YES - - 0 - - YES - - - - - - -2 - - - File's Owner - - - -1 - - - First Responder - - - -3 - - - Application - - - 29 - - - YES - - - - - - - - - 19 - - - YES - - - - - - 56 - - - YES - - - - - - 57 - - - YES - - - - - - - - - - - - - - - - 58 - - - - - 134 - - - - - 150 - - - - - 136 - - - - - 144 - - - - - 129 - - - - - 143 - - - - - 236 - - - - - 131 - - - YES - - - - - - 149 - - - - - 145 - - - - - 130 - - - - - 24 - - - YES - - - - - - - - - 92 - - - - - 5 - - - - - 239 - - - - - 23 - - - - - 295 - - - YES - - - - - - 296 - - - YES - - - - - - 420 - - - - - 490 - - - YES - - - - - - 491 - - - YES - - - - - - 492 - - - - - 494 - - - - - 536 - - - - - - - YES - - YES - -1.IBPluginDependency - -2.IBPluginDependency - -3.IBPluginDependency - 129.IBPluginDependency - 130.IBPluginDependency - 131.IBPluginDependency - 134.IBPluginDependency - 136.IBPluginDependency - 143.IBPluginDependency - 144.IBPluginDependency - 145.IBPluginDependency - 149.IBPluginDependency - 150.IBPluginDependency - 19.IBPluginDependency - 23.IBPluginDependency - 236.IBPluginDependency - 239.IBPluginDependency - 24.IBPluginDependency - 29.IBPluginDependency - 295.IBPluginDependency - 296.IBPluginDependency - 420.IBPluginDependency - 490.IBPluginDependency - 491.IBPluginDependency - 492.IBPluginDependency - 494.IBPluginDependency - 5.IBPluginDependency - 536.IBPluginDependency - 56.IBPluginDependency - 57.IBPluginDependency - 58.IBPluginDependency - 92.IBPluginDependency - - - YES - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - - - YES - - - - - - YES - - - - - 541 - - - - YES - - AppController - NSObject - - YES - - YES - exitFullScreen: - toggleFullScreen: - - - YES - id - id - - - - YES - - YES - exitFullScreen: - toggleFullScreen: - - - YES - - exitFullScreen: - id - - - toggleFullScreen: - id - - - - - YES - - YES - glView - window - - - YES - EAGLView - NSWindow - - - - YES - - YES - glView - window - - - YES - - glView - EAGLView - - - window - NSWindow - - - - - IBProjectSource - ./Classes/AppController.h - - - - EAGLView - NSOpenGLView - - IBProjectSource - ./Classes/EAGLView.h - - - - - 0 - IBCocoaFramework - - com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 - - - YES - 3 - - YES - - YES - NSMenuCheckmark - NSMenuMixedState - - - YES - {9, 8} - {7, 2} - - - - From d3827e9933cadcc7561978fa7d031751204fb38e Mon Sep 17 00:00:00 2001 From: Ricardo Quesada Date: Thu, 19 Sep 2013 16:02:20 -0700 Subject: [PATCH 05/10] Template: Adds JS template for Mac Mac and iOS templates share the same Xcode project --- .../HelloCpp.xcodeproj/project.pbxproj | 40 +- .../HelloJavascript.xcodeproj/project.pbxproj | 475 +++++++++++++----- .../ios}/AppController.h | 0 .../ios}/AppController.mm | 0 .../ios}/Default-568h@2x.png.REMOVED.git-id | 0 .../ios}/Default@2x.png.REMOVED.git-id | 0 .../{proj.ios => proj.ios_mac/ios}/Prefix.pch | 0 .../ios}/RootViewController.h | 0 .../ios}/RootViewController.mm | 0 .../{proj.ios => proj.ios_mac/ios}/main.m | 0 .../proj.ios_mac/mac/Icon.icns | Bin 0 -> 77152 bytes .../proj.ios_mac/mac/Prefix.pch | 7 + .../proj.ios_mac/mac/main.cpp | 36 ++ 13 files changed, 403 insertions(+), 155 deletions(-) rename template/multi-platform-js/{proj.ios => proj.ios_mac}/HelloJavascript.xcodeproj/project.pbxproj (60%) rename template/multi-platform-js/{proj.ios => proj.ios_mac/ios}/AppController.h (100%) rename template/multi-platform-js/{proj.ios => proj.ios_mac/ios}/AppController.mm (100%) rename template/multi-platform-js/{proj.ios => proj.ios_mac/ios}/Default-568h@2x.png.REMOVED.git-id (100%) rename template/multi-platform-js/{proj.ios => proj.ios_mac/ios}/Default@2x.png.REMOVED.git-id (100%) rename template/multi-platform-js/{proj.ios => proj.ios_mac/ios}/Prefix.pch (100%) rename template/multi-platform-js/{proj.ios => proj.ios_mac/ios}/RootViewController.h (100%) rename template/multi-platform-js/{proj.ios => proj.ios_mac/ios}/RootViewController.mm (100%) rename template/multi-platform-js/{proj.ios => proj.ios_mac/ios}/main.m (100%) create mode 100644 template/multi-platform-js/proj.ios_mac/mac/Icon.icns create mode 100644 template/multi-platform-js/proj.ios_mac/mac/Prefix.pch create mode 100644 template/multi-platform-js/proj.ios_mac/mac/main.cpp diff --git a/template/multi-platform-cpp/proj.ios_mac/HelloCpp.xcodeproj/project.pbxproj b/template/multi-platform-cpp/proj.ios_mac/HelloCpp.xcodeproj/project.pbxproj index d94d4a00b6..52ebf32879 100644 --- a/template/multi-platform-cpp/proj.ios_mac/HelloCpp.xcodeproj/project.pbxproj +++ b/template/multi-platform-cpp/proj.ios_mac/HelloCpp.xcodeproj/project.pbxproj @@ -247,7 +247,7 @@ 1AFAF8BA16D35E4900DB1158 /* CloseSelected.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = CloseSelected.png; sourceTree = ""; }; 1AFAF8BB16D35E4900DB1158 /* HelloWorld.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = HelloWorld.png; sourceTree = ""; }; 1D30AB110D05D00D00671497 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; - 1D6058910D05DD3D006BFB54 /* HelloCpp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = HelloCpp.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 1D6058910D05DD3D006BFB54 /* HelloCpp iOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "HelloCpp iOS.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; 288765A40DF7441C002DB57D /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; 503AE0F617EB97AB00D1A890 /* Icon.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = Icon.icns; sourceTree = ""; }; @@ -262,7 +262,7 @@ 503AE10417EB98FF00D1A890 /* Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Prefix.pch; path = mac/Prefix.pch; sourceTree = ""; }; 503AE11117EB99EE00D1A890 /* libcurl.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcurl.dylib; path = usr/lib/libcurl.dylib; sourceTree = SDKROOT; }; 503AE11A17EB9C5A00D1A890 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; }; - 5087E76F17EB910900C73F5D /* HelloCpp - Mac.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "HelloCpp - Mac.app"; sourceTree = BUILT_PRODUCTS_DIR; }; + 5087E76F17EB910900C73F5D /* HelloCpp Mac.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "HelloCpp Mac.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 5087E77217EB970100C73F5D /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = ""; }; 5087E77317EB970100C73F5D /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Default.png; sourceTree = ""; }; 5087E77417EB970100C73F5D /* Default@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default@2x.png"; sourceTree = ""; }; @@ -363,8 +363,8 @@ 19C28FACFE9D520D11CA2CBB /* Products */ = { isa = PBXGroup; children = ( - 1D6058910D05DD3D006BFB54 /* HelloCpp.app */, - 5087E76F17EB910900C73F5D /* HelloCpp - Mac.app */, + 1D6058910D05DD3D006BFB54 /* HelloCpp iOS.app */, + 5087E76F17EB910900C73F5D /* HelloCpp Mac.app */, ); name = Products; sourceTree = ""; @@ -478,9 +478,9 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - 1D6058900D05DD3D006BFB54 /* HelloCpp - iOS */ = { + 1D6058900D05DD3D006BFB54 /* HelloCpp iOS */ = { isa = PBXNativeTarget; - buildConfigurationList = 1D6058960D05DD3E006BFB54 /* Build configuration list for PBXNativeTarget "HelloCpp - iOS" */; + buildConfigurationList = 1D6058960D05DD3E006BFB54 /* Build configuration list for PBXNativeTarget "HelloCpp iOS" */; buildPhases = ( 1D60588D0D05DD3D006BFB54 /* Resources */, 1D60588E0D05DD3D006BFB54 /* Sources */, @@ -495,14 +495,14 @@ 1AF4C2F117865DB400122817 /* PBXTargetDependency */, 1AF4C2F317865DB400122817 /* PBXTargetDependency */, ); - name = "HelloCpp - iOS"; + name = "HelloCpp iOS"; productName = iphone; - productReference = 1D6058910D05DD3D006BFB54 /* HelloCpp.app */; + productReference = 1D6058910D05DD3D006BFB54 /* HelloCpp iOS.app */; productType = "com.apple.product-type.application"; }; - 5087E73D17EB910900C73F5D /* HelloCpp - Mac */ = { + 5087E73D17EB910900C73F5D /* HelloCpp Mac */ = { isa = PBXNativeTarget; - buildConfigurationList = 5087E76C17EB910900C73F5D /* Build configuration list for PBXNativeTarget "HelloCpp - Mac" */; + buildConfigurationList = 5087E76C17EB910900C73F5D /* Build configuration list for PBXNativeTarget "HelloCpp Mac" */; buildPhases = ( 5087E74817EB910900C73F5D /* Resources */, 5087E75617EB910900C73F5D /* Sources */, @@ -517,9 +517,9 @@ 503AE10E17EB99BC00D1A890 /* PBXTargetDependency */, 503AE11017EB99BC00D1A890 /* PBXTargetDependency */, ); - name = "HelloCpp - Mac"; + name = "HelloCpp Mac"; productName = iphone; - productReference = 5087E76F17EB910900C73F5D /* HelloCpp - Mac.app */; + productReference = 5087E76F17EB910900C73F5D /* HelloCpp Mac.app */; productType = "com.apple.product-type.application"; }; /* End PBXNativeTarget section */ @@ -550,8 +550,8 @@ ); projectRoot = ""; targets = ( - 1D6058900D05DD3D006BFB54 /* HelloCpp - iOS */, - 5087E73D17EB910900C73F5D /* HelloCpp - Mac */, + 1D6058900D05DD3D006BFB54 /* HelloCpp iOS */, + 5087E73D17EB910900C73F5D /* HelloCpp Mac */, ); }; /* End PBXProject section */ @@ -806,7 +806,7 @@ "\"$(SRCROOT)/../../../external/libwebsockets/ios/lib\"", ); OTHER_CFLAGS = "-O2"; - PRODUCT_NAME = HelloCpp; + PRODUCT_NAME = "HelloCpp iOS"; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; USER_HEADER_SEARCH_PATHS = ""; @@ -846,7 +846,7 @@ "\"$(SRCROOT)/../../../cocos2dx/platform/third_party/ios/libraries\"", "\"$(SRCROOT)/../../../external/libwebsockets/ios/lib\"", ); - PRODUCT_NAME = HelloCpp; + PRODUCT_NAME = "HelloCpp iOS"; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; USER_HEADER_SEARCH_PATHS = ""; @@ -888,7 +888,7 @@ "\"$(SRCROOT)/../../../cocos2dx/platform/third_party/mac/libraries\"", "\"$(SRCROOT)/../../../external/libwebsockets/mac/lib\"", ); - PRODUCT_NAME = "HelloCpp - Mac"; + PRODUCT_NAME = "HelloCpp Mac"; USER_HEADER_SEARCH_PATHS = ""; }; name = Debug; @@ -926,7 +926,7 @@ "\"$(SRCROOT)/../../../cocos2dx/platform/third_party/mac/libraries\"", "\"$(SRCROOT)/../../../external/libwebsockets/mac/lib\"", ); - PRODUCT_NAME = "HelloCpp - Mac"; + PRODUCT_NAME = "HelloCpp Mac"; USER_HEADER_SEARCH_PATHS = ""; }; name = Release; @@ -961,7 +961,7 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 1D6058960D05DD3E006BFB54 /* Build configuration list for PBXNativeTarget "HelloCpp - iOS" */ = { + 1D6058960D05DD3E006BFB54 /* Build configuration list for PBXNativeTarget "HelloCpp iOS" */ = { isa = XCConfigurationList; buildConfigurations = ( 1D6058940D05DD3E006BFB54 /* Debug */, @@ -970,7 +970,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Debug; }; - 5087E76C17EB910900C73F5D /* Build configuration list for PBXNativeTarget "HelloCpp - Mac" */ = { + 5087E76C17EB910900C73F5D /* Build configuration list for PBXNativeTarget "HelloCpp Mac" */ = { isa = XCConfigurationList; buildConfigurations = ( 5087E76D17EB910900C73F5D /* Debug */, diff --git a/template/multi-platform-js/proj.ios/HelloJavascript.xcodeproj/project.pbxproj b/template/multi-platform-js/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj similarity index 60% rename from template/multi-platform-js/proj.ios/HelloJavascript.xcodeproj/project.pbxproj rename to template/multi-platform-js/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj index 1b4b4934c7..4039cd4ced 100644 --- a/template/multi-platform-js/proj.ios/HelloJavascript.xcodeproj/project.pbxproj +++ b/template/multi-platform-js/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj @@ -30,6 +30,55 @@ 1AF4C35B17865F7400122817 /* jsb.js in Resources */ = {isa = PBXBuildFile; fileRef = 1AF4C34317865F1600122817 /* jsb.js */; }; 1AF4C35C17865F7400122817 /* main.debug.js in Resources */ = {isa = PBXBuildFile; fileRef = 1AF4C34417865F1600122817 /* main.debug.js */; }; 466AF679179FC7EE002EE9BB /* jsb_deprecated.js in Resources */ = {isa = PBXBuildFile; fileRef = 466AF66C179FC7BE002EE9BB /* jsb_deprecated.js */; }; + 502380DC17EBB88200990C9B /* libcurl.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 502380DB17EBB88200990C9B /* libcurl.dylib */; }; + 502380DD17EBB89A00990C9B /* libchipmunk Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AF4C31217865E8F00122817 /* libchipmunk Mac.a */; }; + 502380DE17EBB89A00990C9B /* libcocos2dx Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AF4C30E17865E8F00122817 /* libcocos2dx Mac.a */; }; + 502380DF17EBB89A00990C9B /* libcocos2dx-extensions Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AF4C31017865E8F00122817 /* libcocos2dx-extensions Mac.a */; }; + 502380E017EBB89A00990C9B /* libCocosDenshion Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AF4C31617865E8F00122817 /* libCocosDenshion Mac.a */; }; + 502380E117EBB89A00990C9B /* libjsbindings Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AF4C31817865E8F00122817 /* libjsbindings Mac.a */; }; + 509D4A8117EBB24E00697056 /* AppDelegate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D4545215156E28EF00887EB5 /* AppDelegate.cpp */; }; + 509D4A8817EBB24E00697056 /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 1A82F5FA169AC92500C4B13A /* libsqlite3.dylib */; }; + 509D4A8917EBB24E00697056 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = D454520B156E22BD00887EB5 /* libz.dylib */; }; + 509D4A8A17EBB24E00697056 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A92275411517C094001B78AA /* QuartzCore.framework */; }; + 509D4A8C17EBB24E00697056 /* OpenAL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A92275451517C094001B78AA /* OpenAL.framework */; }; + 509D4A8D17EBB24E00697056 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A92275471517C094001B78AA /* AudioToolbox.framework */; }; + 509D4A8E17EBB24E00697056 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A92275491517C094001B78AA /* AVFoundation.framework */; }; + 509D4A9017EBB24E00697056 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A922754D1517C094001B78AA /* Foundation.framework */; }; + 509D4A9117EBB24E00697056 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A922754F1517C094001B78AA /* CoreGraphics.framework */; }; + 509D4A9417EBB24E00697056 /* jsb_deprecated.js in Resources */ = {isa = PBXBuildFile; fileRef = 466AF66C179FC7BE002EE9BB /* jsb_deprecated.js */; }; + 509D4A9517EBB24E00697056 /* jsb_chipmunk_constants.js in Resources */ = {isa = PBXBuildFile; fileRef = 1AF4C33917865F1600122817 /* jsb_chipmunk_constants.js */; }; + 509D4A9617EBB24E00697056 /* jsb_chipmunk.js in Resources */ = {isa = PBXBuildFile; fileRef = 1AF4C33A17865F1600122817 /* jsb_chipmunk.js */; }; + 509D4A9717EBB24E00697056 /* jsb_cocos2d_constants.js in Resources */ = {isa = PBXBuildFile; fileRef = 1AF4C33B17865F1600122817 /* jsb_cocos2d_constants.js */; }; + 509D4A9817EBB24E00697056 /* jsb_cocos2d_extension.js in Resources */ = {isa = PBXBuildFile; fileRef = 1AF4C33C17865F1600122817 /* jsb_cocos2d_extension.js */; }; + 509D4A9917EBB24E00697056 /* jsb_cocos2d.js in Resources */ = {isa = PBXBuildFile; fileRef = 1AF4C33D17865F1600122817 /* jsb_cocos2d.js */; }; + 509D4A9A17EBB24E00697056 /* jsb_cocosbuilder.js in Resources */ = {isa = PBXBuildFile; fileRef = 1AF4C33E17865F1600122817 /* jsb_cocosbuilder.js */; }; + 509D4A9B17EBB24E00697056 /* jsb_debugger.js in Resources */ = {isa = PBXBuildFile; fileRef = 1AF4C33F17865F1600122817 /* jsb_debugger.js */; }; + 509D4A9C17EBB24E00697056 /* jsb_opengl_constants.js in Resources */ = {isa = PBXBuildFile; fileRef = 1AF4C34017865F1600122817 /* jsb_opengl_constants.js */; }; + 509D4A9D17EBB24E00697056 /* jsb_opengl.js in Resources */ = {isa = PBXBuildFile; fileRef = 1AF4C34117865F1600122817 /* jsb_opengl.js */; }; + 509D4A9E17EBB24E00697056 /* jsb_sys.js in Resources */ = {isa = PBXBuildFile; fileRef = 1AF4C34217865F1600122817 /* jsb_sys.js */; }; + 509D4A9F17EBB24E00697056 /* jsb.js in Resources */ = {isa = PBXBuildFile; fileRef = 1AF4C34317865F1600122817 /* jsb.js */; }; + 509D4AA017EBB24E00697056 /* main.debug.js in Resources */ = {isa = PBXBuildFile; fileRef = 1AF4C34417865F1600122817 /* main.debug.js */; }; + 509D4AA117EBB24E00697056 /* main.js in Resources */ = {isa = PBXBuildFile; fileRef = 1AE4B40016D1FECD003C6D1C /* main.js */; }; + 509D4AA517EBB24E00697056 /* res in Resources */ = {isa = PBXBuildFile; fileRef = 1AE4B40116D1FECD003C6D1C /* res */; }; + 509D4AA617EBB24E00697056 /* src in Resources */ = {isa = PBXBuildFile; fileRef = 1AE4B40216D1FECD003C6D1C /* src */; }; + 509D4ABC17EBB2AB00697056 /* AppController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 509D4AAC17EBB2AB00697056 /* AppController.mm */; }; + 509D4ABD17EBB2AB00697056 /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 509D4AAD17EBB2AB00697056 /* Default-568h@2x.png */; }; + 509D4ABE17EBB2AB00697056 /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = 509D4AAE17EBB2AB00697056 /* Default.png */; }; + 509D4ABF17EBB2AB00697056 /* Default@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 509D4AAF17EBB2AB00697056 /* Default@2x.png */; }; + 509D4AC017EBB2AB00697056 /* Icon-57.png in Resources */ = {isa = PBXBuildFile; fileRef = 509D4AB017EBB2AB00697056 /* Icon-57.png */; }; + 509D4AC117EBB2AB00697056 /* Icon-72.png in Resources */ = {isa = PBXBuildFile; fileRef = 509D4AB117EBB2AB00697056 /* Icon-72.png */; }; + 509D4AC217EBB2AB00697056 /* Icon-76.png in Resources */ = {isa = PBXBuildFile; fileRef = 509D4AB217EBB2AB00697056 /* Icon-76.png */; }; + 509D4AC317EBB2AB00697056 /* Icon-114.png in Resources */ = {isa = PBXBuildFile; fileRef = 509D4AB317EBB2AB00697056 /* Icon-114.png */; }; + 509D4AC417EBB2AB00697056 /* Icon-120.png in Resources */ = {isa = PBXBuildFile; fileRef = 509D4AB417EBB2AB00697056 /* Icon-120.png */; }; + 509D4AC517EBB2AB00697056 /* Icon-144.png in Resources */ = {isa = PBXBuildFile; fileRef = 509D4AB517EBB2AB00697056 /* Icon-144.png */; }; + 509D4AC617EBB2AB00697056 /* Icon-152.png in Resources */ = {isa = PBXBuildFile; fileRef = 509D4AB617EBB2AB00697056 /* Icon-152.png */; }; + 509D4AC817EBB2AB00697056 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 509D4AB817EBB2AB00697056 /* main.m */; }; + 509D4AC917EBB2AB00697056 /* RootViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 509D4ABB17EBB2AB00697056 /* RootViewController.mm */; }; + 509D4ACF17EBB2BE00697056 /* Icon.icns in Resources */ = {isa = PBXBuildFile; fileRef = 509D4ACB17EBB2BE00697056 /* Icon.icns */; }; + 509D4AD117EBB2BE00697056 /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 509D4ACD17EBB2BE00697056 /* main.cpp */; }; + 509D4AE717EBB81800697056 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 509D4AE617EBB81800697056 /* OpenGL.framework */; }; + 509D4AE917EBB82000697056 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 509D4AE817EBB82000697056 /* AppKit.framework */; }; + 509D4AEB17EBB82600697056 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 509D4AEA17EBB82600697056 /* IOKit.framework */; }; A92275421517C094001B78AA /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A92275411517C094001B78AA /* QuartzCore.framework */; }; A92275441517C094001B78AA /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A92275431517C094001B78AA /* OpenGLES.framework */; }; A92275461517C094001B78AA /* OpenAL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A92275451517C094001B78AA /* OpenAL.framework */; }; @@ -38,12 +87,6 @@ A922754C1517C094001B78AA /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A922754B1517C094001B78AA /* UIKit.framework */; }; A922754E1517C094001B78AA /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A922754D1517C094001B78AA /* Foundation.framework */; }; A92275501517C094001B78AA /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A922754F1517C094001B78AA /* CoreGraphics.framework */; }; - D446FDA316102D7D000ADA7B /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = D446FDA216102D7D000ADA7B /* Default.png */; }; - D446FDA516102D82000ADA7B /* Default@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D446FDA416102D82000ADA7B /* Default@2x.png */; }; - D446FDA716102D86000ADA7B /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D446FDA616102D86000ADA7B /* Default-568h@2x.png */; }; - D45446D3156DE74F00887EB5 /* AppController.mm in Sources */ = {isa = PBXBuildFile; fileRef = D45446CE156DE74F00887EB5 /* AppController.mm */; }; - D45446D4156DE74F00887EB5 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = D45446CF156DE74F00887EB5 /* main.m */; }; - D45446D5156DE74F00887EB5 /* RootViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = D45446D2156DE74F00887EB5 /* RootViewController.mm */; }; D454520C156E22BD00887EB5 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = D454520B156E22BD00887EB5 /* libz.dylib */; }; D4545227156E28EF00887EB5 /* AppDelegate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D4545215156E28EF00887EB5 /* AppDelegate.cpp */; }; /* End PBXBuildFile section */ @@ -147,40 +190,19 @@ remoteGlobalIDString = 1A119791178526AA00D62A44; remoteInfo = "luabindings iOS"; }; - 1AF4C32917865EA600122817 /* PBXContainerItemProxy */ = { + 502380EE17EBB8C500990C9B /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 1AF4C2FA17865E8F00122817 /* cocos2d_libs.xcodeproj */; proxyType = 1; - remoteGlobalIDString = A07A4C241783777C0073F6A7; - remoteInfo = "cocos2dx iOS"; + remoteGlobalIDString = A03F2E8E178141C1006731B9; + remoteInfo = "build-all-libs Mac"; }; - 1AF4C32B17865EA600122817 /* PBXContainerItemProxy */ = { + 502380F017EBB8FD00990C9B /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 1AF4C2FA17865E8F00122817 /* cocos2d_libs.xcodeproj */; proxyType = 1; - remoteGlobalIDString = A07A4E111783867C0073F6A7; - remoteInfo = "cocos2dx-extensions iOS"; - }; - 1AF4C32D17865EA600122817 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 1AF4C2FA17865E8F00122817 /* cocos2d_libs.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = A07A4EFD178387670073F6A7; - remoteInfo = "chipmunk iOS"; - }; - 1AF4C32F17865EA600122817 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 1AF4C2FA17865E8F00122817 /* cocos2d_libs.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = A07A4F9F178387730073F6A7; - remoteInfo = "CocosDenshion iOS"; - }; - 1AF4C33117865EA600122817 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 1AF4C2FA17865E8F00122817 /* cocos2d_libs.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = A07A4FB5178387750073F6A7; - remoteInfo = "jsbindings iOS"; + remoteGlobalIDString = A07A4E0B178386390073F6A7; + remoteInfo = "build-all-libs iOS"; }; /* End PBXContainerItemProxy section */ @@ -204,7 +226,33 @@ 1AF4C34317865F1600122817 /* jsb.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; name = jsb.js; path = ../../../scripting/javascript/bindings/js/jsb.js; sourceTree = ""; }; 1AF4C34417865F1600122817 /* main.debug.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; name = main.debug.js; path = ../../../scripting/javascript/bindings/js/main.debug.js; sourceTree = ""; }; 466AF66C179FC7BE002EE9BB /* jsb_deprecated.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; name = jsb_deprecated.js; path = ../../../scripting/javascript/bindings/js/jsb_deprecated.js; sourceTree = ""; }; - A922753D1517C094001B78AA /* HelloJavascript.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = HelloJavascript.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 502380DB17EBB88200990C9B /* libcurl.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcurl.dylib; path = usr/lib/libcurl.dylib; sourceTree = SDKROOT; }; + 509D4AAA17EBB24E00697056 /* Hello JavaScript Mac.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Hello JavaScript Mac.app"; sourceTree = BUILT_PRODUCTS_DIR; }; + 509D4AAB17EBB2AB00697056 /* AppController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppController.h; path = ios/AppController.h; sourceTree = ""; }; + 509D4AAC17EBB2AB00697056 /* AppController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = AppController.mm; path = ios/AppController.mm; sourceTree = ""; }; + 509D4AAD17EBB2AB00697056 /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default-568h@2x.png"; path = "ios/Default-568h@2x.png"; sourceTree = ""; }; + 509D4AAE17EBB2AB00697056 /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Default.png; path = ios/Default.png; sourceTree = ""; }; + 509D4AAF17EBB2AB00697056 /* Default@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default@2x.png"; path = "ios/Default@2x.png"; sourceTree = ""; }; + 509D4AB017EBB2AB00697056 /* Icon-57.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon-57.png"; path = "ios/Icon-57.png"; sourceTree = ""; }; + 509D4AB117EBB2AB00697056 /* Icon-72.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon-72.png"; path = "ios/Icon-72.png"; sourceTree = ""; }; + 509D4AB217EBB2AB00697056 /* Icon-76.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon-76.png"; path = "ios/Icon-76.png"; sourceTree = ""; }; + 509D4AB317EBB2AB00697056 /* Icon-114.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon-114.png"; path = "ios/Icon-114.png"; sourceTree = ""; }; + 509D4AB417EBB2AB00697056 /* Icon-120.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon-120.png"; path = "ios/Icon-120.png"; sourceTree = ""; }; + 509D4AB517EBB2AB00697056 /* Icon-144.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon-144.png"; path = "ios/Icon-144.png"; sourceTree = ""; }; + 509D4AB617EBB2AB00697056 /* Icon-152.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Icon-152.png"; path = "ios/Icon-152.png"; sourceTree = ""; }; + 509D4AB717EBB2AB00697056 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = ios/Info.plist; sourceTree = ""; }; + 509D4AB817EBB2AB00697056 /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = ios/main.m; sourceTree = ""; }; + 509D4AB917EBB2AB00697056 /* Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Prefix.pch; path = ios/Prefix.pch; sourceTree = ""; }; + 509D4ABA17EBB2AB00697056 /* RootViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RootViewController.h; path = ios/RootViewController.h; sourceTree = ""; }; + 509D4ABB17EBB2AB00697056 /* RootViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = RootViewController.mm; path = ios/RootViewController.mm; sourceTree = ""; }; + 509D4ACB17EBB2BE00697056 /* Icon.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = Icon.icns; sourceTree = ""; }; + 509D4ACC17EBB2BE00697056 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 509D4ACD17EBB2BE00697056 /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = main.cpp; sourceTree = ""; }; + 509D4ACE17EBB2BE00697056 /* Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Prefix.pch; sourceTree = ""; }; + 509D4AE617EBB81800697056 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = System/Library/Frameworks/OpenGL.framework; sourceTree = SDKROOT; }; + 509D4AE817EBB82000697056 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; }; + 509D4AEA17EBB82600697056 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; }; + A922753D1517C094001B78AA /* Hello JavaScript iOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Hello JavaScript iOS.app"; sourceTree = BUILT_PRODUCTS_DIR; }; A92275411517C094001B78AA /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; }; A92275431517C094001B78AA /* OpenGLES.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGLES.framework; path = System/Library/Frameworks/OpenGLES.framework; sourceTree = SDKROOT; }; A92275451517C094001B78AA /* OpenAL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenAL.framework; path = System/Library/Frameworks/OpenAL.framework; sourceTree = SDKROOT; }; @@ -213,22 +261,36 @@ A922754B1517C094001B78AA /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; A922754D1517C094001B78AA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; A922754F1517C094001B78AA /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; - D446FDA216102D7D000ADA7B /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Default.png; sourceTree = ""; }; - D446FDA416102D82000ADA7B /* Default@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default@2x.png"; sourceTree = ""; }; - D446FDA616102D86000ADA7B /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = ""; }; - D45446CD156DE74F00887EB5 /* AppController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppController.h; sourceTree = ""; }; - D45446CE156DE74F00887EB5 /* AppController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AppController.mm; sourceTree = ""; }; - D45446CF156DE74F00887EB5 /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; - D45446D0156DE74F00887EB5 /* Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Prefix.pch; sourceTree = ""; }; - D45446D1156DE74F00887EB5 /* RootViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RootViewController.h; sourceTree = ""; }; - D45446D2156DE74F00887EB5 /* RootViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RootViewController.mm; sourceTree = ""; }; - D45446D6156DE79D00887EB5 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; D454520B156E22BD00887EB5 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; }; D4545215156E28EF00887EB5 /* AppDelegate.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AppDelegate.cpp; sourceTree = ""; }; D4545216156E28EF00887EB5 /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ + 509D4A8217EBB24E00697056 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 502380DD17EBB89A00990C9B /* libchipmunk Mac.a in Frameworks */, + 502380DE17EBB89A00990C9B /* libcocos2dx Mac.a in Frameworks */, + 502380DF17EBB89A00990C9B /* libcocos2dx-extensions Mac.a in Frameworks */, + 502380E017EBB89A00990C9B /* libCocosDenshion Mac.a in Frameworks */, + 502380E117EBB89A00990C9B /* libjsbindings Mac.a in Frameworks */, + 502380DC17EBB88200990C9B /* libcurl.dylib in Frameworks */, + 509D4A8817EBB24E00697056 /* libsqlite3.dylib in Frameworks */, + 509D4A8917EBB24E00697056 /* libz.dylib in Frameworks */, + 509D4AEB17EBB82600697056 /* IOKit.framework in Frameworks */, + 509D4AE917EBB82000697056 /* AppKit.framework in Frameworks */, + 509D4AE717EBB81800697056 /* OpenGL.framework in Frameworks */, + 509D4A8A17EBB24E00697056 /* QuartzCore.framework in Frameworks */, + 509D4A8C17EBB24E00697056 /* OpenAL.framework in Frameworks */, + 509D4A8D17EBB24E00697056 /* AudioToolbox.framework in Frameworks */, + 509D4A8E17EBB24E00697056 /* AVFoundation.framework in Frameworks */, + 509D4A9017EBB24E00697056 /* Foundation.framework in Frameworks */, + 509D4A9117EBB24E00697056 /* CoreGraphics.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; A922753A1517C094001B78AA /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -261,9 +323,6 @@ 1AE4B40016D1FECD003C6D1C /* main.js */, 1AE4B40116D1FECD003C6D1C /* res */, 1AE4B40216D1FECD003C6D1C /* src */, - D446FDA616102D86000ADA7B /* Default-568h@2x.png */, - D446FDA216102D7D000ADA7B /* Default.png */, - D446FDA416102D82000ADA7B /* Default@2x.png */, ); name = Resources; sourceTree = ""; @@ -309,14 +368,26 @@ name = "JS Common"; sourceTree = ""; }; + 509D4ACA17EBB2BE00697056 /* mac */ = { + isa = PBXGroup; + children = ( + 509D4ACB17EBB2BE00697056 /* Icon.icns */, + 509D4ACC17EBB2BE00697056 /* Info.plist */, + 509D4ACD17EBB2BE00697056 /* main.cpp */, + 509D4ACE17EBB2BE00697056 /* Prefix.pch */, + ); + path = mac; + sourceTree = ""; + }; A92275321517C094001B78AA = { isa = PBXGroup; children = ( - 1AF4C33817865EF900122817 /* JS Common */, 1AF4C2FA17865E8F00122817 /* cocos2d_libs.xcodeproj */, + 1AF4C33817865EF900122817 /* JS Common */, D4545214156E28EF00887EB5 /* Classes */, A92275401517C094001B78AA /* Frameworks */, D45446CC156DE73F00887EB5 /* ios */, + 509D4ACA17EBB2BE00697056 /* mac */, A922753E1517C094001B78AA /* Products */, 15628F5B15F0F5C2000CF24B /* Resources */, ); @@ -325,7 +396,8 @@ A922753E1517C094001B78AA /* Products */ = { isa = PBXGroup; children = ( - A922753D1517C094001B78AA /* HelloJavascript.app */, + A922753D1517C094001B78AA /* Hello JavaScript iOS.app */, + 509D4AAA17EBB24E00697056 /* Hello JavaScript Mac.app */, ); name = Products; sourceTree = ""; @@ -333,6 +405,10 @@ A92275401517C094001B78AA /* Frameworks */ = { isa = PBXGroup; children = ( + 502380DB17EBB88200990C9B /* libcurl.dylib */, + 509D4AEA17EBB82600697056 /* IOKit.framework */, + 509D4AE817EBB82000697056 /* AppKit.framework */, + 509D4AE617EBB81800697056 /* OpenGL.framework */, 1A96A4F2174A3432008653A9 /* libcurl.a */, 1A82F5FA169AC92500C4B13A /* libsqlite3.dylib */, D454520B156E22BD00887EB5 /* libz.dylib */, @@ -351,13 +427,23 @@ D45446CC156DE73F00887EB5 /* ios */ = { isa = PBXGroup; children = ( - D45446D6156DE79D00887EB5 /* Info.plist */, - D45446CD156DE74F00887EB5 /* AppController.h */, - D45446CE156DE74F00887EB5 /* AppController.mm */, - D45446CF156DE74F00887EB5 /* main.m */, - D45446D0156DE74F00887EB5 /* Prefix.pch */, - D45446D1156DE74F00887EB5 /* RootViewController.h */, - D45446D2156DE74F00887EB5 /* RootViewController.mm */, + 509D4AAB17EBB2AB00697056 /* AppController.h */, + 509D4AAC17EBB2AB00697056 /* AppController.mm */, + 509D4AAD17EBB2AB00697056 /* Default-568h@2x.png */, + 509D4AAE17EBB2AB00697056 /* Default.png */, + 509D4AAF17EBB2AB00697056 /* Default@2x.png */, + 509D4AB017EBB2AB00697056 /* Icon-57.png */, + 509D4AB117EBB2AB00697056 /* Icon-72.png */, + 509D4AB217EBB2AB00697056 /* Icon-76.png */, + 509D4AB317EBB2AB00697056 /* Icon-114.png */, + 509D4AB417EBB2AB00697056 /* Icon-120.png */, + 509D4AB517EBB2AB00697056 /* Icon-144.png */, + 509D4AB617EBB2AB00697056 /* Icon-152.png */, + 509D4AB717EBB2AB00697056 /* Info.plist */, + 509D4AB817EBB2AB00697056 /* main.m */, + 509D4AB917EBB2AB00697056 /* Prefix.pch */, + 509D4ABA17EBB2AB00697056 /* RootViewController.h */, + 509D4ABB17EBB2AB00697056 /* RootViewController.mm */, ); name = ios; sourceTree = ""; @@ -375,9 +461,27 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - A922753C1517C094001B78AA /* HelloJavascript */ = { + 509D4A7517EBB24E00697056 /* Hello JavaScript Mac */ = { isa = PBXNativeTarget; - buildConfigurationList = A92277001517C097001B78AA /* Build configuration list for PBXNativeTarget "HelloJavascript" */; + buildConfigurationList = 509D4AA717EBB24E00697056 /* Build configuration list for PBXNativeTarget "Hello JavaScript Mac" */; + buildPhases = ( + 509D4A8017EBB24E00697056 /* Sources */, + 509D4A8217EBB24E00697056 /* Frameworks */, + 509D4A9317EBB24E00697056 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + 502380EF17EBB8C500990C9B /* PBXTargetDependency */, + ); + name = "Hello JavaScript Mac"; + productName = HelloJavascript; + productReference = 509D4AAA17EBB24E00697056 /* Hello JavaScript Mac.app */; + productType = "com.apple.product-type.application"; + }; + A922753C1517C094001B78AA /* Hello JavaScript iOS */ = { + isa = PBXNativeTarget; + buildConfigurationList = A92277001517C097001B78AA /* Build configuration list for PBXNativeTarget "Hello JavaScript iOS" */; buildPhases = ( A92275391517C094001B78AA /* Sources */, A922753A1517C094001B78AA /* Frameworks */, @@ -386,15 +490,11 @@ buildRules = ( ); dependencies = ( - 1AF4C32A17865EA600122817 /* PBXTargetDependency */, - 1AF4C32C17865EA600122817 /* PBXTargetDependency */, - 1AF4C32E17865EA600122817 /* PBXTargetDependency */, - 1AF4C33017865EA600122817 /* PBXTargetDependency */, - 1AF4C33217865EA600122817 /* PBXTargetDependency */, + 502380F117EBB8FD00990C9B /* PBXTargetDependency */, ); - name = HelloJavascript; + name = "Hello JavaScript iOS"; productName = HelloJavascript; - productReference = A922753D1517C094001B78AA /* HelloJavascript.app */; + productReference = A922753D1517C094001B78AA /* Hello JavaScript iOS.app */; productType = "com.apple.product-type.application"; }; /* End PBXNativeTarget section */ @@ -404,6 +504,11 @@ isa = PBXProject; attributes = { LastUpgradeCheck = 0430; + TargetAttributes = { + A922753C1517C094001B78AA = { + DevelopmentTeam = MDDB52YB8L; + }; + }; }; buildConfigurationList = A92275371517C094001B78AA /* Build configuration list for PBXProject "HelloJavascript" */; compatibilityVersion = "Xcode 3.2"; @@ -423,7 +528,8 @@ ); projectRoot = ""; targets = ( - A922753C1517C094001B78AA /* HelloJavascript */, + A922753C1517C094001B78AA /* Hello JavaScript iOS */, + 509D4A7517EBB24E00697056 /* Hello JavaScript Mac */, ); }; /* End PBXProject section */ @@ -530,6 +636,30 @@ /* End PBXReferenceProxy section */ /* Begin PBXResourcesBuildPhase section */ + 509D4A9317EBB24E00697056 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 509D4A9417EBB24E00697056 /* jsb_deprecated.js in Resources */, + 509D4A9517EBB24E00697056 /* jsb_chipmunk_constants.js in Resources */, + 509D4A9617EBB24E00697056 /* jsb_chipmunk.js in Resources */, + 509D4A9717EBB24E00697056 /* jsb_cocos2d_constants.js in Resources */, + 509D4A9817EBB24E00697056 /* jsb_cocos2d_extension.js in Resources */, + 509D4A9917EBB24E00697056 /* jsb_cocos2d.js in Resources */, + 509D4A9A17EBB24E00697056 /* jsb_cocosbuilder.js in Resources */, + 509D4A9B17EBB24E00697056 /* jsb_debugger.js in Resources */, + 509D4A9C17EBB24E00697056 /* jsb_opengl_constants.js in Resources */, + 509D4A9D17EBB24E00697056 /* jsb_opengl.js in Resources */, + 509D4A9E17EBB24E00697056 /* jsb_sys.js in Resources */, + 509D4A9F17EBB24E00697056 /* jsb.js in Resources */, + 509D4AA017EBB24E00697056 /* main.debug.js in Resources */, + 509D4AA117EBB24E00697056 /* main.js in Resources */, + 509D4ACF17EBB2BE00697056 /* Icon.icns in Resources */, + 509D4AA517EBB24E00697056 /* res in Resources */, + 509D4AA617EBB24E00697056 /* src in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; A922753B1517C094001B78AA /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; @@ -538,20 +668,27 @@ 1AF4C35117865F7400122817 /* jsb_chipmunk_constants.js in Resources */, 1AF4C35217865F7400122817 /* jsb_chipmunk.js in Resources */, 1AF4C35317865F7400122817 /* jsb_cocos2d_constants.js in Resources */, + 509D4ABE17EBB2AB00697056 /* Default.png in Resources */, + 509D4AC117EBB2AB00697056 /* Icon-72.png in Resources */, 1AF4C35417865F7400122817 /* jsb_cocos2d_extension.js in Resources */, 1AF4C35517865F7400122817 /* jsb_cocos2d.js in Resources */, 1AF4C35617865F7400122817 /* jsb_cocosbuilder.js in Resources */, + 509D4AC017EBB2AB00697056 /* Icon-57.png in Resources */, 1AF4C35717865F7400122817 /* jsb_debugger.js in Resources */, 1AF4C35817865F7400122817 /* jsb_opengl_constants.js in Resources */, 1AF4C35917865F7400122817 /* jsb_opengl.js in Resources */, 1AF4C35A17865F7400122817 /* jsb_sys.js in Resources */, + 509D4AC617EBB2AB00697056 /* Icon-152.png in Resources */, + 509D4AC517EBB2AB00697056 /* Icon-144.png in Resources */, 1AF4C35B17865F7400122817 /* jsb.js in Resources */, + 509D4AC317EBB2AB00697056 /* Icon-114.png in Resources */, 1AF4C35C17865F7400122817 /* main.debug.js in Resources */, + 509D4ABD17EBB2AB00697056 /* Default-568h@2x.png in Resources */, 1AE4B40616D1FF4C003C6D1C /* main.js in Resources */, - D446FDA316102D7D000ADA7B /* Default.png in Resources */, - D446FDA516102D82000ADA7B /* Default@2x.png in Resources */, - D446FDA716102D86000ADA7B /* Default-568h@2x.png in Resources */, + 509D4ABF17EBB2AB00697056 /* Default@2x.png in Resources */, + 509D4AC217EBB2AB00697056 /* Icon-76.png in Resources */, 1AE4B40416D1FECD003C6D1C /* res in Resources */, + 509D4AC417EBB2AB00697056 /* Icon-120.png in Resources */, 1AE4B40516D1FECD003C6D1C /* src in Resources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -559,60 +696,137 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ + 509D4A8017EBB24E00697056 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 509D4AD117EBB2BE00697056 /* main.cpp in Sources */, + 509D4A8117EBB24E00697056 /* AppDelegate.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; A92275391517C094001B78AA /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - D45446D3156DE74F00887EB5 /* AppController.mm in Sources */, - D45446D4156DE74F00887EB5 /* main.m in Sources */, - D45446D5156DE74F00887EB5 /* RootViewController.mm in Sources */, + 509D4AC917EBB2AB00697056 /* RootViewController.mm in Sources */, D4545227156E28EF00887EB5 /* AppDelegate.cpp in Sources */, + 509D4AC817EBB2AB00697056 /* main.m in Sources */, + 509D4ABC17EBB2AB00697056 /* AppController.mm in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ - 1AF4C32A17865EA600122817 /* PBXTargetDependency */ = { + 502380EF17EBB8C500990C9B /* PBXTargetDependency */ = { isa = PBXTargetDependency; - name = "cocos2dx iOS"; - targetProxy = 1AF4C32917865EA600122817 /* PBXContainerItemProxy */; + name = "build-all-libs Mac"; + targetProxy = 502380EE17EBB8C500990C9B /* PBXContainerItemProxy */; }; - 1AF4C32C17865EA600122817 /* PBXTargetDependency */ = { + 502380F117EBB8FD00990C9B /* PBXTargetDependency */ = { isa = PBXTargetDependency; - name = "cocos2dx-extensions iOS"; - targetProxy = 1AF4C32B17865EA600122817 /* PBXContainerItemProxy */; - }; - 1AF4C32E17865EA600122817 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "chipmunk iOS"; - targetProxy = 1AF4C32D17865EA600122817 /* PBXContainerItemProxy */; - }; - 1AF4C33017865EA600122817 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "CocosDenshion iOS"; - targetProxy = 1AF4C32F17865EA600122817 /* PBXContainerItemProxy */; - }; - 1AF4C33217865EA600122817 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "jsbindings iOS"; - targetProxy = 1AF4C33117865EA600122817 /* PBXContainerItemProxy */; + name = "build-all-libs iOS"; + targetProxy = 502380F017EBB8FD00990C9B /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ /* Begin XCBuildConfiguration section */ + 509D4AA817EBB24E00697056 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + GCC_DYNAMIC_NO_PIC = NO; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = mac/Prefix.pch; + GCC_PREPROCESSOR_DEFINITIONS = ( + CC_TARGET_OS_MAC, + "$(inherited)", + ); + HEADER_SEARCH_PATHS = ( + "\"$(SRCROOT)/../../../cocos2dx\"", + "\"$(SRCROOT)/../../../cocos2dx/kazmath/include\"", + "$(SRCROOT)/../../../cocos2dx/platform/third_party/ios", + "\"$(SRCROOT)/../../../CocosDenshion/include\"", + "$(SRCROOT)/../../../cocos2dx/include", + "$(SRCROOT)/../../../cocos2dx/platform/mac", + "$(SRCROOT)/../../../external/chipmunk/include/chipmunk", + "$(SRCROOT)/../../../scripting/javascript/spidermonkey-mac/include", + "$(SRCROOT)/../../../scripting/auto-generated/js-bindings", + "$(SRCROOT)/../../../scripting/javascript/bindings", + "$(SRCROOT)/../../../extensions", + ); + INFOPLIST_FILE = mac/Info.plist; + LIBRARY_SEARCH_PATHS = ( + "\"$(SRCROOT)/../../../scripting/javascript/spidermonkey-mac/lib\"", + "\"$(SRCROOT)/../../../cocos2dx/platform/third_party/mac/libraries\"", + "\"$(SRCROOT)/../../../external/libwebsockets/mac/lib\"", + ); + OTHER_LDFLAGS = ( + "-lxml2", + "-lz", + "-ljs_static", + ); + PRODUCT_NAME = "Hello JavaScript Mac"; + SDKROOT = macosx; + }; + name = Debug; + }; + 509D4AA917EBB24E00697056 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = mac/Prefix.pch; + GCC_PREPROCESSOR_DEFINITIONS = ( + CC_TARGET_OS_MAC, + "$(inherited)", + ); + HEADER_SEARCH_PATHS = ( + "\"$(SRCROOT)/../../../cocos2dx\"", + "\"$(SRCROOT)/../../../cocos2dx/kazmath/include\"", + "$(SRCROOT)/../../../cocos2dx/platform/third_party/ios", + "\"$(SRCROOT)/../../../CocosDenshion/include\"", + "$(SRCROOT)/../../../cocos2dx/include", + "$(SRCROOT)/../../../cocos2dx/platform/mac", + "$(SRCROOT)/../../../external/chipmunk/include/chipmunk", + "$(SRCROOT)/../../../scripting/javascript/spidermonkey-mac/include", + "$(SRCROOT)/../../../scripting/auto-generated/js-bindings", + "$(SRCROOT)/../../../scripting/javascript/bindings", + "$(SRCROOT)/../../../extensions", + ); + INFOPLIST_FILE = mac/Info.plist; + LIBRARY_SEARCH_PATHS = ( + "\"$(SRCROOT)/../../../scripting/javascript/spidermonkey-mac/lib\"", + "\"$(SRCROOT)/../../../cocos2dx/platform/third_party/mac/libraries\"", + "\"$(SRCROOT)/../../../external/libwebsockets/mac/lib\"", + ); + OTHER_LDFLAGS = ( + "-lxml2", + "-lz", + "-ljs_static", + ); + PRODUCT_NAME = "Hello JavaScript Mac"; + SDKROOT = macosx; + }; + name = Release; + }; A92276FE1517C097001B78AA /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT)"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - GCC_C_LANGUAGE_STANDARD = gnu99; + CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; + CLANG_CXX_LIBRARY = "libc++"; + COPY_PHASE_STRIP = NO; + GCC_C_LANGUAGE_STANDARD = c99; GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = ( DEBUG, "COCOS2D_DEBUG=1", USE_FILE32API, - CC_TARGET_OS_IPHONE, + COCOS2D_JAVASCRIPT, + CC_ENABLE_CHIPMUNK_INTEGRATION, ); GCC_SYMBOLS_PRIVATE_EXTERN = NO; GCC_WARN_ABOUT_RETURN_TYPE = YES; @@ -624,20 +838,21 @@ "$(SRCROOT)/../../scripting/javascript/spidermonkey-ios/include1", ); IPHONEOS_DEPLOYMENT_TARGET = 5.1; - SDKROOT = iphoneos; + ONLY_ACTIVE_ARCH = YES; }; name = Debug; }; A92276FF1517C097001B78AA /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT)"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - GCC_C_LANGUAGE_STANDARD = gnu99; + CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; + CLANG_CXX_LIBRARY = "libc++"; + GCC_C_LANGUAGE_STANDARD = c99; GCC_PREPROCESSOR_DEFINITIONS = ( NDEBUG, USE_FILE32API, - CC_TARGET_OS_IPHONE, + COCOS2D_JAVASCRIPT, + CC_ENABLE_CHIPMUNK_INTEGRATION, ); GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; @@ -649,7 +864,7 @@ ); IPHONEOS_DEPLOYMENT_TARGET = 5.1; OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1"; - SDKROOT = iphoneos; + VALIDATE_PRODUCT = YES; }; name = Release; }; @@ -657,24 +872,15 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; - CLANG_CXX_LIBRARY = "libc++"; + CODE_SIGN_IDENTITY = "iPhone Developer"; COMPRESS_PNG_FILES = NO; - COPY_PHASE_STRIP = NO; GCC_DYNAMIC_NO_PIC = NO; - GCC_OPTIMIZATION_LEVEL = 1; GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = Prefix.pch; + GCC_PREFIX_HEADER = ios/Prefix.pch; GCC_PREPROCESSOR_DEFINITIONS = ( - COCOS2D_JAVASCRIPT, - DEBUG, - "COCOS2D_DEBUG=1", - USE_FILE32API, CC_TARGET_OS_IPHONE, - CC_ENABLE_CHIPMUNK_INTEGRATION, + "$(inherited)", ); - GCC_THUMB_SUPPORT = NO; - GCC_VERSION = ""; HEADER_SEARCH_PATHS = ( "\"$(SRCROOT)/../../../cocos2dx\"", "\"$(SRCROOT)/../../../cocos2dx/kazmath/include\"", @@ -688,22 +894,21 @@ "$(SRCROOT)/../../../scripting/javascript/bindings", "$(SRCROOT)/../../../extensions", ); - INFOPLIST_FILE = Info.plist; + INFOPLIST_FILE = ios/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 5.0; LIBRARY_SEARCH_PATHS = ( "\"$(SRCROOT)/../../../scripting/javascript/spidermonkey-ios/lib\"", "\"$(SRCROOT)/../../../cocos2dx/platform/third_party/ios/libraries\"", "\"$(SRCROOT)/../../../external/libwebsockets/ios/lib\"", ); - ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = ( "-lxml2", "-lz", "-ljs_static", ); - PRODUCT_NAME = HelloJavascript; + PRODUCT_NAME = "Hello JavaScript iOS"; + SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; - WRAPPER_EXTENSION = app; }; name = Debug; }; @@ -711,21 +916,14 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; - CLANG_CXX_LIBRARY = "libc++"; + CODE_SIGN_IDENTITY = "iPhone Developer"; COMPRESS_PNG_FILES = NO; - COPY_PHASE_STRIP = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = Prefix.pch; + GCC_PREFIX_HEADER = ios/Prefix.pch; GCC_PREPROCESSOR_DEFINITIONS = ( - COCOS2D_JAVASCRIPT, - NDEBUG, - USE_FILE32API, CC_TARGET_OS_IPHONE, - CC_ENABLE_CHIPMUNK_INTEGRATION, + "$(inherited)", ); - GCC_THUMB_SUPPORT = NO; - GCC_VERSION = ""; HEADER_SEARCH_PATHS = ( "\"$(SRCROOT)/../../../cocos2dx\"", "\"$(SRCROOT)/../../../cocos2dx/kazmath/include\"", @@ -739,29 +937,36 @@ "$(SRCROOT)/../../../scripting/javascript/bindings", "$(SRCROOT)/../../../extensions", ); - INFOPLIST_FILE = Info.plist; + INFOPLIST_FILE = ios/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 5.0; LIBRARY_SEARCH_PATHS = ( "\"$(SRCROOT)/../../../scripting/javascript/spidermonkey-ios/lib\"", "\"$(SRCROOT)/../../../cocos2dx/platform/third_party/ios/libraries\"", "\"$(SRCROOT)/../../../external/libwebsockets/ios/lib\"", ); - ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = ( "-lxml2", "-lz", "-ljs_static", ); - PRODUCT_NAME = HelloJavascript; + PRODUCT_NAME = "Hello JavaScript iOS"; + SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; - VALIDATE_PRODUCT = YES; - WRAPPER_EXTENSION = app; }; name = Release; }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ + 509D4AA717EBB24E00697056 /* Build configuration list for PBXNativeTarget "Hello JavaScript Mac" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 509D4AA817EBB24E00697056 /* Debug */, + 509D4AA917EBB24E00697056 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; A92275371517C094001B78AA /* Build configuration list for PBXProject "HelloJavascript" */ = { isa = XCConfigurationList; buildConfigurations = ( @@ -771,7 +976,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - A92277001517C097001B78AA /* Build configuration list for PBXNativeTarget "HelloJavascript" */ = { + A92277001517C097001B78AA /* Build configuration list for PBXNativeTarget "Hello JavaScript iOS" */ = { isa = XCConfigurationList; buildConfigurations = ( A92277011517C097001B78AA /* Debug */, diff --git a/template/multi-platform-js/proj.ios/AppController.h b/template/multi-platform-js/proj.ios_mac/ios/AppController.h similarity index 100% rename from template/multi-platform-js/proj.ios/AppController.h rename to template/multi-platform-js/proj.ios_mac/ios/AppController.h diff --git a/template/multi-platform-js/proj.ios/AppController.mm b/template/multi-platform-js/proj.ios_mac/ios/AppController.mm similarity index 100% rename from template/multi-platform-js/proj.ios/AppController.mm rename to template/multi-platform-js/proj.ios_mac/ios/AppController.mm diff --git a/template/multi-platform-js/proj.ios/Default-568h@2x.png.REMOVED.git-id b/template/multi-platform-js/proj.ios_mac/ios/Default-568h@2x.png.REMOVED.git-id similarity index 100% rename from template/multi-platform-js/proj.ios/Default-568h@2x.png.REMOVED.git-id rename to template/multi-platform-js/proj.ios_mac/ios/Default-568h@2x.png.REMOVED.git-id diff --git a/template/multi-platform-js/proj.ios/Default@2x.png.REMOVED.git-id b/template/multi-platform-js/proj.ios_mac/ios/Default@2x.png.REMOVED.git-id similarity index 100% rename from template/multi-platform-js/proj.ios/Default@2x.png.REMOVED.git-id rename to template/multi-platform-js/proj.ios_mac/ios/Default@2x.png.REMOVED.git-id diff --git a/template/multi-platform-js/proj.ios/Prefix.pch b/template/multi-platform-js/proj.ios_mac/ios/Prefix.pch similarity index 100% rename from template/multi-platform-js/proj.ios/Prefix.pch rename to template/multi-platform-js/proj.ios_mac/ios/Prefix.pch diff --git a/template/multi-platform-js/proj.ios/RootViewController.h b/template/multi-platform-js/proj.ios_mac/ios/RootViewController.h similarity index 100% rename from template/multi-platform-js/proj.ios/RootViewController.h rename to template/multi-platform-js/proj.ios_mac/ios/RootViewController.h diff --git a/template/multi-platform-js/proj.ios/RootViewController.mm b/template/multi-platform-js/proj.ios_mac/ios/RootViewController.mm similarity index 100% rename from template/multi-platform-js/proj.ios/RootViewController.mm rename to template/multi-platform-js/proj.ios_mac/ios/RootViewController.mm diff --git a/template/multi-platform-js/proj.ios/main.m b/template/multi-platform-js/proj.ios_mac/ios/main.m similarity index 100% rename from template/multi-platform-js/proj.ios/main.m rename to template/multi-platform-js/proj.ios_mac/ios/main.m diff --git a/template/multi-platform-js/proj.ios_mac/mac/Icon.icns b/template/multi-platform-js/proj.ios_mac/mac/Icon.icns new file mode 100644 index 0000000000000000000000000000000000000000..285dee82b3d3f80acf3c0037b6b6ce35df0e9e5c GIT binary patch literal 77152 zcmeFZXIxat_Ab0T(TVPcCg&WwF((wvIgtbb0l@$Yf+$9U!rtBFj7Ss^6+xmXS&|aF z0l}Pe9`lUjIL3ZgHO@J6=AQq(U*1pmcR^-g*WPQbTD7Y7s%Jgb0ULvNVx+O_0(MTG zgkcnJ)SEEf@#a<*=Hn~`LW^;F@yiUYEQJKZ+=Qc z@;C=Ct#KBLYV?`;X4u#qA!fFSC$v=LaWrsMs`_?qirQk9g*k`KC#_sfo*6ckVr!*o zZp=~SaF|Yk>zo}H3pfV)h8!M;qew9xD=_6Vb+mO2tr;9eHk(9MpeQIQtLrF7eY@Q^ z*gw=Gx!N@-kqq=bywpD+8SEYKE4bA)B$W>Ib@aj2;qLifao4*CCDMUYOsqAiFMWCN%jT>Ly@S&1;^L0ra@nm@kJ?xIfsBN-+{E3|Q}16qt4&(a zE0u=FhN~T`t-ly|wK93@k*hsXK@kDts@odtvO3};Lz1ubcyISyU*j_;xh`qk@~sDM zbg%O9Se|Ku2@aZLMy?xr`t9vJCPy+o-5q`0S<5H1x7jaSJ$1Rm1aE(jaZ@J8*VowD ztypEb%*Vxf!R$$%1v#ZF?d?{s)HfMtF~)R}I3_)J%QCy=v#d4wn(CHzUVFtcI^W+s zc>Lh$-G}dPJ$?A-@q>5p--l1`J>FjX@zzuPQPjhm_a8pK|NQO}&%9snJbC!&(eUNF z_n+Mg2!9oF@b}wrbGP)um8V-Sd<74j_~qV{N6qIt?-FIQo2MSOuiW+ft*15h%@yJO zr{BMLTAR4!-lIoHYV!1t*VbQ>d!X^%ovh=DV{6(PkOQK&7rwodc!=<=@t&1bpEzcD z;IR+uZWGBd&gsYlW|-mXZTB8TMkFtaV6F9X+~C1lHvQJM$j~^irH&K90~4l9K7M5& zGBP}7?&9^US1+7BVb{5)zOcy1h<%fc$Cz1}t*tC?IFlK^KXikem9CM|%)rRQ<&`_9 zZwUU_irEm-6;R4qAKEDgNKR6pUcO zi4|y=nwmk2Kp?cVG9zc~KJ@A0HnK5DiV>(8n?Rd6TAqa1soPDmPp_InFv~cBhLMrH z$h-G^55C@ge>10SJ;t^W3v_jK zboC6hEjZJkJdZyA{Qi?0Pai%k%1v5i2y2-T7wBqf>*(mSjIsFN$|j$^bLGbM>sRlV zXNba<(6lpH0s{`0$K!JpBeUEw1&oTh7umyqY1ndmjG`(q7YJ~UE{~&%xgK=G z$P9gKcHSJ!kdBd-EHzayLlFS&TtyX%8L@+hX^g{GrL4rp^D&;|YIVN35!@l-Xe;u_ zt8hCIYJ_jurvX;Xa5JWvz>CS$47DoJ)OMeivR)A}M`9GJO8r(10XX${3KmkiERxI|!GV1AP~cRX;c@9hAgK6(j?_53WiF z#8S3ou;)q=lkLQ=2nP4T*{LSbziMC$2QA$sT{e|Jp?*5Pc<~Ro$ZmpJM-d6X7b*Gk5@7| zrI&h!K)hB(^{K{|_H&Z{p>}%Zy$0FmXKe+%rs2LpiCC&tQdW7guBr8G=dfY4?CG~J zf66*K5(Sm{O>Pc$>;35TiNBuFk!!BfRK76 zB&TQPrPT&ad-fD&?Y$>Ao;yME

DIFU*Fwvw&PsdsixNYgCbE#(d^=@ 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 L0000CLjGoE&y@FX literal 0 HcmV?d00001 diff --git a/template/multi-platform-js/proj.ios_mac/mac/Prefix.pch b/template/multi-platform-js/proj.ios_mac/mac/Prefix.pch new file mode 100644 index 0000000000..46c36a7e99 --- /dev/null +++ b/template/multi-platform-js/proj.ios_mac/mac/Prefix.pch @@ -0,0 +1,7 @@ +// +// Prefix header for all source files of the 'Paralaxer' target in the 'Paralaxer' project +// + +#ifdef __OBJC__ + #import +#endif diff --git a/template/multi-platform-js/proj.ios_mac/mac/main.cpp b/template/multi-platform-js/proj.ios_mac/mac/main.cpp new file mode 100644 index 0000000000..1d6fd403f1 --- /dev/null +++ b/template/multi-platform-js/proj.ios_mac/mac/main.cpp @@ -0,0 +1,36 @@ +/**************************************************************************** + Copyright (c) 2010 cocos2d-x.org + + http://www.cocos2d-x.org + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + 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 "AppDelegate.h" +#include "CCEGLView.h" + +USING_NS_CC; + +int main(int argc, char *argv[]) +{ + AppDelegate app; + EGLView eglView; + eglView.init("Hello World",900,640); + return Application::getInstance()->run(); +} From 2ab1b2ff0461bd1a8961e60283cacba939385d7a Mon Sep 17 00:00:00 2001 From: Ricardo Quesada Date: Thu, 19 Sep 2013 17:05:00 -0700 Subject: [PATCH 06/10] Lua template: ios and mac projects in one Xcode file Merged iOS and Mac projects into one single Xcode.proj file --- .../project.pbxproj.REMOVED.git-id | 2 +- .../HelloLua.xcodeproj/project.pbxproj | 549 +++++++---- .../ios}/AppController.h | 0 .../ios}/AppController.mm | 0 .../ios}/Default-568h@2x.png.REMOVED.git-id | 0 .../ios}/Default@2x.png.REMOVED.git-id | 0 .../{proj.ios => proj.ios_mac/ios}/Prefix.pch | 0 .../ios}/RootViewController.h | 0 .../ios}/RootViewController.mm | 0 .../{proj.ios => proj.ios_mac/ios}/main.m | 0 .../{proj.mac => proj.ios_mac/mac}/Icon.icns | Bin .../{proj.mac => proj.ios_mac/mac}/Prefix.pch | 0 .../{proj.mac => proj.ios_mac/mac}/main.cpp | 4 +- .../HelloLua.xcodeproj/project.pbxproj | 856 ------------------ .../proj.mac/en.lproj/InfoPlist.strings | 2 - .../proj.mac/en.lproj/MainMenu.xib | 812 ----------------- 16 files changed, 381 insertions(+), 1844 deletions(-) rename template/multi-platform-lua/{proj.ios => proj.ios_mac}/HelloLua.xcodeproj/project.pbxproj (60%) rename template/multi-platform-lua/{proj.ios => proj.ios_mac/ios}/AppController.h (100%) rename template/multi-platform-lua/{proj.ios => proj.ios_mac/ios}/AppController.mm (100%) rename template/multi-platform-lua/{proj.ios => proj.ios_mac/ios}/Default-568h@2x.png.REMOVED.git-id (100%) rename template/multi-platform-lua/{proj.ios => proj.ios_mac/ios}/Default@2x.png.REMOVED.git-id (100%) rename template/multi-platform-lua/{proj.ios => proj.ios_mac/ios}/Prefix.pch (100%) rename template/multi-platform-lua/{proj.ios => proj.ios_mac/ios}/RootViewController.h (100%) rename template/multi-platform-lua/{proj.ios => proj.ios_mac/ios}/RootViewController.mm (100%) rename template/multi-platform-lua/{proj.ios => proj.ios_mac/ios}/main.m (100%) rename template/multi-platform-lua/{proj.mac => proj.ios_mac/mac}/Icon.icns (100%) rename template/multi-platform-lua/{proj.mac => proj.ios_mac/mac}/Prefix.pch (100%) rename template/multi-platform-lua/{proj.mac => proj.ios_mac/mac}/main.cpp (97%) delete mode 100644 template/multi-platform-lua/proj.mac/HelloLua.xcodeproj/project.pbxproj delete mode 100644 template/multi-platform-lua/proj.mac/en.lproj/InfoPlist.strings delete mode 100644 template/multi-platform-lua/proj.mac/en.lproj/MainMenu.xib diff --git a/samples/samples.xcodeproj/project.pbxproj.REMOVED.git-id b/samples/samples.xcodeproj/project.pbxproj.REMOVED.git-id index 80d63f3cbc..c77e83acd2 100644 --- a/samples/samples.xcodeproj/project.pbxproj.REMOVED.git-id +++ b/samples/samples.xcodeproj/project.pbxproj.REMOVED.git-id @@ -1 +1 @@ -2a3cefc05af08962d7b69b8f364870a77bc86e35 \ No newline at end of file +6525e599db23af6e97431ff58db75979a289e203 \ No newline at end of file diff --git a/template/multi-platform-lua/proj.ios/HelloLua.xcodeproj/project.pbxproj b/template/multi-platform-lua/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj similarity index 60% rename from template/multi-platform-lua/proj.ios/HelloLua.xcodeproj/project.pbxproj rename to template/multi-platform-lua/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj index 0c63bab1cc..c6a596167b 100644 --- a/template/multi-platform-lua/proj.ios/HelloLua.xcodeproj/project.pbxproj +++ b/template/multi-platform-lua/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj @@ -11,13 +11,6 @@ 1525771F17CEFBD400BE417B /* DeprecatedEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1525771C17CEFBD400BE417B /* DeprecatedEnum.lua */; }; 1525772017CEFBD400BE417B /* DeprecatedOpenglEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1525771D17CEFBD400BE417B /* DeprecatedOpenglEnum.lua */; }; 15C1568E1683131500D239F2 /* libcurl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C1568D1683131500D239F2 /* libcurl.a */; }; - 15C156981683138E00D239F2 /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 15C156911683138E00D239F2 /* Default-568h@2x.png */; }; - 15C156991683138E00D239F2 /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = 15C156921683138E00D239F2 /* Default.png */; }; - 15C1569A1683138E00D239F2 /* Default@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 15C156931683138E00D239F2 /* Default@2x.png */; }; - 15C1569B1683138E00D239F2 /* Icon-57.png in Resources */ = {isa = PBXBuildFile; fileRef = 15C156941683138E00D239F2 /* Icon-57.png */; }; - 15C1569C1683138E00D239F2 /* Icon-72.png in Resources */ = {isa = PBXBuildFile; fileRef = 15C156951683138E00D239F2 /* Icon-72.png */; }; - 15C1569D1683138E00D239F2 /* Icon-114.png in Resources */ = {isa = PBXBuildFile; fileRef = 15C156961683138E00D239F2 /* Icon-114.png */; }; - 15C1569E1683138E00D239F2 /* Icon-144.png in Resources */ = {isa = PBXBuildFile; fileRef = 15C156971683138E00D239F2 /* Icon-144.png */; }; 1A0227AC17A3AA3500B867AD /* AudioEngine.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1A0227A517A3AA3500B867AD /* AudioEngine.lua */; }; 1A0227AD17A3AA3500B867AD /* CCBReaderLoad.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1A0227A617A3AA3500B867AD /* CCBReaderLoad.lua */; }; 1A0227AE17A3AA3500B867AD /* Cocos2dConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1A0227A717A3AA3500B867AD /* Cocos2dConstants.lua */; }; @@ -38,23 +31,76 @@ 1AC3623916D47C5C000847F2 /* menu1.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AC3622D16D47C5C000847F2 /* menu1.png */; }; 1AC3623A16D47C5C000847F2 /* menu2.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AC3622E16D47C5C000847F2 /* menu2.png */; }; 1ADB273817CCA0C200634B5E /* Cocos2d.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ADB273717CCA0C200634B5E /* Cocos2d.lua */; }; - 1AF4C3F21786633E00122817 /* libchipmunk iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AF4C3DF1786631700122817 /* libchipmunk iOS.a */; }; - 1AF4C3F31786633E00122817 /* libcocos2dx iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AF4C3DB1786631700122817 /* libcocos2dx iOS.a */; }; - 1AF4C3F41786633E00122817 /* libcocos2dx-extensions iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AF4C3DD1786631700122817 /* libcocos2dx-extensions iOS.a */; }; - 1AF4C3F51786633E00122817 /* libCocosDenshion iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AF4C3E31786631700122817 /* libCocosDenshion iOS.a */; }; - 1AF4C3F61786633E00122817 /* libluabindings iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AF4C3E71786631700122817 /* libluabindings iOS.a */; }; 1AF4C403178663F200122817 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AF4C402178663F200122817 /* libz.dylib */; }; + 5023811817EBBCAC00990C9B /* AppController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5023810817EBBCAC00990C9B /* AppController.mm */; }; + 5023811917EBBCAC00990C9B /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 5023810917EBBCAC00990C9B /* Default-568h@2x.png */; }; + 5023811A17EBBCAC00990C9B /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = 5023810A17EBBCAC00990C9B /* Default.png */; }; + 5023811B17EBBCAC00990C9B /* Default@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 5023810B17EBBCAC00990C9B /* Default@2x.png */; }; + 5023811C17EBBCAC00990C9B /* Icon-114.png in Resources */ = {isa = PBXBuildFile; fileRef = 5023810C17EBBCAC00990C9B /* Icon-114.png */; }; + 5023811D17EBBCAC00990C9B /* Icon-120.png in Resources */ = {isa = PBXBuildFile; fileRef = 5023810D17EBBCAC00990C9B /* Icon-120.png */; }; + 5023811E17EBBCAC00990C9B /* Icon-144.png in Resources */ = {isa = PBXBuildFile; fileRef = 5023810E17EBBCAC00990C9B /* Icon-144.png */; }; + 5023811F17EBBCAC00990C9B /* Icon-152.png in Resources */ = {isa = PBXBuildFile; fileRef = 5023810F17EBBCAC00990C9B /* Icon-152.png */; }; + 5023812017EBBCAC00990C9B /* Icon-57.png in Resources */ = {isa = PBXBuildFile; fileRef = 5023811017EBBCAC00990C9B /* Icon-57.png */; }; + 5023812117EBBCAC00990C9B /* Icon-72.png in Resources */ = {isa = PBXBuildFile; fileRef = 5023811117EBBCAC00990C9B /* Icon-72.png */; }; + 5023812217EBBCAC00990C9B /* Icon-76.png in Resources */ = {isa = PBXBuildFile; fileRef = 5023811217EBBCAC00990C9B /* Icon-76.png */; }; + 5023812417EBBCAC00990C9B /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 5023811417EBBCAC00990C9B /* main.m */; }; + 5023812517EBBCAC00990C9B /* RootViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5023811717EBBCAC00990C9B /* RootViewController.mm */; }; + 5023813317EBBCE400990C9B /* AppDelegate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F293BB7E15EB831F00256477 /* AppDelegate.cpp */; }; + 5023813717EBBCE400990C9B /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AF4C402178663F200122817 /* libz.dylib */; }; + 5023813E17EBBCE400990C9B /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F293B3CC15EB7BE500256477 /* QuartzCore.framework */; }; + 5023814017EBBCE400990C9B /* OpenAL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F293B3D015EB7BE500256477 /* OpenAL.framework */; }; + 5023814117EBBCE400990C9B /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F293B3D215EB7BE500256477 /* AudioToolbox.framework */; }; + 5023814217EBBCE400990C9B /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F293B3D415EB7BE500256477 /* AVFoundation.framework */; }; + 5023814417EBBCE400990C9B /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F293B3D815EB7BE500256477 /* Foundation.framework */; }; + 5023814517EBBCE400990C9B /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F293B3DA15EB7BE500256477 /* CoreGraphics.framework */; }; + 5023814817EBBCE400990C9B /* background.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 1AC3622316D47C5C000847F2 /* background.mp3 */; }; + 5023814917EBBCE400990C9B /* background.ogg in Resources */ = {isa = PBXBuildFile; fileRef = 1AC3622416D47C5C000847F2 /* background.ogg */; }; + 5023814A17EBBCE400990C9B /* crop.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AC3622516D47C5C000847F2 /* crop.png */; }; + 5023814B17EBBCE400990C9B /* dog.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AC3622616D47C5C000847F2 /* dog.png */; }; + 5023814D17EBBCE400990C9B /* effect1.wav in Resources */ = {isa = PBXBuildFile; fileRef = 1AC3622716D47C5C000847F2 /* effect1.wav */; }; + 5023814F17EBBCE400990C9B /* farm.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 1AC3622816D47C5C000847F2 /* farm.jpg */; }; + 5023815017EBBCE400990C9B /* fonts in Resources */ = {isa = PBXBuildFile; fileRef = 1AC3622916D47C5C000847F2 /* fonts */; }; + 5023815117EBBCE400990C9B /* hello.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1AC3622A16D47C5C000847F2 /* hello.lua */; }; + 5023815217EBBCE400990C9B /* hello2.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1AC3622B16D47C5C000847F2 /* hello2.lua */; }; + 5023815317EBBCE400990C9B /* land.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AC3622C16D47C5C000847F2 /* land.png */; }; + 5023815617EBBCE400990C9B /* menu1.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AC3622D16D47C5C000847F2 /* menu1.png */; }; + 5023815717EBBCE400990C9B /* menu2.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AC3622E16D47C5C000847F2 /* menu2.png */; }; + 5023815917EBBCE400990C9B /* AudioEngine.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1A0227A517A3AA3500B867AD /* AudioEngine.lua */; }; + 5023815A17EBBCE400990C9B /* CCBReaderLoad.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1A0227A617A3AA3500B867AD /* CCBReaderLoad.lua */; }; + 5023815B17EBBCE400990C9B /* Cocos2dConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1A0227A717A3AA3500B867AD /* Cocos2dConstants.lua */; }; + 5023815C17EBBCE400990C9B /* Deprecated.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1A0227A817A3AA3500B867AD /* Deprecated.lua */; }; + 5023815D17EBBCE400990C9B /* DrawPrimitives.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1A0227A917A3AA3500B867AD /* DrawPrimitives.lua */; }; + 5023815E17EBBCE400990C9B /* Opengl.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1A0227AA17A3AA3500B867AD /* Opengl.lua */; }; + 5023816117EBBCE400990C9B /* OpenglConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1A0227AB17A3AA3500B867AD /* OpenglConstants.lua */; }; + 5023816217EBBCE400990C9B /* Cocos2d.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ADB273717CCA0C200634B5E /* Cocos2d.lua */; }; + 5023816317EBBCE400990C9B /* DeprecatedClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1525771B17CEFBD400BE417B /* DeprecatedClass.lua */; }; + 5023816417EBBCE400990C9B /* DeprecatedEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1525771C17CEFBD400BE417B /* DeprecatedEnum.lua */; }; + 5023816717EBBCE400990C9B /* DeprecatedOpenglEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1525771D17CEFBD400BE417B /* DeprecatedOpenglEnum.lua */; }; + 5023817617EBBE3400990C9B /* Icon.icns in Resources */ = {isa = PBXBuildFile; fileRef = 5023817217EBBE3400990C9B /* Icon.icns */; }; + 5023817817EBBE3400990C9B /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5023817417EBBE3400990C9B /* main.cpp */; }; + 5023817A17EBBE8300990C9B /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5023817917EBBE8300990C9B /* OpenGLES.framework */; }; + 50805AAF17EBBEAA004CFAD3 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 50805AAE17EBBEAA004CFAD3 /* UIKit.framework */; }; + 50D7C96517EBBECA005D0B91 /* libbox2d iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AF4C3E11786631700122817 /* libbox2d iOS.a */; }; + 50D7C96617EBBECA005D0B91 /* libchipmunk iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AF4C3DF1786631700122817 /* libchipmunk iOS.a */; }; + 50D7C96717EBBECA005D0B91 /* libcocos2dx iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AF4C3DB1786631700122817 /* libcocos2dx iOS.a */; }; + 50D7C96817EBBECA005D0B91 /* libcocos2dx-extensions iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AF4C3DD1786631700122817 /* libcocos2dx-extensions iOS.a */; }; + 50D7C96917EBBECA005D0B91 /* libCocosDenshion iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AF4C3E31786631700122817 /* libCocosDenshion iOS.a */; }; + 50D7C96A17EBBECB005D0B91 /* libluabindings iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AF4C3E71786631700122817 /* libluabindings iOS.a */; }; + 50D7C96C17EBBEDF005D0B91 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 50D7C96B17EBBEDF005D0B91 /* OpenGL.framework */; }; + 50D7C96E17EBBEE6005D0B91 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 50D7C96D17EBBEE6005D0B91 /* AppKit.framework */; }; + 50D7C97017EBBEEC005D0B91 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 50D7C96F17EBBEEC005D0B91 /* IOKit.framework */; }; + 50D7C97117EBBEF7005D0B91 /* libbox2d Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AF4C3D31786631700122817 /* libbox2d Mac.a */; }; + 50D7C97217EBBEF7005D0B91 /* libchipmunk Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AF4C3D11786631700122817 /* libchipmunk Mac.a */; }; + 50D7C97317EBBEF7005D0B91 /* libcocos2dx Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AF4C3CD1786631700122817 /* libcocos2dx Mac.a */; }; + 50D7C97417EBBEF7005D0B91 /* libcocos2dx-extensions Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AF4C3CF1786631700122817 /* libcocos2dx-extensions Mac.a */; }; + 50D7C97517EBBEF7005D0B91 /* libCocosDenshion Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AF4C3D51786631700122817 /* libCocosDenshion Mac.a */; }; + 50D7C97617EBBEF7005D0B91 /* libluabindings Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1AF4C3D91786631700122817 /* libluabindings Mac.a */; }; F293B3CD15EB7BE500256477 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F293B3CC15EB7BE500256477 /* QuartzCore.framework */; }; - F293B3CF15EB7BE500256477 /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F293B3CE15EB7BE500256477 /* OpenGLES.framework */; }; F293B3D115EB7BE500256477 /* OpenAL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F293B3D015EB7BE500256477 /* OpenAL.framework */; }; F293B3D315EB7BE500256477 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F293B3D215EB7BE500256477 /* AudioToolbox.framework */; }; F293B3D515EB7BE500256477 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F293B3D415EB7BE500256477 /* AVFoundation.framework */; }; - F293B3D715EB7BE500256477 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F293B3D615EB7BE500256477 /* UIKit.framework */; }; F293B3D915EB7BE500256477 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F293B3D815EB7BE500256477 /* Foundation.framework */; }; F293B3DB15EB7BE500256477 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F293B3DA15EB7BE500256477 /* CoreGraphics.framework */; }; - F293B6FC15EB823D00256477 /* AppController.mm in Sources */ = {isa = PBXBuildFile; fileRef = F293B6F715EB823D00256477 /* AppController.mm */; }; - F293B6FD15EB823D00256477 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = F293B6F815EB823D00256477 /* main.m */; }; - F293B6FE15EB823D00256477 /* RootViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = F293B6FA15EB823D00256477 /* RootViewController.mm */; }; F293BB9C15EB831F00256477 /* AppDelegate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F293BB7E15EB831F00256477 /* AppDelegate.cpp */; }; /* End PBXBuildFile section */ @@ -157,40 +203,19 @@ remoteGlobalIDString = 1A119791178526AA00D62A44; remoteInfo = "luabindings iOS"; }; - 1AF4C3E81786632F00122817 /* PBXContainerItemProxy */ = { + 5023816D17EBBDBE00990C9B /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 1AF4C3B91786631600122817 /* cocos2d_libs.xcodeproj */; proxyType = 1; - remoteGlobalIDString = A07A4C241783777C0073F6A7; - remoteInfo = "cocos2dx iOS"; + remoteGlobalIDString = A03F2E8E178141C1006731B9; + remoteInfo = "build-all-libs Mac"; }; - 1AF4C3EA1786632F00122817 /* PBXContainerItemProxy */ = { + 5023816F17EBBDC600990C9B /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 1AF4C3B91786631600122817 /* cocos2d_libs.xcodeproj */; proxyType = 1; - remoteGlobalIDString = A07A4E111783867C0073F6A7; - remoteInfo = "cocos2dx-extensions iOS"; - }; - 1AF4C3EC1786632F00122817 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 1AF4C3B91786631600122817 /* cocos2d_libs.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = A07A4EFD178387670073F6A7; - remoteInfo = "chipmunk iOS"; - }; - 1AF4C3EE1786632F00122817 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 1AF4C3B91786631600122817 /* cocos2d_libs.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = A07A4F9F178387730073F6A7; - remoteInfo = "CocosDenshion iOS"; - }; - 1AF4C3F01786632F00122817 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 1AF4C3B91786631600122817 /* cocos2d_libs.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 1A119716178526AA00D62A44; - remoteInfo = "luabindings iOS"; + remoteGlobalIDString = A07A4E0B178386390073F6A7; + remoteInfo = "build-all-libs iOS"; }; /* End PBXContainerItemProxy section */ @@ -199,13 +224,6 @@ 1525771C17CEFBD400BE417B /* DeprecatedEnum.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedEnum.lua; path = ../../../scripting/lua/script/DeprecatedEnum.lua; sourceTree = ""; }; 1525771D17CEFBD400BE417B /* DeprecatedOpenglEnum.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DeprecatedOpenglEnum.lua; path = ../../../scripting/lua/script/DeprecatedOpenglEnum.lua; sourceTree = ""; }; 15C1568D1683131500D239F2 /* libcurl.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcurl.a; path = ../../../cocos2dx/platform/third_party/ios/libraries/libcurl.a; sourceTree = ""; }; - 15C156911683138E00D239F2 /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = SOURCE_ROOT; }; - 15C156921683138E00D239F2 /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Default.png; sourceTree = SOURCE_ROOT; }; - 15C156931683138E00D239F2 /* Default@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default@2x.png"; sourceTree = SOURCE_ROOT; }; - 15C156941683138E00D239F2 /* Icon-57.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-57.png"; sourceTree = SOURCE_ROOT; }; - 15C156951683138E00D239F2 /* Icon-72.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-72.png"; sourceTree = SOURCE_ROOT; }; - 15C156961683138E00D239F2 /* Icon-114.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-114.png"; sourceTree = SOURCE_ROOT; }; - 15C156971683138E00D239F2 /* Icon-144.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-144.png"; sourceTree = SOURCE_ROOT; }; 1A0227A517A3AA3500B867AD /* AudioEngine.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = AudioEngine.lua; path = ../../../scripting/lua/script/AudioEngine.lua; sourceTree = ""; }; 1A0227A617A3AA3500B867AD /* CCBReaderLoad.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = CCBReaderLoad.lua; path = ../../../scripting/lua/script/CCBReaderLoad.lua; sourceTree = ""; }; 1A0227A717A3AA3500B867AD /* Cocos2dConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Cocos2dConstants.lua; path = ../../../scripting/lua/script/Cocos2dConstants.lua; sourceTree = ""; }; @@ -226,10 +244,36 @@ 1AC3622D16D47C5C000847F2 /* menu1.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = menu1.png; path = ../Resources/menu1.png; sourceTree = ""; }; 1AC3622E16D47C5C000847F2 /* menu2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = menu2.png; path = ../Resources/menu2.png; sourceTree = ""; }; 1ADB273717CCA0C200634B5E /* Cocos2d.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Cocos2d.lua; path = ../../../scripting/lua/script/Cocos2d.lua; sourceTree = ""; }; - 1AF4C3B8178662A500122817 /* Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Prefix.pch; sourceTree = ""; }; 1AF4C3B91786631600122817 /* cocos2d_libs.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = cocos2d_libs.xcodeproj; path = ../../../cocos2d_libs.xcodeproj; sourceTree = ""; }; 1AF4C402178663F200122817 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; }; - F293B3C815EB7BE500256477 /* HelloLua.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = HelloLua.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 5023810717EBBCAC00990C9B /* AppController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppController.h; sourceTree = ""; }; + 5023810817EBBCAC00990C9B /* AppController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AppController.mm; sourceTree = ""; }; + 5023810917EBBCAC00990C9B /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = ""; }; + 5023810A17EBBCAC00990C9B /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Default.png; sourceTree = ""; }; + 5023810B17EBBCAC00990C9B /* Default@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default@2x.png"; sourceTree = ""; }; + 5023810C17EBBCAC00990C9B /* Icon-114.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-114.png"; sourceTree = ""; }; + 5023810D17EBBCAC00990C9B /* Icon-120.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-120.png"; sourceTree = ""; }; + 5023810E17EBBCAC00990C9B /* Icon-144.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-144.png"; sourceTree = ""; }; + 5023810F17EBBCAC00990C9B /* Icon-152.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-152.png"; sourceTree = ""; }; + 5023811017EBBCAC00990C9B /* Icon-57.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-57.png"; sourceTree = ""; }; + 5023811117EBBCAC00990C9B /* Icon-72.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-72.png"; sourceTree = ""; }; + 5023811217EBBCAC00990C9B /* Icon-76.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Icon-76.png"; sourceTree = ""; }; + 5023811317EBBCAC00990C9B /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 5023811417EBBCAC00990C9B /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; + 5023811517EBBCAC00990C9B /* Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Prefix.pch; sourceTree = ""; }; + 5023811617EBBCAC00990C9B /* RootViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RootViewController.h; sourceTree = ""; }; + 5023811717EBBCAC00990C9B /* RootViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RootViewController.mm; sourceTree = ""; }; + 5023816B17EBBCE400990C9B /* HelloLua Mac.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "HelloLua Mac.app"; sourceTree = BUILT_PRODUCTS_DIR; }; + 5023817217EBBE3400990C9B /* Icon.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = Icon.icns; sourceTree = ""; }; + 5023817317EBBE3400990C9B /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 5023817417EBBE3400990C9B /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = main.cpp; sourceTree = ""; }; + 5023817517EBBE3400990C9B /* Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Prefix.pch; sourceTree = ""; }; + 5023817917EBBE8300990C9B /* OpenGLES.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGLES.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.0.sdk/System/Library/Frameworks/OpenGLES.framework; sourceTree = DEVELOPER_DIR; }; + 50805AAE17EBBEAA004CFAD3 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.0.sdk/System/Library/Frameworks/UIKit.framework; sourceTree = DEVELOPER_DIR; }; + 50D7C96B17EBBEDF005D0B91 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = System/Library/Frameworks/OpenGL.framework; sourceTree = SDKROOT; }; + 50D7C96D17EBBEE6005D0B91 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; }; + 50D7C96F17EBBEEC005D0B91 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; }; + F293B3C815EB7BE500256477 /* HelloLua iOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "HelloLua iOS.app"; sourceTree = BUILT_PRODUCTS_DIR; }; F293B3CC15EB7BE500256477 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; }; F293B3CE15EB7BE500256477 /* OpenGLES.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGLES.framework; path = System/Library/Frameworks/OpenGLES.framework; sourceTree = SDKROOT; }; F293B3D015EB7BE500256477 /* OpenAL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenAL.framework; path = System/Library/Frameworks/OpenAL.framework; sourceTree = SDKROOT; }; @@ -238,33 +282,52 @@ F293B3D615EB7BE500256477 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; F293B3D815EB7BE500256477 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; F293B3DA15EB7BE500256477 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; - F293B6F615EB823D00256477 /* AppController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppController.h; sourceTree = ""; }; - F293B6F715EB823D00256477 /* AppController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AppController.mm; sourceTree = ""; }; - F293B6F815EB823D00256477 /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; - F293B6F915EB823D00256477 /* RootViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RootViewController.h; sourceTree = ""; }; - F293B6FA15EB823D00256477 /* RootViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RootViewController.mm; sourceTree = ""; }; F293BB7E15EB831F00256477 /* AppDelegate.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AppDelegate.cpp; path = ../Classes/AppDelegate.cpp; sourceTree = ""; }; F293BB7F15EB831F00256477 /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = ../Classes/AppDelegate.h; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ + 5023813617EBBCE400990C9B /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 50D7C97117EBBEF7005D0B91 /* libbox2d Mac.a in Frameworks */, + 50D7C97217EBBEF7005D0B91 /* libchipmunk Mac.a in Frameworks */, + 50D7C97317EBBEF7005D0B91 /* libcocos2dx Mac.a in Frameworks */, + 50D7C97417EBBEF7005D0B91 /* libcocos2dx-extensions Mac.a in Frameworks */, + 50D7C97517EBBEF7005D0B91 /* libCocosDenshion Mac.a in Frameworks */, + 50D7C97617EBBEF7005D0B91 /* libluabindings Mac.a in Frameworks */, + 50D7C97017EBBEEC005D0B91 /* IOKit.framework in Frameworks */, + 50D7C96E17EBBEE6005D0B91 /* AppKit.framework in Frameworks */, + 50D7C96C17EBBEDF005D0B91 /* OpenGL.framework in Frameworks */, + 5023813717EBBCE400990C9B /* libz.dylib in Frameworks */, + 5023813E17EBBCE400990C9B /* QuartzCore.framework in Frameworks */, + 5023814017EBBCE400990C9B /* OpenAL.framework in Frameworks */, + 5023814117EBBCE400990C9B /* AudioToolbox.framework in Frameworks */, + 5023814217EBBCE400990C9B /* AVFoundation.framework in Frameworks */, + 5023814417EBBCE400990C9B /* Foundation.framework in Frameworks */, + 5023814517EBBCE400990C9B /* CoreGraphics.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; F293B3C515EB7BE500256477 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 50D7C96517EBBECA005D0B91 /* libbox2d iOS.a in Frameworks */, + 50D7C96617EBBECA005D0B91 /* libchipmunk iOS.a in Frameworks */, + 50D7C96717EBBECA005D0B91 /* libcocos2dx iOS.a in Frameworks */, + 50D7C96817EBBECA005D0B91 /* libcocos2dx-extensions iOS.a in Frameworks */, + 50D7C96917EBBECA005D0B91 /* libCocosDenshion iOS.a in Frameworks */, + 50D7C96A17EBBECB005D0B91 /* libluabindings iOS.a in Frameworks */, 1AF4C403178663F200122817 /* libz.dylib in Frameworks */, - 1AF4C3F21786633E00122817 /* libchipmunk iOS.a in Frameworks */, - 1AF4C3F31786633E00122817 /* libcocos2dx iOS.a in Frameworks */, - 1AF4C3F41786633E00122817 /* libcocos2dx-extensions iOS.a in Frameworks */, - 1AF4C3F51786633E00122817 /* libCocosDenshion iOS.a in Frameworks */, - 1AF4C3F61786633E00122817 /* libluabindings iOS.a in Frameworks */, 15C1568E1683131500D239F2 /* libcurl.a in Frameworks */, + 50805AAF17EBBEAA004CFAD3 /* UIKit.framework in Frameworks */, + 5023817A17EBBE8300990C9B /* OpenGLES.framework in Frameworks */, F293B3CD15EB7BE500256477 /* QuartzCore.framework in Frameworks */, - F293B3CF15EB7BE500256477 /* OpenGLES.framework in Frameworks */, F293B3D115EB7BE500256477 /* OpenAL.framework in Frameworks */, F293B3D315EB7BE500256477 /* AudioToolbox.framework in Frameworks */, F293B3D515EB7BE500256477 /* AVFoundation.framework in Frameworks */, - F293B3D715EB7BE500256477 /* UIKit.framework in Frameworks */, F293B3D915EB7BE500256477 /* Foundation.framework in Frameworks */, F293B3DB15EB7BE500256477 /* CoreGraphics.framework in Frameworks */, ); @@ -312,14 +375,50 @@ name = Products; sourceTree = ""; }; + 5023810617EBBCAC00990C9B /* ios */ = { + isa = PBXGroup; + children = ( + 5023810717EBBCAC00990C9B /* AppController.h */, + 5023810817EBBCAC00990C9B /* AppController.mm */, + 5023810917EBBCAC00990C9B /* Default-568h@2x.png */, + 5023810A17EBBCAC00990C9B /* Default.png */, + 5023810B17EBBCAC00990C9B /* Default@2x.png */, + 5023810C17EBBCAC00990C9B /* Icon-114.png */, + 5023810D17EBBCAC00990C9B /* Icon-120.png */, + 5023810E17EBBCAC00990C9B /* Icon-144.png */, + 5023810F17EBBCAC00990C9B /* Icon-152.png */, + 5023811017EBBCAC00990C9B /* Icon-57.png */, + 5023811117EBBCAC00990C9B /* Icon-72.png */, + 5023811217EBBCAC00990C9B /* Icon-76.png */, + 5023811317EBBCAC00990C9B /* Info.plist */, + 5023811417EBBCAC00990C9B /* main.m */, + 5023811517EBBCAC00990C9B /* Prefix.pch */, + 5023811617EBBCAC00990C9B /* RootViewController.h */, + 5023811717EBBCAC00990C9B /* RootViewController.mm */, + ); + path = ios; + sourceTree = ""; + }; + 5023817117EBBE3400990C9B /* mac */ = { + isa = PBXGroup; + children = ( + 5023817217EBBE3400990C9B /* Icon.icns */, + 5023817317EBBE3400990C9B /* Info.plist */, + 5023817417EBBE3400990C9B /* main.cpp */, + 5023817517EBBE3400990C9B /* Prefix.pch */, + ); + path = mac; + sourceTree = ""; + }; F293B3BD15EB7BE500256477 = { isa = PBXGroup; children = ( 1AF4C3B91786631600122817 /* cocos2d_libs.xcodeproj */, + 5023810617EBBCAC00990C9B /* ios */, + 5023817117EBBE3400990C9B /* mac */, F293BB7C15EB830F00256477 /* Classes */, F293B3CB15EB7BE500256477 /* Frameworks */, 1A0227A417A3AA1A00B867AD /* Lua Common */, - F293B6E815EB807E00256477 /* Other Sources */, F293B3C915EB7BE500256477 /* Products */, F293BC4615EB859D00256477 /* Resources */, ); @@ -328,7 +427,8 @@ F293B3C915EB7BE500256477 /* Products */ = { isa = PBXGroup; children = ( - F293B3C815EB7BE500256477 /* HelloLua.app */, + F293B3C815EB7BE500256477 /* HelloLua iOS.app */, + 5023816B17EBBCE400990C9B /* HelloLua Mac.app */, ); name = Products; sourceTree = ""; @@ -336,6 +436,11 @@ F293B3CB15EB7BE500256477 /* Frameworks */ = { isa = PBXGroup; children = ( + 50D7C96F17EBBEEC005D0B91 /* IOKit.framework */, + 50D7C96D17EBBEE6005D0B91 /* AppKit.framework */, + 50D7C96B17EBBEDF005D0B91 /* OpenGL.framework */, + 50805AAE17EBBEAA004CFAD3 /* UIKit.framework */, + 5023817917EBBE8300990C9B /* OpenGLES.framework */, 1AF4C402178663F200122817 /* libz.dylib */, 15C1568D1683131500D239F2 /* libcurl.a */, F293B3CC15EB7BE500256477 /* QuartzCore.framework */, @@ -350,19 +455,6 @@ name = Frameworks; sourceTree = ""; }; - F293B6E815EB807E00256477 /* Other Sources */ = { - isa = PBXGroup; - children = ( - F293B6F615EB823D00256477 /* AppController.h */, - F293B6F715EB823D00256477 /* AppController.mm */, - F293B6F815EB823D00256477 /* main.m */, - 1AF4C3B8178662A500122817 /* Prefix.pch */, - F293B6F915EB823D00256477 /* RootViewController.h */, - F293B6FA15EB823D00256477 /* RootViewController.mm */, - ); - name = "Other Sources"; - sourceTree = ""; - }; F293BB7C15EB830F00256477 /* Classes */ = { isa = PBXGroup; children = ( @@ -387,13 +479,6 @@ 1AC3622C16D47C5C000847F2 /* land.png */, 1AC3622D16D47C5C000847F2 /* menu1.png */, 1AC3622E16D47C5C000847F2 /* menu2.png */, - 15C156911683138E00D239F2 /* Default-568h@2x.png */, - 15C156921683138E00D239F2 /* Default.png */, - 15C156931683138E00D239F2 /* Default@2x.png */, - 15C156941683138E00D239F2 /* Icon-57.png */, - 15C156951683138E00D239F2 /* Icon-72.png */, - 15C156961683138E00D239F2 /* Icon-114.png */, - 15C156971683138E00D239F2 /* Icon-144.png */, ); name = Resources; path = ../Resources; @@ -402,9 +487,27 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - F293B3C715EB7BE500256477 /* HelloLua */ = { + 5023812617EBBCE400990C9B /* HelloLua Mac */ = { isa = PBXNativeTarget; - buildConfigurationList = F293B6C415EB7BEA00256477 /* Build configuration list for PBXNativeTarget "HelloLua" */; + buildConfigurationList = 5023816817EBBCE400990C9B /* Build configuration list for PBXNativeTarget "HelloLua Mac" */; + buildPhases = ( + 5023813117EBBCE400990C9B /* Sources */, + 5023813617EBBCE400990C9B /* Frameworks */, + 5023814617EBBCE400990C9B /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + 5023816E17EBBDBE00990C9B /* PBXTargetDependency */, + ); + name = "HelloLua Mac"; + productName = HelloLua; + productReference = 5023816B17EBBCE400990C9B /* HelloLua Mac.app */; + productType = "com.apple.product-type.application"; + }; + F293B3C715EB7BE500256477 /* HelloLua iOS */ = { + isa = PBXNativeTarget; + buildConfigurationList = F293B6C415EB7BEA00256477 /* Build configuration list for PBXNativeTarget "HelloLua iOS" */; buildPhases = ( F293B3C415EB7BE500256477 /* Sources */, F293B3C515EB7BE500256477 /* Frameworks */, @@ -413,15 +516,11 @@ buildRules = ( ); dependencies = ( - 1AF4C3E91786632F00122817 /* PBXTargetDependency */, - 1AF4C3EB1786632F00122817 /* PBXTargetDependency */, - 1AF4C3ED1786632F00122817 /* PBXTargetDependency */, - 1AF4C3EF1786632F00122817 /* PBXTargetDependency */, - 1AF4C3F11786632F00122817 /* PBXTargetDependency */, + 5023817017EBBDC600990C9B /* PBXTargetDependency */, ); - name = HelloLua; + name = "HelloLua iOS"; productName = HelloLua; - productReference = F293B3C815EB7BE500256477 /* HelloLua.app */; + productReference = F293B3C815EB7BE500256477 /* HelloLua iOS.app */; productType = "com.apple.product-type.application"; }; /* End PBXNativeTarget section */ @@ -450,7 +549,8 @@ ); projectRoot = ""; targets = ( - F293B3C715EB7BE500256477 /* HelloLua */, + F293B3C715EB7BE500256477 /* HelloLua iOS */, + 5023812617EBBCE400990C9B /* HelloLua Mac */, ); }; /* End PBXProject section */ @@ -557,39 +657,73 @@ /* End PBXReferenceProxy section */ /* Begin PBXResourcesBuildPhase section */ + 5023814617EBBCE400990C9B /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 5023814817EBBCE400990C9B /* background.mp3 in Resources */, + 5023814917EBBCE400990C9B /* background.ogg in Resources */, + 5023814A17EBBCE400990C9B /* crop.png in Resources */, + 5023814B17EBBCE400990C9B /* dog.png in Resources */, + 5023814D17EBBCE400990C9B /* effect1.wav in Resources */, + 5023814F17EBBCE400990C9B /* farm.jpg in Resources */, + 5023815017EBBCE400990C9B /* fonts in Resources */, + 5023815117EBBCE400990C9B /* hello.lua in Resources */, + 5023815217EBBCE400990C9B /* hello2.lua in Resources */, + 5023815317EBBCE400990C9B /* land.png in Resources */, + 5023815617EBBCE400990C9B /* menu1.png in Resources */, + 5023815717EBBCE400990C9B /* menu2.png in Resources */, + 5023815917EBBCE400990C9B /* AudioEngine.lua in Resources */, + 5023817617EBBE3400990C9B /* Icon.icns in Resources */, + 5023815A17EBBCE400990C9B /* CCBReaderLoad.lua in Resources */, + 5023815B17EBBCE400990C9B /* Cocos2dConstants.lua in Resources */, + 5023815C17EBBCE400990C9B /* Deprecated.lua in Resources */, + 5023815D17EBBCE400990C9B /* DrawPrimitives.lua in Resources */, + 5023815E17EBBCE400990C9B /* Opengl.lua in Resources */, + 5023816117EBBCE400990C9B /* OpenglConstants.lua in Resources */, + 5023816217EBBCE400990C9B /* Cocos2d.lua in Resources */, + 5023816317EBBCE400990C9B /* DeprecatedClass.lua in Resources */, + 5023816417EBBCE400990C9B /* DeprecatedEnum.lua in Resources */, + 5023816717EBBCE400990C9B /* DeprecatedOpenglEnum.lua in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; F293B3C615EB7BE500256477 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 15C156981683138E00D239F2 /* Default-568h@2x.png in Resources */, - 15C156991683138E00D239F2 /* Default.png in Resources */, - 15C1569A1683138E00D239F2 /* Default@2x.png in Resources */, - 15C1569B1683138E00D239F2 /* Icon-57.png in Resources */, - 15C1569C1683138E00D239F2 /* Icon-72.png in Resources */, - 15C1569D1683138E00D239F2 /* Icon-114.png in Resources */, - 15C1569E1683138E00D239F2 /* Icon-144.png in Resources */, + 5023811D17EBBCAC00990C9B /* Icon-120.png in Resources */, 1AC3622F16D47C5C000847F2 /* background.mp3 in Resources */, 1AC3623016D47C5C000847F2 /* background.ogg in Resources */, 1AC3623116D47C5C000847F2 /* crop.png in Resources */, 1AC3623216D47C5C000847F2 /* dog.png in Resources */, + 5023811B17EBBCAC00990C9B /* Default@2x.png in Resources */, 1AC3623316D47C5C000847F2 /* effect1.wav in Resources */, + 5023811917EBBCAC00990C9B /* Default-568h@2x.png in Resources */, 1AC3623416D47C5C000847F2 /* farm.jpg in Resources */, 1AC3623516D47C5C000847F2 /* fonts in Resources */, 1AC3623616D47C5C000847F2 /* hello.lua in Resources */, 1AC3623716D47C5C000847F2 /* hello2.lua in Resources */, 1AC3623816D47C5C000847F2 /* land.png in Resources */, + 5023811F17EBBCAC00990C9B /* Icon-152.png in Resources */, + 5023812017EBBCAC00990C9B /* Icon-57.png in Resources */, 1AC3623916D47C5C000847F2 /* menu1.png in Resources */, 1AC3623A16D47C5C000847F2 /* menu2.png in Resources */, + 5023812217EBBCAC00990C9B /* Icon-76.png in Resources */, 1A0227AC17A3AA3500B867AD /* AudioEngine.lua in Resources */, 1A0227AD17A3AA3500B867AD /* CCBReaderLoad.lua in Resources */, 1A0227AE17A3AA3500B867AD /* Cocos2dConstants.lua in Resources */, 1A0227AF17A3AA3500B867AD /* Deprecated.lua in Resources */, 1A0227B017A3AA3500B867AD /* DrawPrimitives.lua in Resources */, 1A0227B117A3AA3500B867AD /* Opengl.lua in Resources */, + 5023811E17EBBCAC00990C9B /* Icon-144.png in Resources */, + 5023811A17EBBCAC00990C9B /* Default.png in Resources */, 1A0227B217A3AA3500B867AD /* OpenglConstants.lua in Resources */, 1ADB273817CCA0C200634B5E /* Cocos2d.lua in Resources */, 1525771E17CEFBD400BE417B /* DeprecatedClass.lua in Resources */, 1525771F17CEFBD400BE417B /* DeprecatedEnum.lua in Resources */, + 5023812117EBBCAC00990C9B /* Icon-72.png in Resources */, + 5023811C17EBBCAC00990C9B /* Icon-114.png in Resources */, 1525772017CEFBD400BE417B /* DeprecatedOpenglEnum.lua in Resources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -597,61 +731,147 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ + 5023813117EBBCE400990C9B /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 5023813317EBBCE400990C9B /* AppDelegate.cpp in Sources */, + 5023817817EBBE3400990C9B /* main.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; F293B3C415EB7BE500256477 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - F293B6FC15EB823D00256477 /* AppController.mm in Sources */, - F293B6FD15EB823D00256477 /* main.m in Sources */, - F293B6FE15EB823D00256477 /* RootViewController.mm in Sources */, + 5023812517EBBCAC00990C9B /* RootViewController.mm in Sources */, F293BB9C15EB831F00256477 /* AppDelegate.cpp in Sources */, + 5023812417EBBCAC00990C9B /* main.m in Sources */, + 5023811817EBBCAC00990C9B /* AppController.mm in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ - 1AF4C3E91786632F00122817 /* PBXTargetDependency */ = { + 5023816E17EBBDBE00990C9B /* PBXTargetDependency */ = { isa = PBXTargetDependency; - name = "cocos2dx iOS"; - targetProxy = 1AF4C3E81786632F00122817 /* PBXContainerItemProxy */; + name = "build-all-libs Mac"; + targetProxy = 5023816D17EBBDBE00990C9B /* PBXContainerItemProxy */; }; - 1AF4C3EB1786632F00122817 /* PBXTargetDependency */ = { + 5023817017EBBDC600990C9B /* PBXTargetDependency */ = { isa = PBXTargetDependency; - name = "cocos2dx-extensions iOS"; - targetProxy = 1AF4C3EA1786632F00122817 /* PBXContainerItemProxy */; - }; - 1AF4C3ED1786632F00122817 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "chipmunk iOS"; - targetProxy = 1AF4C3EC1786632F00122817 /* PBXContainerItemProxy */; - }; - 1AF4C3EF1786632F00122817 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "CocosDenshion iOS"; - targetProxy = 1AF4C3EE1786632F00122817 /* PBXContainerItemProxy */; - }; - 1AF4C3F11786632F00122817 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "luabindings iOS"; - targetProxy = 1AF4C3F01786632F00122817 /* PBXContainerItemProxy */; + name = "build-all-libs iOS"; + targetProxy = 5023816F17EBBDC600990C9B /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ /* Begin XCBuildConfiguration section */ + 5023816917EBBCE400990C9B /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + GCC_DYNAMIC_NO_PIC = NO; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = mac/Prefix.pch; + GCC_PREPROCESSOR_DEFINITIONS = ( + CC_TARGET_OS_MAC, + "$(inherited)", + ); + HEADER_SEARCH_PATHS = ( + "\"$(SRCROOT)/../../../cocos2dx\"", + "\"$(SRCROOT)/../../../cocos2dx/kazmath/include\"", + "\"$(SRCROOT)/../../../scripting/lua/tolua\"", + "\"$(SRCROOT)/../../../scripting/lua/luajit/include\"", + "\"$(SRCROOT)/../../../scripting/auto-generated/lua-bindings\"", + "\"$(SRCROOT)/../../../scripting/lua/cocos2dx_support\"", + "\"$(SRCROOT)/../../../cocos2dx/platform/mac\"", + "\"$(SRCROOT)/../../../cocos2dx/include\"", + "\"$(SRCROOT)/../../../CocosDenshion/include\"", + "\"$(SRCROOT)/../../../external/chipmunk/include/chipmunk\"", + "\"$(SRCROOT)/../../../external/chipmunk/include/constraints\"", + "\"$(SRCROOT)/../../../external\"", + "\"$(SRCROOT)/../../../cocos2dx/platform/third_party/mac\"", + "\"$(SRCROOT)/../../../extensions\"", + "\"$(SRCROOT)/../../../external/libwebsockets/mac/include\"", + ); + INFOPLIST_FILE = mac/Info.plist; + LIBRARY_SEARCH_PATHS = ( + "$(SRCROOT)/../../../cocos2dx/platform/third_party/mac/libraries", + "$(inherited)", + "\"$(SRCROOT)/../../../scripting/lua/luajit/mac\"", + "\"$(SRCROOT)/../../../external/libwebsockets/mac/lib\"", + ); + OTHER_LDFLAGS = ( + "-image_base", + 100000000, + "-pagezero_size", + 10000, + ); + SDKROOT = macosx; + }; + name = Debug; + }; + 5023816A17EBBCE400990C9B /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREFIX_HEADER = mac/Prefix.pch; + GCC_PREPROCESSOR_DEFINITIONS = ( + CC_TARGET_OS_MAC, + "$(inherited)", + ); + HEADER_SEARCH_PATHS = ( + "\"$(SRCROOT)/../../../cocos2dx\"", + "\"$(SRCROOT)/../../../cocos2dx/kazmath/include\"", + "\"$(SRCROOT)/../../../scripting/lua/tolua\"", + "\"$(SRCROOT)/../../../scripting/lua/luajit/include\"", + "\"$(SRCROOT)/../../../scripting/auto-generated/lua-bindings\"", + "\"$(SRCROOT)/../../../scripting/lua/cocos2dx_support\"", + "\"$(SRCROOT)/../../../cocos2dx/platform/mac\"", + "\"$(SRCROOT)/../../../cocos2dx/include\"", + "\"$(SRCROOT)/../../../CocosDenshion/include\"", + "\"$(SRCROOT)/../../../external/chipmunk/include/chipmunk\"", + "\"$(SRCROOT)/../../../external/chipmunk/include/constraints\"", + "\"$(SRCROOT)/../../../external\"", + "\"$(SRCROOT)/../../../cocos2dx/platform/third_party/mac\"", + "\"$(SRCROOT)/../../../extensions\"", + "\"$(SRCROOT)/../../../external/libwebsockets/mac/include\"", + ); + INFOPLIST_FILE = mac/Info.plist; + LIBRARY_SEARCH_PATHS = ( + "$(SRCROOT)/../../../cocos2dx/platform/third_party/mac/libraries", + "$(inherited)", + "\"$(SRCROOT)/../../../scripting/lua/luajit/mac\"", + "\"$(SRCROOT)/../../../external/libwebsockets/mac/lib\"", + ); + OTHER_LDFLAGS = ( + "-image_base", + 100000000, + "-pagezero_size", + 10000, + ); + SDKROOT = macosx; + }; + name = Release; + }; F293B6C215EB7BEA00256477 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT)"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - GCC_C_LANGUAGE_STANDARD = gnu99; + CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; + CLANG_CXX_LIBRARY = "libc++"; + COPY_PHASE_STRIP = NO; + GCC_C_LANGUAGE_STANDARD = c99; GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = ( DEBUG, "COCOS2D_DEBUG=1", USE_FILE32API, - TARGET_OS_IPHONE, "CC_LUA_ENGINE_ENABLED=1", + "CC_ENABLE_CHIPMUNK_INTEGRATION=1", ); GCC_SYMBOLS_PRIVATE_EXTERN = NO; GCC_WARN_ABOUT_RETURN_TYPE = YES; @@ -669,22 +889,22 @@ "$(SRCROOT)/../../cocos2dx/platform/ios", "$(SRCROOT)/../../cocos2dx/include", ); - IPHONEOS_DEPLOYMENT_TARGET = 5.1; - SDKROOT = iphoneos; + ONLY_ACTIVE_ARCH = YES; + PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; }; F293B6C315EB7BEA00256477 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_BIT)"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - GCC_C_LANGUAGE_STANDARD = gnu99; + CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; + CLANG_CXX_LIBRARY = "libc++"; + GCC_C_LANGUAGE_STANDARD = c99; GCC_PREPROCESSOR_DEFINITIONS = ( NDEBUG, USE_FILE32API, - TARGET_OS_IPHONE, "CC_LUA_ENGINE_ENABLED=1", + "CC_ENABLE_CHIPMUNK_INTEGRATION=1", ); GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; @@ -701,9 +921,9 @@ "$(SRCROOT)/../../cocos2dx/platform/ios", "$(SRCROOT)/../../cocos2dx/include", ); - IPHONEOS_DEPLOYMENT_TARGET = 5.1; OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1"; - SDKROOT = iphoneos; + PRODUCT_NAME = "$(TARGET_NAME)"; + VALIDATE_PRODUCT = YES; }; name = Release; }; @@ -711,22 +931,14 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; - CLANG_CXX_LIBRARY = "libc++"; COMPRESS_PNG_FILES = NO; - COPY_PHASE_STRIP = NO; GCC_DYNAMIC_NO_PIC = NO; GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = Prefix.pch; + GCC_PREFIX_HEADER = ios/Prefix.pch; GCC_PREPROCESSOR_DEFINITIONS = ( - DEBUG, - "COCOS2D_DEBUG=1", - USE_FILE32API, CC_TARGET_OS_IPHONE, - "CC_LUA_ENGINE_ENABLED=1", - "CC_ENABLE_CHIPMUNK_INTEGRATION=1", + "$(inherited)", ); - "GCC_THUMB_SUPPORT[arch=armv6]" = ""; HEADER_SEARCH_PATHS = ( "\"$(SRCROOT)/../../../cocos2dx\"", "\"$(SRCROOT)/../../../cocos2dx/kazmath/include\"", @@ -745,7 +957,7 @@ "\"$(SRCROOT)/../../../extensions\"", "\"$(SRCROOT)/../../../external/libwebsockets/ios/include\"", ); - INFOPLIST_FILE = Info.plist; + INFOPLIST_FILE = ios/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 5.0; LIBRARY_SEARCH_PATHS = ( "$(SRCROOT)/../../../cocos2dx/platform/third_party/ios/libraries", @@ -753,11 +965,8 @@ "\"$(SRCROOT)/../../../scripting/lua/luajit/ios\"", "\"$(SRCROOT)/../../../external/libwebsockets/ios/lib\"", ); - ONLY_ACTIVE_ARCH = YES; - OTHER_LDFLAGS = ""; - PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; - WRAPPER_EXTENSION = app; }; name = Debug; }; @@ -765,20 +974,13 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; - CLANG_CXX_LIBRARY = "libc++"; COMPRESS_PNG_FILES = NO; - COPY_PHASE_STRIP = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = Prefix.pch; + GCC_PREFIX_HEADER = ios/Prefix.pch; GCC_PREPROCESSOR_DEFINITIONS = ( - NDEBUG, - USE_FILE32API, CC_TARGET_OS_IPHONE, - "CC_LUA_ENGINE_ENABLED=1", - "CC_ENABLE_CHIPMUNK_INTEGRATION=1", + "$(inherited)", ); - "GCC_THUMB_SUPPORT[arch=armv6]" = ""; HEADER_SEARCH_PATHS = ( "\"$(SRCROOT)/../../../cocos2dx\"", "\"$(SRCROOT)/../../../cocos2dx/kazmath/include\"", @@ -797,7 +999,7 @@ "\"$(SRCROOT)/../../../extensions\"", "\"$(SRCROOT)/../../../external/libwebsockets/ios/include\"", ); - INFOPLIST_FILE = Info.plist; + INFOPLIST_FILE = ios/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 5.0; LIBRARY_SEARCH_PATHS = ( "$(SRCROOT)/../../../cocos2dx/platform/third_party/ios/libraries", @@ -805,18 +1007,23 @@ "\"$(SRCROOT)/../../../scripting/lua/luajit/ios\"", "\"$(SRCROOT)/../../../external/libwebsockets/ios/lib\"", ); - ONLY_ACTIVE_ARCH = YES; - OTHER_LDFLAGS = ""; - PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; - VALIDATE_PRODUCT = YES; - WRAPPER_EXTENSION = app; }; name = Release; }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ + 5023816817EBBCE400990C9B /* Build configuration list for PBXNativeTarget "HelloLua Mac" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 5023816917EBBCE400990C9B /* Debug */, + 5023816A17EBBCE400990C9B /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; F293B3C215EB7BE500256477 /* Build configuration list for PBXProject "HelloLua" */ = { isa = XCConfigurationList; buildConfigurations = ( @@ -826,7 +1033,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - F293B6C415EB7BEA00256477 /* Build configuration list for PBXNativeTarget "HelloLua" */ = { + F293B6C415EB7BEA00256477 /* Build configuration list for PBXNativeTarget "HelloLua iOS" */ = { isa = XCConfigurationList; buildConfigurations = ( F293B6C515EB7BEA00256477 /* Debug */, diff --git a/template/multi-platform-lua/proj.ios/AppController.h b/template/multi-platform-lua/proj.ios_mac/ios/AppController.h similarity index 100% rename from template/multi-platform-lua/proj.ios/AppController.h rename to template/multi-platform-lua/proj.ios_mac/ios/AppController.h diff --git a/template/multi-platform-lua/proj.ios/AppController.mm b/template/multi-platform-lua/proj.ios_mac/ios/AppController.mm similarity index 100% rename from template/multi-platform-lua/proj.ios/AppController.mm rename to template/multi-platform-lua/proj.ios_mac/ios/AppController.mm diff --git a/template/multi-platform-lua/proj.ios/Default-568h@2x.png.REMOVED.git-id b/template/multi-platform-lua/proj.ios_mac/ios/Default-568h@2x.png.REMOVED.git-id similarity index 100% rename from template/multi-platform-lua/proj.ios/Default-568h@2x.png.REMOVED.git-id rename to template/multi-platform-lua/proj.ios_mac/ios/Default-568h@2x.png.REMOVED.git-id diff --git a/template/multi-platform-lua/proj.ios/Default@2x.png.REMOVED.git-id b/template/multi-platform-lua/proj.ios_mac/ios/Default@2x.png.REMOVED.git-id similarity index 100% rename from template/multi-platform-lua/proj.ios/Default@2x.png.REMOVED.git-id rename to template/multi-platform-lua/proj.ios_mac/ios/Default@2x.png.REMOVED.git-id diff --git a/template/multi-platform-lua/proj.ios/Prefix.pch b/template/multi-platform-lua/proj.ios_mac/ios/Prefix.pch similarity index 100% rename from template/multi-platform-lua/proj.ios/Prefix.pch rename to template/multi-platform-lua/proj.ios_mac/ios/Prefix.pch diff --git a/template/multi-platform-lua/proj.ios/RootViewController.h b/template/multi-platform-lua/proj.ios_mac/ios/RootViewController.h similarity index 100% rename from template/multi-platform-lua/proj.ios/RootViewController.h rename to template/multi-platform-lua/proj.ios_mac/ios/RootViewController.h diff --git a/template/multi-platform-lua/proj.ios/RootViewController.mm b/template/multi-platform-lua/proj.ios_mac/ios/RootViewController.mm similarity index 100% rename from template/multi-platform-lua/proj.ios/RootViewController.mm rename to template/multi-platform-lua/proj.ios_mac/ios/RootViewController.mm diff --git a/template/multi-platform-lua/proj.ios/main.m b/template/multi-platform-lua/proj.ios_mac/ios/main.m similarity index 100% rename from template/multi-platform-lua/proj.ios/main.m rename to template/multi-platform-lua/proj.ios_mac/ios/main.m diff --git a/template/multi-platform-lua/proj.mac/Icon.icns b/template/multi-platform-lua/proj.ios_mac/mac/Icon.icns similarity index 100% rename from template/multi-platform-lua/proj.mac/Icon.icns rename to template/multi-platform-lua/proj.ios_mac/mac/Icon.icns diff --git a/template/multi-platform-lua/proj.mac/Prefix.pch b/template/multi-platform-lua/proj.ios_mac/mac/Prefix.pch similarity index 100% rename from template/multi-platform-lua/proj.mac/Prefix.pch rename to template/multi-platform-lua/proj.ios_mac/mac/Prefix.pch diff --git a/template/multi-platform-lua/proj.mac/main.cpp b/template/multi-platform-lua/proj.ios_mac/mac/main.cpp similarity index 97% rename from template/multi-platform-lua/proj.mac/main.cpp rename to template/multi-platform-lua/proj.ios_mac/mac/main.cpp index ab23e39856..1d6fd403f1 100644 --- a/template/multi-platform-lua/proj.mac/main.cpp +++ b/template/multi-platform-lua/proj.ios_mac/mac/main.cpp @@ -31,6 +31,6 @@ int main(int argc, char *argv[]) { AppDelegate app; EGLView eglView; - eglView.init("TestCPP",900,640); + eglView.init("Hello World",900,640); return Application::getInstance()->run(); -} \ No newline at end of file +} diff --git a/template/multi-platform-lua/proj.mac/HelloLua.xcodeproj/project.pbxproj b/template/multi-platform-lua/proj.mac/HelloLua.xcodeproj/project.pbxproj deleted file mode 100644 index dc0f3aae2f..0000000000 --- a/template/multi-platform-lua/proj.mac/HelloLua.xcodeproj/project.pbxproj +++ /dev/null @@ -1,856 +0,0 @@ -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = { - }; - objectVersion = 46; - objects = { - -/* Begin PBXBuildFile section */ - 150181DE17A6636600E674E5 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 150181DD17A6636600E674E5 /* QuartzCore.framework */; }; - 150181E517A663C800E674E5 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15A02E6817A647C90035E92B /* Foundation.framework */; }; - 150181E817A6647000E674E5 /* OpenAL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15A02FAA17A65D810035E92B /* OpenAL.framework */; }; - 150181EA17A6670300E674E5 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 150181E917A6670300E674E5 /* OpenGL.framework */; }; - 150181F017A667DA00E674E5 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 150181DF17A6637B00E674E5 /* AudioToolbox.framework */; }; - 150181F117A6684F00E674E5 /* ApplicationServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 150181EC17A6679B00E674E5 /* ApplicationServices.framework */; }; - 150181F217A6686400E674E5 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 150181EE17A667BC00E674E5 /* Cocoa.framework */; }; - 150181F417A6695400E674E5 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 150181F317A6695400E674E5 /* libz.dylib */; }; - 150181F617A6696400E674E5 /* libcurl.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 150181F517A6696400E674E5 /* libcurl.dylib */; }; - 1501821D17A6706400E674E5 /* libcocos2dx Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15A02F0717A64D060035E92B /* libcocos2dx Mac.a */; }; - 1501821E17A6706400E674E5 /* libcocos2dx-extensions Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15A02F0917A64D060035E92B /* libcocos2dx-extensions Mac.a */; }; - 1501821F17A6706400E674E5 /* libCocosDenshion Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15A02F0F17A64D060035E92B /* libCocosDenshion Mac.a */; }; - 1501822017A6706400E674E5 /* libluabindings Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15A02F1317A64D060035E92B /* libluabindings Mac.a */; }; - 1501825917A74F8000E674E5 /* AudioEngine.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1501825217A74F8000E674E5 /* AudioEngine.lua */; }; - 1501825A17A74F8000E674E5 /* CCBReaderLoad.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1501825317A74F8000E674E5 /* CCBReaderLoad.lua */; }; - 1501825B17A74F8000E674E5 /* Cocos2dConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1501825417A74F8000E674E5 /* Cocos2dConstants.lua */; }; - 1501825C17A74F8000E674E5 /* Deprecated.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1501825517A74F8000E674E5 /* Deprecated.lua */; }; - 1501825D17A74F8000E674E5 /* DrawPrimitives.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1501825617A74F8000E674E5 /* DrawPrimitives.lua */; }; - 1501825E17A74F8000E674E5 /* Opengl.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1501825717A74F8000E674E5 /* Opengl.lua */; }; - 1501825F17A74F8000E674E5 /* OpenglConstants.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1501825817A74F8000E674E5 /* OpenglConstants.lua */; }; - 1501826E17A7513400E674E5 /* libchipmunk Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15A02F0B17A64D060035E92B /* libchipmunk Mac.a */; }; - 1525770C17CEFB6300BE417B /* DeprecatedClass.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1525770917CEFB6200BE417B /* DeprecatedClass.lua */; }; - 1525770D17CEFB6300BE417B /* DeprecatedEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1525770A17CEFB6300BE417B /* DeprecatedEnum.lua */; }; - 1525770E17CEFB6300BE417B /* DeprecatedOpenglEnum.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1525770B17CEFB6300BE417B /* DeprecatedOpenglEnum.lua */; }; - 15A02F3817A64D1E0035E92B /* background.mp3 in Resources */ = {isa = PBXBuildFile; fileRef = 15A02F2417A64D1E0035E92B /* background.mp3 */; }; - 15A02F3917A64D1E0035E92B /* background.ogg in Resources */ = {isa = PBXBuildFile; fileRef = 15A02F2517A64D1E0035E92B /* background.ogg */; }; - 15A02F3C17A64D1E0035E92B /* crop.png in Resources */ = {isa = PBXBuildFile; fileRef = 15A02F2817A64D1E0035E92B /* crop.png */; }; - 15A02F3E17A64D1E0035E92B /* dog.png in Resources */ = {isa = PBXBuildFile; fileRef = 15A02F2A17A64D1E0035E92B /* dog.png */; }; - 15A02F4017A64D1E0035E92B /* effect1.wav in Resources */ = {isa = PBXBuildFile; fileRef = 15A02F2C17A64D1E0035E92B /* effect1.wav */; }; - 15A02F4117A64D1E0035E92B /* farm.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 15A02F2D17A64D1E0035E92B /* farm.jpg */; }; - 15A02F4317A64D1E0035E92B /* hello.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15A02F3017A64D1E0035E92B /* hello.lua */; }; - 15A02F4417A64D1E0035E92B /* hello2.lua in Resources */ = {isa = PBXBuildFile; fileRef = 15A02F3117A64D1E0035E92B /* hello2.lua */; }; - 15A02F4517A64D1E0035E92B /* land.png in Resources */ = {isa = PBXBuildFile; fileRef = 15A02F3217A64D1E0035E92B /* land.png */; }; - 15A02F4617A64D1E0035E92B /* menu1.png in Resources */ = {isa = PBXBuildFile; fileRef = 15A02F3317A64D1E0035E92B /* menu1.png */; }; - 15A02F4717A64D1E0035E92B /* menu2.png in Resources */ = {isa = PBXBuildFile; fileRef = 15A02F3417A64D1E0035E92B /* menu2.png */; }; - 15A02F4D17A64D390035E92B /* AppDelegate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15A02F4B17A64D390035E92B /* AppDelegate.cpp */; }; - 15A02F7317A64DFB0035E92B /* Icon.icns in Resources */ = {isa = PBXBuildFile; fileRef = 15A02F6D17A64DFB0035E92B /* Icon.icns */; }; - 15A02F7417A64DFB0035E92B /* Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 15A02F6E17A64DFB0035E92B /* Info.plist */; }; - 15A02F7517A64DFB0035E92B /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 15A02F6F17A64DFB0035E92B /* main.cpp */; }; - 15A02F7B17A64E2A0035E92B /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 15A02F7717A64E2A0035E92B /* InfoPlist.strings */; }; - 15A02F7C17A64E2A0035E92B /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 15A02F7917A64E2A0035E92B /* MainMenu.xib */; }; - 1ADB273B17CCA0F500634B5E /* Cocos2d.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1ADB273A17CCA0F500634B5E /* Cocos2d.lua */; }; - ED4D1B4B17D4460E0058FC68 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ED4D1B4A17D4460E0058FC68 /* IOKit.framework */; }; -/* End PBXBuildFile section */ - -/* Begin PBXContainerItemProxy section */ - 1501822117A6714D00E674E5 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 15A02EF317A64D050035E92B /* cocos2d_libs.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 1551A33E158F2AB200E66CFE; - remoteInfo = "cocos2dx Mac"; - }; - 1501822317A6714D00E674E5 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 15A02EF317A64D050035E92B /* cocos2d_libs.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = A03F2FC117814595006731B9; - remoteInfo = "cocos2dx-extensions Mac"; - }; - 1501822517A6714D00E674E5 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 15A02EF317A64D050035E92B /* cocos2d_libs.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = A03F2E9817814268006731B9; - remoteInfo = "CocosDenshion Mac"; - }; - 1501822717A6714D00E674E5 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 15A02EF317A64D050035E92B /* cocos2d_libs.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = 1A6FB50417854BC200CDF010; - remoteInfo = "luabindings Mac"; - }; - 1501826C17A7512B00E674E5 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 15A02EF317A64D050035E92B /* cocos2d_libs.xcodeproj */; - proxyType = 1; - remoteGlobalIDString = A03F2B781780BD04006731B9; - remoteInfo = "chipmunk Mac"; - }; - 15A02F0617A64D060035E92B /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 15A02EF317A64D050035E92B /* cocos2d_libs.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 1551A33F158F2AB200E66CFE; - remoteInfo = "cocos2dx Mac"; - }; - 15A02F0817A64D060035E92B /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 15A02EF317A64D050035E92B /* cocos2d_libs.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = A03F2FD617814595006731B9; - remoteInfo = "cocos2dx-extensions Mac"; - }; - 15A02F0A17A64D060035E92B /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 15A02EF317A64D050035E92B /* cocos2d_libs.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = A03F2CB81780BD04006731B9; - remoteInfo = "chipmunk Mac"; - }; - 15A02F0C17A64D060035E92B /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 15A02EF317A64D050035E92B /* cocos2d_libs.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = A03F2D9B1780BDF7006731B9; - remoteInfo = "box2d Mac"; - }; - 15A02F0E17A64D060035E92B /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 15A02EF317A64D050035E92B /* cocos2d_libs.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = A03F2ED617814268006731B9; - remoteInfo = "CocosDenshion Mac"; - }; - 15A02F1017A64D060035E92B /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 15A02EF317A64D050035E92B /* cocos2d_libs.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = A03F31FD1781479B006731B9; - remoteInfo = "jsbindings Mac"; - }; - 15A02F1217A64D060035E92B /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 15A02EF317A64D050035E92B /* cocos2d_libs.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 1A6FB53017854BC300CDF010; - remoteInfo = "luabindings Mac"; - }; - 15A02F1417A64D060035E92B /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 15A02EF317A64D050035E92B /* cocos2d_libs.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = A07A4D641783777C0073F6A7; - remoteInfo = "cocos2dx iOS"; - }; - 15A02F1617A64D060035E92B /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 15A02EF317A64D050035E92B /* cocos2d_libs.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = A07A4EFC1783867C0073F6A7; - remoteInfo = "cocos2dx-extensions iOS"; - }; - 15A02F1817A64D060035E92B /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 15A02EF317A64D050035E92B /* cocos2d_libs.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = A07A4F3B178387670073F6A7; - remoteInfo = "chipmunk iOS"; - }; - 15A02F1A17A64D060035E92B /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 15A02EF317A64D050035E92B /* cocos2d_libs.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = A07A4F9E1783876B0073F6A7; - remoteInfo = "box2d iOS"; - }; - 15A02F1C17A64D060035E92B /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 15A02EF317A64D050035E92B /* cocos2d_libs.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = A07A4FB4178387730073F6A7; - remoteInfo = "CocosDenshion iOS"; - }; - 15A02F1E17A64D060035E92B /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 15A02EF317A64D050035E92B /* cocos2d_libs.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = A07A5030178387750073F6A7; - remoteInfo = "jsbindings iOS"; - }; - 15A02F2017A64D060035E92B /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 15A02EF317A64D050035E92B /* cocos2d_libs.xcodeproj */; - proxyType = 2; - remoteGlobalIDString = 1A119791178526AA00D62A44; - remoteInfo = "luabindings iOS"; - }; -/* End PBXContainerItemProxy section */ - -/* Begin PBXFileReference section */ - 150181DD17A6636600E674E5 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; }; - 150181DF17A6637B00E674E5 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; }; - 150181E917A6670300E674E5 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = System/Library/Frameworks/OpenGL.framework; sourceTree = SDKROOT; }; - 150181EC17A6679B00E674E5 /* ApplicationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ApplicationServices.framework; path = System/Library/Frameworks/ApplicationServices.framework; sourceTree = SDKROOT; }; - 150181EE17A667BC00E674E5 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; }; - 150181F317A6695400E674E5 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; }; - 150181F517A6696400E674E5 /* libcurl.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcurl.dylib; path = usr/lib/libcurl.dylib; sourceTree = SDKROOT; }; - 1501825217A74F8000E674E5 /* AudioEngine.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = AudioEngine.lua; sourceTree = ""; }; - 1501825317A74F8000E674E5 /* CCBReaderLoad.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = CCBReaderLoad.lua; sourceTree = ""; }; - 1501825417A74F8000E674E5 /* Cocos2dConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Cocos2dConstants.lua; sourceTree = ""; }; - 1501825517A74F8000E674E5 /* Deprecated.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Deprecated.lua; sourceTree = ""; }; - 1501825617A74F8000E674E5 /* DrawPrimitives.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = DrawPrimitives.lua; sourceTree = ""; }; - 1501825717A74F8000E674E5 /* Opengl.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Opengl.lua; sourceTree = ""; }; - 1501825817A74F8000E674E5 /* OpenglConstants.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = OpenglConstants.lua; sourceTree = ""; }; - 1525770917CEFB6200BE417B /* DeprecatedClass.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = DeprecatedClass.lua; sourceTree = ""; }; - 1525770A17CEFB6300BE417B /* DeprecatedEnum.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = DeprecatedEnum.lua; sourceTree = ""; }; - 1525770B17CEFB6300BE417B /* DeprecatedOpenglEnum.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = DeprecatedOpenglEnum.lua; sourceTree = ""; }; - 15A02E6017A647C90035E92B /* HelloLua.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = HelloLua.app; sourceTree = BUILT_PRODUCTS_DIR; }; - 15A02E6817A647C90035E92B /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; - 15A02EF317A64D050035E92B /* cocos2d_libs.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = cocos2d_libs.xcodeproj; path = ../../../cocos2d_libs.xcodeproj; sourceTree = ""; }; - 15A02F2417A64D1E0035E92B /* background.mp3 */ = {isa = PBXFileReference; lastKnownFileType = audio.mp3; path = background.mp3; sourceTree = ""; }; - 15A02F2517A64D1E0035E92B /* background.ogg */ = {isa = PBXFileReference; lastKnownFileType = file; path = background.ogg; sourceTree = ""; }; - 15A02F2817A64D1E0035E92B /* crop.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = crop.png; sourceTree = ""; }; - 15A02F2A17A64D1E0035E92B /* dog.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = dog.png; sourceTree = ""; }; - 15A02F2C17A64D1E0035E92B /* effect1.wav */ = {isa = PBXFileReference; lastKnownFileType = audio.wav; path = effect1.wav; sourceTree = ""; }; - 15A02F2D17A64D1E0035E92B /* farm.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = farm.jpg; sourceTree = ""; }; - 15A02F3017A64D1E0035E92B /* hello.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = hello.lua; sourceTree = ""; }; - 15A02F3117A64D1E0035E92B /* hello2.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = hello2.lua; sourceTree = ""; }; - 15A02F3217A64D1E0035E92B /* land.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = land.png; sourceTree = ""; }; - 15A02F3317A64D1E0035E92B /* menu1.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu1.png; sourceTree = ""; }; - 15A02F3417A64D1E0035E92B /* menu2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = menu2.png; sourceTree = ""; }; - 15A02F4B17A64D390035E92B /* AppDelegate.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AppDelegate.cpp; sourceTree = ""; }; - 15A02F4C17A64D390035E92B /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = ""; }; - 15A02F6D17A64DFB0035E92B /* Icon.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = Icon.icns; sourceTree = ""; }; - 15A02F6E17A64DFB0035E92B /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 15A02F6F17A64DFB0035E92B /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = main.cpp; sourceTree = ""; }; - 15A02F7817A64E2A0035E92B /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = InfoPlist.strings; sourceTree = ""; }; - 15A02F7A17A64E2A0035E92B /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = MainMenu.xib; sourceTree = ""; }; - 15A02FAA17A65D810035E92B /* OpenAL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenAL.framework; path = System/Library/Frameworks/OpenAL.framework; sourceTree = SDKROOT; }; - 1ADB273A17CCA0F500634B5E /* Cocos2d.lua */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Cocos2d.lua; sourceTree = ""; }; - ED4D1B4A17D4460E0058FC68 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; }; -/* End PBXFileReference section */ - -/* Begin PBXFrameworksBuildPhase section */ - 15A02E5D17A647C90035E92B /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ED4D1B4B17D4460E0058FC68 /* IOKit.framework in Frameworks */, - 1501826E17A7513400E674E5 /* libchipmunk Mac.a in Frameworks */, - 1501821D17A6706400E674E5 /* libcocos2dx Mac.a in Frameworks */, - 1501821E17A6706400E674E5 /* libcocos2dx-extensions Mac.a in Frameworks */, - 1501821F17A6706400E674E5 /* libCocosDenshion Mac.a in Frameworks */, - 1501822017A6706400E674E5 /* libluabindings Mac.a in Frameworks */, - 150181F417A6695400E674E5 /* libz.dylib in Frameworks */, - 150181F617A6696400E674E5 /* libcurl.dylib in Frameworks */, - 150181F117A6684F00E674E5 /* ApplicationServices.framework in Frameworks */, - 150181F017A667DA00E674E5 /* AudioToolbox.framework in Frameworks */, - 150181E517A663C800E674E5 /* Foundation.framework in Frameworks */, - 150181F217A6686400E674E5 /* Cocoa.framework in Frameworks */, - 150181EA17A6670300E674E5 /* OpenGL.framework in Frameworks */, - 150181DE17A6636600E674E5 /* QuartzCore.framework in Frameworks */, - 150181E817A6647000E674E5 /* OpenAL.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - -/* Begin PBXGroup section */ - 1501825117A74F8000E674E5 /* Lua Common */ = { - isa = PBXGroup; - children = ( - 1525770917CEFB6200BE417B /* DeprecatedClass.lua */, - 1525770A17CEFB6300BE417B /* DeprecatedEnum.lua */, - 1525770B17CEFB6300BE417B /* DeprecatedOpenglEnum.lua */, - 1501825217A74F8000E674E5 /* AudioEngine.lua */, - 1501825317A74F8000E674E5 /* CCBReaderLoad.lua */, - 1ADB273A17CCA0F500634B5E /* Cocos2d.lua */, - 1501825417A74F8000E674E5 /* Cocos2dConstants.lua */, - 1501825517A74F8000E674E5 /* Deprecated.lua */, - 1501825617A74F8000E674E5 /* DrawPrimitives.lua */, - 1501825717A74F8000E674E5 /* Opengl.lua */, - 1501825817A74F8000E674E5 /* OpenglConstants.lua */, - ); - name = "Lua Common"; - path = ../../../scripting/lua/script; - sourceTree = ""; - }; - 15A02E5717A647C90035E92B = { - isa = PBXGroup; - children = ( - 15A02EF317A64D050035E92B /* cocos2d_libs.xcodeproj */, - 15A02F4A17A64D390035E92B /* Classes */, - 15A02E6217A647C90035E92B /* Frameworks */, - 15A02F6217A64DFB0035E92B /* Mac */, - 1501825117A74F8000E674E5 /* Lua Common */, - 15A02E6117A647C90035E92B /* Products */, - 15A02F2217A64D1E0035E92B /* Resources */, - ); - sourceTree = ""; - }; - 15A02E6117A647C90035E92B /* Products */ = { - isa = PBXGroup; - children = ( - 15A02E6017A647C90035E92B /* HelloLua.app */, - ); - name = Products; - sourceTree = ""; - }; - 15A02E6217A647C90035E92B /* Frameworks */ = { - isa = PBXGroup; - children = ( - ED4D1B4A17D4460E0058FC68 /* IOKit.framework */, - 150181F517A6696400E674E5 /* libcurl.dylib */, - 150181F317A6695400E674E5 /* libz.dylib */, - 150181EC17A6679B00E674E5 /* ApplicationServices.framework */, - 150181EE17A667BC00E674E5 /* Cocoa.framework */, - 150181E917A6670300E674E5 /* OpenGL.framework */, - 150181DF17A6637B00E674E5 /* AudioToolbox.framework */, - 150181DD17A6636600E674E5 /* QuartzCore.framework */, - 15A02E6817A647C90035E92B /* Foundation.framework */, - 15A02FAA17A65D810035E92B /* OpenAL.framework */, - ); - name = Frameworks; - sourceTree = ""; - }; - 15A02EF417A64D050035E92B /* Products */ = { - isa = PBXGroup; - children = ( - 15A02F0717A64D060035E92B /* libcocos2dx Mac.a */, - 15A02F0917A64D060035E92B /* libcocos2dx-extensions Mac.a */, - 15A02F0B17A64D060035E92B /* libchipmunk Mac.a */, - 15A02F0D17A64D060035E92B /* libbox2d Mac.a */, - 15A02F0F17A64D060035E92B /* libCocosDenshion Mac.a */, - 15A02F1117A64D060035E92B /* libjsbindings Mac.a */, - 15A02F1317A64D060035E92B /* libluabindings Mac.a */, - 15A02F1517A64D060035E92B /* libcocos2dx iOS.a */, - 15A02F1717A64D060035E92B /* libcocos2dx-extensions iOS.a */, - 15A02F1917A64D060035E92B /* libchipmunk iOS.a */, - 15A02F1B17A64D060035E92B /* libbox2d iOS.a */, - 15A02F1D17A64D060035E92B /* libCocosDenshion iOS.a */, - 15A02F1F17A64D060035E92B /* libjsbindings iOS.a */, - 15A02F2117A64D060035E92B /* libluabindings iOS.a */, - ); - name = Products; - sourceTree = ""; - }; - 15A02F2217A64D1E0035E92B /* Resources */ = { - isa = PBXGroup; - children = ( - 15A02F2417A64D1E0035E92B /* background.mp3 */, - 15A02F2517A64D1E0035E92B /* background.ogg */, - 15A02F2817A64D1E0035E92B /* crop.png */, - 15A02F2A17A64D1E0035E92B /* dog.png */, - 15A02F2C17A64D1E0035E92B /* effect1.wav */, - 15A02F2D17A64D1E0035E92B /* farm.jpg */, - 15A02F3017A64D1E0035E92B /* hello.lua */, - 15A02F3117A64D1E0035E92B /* hello2.lua */, - 15A02F3217A64D1E0035E92B /* land.png */, - 15A02F3317A64D1E0035E92B /* menu1.png */, - 15A02F3417A64D1E0035E92B /* menu2.png */, - ); - name = Resources; - path = ../Resources; - sourceTree = ""; - }; - 15A02F4A17A64D390035E92B /* Classes */ = { - isa = PBXGroup; - children = ( - 15A02F4B17A64D390035E92B /* AppDelegate.cpp */, - 15A02F4C17A64D390035E92B /* AppDelegate.h */, - ); - name = Classes; - path = ../Classes; - sourceTree = ""; - }; - 15A02F6217A64DFB0035E92B /* Mac */ = { - isa = PBXGroup; - children = ( - 15A02F7617A64E2A0035E92B /* en.lproj */, - 15A02F6D17A64DFB0035E92B /* Icon.icns */, - 15A02F6E17A64DFB0035E92B /* Info.plist */, - 15A02F6F17A64DFB0035E92B /* main.cpp */, - ); - name = Mac; - sourceTree = ""; - }; - 15A02F7617A64E2A0035E92B /* en.lproj */ = { - isa = PBXGroup; - children = ( - 15A02F7717A64E2A0035E92B /* InfoPlist.strings */, - 15A02F7917A64E2A0035E92B /* MainMenu.xib */, - ); - path = en.lproj; - sourceTree = ""; - }; -/* End PBXGroup section */ - -/* Begin PBXNativeTarget section */ - 15A02E5F17A647C90035E92B /* HelloLua */ = { - isa = PBXNativeTarget; - buildConfigurationList = 15A02E9117A647CA0035E92B /* Build configuration list for PBXNativeTarget "HelloLua" */; - buildPhases = ( - 15A02E5C17A647C90035E92B /* Sources */, - 15A02E5D17A647C90035E92B /* Frameworks */, - 15A02E5E17A647C90035E92B /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - 1501826D17A7512B00E674E5 /* PBXTargetDependency */, - 1501822217A6714D00E674E5 /* PBXTargetDependency */, - 1501822417A6714D00E674E5 /* PBXTargetDependency */, - 1501822617A6714D00E674E5 /* PBXTargetDependency */, - 1501822817A6714D00E674E5 /* PBXTargetDependency */, - ); - name = HelloLua; - productName = HelloLua; - productReference = 15A02E6017A647C90035E92B /* HelloLua.app */; - productType = "com.apple.product-type.application"; - }; -/* End PBXNativeTarget section */ - -/* Begin PBXProject section */ - 15A02E5817A647C90035E92B /* Project object */ = { - isa = PBXProject; - attributes = { - LastUpgradeCheck = 0460; - ORGANIZATIONNAME = "Cocos2d-x"; - }; - buildConfigurationList = 15A02E5B17A647C90035E92B /* Build configuration list for PBXProject "HelloLua" */; - compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; - hasScannedForEncodings = 0; - knownRegions = ( - en, - ); - mainGroup = 15A02E5717A647C90035E92B; - productRefGroup = 15A02E6117A647C90035E92B /* Products */; - projectDirPath = ""; - projectReferences = ( - { - ProductGroup = 15A02EF417A64D050035E92B /* Products */; - ProjectRef = 15A02EF317A64D050035E92B /* cocos2d_libs.xcodeproj */; - }, - ); - projectRoot = ""; - targets = ( - 15A02E5F17A647C90035E92B /* HelloLua */, - ); - }; -/* End PBXProject section */ - -/* Begin PBXReferenceProxy section */ - 15A02F0717A64D060035E92B /* libcocos2dx Mac.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libcocos2dx Mac.a"; - remoteRef = 15A02F0617A64D060035E92B /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 15A02F0917A64D060035E92B /* libcocos2dx-extensions Mac.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libcocos2dx-extensions Mac.a"; - remoteRef = 15A02F0817A64D060035E92B /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 15A02F0B17A64D060035E92B /* libchipmunk Mac.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libchipmunk Mac.a"; - remoteRef = 15A02F0A17A64D060035E92B /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 15A02F0D17A64D060035E92B /* libbox2d Mac.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libbox2d Mac.a"; - remoteRef = 15A02F0C17A64D060035E92B /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 15A02F0F17A64D060035E92B /* libCocosDenshion Mac.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libCocosDenshion Mac.a"; - remoteRef = 15A02F0E17A64D060035E92B /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 15A02F1117A64D060035E92B /* libjsbindings Mac.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libjsbindings Mac.a"; - remoteRef = 15A02F1017A64D060035E92B /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 15A02F1317A64D060035E92B /* libluabindings Mac.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libluabindings Mac.a"; - remoteRef = 15A02F1217A64D060035E92B /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 15A02F1517A64D060035E92B /* libcocos2dx iOS.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libcocos2dx iOS.a"; - remoteRef = 15A02F1417A64D060035E92B /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 15A02F1717A64D060035E92B /* libcocos2dx-extensions iOS.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libcocos2dx-extensions iOS.a"; - remoteRef = 15A02F1617A64D060035E92B /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 15A02F1917A64D060035E92B /* libchipmunk iOS.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libchipmunk iOS.a"; - remoteRef = 15A02F1817A64D060035E92B /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 15A02F1B17A64D060035E92B /* libbox2d iOS.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libbox2d iOS.a"; - remoteRef = 15A02F1A17A64D060035E92B /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 15A02F1D17A64D060035E92B /* libCocosDenshion iOS.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libCocosDenshion iOS.a"; - remoteRef = 15A02F1C17A64D060035E92B /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 15A02F1F17A64D060035E92B /* libjsbindings iOS.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libjsbindings iOS.a"; - remoteRef = 15A02F1E17A64D060035E92B /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; - 15A02F2117A64D060035E92B /* libluabindings iOS.a */ = { - isa = PBXReferenceProxy; - fileType = archive.ar; - path = "libluabindings iOS.a"; - remoteRef = 15A02F2017A64D060035E92B /* PBXContainerItemProxy */; - sourceTree = BUILT_PRODUCTS_DIR; - }; -/* End PBXReferenceProxy section */ - -/* Begin PBXResourcesBuildPhase section */ - 15A02E5E17A647C90035E92B /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 15A02F3817A64D1E0035E92B /* background.mp3 in Resources */, - 15A02F3917A64D1E0035E92B /* background.ogg in Resources */, - 15A02F3C17A64D1E0035E92B /* crop.png in Resources */, - 15A02F3E17A64D1E0035E92B /* dog.png in Resources */, - 15A02F4017A64D1E0035E92B /* effect1.wav in Resources */, - 15A02F4117A64D1E0035E92B /* farm.jpg in Resources */, - 15A02F4317A64D1E0035E92B /* hello.lua in Resources */, - 15A02F4417A64D1E0035E92B /* hello2.lua in Resources */, - 15A02F4517A64D1E0035E92B /* land.png in Resources */, - 15A02F4617A64D1E0035E92B /* menu1.png in Resources */, - 15A02F4717A64D1E0035E92B /* menu2.png in Resources */, - 15A02F7317A64DFB0035E92B /* Icon.icns in Resources */, - 15A02F7417A64DFB0035E92B /* Info.plist in Resources */, - 15A02F7B17A64E2A0035E92B /* InfoPlist.strings in Resources */, - 15A02F7C17A64E2A0035E92B /* MainMenu.xib in Resources */, - 1501825917A74F8000E674E5 /* AudioEngine.lua in Resources */, - 1501825A17A74F8000E674E5 /* CCBReaderLoad.lua in Resources */, - 1501825B17A74F8000E674E5 /* Cocos2dConstants.lua in Resources */, - 1501825C17A74F8000E674E5 /* Deprecated.lua in Resources */, - 1501825D17A74F8000E674E5 /* DrawPrimitives.lua in Resources */, - 1501825E17A74F8000E674E5 /* Opengl.lua in Resources */, - 1501825F17A74F8000E674E5 /* OpenglConstants.lua in Resources */, - 1ADB273B17CCA0F500634B5E /* Cocos2d.lua in Resources */, - 1525770C17CEFB6300BE417B /* DeprecatedClass.lua in Resources */, - 1525770D17CEFB6300BE417B /* DeprecatedEnum.lua in Resources */, - 1525770E17CEFB6300BE417B /* DeprecatedOpenglEnum.lua in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXResourcesBuildPhase section */ - -/* Begin PBXSourcesBuildPhase section */ - 15A02E5C17A647C90035E92B /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 15A02F4D17A64D390035E92B /* AppDelegate.cpp in Sources */, - 15A02F7517A64DFB0035E92B /* main.cpp in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXSourcesBuildPhase section */ - -/* Begin PBXTargetDependency section */ - 1501822217A6714D00E674E5 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "cocos2dx Mac"; - targetProxy = 1501822117A6714D00E674E5 /* PBXContainerItemProxy */; - }; - 1501822417A6714D00E674E5 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "cocos2dx-extensions Mac"; - targetProxy = 1501822317A6714D00E674E5 /* PBXContainerItemProxy */; - }; - 1501822617A6714D00E674E5 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "CocosDenshion Mac"; - targetProxy = 1501822517A6714D00E674E5 /* PBXContainerItemProxy */; - }; - 1501822817A6714D00E674E5 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "luabindings Mac"; - targetProxy = 1501822717A6714D00E674E5 /* PBXContainerItemProxy */; - }; - 1501826D17A7512B00E674E5 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - name = "chipmunk Mac"; - targetProxy = 1501826C17A7512B00E674E5 /* PBXContainerItemProxy */; - }; -/* End PBXTargetDependency section */ - -/* Begin PBXVariantGroup section */ - 15A02F7717A64E2A0035E92B /* InfoPlist.strings */ = { - isa = PBXVariantGroup; - children = ( - 15A02F7817A64E2A0035E92B /* en */, - ); - name = InfoPlist.strings; - sourceTree = ""; - }; - 15A02F7917A64E2A0035E92B /* MainMenu.xib */ = { - isa = PBXVariantGroup; - children = ( - 15A02F7A17A64E2A0035E92B /* en */, - ); - name = MainMenu.xib; - sourceTree = ""; - }; -/* End PBXVariantGroup section */ - -/* Begin XCBuildConfiguration section */ - 15A02E8F17A647CA0035E92B /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; - CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COPY_PHASE_STRIP = NO; - GCC_C_LANGUAGE_STANDARD = c99; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_OBJC_EXCEPTIONS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_SYMBOLS_PRIVATE_EXTERN = NO; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.8; - ONLY_ACTIVE_ARCH = NO; - SDKROOT = macosx; - }; - name = Debug; - }; - 15A02E9017A647CA0035E92B /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; - CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COPY_PHASE_STRIP = YES; - DEBUG_INFORMATION_FORMAT = dwarf; - GCC_C_LANGUAGE_STANDARD = c99; - GCC_ENABLE_OBJC_EXCEPTIONS = YES; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.8; - SDKROOT = macosx; - }; - name = Release; - }; - 15A02E9217A647CA0035E92B /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_64_BIT)"; - CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; - CLANG_ENABLE_OBJC_ARC = NO; - CLANG_WARN_CONSTANT_CONVERSION = NO; - CLANG_WARN_EMPTY_BODY = NO; - CLANG_WARN_ENUM_CONVERSION = NO; - CLANG_WARN_INT_CONVERSION = NO; - COMBINE_HIDPI_IMAGES = YES; - FRAMEWORK_SEARCH_PATHS = ""; - GCC_C_LANGUAGE_STANDARD = c99; - GCC_INLINES_ARE_PRIVATE_EXTERN = NO; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = Prefix.pch; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - USE_FILE32API, - CC_TARGET_OS_MAC, - "COCOS2D_DEBUG=1", - "CC_ENABLE_CHIPMUNK_INTEGRATION=1", - CC_KEYBOARD_SUPPORT, - ); - GCC_WARN_64_TO_32_BIT_CONVERSION = NO; - HEADER_SEARCH_PATHS = ( - "\"$(SRCROOT)/../../../cocos2dx\"", - "\"$(SRCROOT)/../../../cocos2dx/kazmath/include\"", - "\"$(SRCROOT)/../../../scripting/lua/tolua\"", - "\"$(SRCROOT)/../../../scripting/lua/luajit/include\"", - "\"$(SRCROOT)/../../../scripting/lua/cocos2dx_support\"", - "\"$(SRCROOT)/../../../cocos2dx/platform/mac\"", - "\"$(SRCROOT)/../../../cocos2dx/include\"", - "\"$(SRCROOT)/../../../CocosDenshion/include\"", - "\"$(SRCROOT)/../../../external/chipmunk/include/chipmunk\"", - "\"$(SRCROOT)/../../../external/chipmunk/include/constraints\"", - "\"$(SRCROOT)/../../../external\"", - "\"$(SRCROOT)/../../../cocos2dx/platform/third_party/mac\"", - "\"$(SRCROOT)/../../../cocos2dx/platform/mac/Simulation\"", - "\"$(SRCROOT)/../../../extensions\"", - ); - INFOPLIST_FILE = Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 5.0; - LIBRARY_SEARCH_PATHS = ( - "$(SRCROOT)/../../../cocos2dx/platform/third_party/mac/libraries", - "$(inherited)", - "\"$(SRCROOT)/../../../scripting/lua/luajit/mac\"", - ); - ONLY_ACTIVE_ARCH = YES; - OTHER_CFLAGS = "-O2"; - "OTHER_LDFLAGS[arch=x86_64]" = ( - "-pagezero_size", - 10000, - "-image_base", - 100000000, - ); - PRODUCT_NAME = "$(TARGET_NAME)"; - TARGETED_DEVICE_FAMILY = "1,2"; - VALID_ARCHS = "i386 x86_64"; - WRAPPER_EXTENSION = app; - }; - name = Debug; - }; - 15A02E9317A647CA0035E92B /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_64_BIT)"; - CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; - CLANG_ENABLE_OBJC_ARC = NO; - CLANG_WARN_CONSTANT_CONVERSION = NO; - CLANG_WARN_EMPTY_BODY = NO; - CLANG_WARN_ENUM_CONVERSION = NO; - CLANG_WARN_INT_CONVERSION = NO; - COMBINE_HIDPI_IMAGES = YES; - DEBUG_INFORMATION_FORMAT = dwarf; - FRAMEWORK_SEARCH_PATHS = ""; - GCC_C_LANGUAGE_STANDARD = c99; - GCC_INLINES_ARE_PRIVATE_EXTERN = NO; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = Prefix.pch; - GCC_PREPROCESSOR_DEFINITIONS = ( - NDEBUG, - CC_TARGET_OS_MAC, - USE_FILE32API, - "CC_ENABLE_CHIPMUNK_INTEGRATION=1", - CC_KEYBOARD_SUPPORT, - ); - GCC_SYMBOLS_PRIVATE_EXTERN = NO; - GCC_WARN_64_TO_32_BIT_CONVERSION = NO; - HEADER_SEARCH_PATHS = ( - "\"$(SRCROOT)/../../../cocos2dx\"", - "\"$(SRCROOT)/../../../cocos2dx/kazmath/include\"", - "\"$(SRCROOT)/../../../scripting/lua/tolua\"", - "\"$(SRCROOT)/../../../scripting/lua/luajit/include\"", - "\"$(SRCROOT)/../../../scripting/lua/cocos2dx_support\"", - "\"$(SRCROOT)/../../../cocos2dx/platform/mac\"", - "\"$(SRCROOT)/../../../cocos2dx/include\"", - "\"$(SRCROOT)/../../../CocosDenshion/include\"", - "\"$(SRCROOT)/../../../external/chipmunk/include/chipmunk\"", - "\"$(SRCROOT)/../../../external/chipmunk/include/constraints\"", - "\"$(SRCROOT)/../../../external\"", - "\"$(SRCROOT)/../../../cocos2dx/platform/third_party/mac\"", - "\"$(SRCROOT)/../../../cocos2dx/platform/mac/Simulation\"", - "\"$(SRCROOT)/../../../extensions\"", - ); - INFOPLIST_FILE = Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 5.0; - LIBRARY_SEARCH_PATHS = ( - "$(SRCROOT)/../../../cocos2dx/platform/third_party/mac/libraries", - "$(inherited)", - "\"$(SRCROOT)/../../../scripting/lua/luajit/mac\"", - ); - ONLY_ACTIVE_ARCH = NO; - OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1"; - "OTHER_LDFLAGS[arch=x86_64]" = ( - "-pagezero_size", - 10000, - "-image_base", - 100000000, - ); - PRODUCT_NAME = "$(TARGET_NAME)"; - TARGETED_DEVICE_FAMILY = "1,2"; - VALIDATE_PRODUCT = YES; - VALID_ARCHS = "i386 x86_64"; - WRAPPER_EXTENSION = app; - }; - name = Release; - }; -/* End XCBuildConfiguration section */ - -/* Begin XCConfigurationList section */ - 15A02E5B17A647C90035E92B /* Build configuration list for PBXProject "HelloLua" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 15A02E8F17A647CA0035E92B /* Debug */, - 15A02E9017A647CA0035E92B /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 15A02E9117A647CA0035E92B /* Build configuration list for PBXNativeTarget "HelloLua" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 15A02E9217A647CA0035E92B /* Debug */, - 15A02E9317A647CA0035E92B /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; -/* End XCConfigurationList section */ - }; - rootObject = 15A02E5817A647C90035E92B /* Project object */; -} diff --git a/template/multi-platform-lua/proj.mac/en.lproj/InfoPlist.strings b/template/multi-platform-lua/proj.mac/en.lproj/InfoPlist.strings deleted file mode 100644 index 477b28ff8f..0000000000 --- a/template/multi-platform-lua/proj.mac/en.lproj/InfoPlist.strings +++ /dev/null @@ -1,2 +0,0 @@ -/* Localized versions of Info.plist keys */ - diff --git a/template/multi-platform-lua/proj.mac/en.lproj/MainMenu.xib b/template/multi-platform-lua/proj.mac/en.lproj/MainMenu.xib deleted file mode 100644 index 9f99439250..0000000000 --- a/template/multi-platform-lua/proj.mac/en.lproj/MainMenu.xib +++ /dev/null @@ -1,812 +0,0 @@ - - - - 1060 - 10K549 - 1938 - 1038.36 - 461.00 - - com.apple.InterfaceBuilder.CocoaPlugin - 1938 - - - YES - NSMenuItem - NSCustomObject - NSMenu - - - YES - com.apple.InterfaceBuilder.CocoaPlugin - - - PluginDependencyRecalculationVersion - - - - YES - - NSApplication - - - FirstResponder - - - NSApplication - - - AMainMenu - - YES - - - HelloCpp - - 1048576 - 2147483647 - - NSImage - NSMenuCheckmark - - - NSImage - NSMenuMixedState - - submenuAction: - - HelloCpp - - YES - - - About HelloCpp - - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Preferences… - , - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Services - - 1048576 - 2147483647 - - - submenuAction: - - Services - - YES - - _NSServicesMenu - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Hide HelloCpp - h - 1048576 - 2147483647 - - - - - - Hide Others - h - 1572864 - 2147483647 - - - - - - Show All - - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Quit HelloCpp - q - 1048576 - 2147483647 - - - - - _NSAppleMenu - - - - - View - - 1048576 - 2147483647 - - - submenuAction: - - View - - YES - - - Toggle Fullscreen - f - 1048576 - 2147483647 - - - - - - - - - Window - - 1048576 - 2147483647 - - - submenuAction: - - Window - - YES - - - Minimize - m - 1048576 - 2147483647 - - - - - - Zoom - - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Bring All to Front - - 1048576 - 2147483647 - - - - - _NSWindowsMenu - - - - - Help - - 2147483647 - - - submenuAction: - - Help - - YES - - - HelloCpp Help - ? - 1048576 - 2147483647 - - - - - _NSHelpMenu - - - - _NSMainMenu - - - AppController - - - NSFontManager - - - - - YES - - - terminate: - - - - 449 - - - - orderFrontStandardAboutPanel: - - - - 142 - - - - delegate - - - - 495 - - - - performMiniaturize: - - - - 37 - - - - arrangeInFront: - - - - 39 - - - - performZoom: - - - - 240 - - - - hide: - - - - 367 - - - - hideOtherApplications: - - - - 368 - - - - unhideAllApplications: - - - - 370 - - - - showHelp: - - - - 493 - - - - toggleFullScreen: - - - - 537 - - - - - YES - - 0 - - YES - - - - - - -2 - - - File's Owner - - - -1 - - - First Responder - - - -3 - - - Application - - - 29 - - - YES - - - - - - - - - 19 - - - YES - - - - - - 56 - - - YES - - - - - - 57 - - - YES - - - - - - - - - - - - - - - - 58 - - - - - 134 - - - - - 150 - - - - - 136 - - - - - 144 - - - - - 129 - - - - - 143 - - - - - 236 - - - - - 131 - - - YES - - - - - - 149 - - - - - 145 - - - - - 130 - - - - - 24 - - - YES - - - - - - - - - 92 - - - - - 5 - - - - - 239 - - - - - 23 - - - - - 295 - - - YES - - - - - - 296 - - - YES - - - - - - 420 - - - - - 490 - - - YES - - - - - - 491 - - - YES - - - - - - 492 - - - - - 494 - - - - - 536 - - - - - - - YES - - YES - -1.IBPluginDependency - -2.IBPluginDependency - -3.IBPluginDependency - 129.IBPluginDependency - 130.IBPluginDependency - 131.IBPluginDependency - 134.IBPluginDependency - 136.IBPluginDependency - 143.IBPluginDependency - 144.IBPluginDependency - 145.IBPluginDependency - 149.IBPluginDependency - 150.IBPluginDependency - 19.IBPluginDependency - 23.IBPluginDependency - 236.IBPluginDependency - 239.IBPluginDependency - 24.IBPluginDependency - 29.IBPluginDependency - 295.IBPluginDependency - 296.IBPluginDependency - 420.IBPluginDependency - 490.IBPluginDependency - 491.IBPluginDependency - 492.IBPluginDependency - 494.IBPluginDependency - 5.IBPluginDependency - 536.IBPluginDependency - 56.IBPluginDependency - 57.IBPluginDependency - 58.IBPluginDependency - 92.IBPluginDependency - - - YES - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - - - YES - - - - - - YES - - - - - 541 - - - - YES - - AppController - NSObject - - YES - - YES - exitFullScreen: - toggleFullScreen: - - - YES - id - id - - - - YES - - YES - exitFullScreen: - toggleFullScreen: - - - YES - - exitFullScreen: - id - - - toggleFullScreen: - id - - - - - YES - - YES - glView - window - - - YES - EAGLView - Window - - - - YES - - YES - glView - window - - - YES - - glView - EAGLView - - - window - Window - - - - - IBProjectSource - ./Classes/AppController.h - - - - EAGLView - NSOpenGLView - - IBProjectSource - ./Classes/EAGLView.h - - - - - 0 - IBCocoaFramework - - com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 - - - YES - 3 - - YES - - YES - NSMenuCheckmark - NSMenuMixedState - - - YES - {9, 8} - {7, 2} - - - - From 7ecb9778a319637af3f8583a039c9a6dc66485e7 Mon Sep 17 00:00:00 2001 From: Ricardo Quesada Date: Thu, 19 Sep 2013 18:12:02 -0700 Subject: [PATCH 07/10] Product Name is the project name --- .../proj.ios_mac/HelloCpp.xcodeproj/project.pbxproj | 6 ++---- .../proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj | 6 ++---- tools/project_creator/create_project.py | 4 ++-- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/template/multi-platform-cpp/proj.ios_mac/HelloCpp.xcodeproj/project.pbxproj b/template/multi-platform-cpp/proj.ios_mac/HelloCpp.xcodeproj/project.pbxproj index 52ebf32879..4a449355c9 100644 --- a/template/multi-platform-cpp/proj.ios_mac/HelloCpp.xcodeproj/project.pbxproj +++ b/template/multi-platform-cpp/proj.ios_mac/HelloCpp.xcodeproj/project.pbxproj @@ -806,7 +806,6 @@ "\"$(SRCROOT)/../../../external/libwebsockets/ios/lib\"", ); OTHER_CFLAGS = "-O2"; - PRODUCT_NAME = "HelloCpp iOS"; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; USER_HEADER_SEARCH_PATHS = ""; @@ -846,7 +845,6 @@ "\"$(SRCROOT)/../../../cocos2dx/platform/third_party/ios/libraries\"", "\"$(SRCROOT)/../../../external/libwebsockets/ios/lib\"", ); - PRODUCT_NAME = "HelloCpp iOS"; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; USER_HEADER_SEARCH_PATHS = ""; @@ -888,7 +886,6 @@ "\"$(SRCROOT)/../../../cocos2dx/platform/third_party/mac/libraries\"", "\"$(SRCROOT)/../../../external/libwebsockets/mac/lib\"", ); - PRODUCT_NAME = "HelloCpp Mac"; USER_HEADER_SEARCH_PATHS = ""; }; name = Debug; @@ -926,7 +923,6 @@ "\"$(SRCROOT)/../../../cocos2dx/platform/third_party/mac/libraries\"", "\"$(SRCROOT)/../../../external/libwebsockets/mac/lib\"", ); - PRODUCT_NAME = "HelloCpp Mac"; USER_HEADER_SEARCH_PATHS = ""; }; name = Release; @@ -941,6 +937,7 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; ONLY_ACTIVE_ARCH = YES; + PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx; }; name = Debug; @@ -953,6 +950,7 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1"; + PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx; VALIDATE_PRODUCT = YES; }; diff --git a/template/multi-platform-js/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj b/template/multi-platform-js/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj index 4039cd4ced..a115f11915 100644 --- a/template/multi-platform-js/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj +++ b/template/multi-platform-js/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj @@ -768,7 +768,6 @@ "-lz", "-ljs_static", ); - PRODUCT_NAME = "Hello JavaScript Mac"; SDKROOT = macosx; }; name = Debug; @@ -808,7 +807,6 @@ "-lz", "-ljs_static", ); - PRODUCT_NAME = "Hello JavaScript Mac"; SDKROOT = macosx; }; name = Release; @@ -839,6 +837,7 @@ ); IPHONEOS_DEPLOYMENT_TARGET = 5.1; ONLY_ACTIVE_ARCH = YES; + PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; }; @@ -864,6 +863,7 @@ ); IPHONEOS_DEPLOYMENT_TARGET = 5.1; OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1"; + PRODUCT_NAME = "$(TARGET_NAME)"; VALIDATE_PRODUCT = YES; }; name = Release; @@ -906,7 +906,6 @@ "-lz", "-ljs_static", ); - PRODUCT_NAME = "Hello JavaScript iOS"; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; }; @@ -949,7 +948,6 @@ "-lz", "-ljs_static", ); - PRODUCT_NAME = "Hello JavaScript iOS"; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; }; diff --git a/tools/project_creator/create_project.py b/tools/project_creator/create_project.py index 6ea0ff13f8..3763e041f8 100755 --- a/tools/project_creator/create_project.py +++ b/tools/project_creator/create_project.py @@ -7,8 +7,8 @@ # define global variables PLATFORMS = { "cpp" : ["ios", "android", "win32", "mac", "linux"], - "lua" : ["ios", "android", "win32", "mac","linux"], - "javascript" : ["ios", "android", "win32"] + "lua" : ["ios", "android", "win32", "mac", "linux"], + "javascript" : ["ios", "android", "win32", "mac"] } From 51834e52916e30430d4ef68fe5a95934ae84a9ae Mon Sep 17 00:00:00 2001 From: Ricardo Quesada Date: Thu, 19 Sep 2013 18:27:11 -0700 Subject: [PATCH 08/10] Xcode template projects fixes Updats the xcode project with recommended fixes from Xcode 5.0 --- .../proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj | 6 +++--- .../proj.ios_mac/HelloLua.xcodeproj/project.pbxproj | 6 +++--- tools/project_creator/create_project.py | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/template/multi-platform-js/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj b/template/multi-platform-js/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj index a115f11915..046a59ce5b 100644 --- a/template/multi-platform-js/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj +++ b/template/multi-platform-js/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj @@ -503,7 +503,7 @@ A92275341517C094001B78AA /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0430; + LastUpgradeCheck = 0500; TargetAttributes = { A922753C1517C094001B78AA = { DevelopmentTeam = MDDB52YB8L; @@ -736,7 +736,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + COMBINE_HIDPI_IMAGES = YES; GCC_DYNAMIC_NO_PIC = NO; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = mac/Prefix.pch; @@ -776,7 +776,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + COMBINE_HIDPI_IMAGES = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = mac/Prefix.pch; GCC_PREPROCESSOR_DEFINITIONS = ( diff --git a/template/multi-platform-lua/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj b/template/multi-platform-lua/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj index c6a596167b..666e9d5800 100644 --- a/template/multi-platform-lua/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj +++ b/template/multi-platform-lua/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj @@ -529,7 +529,7 @@ F293B3BF15EB7BE500256477 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0430; + LastUpgradeCheck = 0500; }; buildConfigurationList = F293B3C215EB7BE500256477 /* Build configuration list for PBXProject "HelloLua" */; compatibilityVersion = "Xcode 3.2"; @@ -771,7 +771,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + COMBINE_HIDPI_IMAGES = YES; GCC_DYNAMIC_NO_PIC = NO; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = mac/Prefix.pch; @@ -817,7 +817,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_64_BIT)"; + COMBINE_HIDPI_IMAGES = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = mac/Prefix.pch; GCC_PREPROCESSOR_DEFINITIONS = ( diff --git a/tools/project_creator/create_project.py b/tools/project_creator/create_project.py index 3763e041f8..f86ca7dc6e 100755 --- a/tools/project_creator/create_project.py +++ b/tools/project_creator/create_project.py @@ -23,7 +23,7 @@ def checkParams(): # set the parser to parse input params # the correspond variable name of "-x, --xxx" is parser.xxx - parser = OptionParser(usage="Usage: ./%prog -p -k -l \nSample: ./%prog -p MyGame -k com.MyCompany.AwesomeGame -l javascript") + parser = OptionParser(usage="\n %prog -p -k -l \n\nSample:\n %prog -p MyGame -k com.MyCompany.AwesomeGame -l javascript") parser.add_option("-p", "--project", metavar="PROJECT_NAME", help="Set a project name") parser.add_option("-k", "--package", metavar="PACKAGE_NAME", help="Set a package name for project") parser.add_option("-l", "--language", From 4f07dbaece5d2e62624af6f835cfa9622c9e9f4d Mon Sep 17 00:00:00 2001 From: Ricardo Quesada Date: Thu, 19 Sep 2013 18:32:47 -0700 Subject: [PATCH 09/10] Restores .py file to its original layout --- tools/project_creator/create_project.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/project_creator/create_project.py b/tools/project_creator/create_project.py index f86ca7dc6e..966baaeaff 100755 --- a/tools/project_creator/create_project.py +++ b/tools/project_creator/create_project.py @@ -23,7 +23,7 @@ def checkParams(): # set the parser to parse input params # the correspond variable name of "-x, --xxx" is parser.xxx - parser = OptionParser(usage="\n %prog -p -k -l \n\nSample:\n %prog -p MyGame -k com.MyCompany.AwesomeGame -l javascript") + parser = OptionParser(usage="Usage: %prog -p -k -l \nSample: %prog -p MyGame -k com.MyCompany.AwesomeGame -l javascript") parser.add_option("-p", "--project", metavar="PROJECT_NAME", help="Set a project name") parser.add_option("-k", "--package", metavar="PACKAGE_NAME", help="Set a package name for project") parser.add_option("-l", "--language", From 3696703db426a3dcc849abca113e63063bb5e5f3 Mon Sep 17 00:00:00 2001 From: Ricardo Quesada Date: Thu, 19 Sep 2013 18:46:07 -0700 Subject: [PATCH 10/10] forces 64-bit arch --- .../proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj | 2 ++ .../proj.ios_mac/HelloLua.xcodeproj/project.pbxproj | 2 ++ 2 files changed, 4 insertions(+) diff --git a/template/multi-platform-js/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj b/template/multi-platform-js/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj index 046a59ce5b..e2aff1abec 100644 --- a/template/multi-platform-js/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj +++ b/template/multi-platform-js/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj @@ -736,6 +736,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; COMBINE_HIDPI_IMAGES = YES; GCC_DYNAMIC_NO_PIC = NO; GCC_PRECOMPILE_PREFIX_HEADER = YES; @@ -776,6 +777,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; COMBINE_HIDPI_IMAGES = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = mac/Prefix.pch; diff --git a/template/multi-platform-lua/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj b/template/multi-platform-lua/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj index 666e9d5800..86343f277e 100644 --- a/template/multi-platform-lua/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj +++ b/template/multi-platform-lua/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj @@ -771,6 +771,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; COMBINE_HIDPI_IMAGES = YES; GCC_DYNAMIC_NO_PIC = NO; GCC_PRECOMPILE_PREFIX_HEADER = YES; @@ -817,6 +818,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; COMBINE_HIDPI_IMAGES = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = mac/Prefix.pch;