diff --git a/build/cocos2d_libs.xcodeproj/project.pbxproj b/build/cocos2d_libs.xcodeproj/project.pbxproj index 1d9417b86f..852d15b8c4 100644 --- a/build/cocos2d_libs.xcodeproj/project.pbxproj +++ b/build/cocos2d_libs.xcodeproj/project.pbxproj @@ -1355,7 +1355,7 @@ 3E2BDAEC19C0436F0055CDCD /* AudioEngine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E2BDAEB19C0436F0055CDCD /* AudioEngine.cpp */; }; 3E2F27A619CFBFE100E7C490 /* AudioEngine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E2BDAEB19C0436F0055CDCD /* AudioEngine.cpp */; }; 3E2F27A719CFBFE400E7C490 /* AudioEngine.h in Headers */ = {isa = PBXBuildFile; fileRef = 3E2BDADD19C030ED0055CDCD /* AudioEngine.h */; }; - 3E6176681960F89B00DE83F5 /* CCController-iOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3E6176551960F89B00DE83F5 /* CCController-iOS.mm */; }; + 3E6176681960F89B00DE83F5 /* CCController-apple.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3E6176551960F89B00DE83F5 /* CCController-apple.mm */; }; 3E6176691960F89B00DE83F5 /* CCController.h in Headers */ = {isa = PBXBuildFile; fileRef = 3E6176561960F89B00DE83F5 /* CCController.h */; }; 3E6176741960F89B00DE83F5 /* CCEventController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E6176611960F89B00DE83F5 /* CCEventController.cpp */; }; 3E6176751960F89B00DE83F5 /* CCEventController.h in Headers */ = {isa = PBXBuildFile; fileRef = 3E6176621960F89B00DE83F5 /* CCEventController.h */; }; @@ -1900,7 +1900,7 @@ 507B3A4F1C31BDD30067B53E /* UIEditBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 292DB12F19B4574100A80320 /* UIEditBox.cpp */; }; 507B3A511C31BDD30067B53E /* gim_box_set.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B6CAB0BA1AF9AA1900B9B856 /* gim_box_set.cpp */; }; 507B3A521C31BDD30067B53E /* btGjkConvexCast.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B6CAB0D01AF9AA1900B9B856 /* btGjkConvexCast.cpp */; }; - 507B3A531C31BDD30067B53E /* CCController-iOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3E6176551960F89B00DE83F5 /* CCController-iOS.mm */; }; + 507B3A531C31BDD30067B53E /* CCController-apple.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3E6176551960F89B00DE83F5 /* CCController-apple.mm */; }; 507B3A541C31BDD30067B53E /* CCBReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AD71D01180E26E600808F54 /* CCBReader.cpp */; }; 507B3A551C31BDD30067B53E /* CCArmatureDefine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A8C5958180E930E00EF57C3 /* CCArmatureDefine.cpp */; }; 507B3A561C31BDD30067B53E /* CCPUOnRandomObserverTranslator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B665E1821AA80A6500DDB1C5 /* CCPUOnRandomObserverTranslator.cpp */; }; @@ -3988,7 +3988,6 @@ 50CB248019D9C5A100687767 /* AudioPlayer.mm in Sources */ = {isa = PBXBuildFile; fileRef = 50CB247419D9C5A100687767 /* AudioPlayer.mm */; }; 50CE4D1F1D243DD8003D2FB9 /* glfw3.h in Headers */ = {isa = PBXBuildFile; fileRef = 50CE4D1D1D243DD8003D2FB9 /* glfw3.h */; }; 50CE4D201D243DD8003D2FB9 /* glfw3native.h in Headers */ = {isa = PBXBuildFile; fileRef = 50CE4D1E1D243DD8003D2FB9 /* glfw3native.h */; }; - 50ED2BD919BE5D5D00A0AB90 /* CCEventListenerController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E6176631960F89B00DE83F5 /* CCEventListenerController.cpp */; }; 50ED2BDA19BE76D300A0AB90 /* UIVideoPlayer.h in Headers */ = {isa = PBXBuildFile; fileRef = 3EA0FB69191C841D00B170C8 /* UIVideoPlayer.h */; }; 50ED2BDB19BE76D500A0AB90 /* UIVideoPlayer-ios.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3EA0FB6A191C841D00B170C8 /* UIVideoPlayer-ios.mm */; }; 50ED2BE019BEAF7900A0AB90 /* UIEditBoxImpl-win32.h in Headers */ = {isa = PBXBuildFile; fileRef = 50ED2BDC19BEAF7900A0AB90 /* UIEditBoxImpl-win32.h */; }; @@ -4004,6 +4003,11 @@ 50F965571CD0360000ADE813 /* CCVRProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 50F965501CD0360000ADE813 /* CCVRProtocol.h */; }; 50F965581CD0360000ADE813 /* CCVRProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 50F965501CD0360000ADE813 /* CCVRProtocol.h */; }; 50F965591CD0360000ADE813 /* CCVRProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 50F965501CD0360000ADE813 /* CCVRProtocol.h */; }; + 50FC3F9E1D74C0A3001C936A /* CCController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E61781C1966A5A300DE83F5 /* CCController.cpp */; }; + 50FC3F9F1D74C0E5001C936A /* CCController-apple.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3E6176551960F89B00DE83F5 /* CCController-apple.mm */; }; + 50FC3FA21D74C1A1001C936A /* CCEventController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E6176611960F89B00DE83F5 /* CCEventController.cpp */; }; + 50FC3FA81D74C2A1001C936A /* CCEventListenerController.h in Headers */ = {isa = PBXBuildFile; fileRef = 3E6176641960F89B00DE83F5 /* CCEventListenerController.h */; }; + 50FC3FA91D74C2D1001C936A /* CCEventListenerController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E6176631960F89B00DE83F5 /* CCEventListenerController.cpp */; }; 52B47A2E1A5349A3004E4C60 /* HttpAsynConnection-apple.h in Headers */ = {isa = PBXBuildFile; fileRef = 52B47A291A5349A3004E4C60 /* HttpAsynConnection-apple.h */; }; 52B47A2F1A5349A3004E4C60 /* HttpAsynConnection-apple.m in Sources */ = {isa = PBXBuildFile; fileRef = 52B47A2A1A5349A3004E4C60 /* HttpAsynConnection-apple.m */; }; 52B47A301A5349A3004E4C60 /* HttpClient-apple.mm in Sources */ = {isa = PBXBuildFile; fileRef = 52B47A2B1A5349A3004E4C60 /* HttpClient-apple.mm */; }; @@ -6283,7 +6287,7 @@ 3E2A09C11BAA91B70086B878 /* CCMotionStreak3D.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCMotionStreak3D.h; sourceTree = ""; }; 3E2BDADD19C030ED0055CDCD /* AudioEngine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AudioEngine.h; sourceTree = ""; }; 3E2BDAEB19C0436F0055CDCD /* AudioEngine.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AudioEngine.cpp; sourceTree = ""; }; - 3E6176551960F89B00DE83F5 /* CCController-iOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = "CCController-iOS.mm"; path = "../base/CCController-iOS.mm"; sourceTree = ""; }; + 3E6176551960F89B00DE83F5 /* CCController-apple.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = "CCController-apple.mm"; path = "../base/CCController-apple.mm"; sourceTree = ""; }; 3E6176561960F89B00DE83F5 /* CCController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCController.h; path = ../base/CCController.h; sourceTree = ""; }; 3E6176611960F89B00DE83F5 /* CCEventController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCEventController.cpp; path = ../base/CCEventController.cpp; sourceTree = ""; }; 3E6176621960F89B00DE83F5 /* CCEventController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCEventController.h; path = ../base/CCEventController.h; sourceTree = ""; }; @@ -8089,7 +8093,7 @@ 464AD6E3197EBB1400E502D8 /* pvr.cpp */, 464AD6E4197EBB1400E502D8 /* pvr.h */, 3E61781C1966A5A300DE83F5 /* CCController.cpp */, - 3E6176551960F89B00DE83F5 /* CCController-iOS.mm */, + 3E6176551960F89B00DE83F5 /* CCController-apple.mm */, 3E6176561960F89B00DE83F5 /* CCController.h */, 3E6176611960F89B00DE83F5 /* CCEventController.cpp */, 3E6176621960F89B00DE83F5 /* CCEventController.h */, @@ -12046,6 +12050,7 @@ 1A57030E180BCF190088DEC7 /* CCComponent.h in Headers */, B6CAB33D1AF9AA1A00B9B856 /* gim_array.h in Headers */, B6CAB2DB1AF9AA1A00B9B856 /* btPolyhedralConvexShape.h in Headers */, + 50FC3FA81D74C2A1001C936A /* CCEventListenerController.h in Headers */, B6CAB5251AF9AA1A00B9B856 /* btQuickprof.h in Headers */, B665E2AC1AA80A6500DDB1C5 /* CCPUFlockCenteringAffector.h in Headers */, 5020A19B1D49912500E80C72 /* Event.h in Headers */, @@ -14679,6 +14684,7 @@ 50ABBEB71925AB6F00A911A9 /* ccUTF8.cpp in Sources */, B665E2621AA80A6500DDB1C5 /* CCPUDoExpireEventHandler.cpp in Sources */, B665E4161AA80A6600DDB1C5 /* CCPUTextureAnimatorTranslator.cpp in Sources */, + 50FC3F9F1D74C0E5001C936A /* CCController-apple.mm in Sources */, B665E41E1AA80A6600DDB1C5 /* CCPUTextureRotatorTranslator.cpp in Sources */, 15AE189819AAD33D00C27E9E /* CCMenuItemLoader.cpp in Sources */, 15AE1A5719AAD40300C27E9E /* b2Settings.cpp in Sources */, @@ -14787,7 +14793,6 @@ 1A57009E180BC5D20088DEC7 /* CCNode.cpp in Sources */, B6CAB3CD1AF9AA1A00B9B856 /* btSequentialImpulseConstraintSolver.cpp in Sources */, B6CAB5191AF9AA1A00B9B856 /* btPolarDecomposition.cpp in Sources */, - 50ED2BD919BE5D5D00A0AB90 /* CCEventListenerController.cpp in Sources */, B665E2321AA80A6500DDB1C5 /* CCPUBoxEmitter.cpp in Sources */, B257B460198A353E00D9A687 /* CCPrimitiveCommand.cpp in Sources */, 291901451B05895600F8B4BA /* CCNinePatchImageParser.cpp in Sources */, @@ -14917,6 +14922,7 @@ 5020A2041D49912500E80C72 /* Skin.c in Sources */, 1A5701CB180BCB5A0088DEC7 /* CCLabelTTF.cpp in Sources */, 50ABBE711925AB6F00A911A9 /* CCEventListenerMouse.cpp in Sources */, + 50FC3FA91D74C2D1001C936A /* CCEventListenerController.cpp in Sources */, B6CAB3C91AF9AA1A00B9B856 /* btPoint2PointConstraint.cpp in Sources */, 1A5701DE180BCB8C0088DEC7 /* CCLayer.cpp in Sources */, 15AE1B5919AADA9900C27E9E /* UIText.cpp in Sources */, @@ -15130,6 +15136,7 @@ B665E3621AA80A6500DDB1C5 /* CCPUOnTimeObserver.cpp in Sources */, 15AE18DF19AAD35000C27E9E /* TriggerBase.cpp in Sources */, 15AE1A7219AAD40300C27E9E /* b2ContactSolver.cpp in Sources */, + 50FC3FA21D74C1A1001C936A /* CCEventController.cpp in Sources */, B6DD2FE11B04825B00E47F5F /* DetourPathCorridor.cpp in Sources */, B665E2BE1AA80A6500DDB1C5 /* CCPUGeometryRotator.cpp in Sources */, 3823841A1A2590D2002C4610 /* ComAudioReader.cpp in Sources */, @@ -15166,6 +15173,7 @@ B6DD2FCB1B04825B00E47F5F /* DetourNavMeshQuery.cpp in Sources */, B6CAB26D1AF9AA1A00B9B856 /* btSphereSphereCollisionAlgorithm.cpp in Sources */, B6CAB3251AF9AA1A00B9B856 /* btGImpactBvh.cpp in Sources */, + 50FC3F9E1D74C0A3001C936A /* CCController.cpp in Sources */, B665E2721AA80A6500DDB1C5 /* CCPUDoPlacementParticleEventHandler.cpp in Sources */, 50ABBD3C1925AB0000A911A9 /* CCGeometry.cpp in Sources */, B6CAB3C31AF9AA1A00B9B856 /* btHingeConstraint.cpp in Sources */, @@ -15595,7 +15603,7 @@ 5020A1AC1D49912500E80C72 /* IkConstraint.c in Sources */, 507B3A511C31BDD30067B53E /* gim_box_set.cpp in Sources */, 507B3A521C31BDD30067B53E /* btGjkConvexCast.cpp in Sources */, - 507B3A531C31BDD30067B53E /* CCController-iOS.mm in Sources */, + 507B3A531C31BDD30067B53E /* CCController-apple.mm in Sources */, 507B3A541C31BDD30067B53E /* CCBReader.cpp in Sources */, 507B3A551C31BDD30067B53E /* CCArmatureDefine.cpp in Sources */, 507B3A561C31BDD30067B53E /* CCPUOnRandomObserverTranslator.cpp in Sources */, @@ -16452,7 +16460,7 @@ 292DB13E19B4574100A80320 /* UIEditBox.cpp in Sources */, B6CAB3461AF9AA1A00B9B856 /* gim_box_set.cpp in Sources */, B6CAB3701AF9AA1A00B9B856 /* btGjkConvexCast.cpp in Sources */, - 3E6176681960F89B00DE83F5 /* CCController-iOS.mm in Sources */, + 3E6176681960F89B00DE83F5 /* CCController-apple.mm in Sources */, 15AE18B219AAD33D00C27E9E /* CCBReader.cpp in Sources */, 15AE193C19AAD35100C27E9E /* CCArmatureDefine.cpp in Sources */, B665E35F1AA80A6500DDB1C5 /* CCPUOnRandomObserverTranslator.cpp in Sources */, diff --git a/build/cocos2d_tests.xcodeproj/project.pbxproj b/build/cocos2d_tests.xcodeproj/project.pbxproj index 483ea36f90..0e7450ff27 100644 --- a/build/cocos2d_tests.xcodeproj/project.pbxproj +++ b/build/cocos2d_tests.xcodeproj/project.pbxproj @@ -27,6 +27,7 @@ buildPhases = ( ); dependencies = ( + 50FC3FAB1D74C3D0001C936A /* PBXTargetDependency */, 293CE83A1B43F3ED00F66EF1 /* PBXTargetDependency */, 1ADA8BA418CF277400AE24B9 /* PBXTargetDependency */, 1ADA8BA618CF277400AE24B9 /* PBXTargetDependency */, @@ -1228,6 +1229,29 @@ 50FC18F81C3372DB00DD15A3 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 50FC18181C3371C000DD15A3 /* main.m */; }; 50FC18F91C3372DB00DD15A3 /* NativeOcClass.m in Sources */ = {isa = PBXBuildFile; fileRef = 50FC181A1C3371C000DD15A3 /* NativeOcClass.m */; }; 50FC18FA1C3372DB00DD15A3 /* RootViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 50FC181D1C3371C000DD15A3 /* RootViewController.mm */; }; + 50FC3F811D74BCC9001C936A /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 826294421AAF071500CB7CF7 /* Security.framework */; }; + 50FC3F821D74BCC9001C936A /* libcocos2d Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FB01807A4F9005B8026 /* libcocos2d Mac.a */; }; + 50FC3F831D74BCC9001C936A /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EDCC747E17C455FD007B692C /* IOKit.framework */; }; + 50FC3F841D74BCC9001C936A /* libiconv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = ED545A6C1B68A18300C3958E /* libiconv.dylib */; }; + 50FC3F851D74BCC9001C936A /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C6482E165F399D007D4F18 /* libz.dylib */; }; + 50FC3F861D74BCC9001C936A /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C64832165F3AFD007D4F18 /* Foundation.framework */; }; + 50FC3F871D74BCC9001C936A /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C6482C165F3988007D4F18 /* AudioToolbox.framework */; }; + 50FC3F881D74BCC9001C936A /* ApplicationServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C6482A165F3979007D4F18 /* ApplicationServices.framework */; }; + 50FC3F891D74BCC9001C936A /* OpenAL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C64828165F396B007D4F18 /* OpenAL.framework */; }; + 50FC3F8A1D74BCC9001C936A /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C64826165F394E007D4F18 /* QuartzCore.framework */; }; + 50FC3F8B1D74BCC9001C936A /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C64824165F3934007D4F18 /* OpenGL.framework */; }; + 50FC3F8C1D74BCC9001C936A /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 15C64822165F391E007D4F18 /* Cocoa.framework */; }; + 50FC3F921D74BD5F001C936A /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 503FAE1A1D74B6C30036585D /* InfoPlist.strings */; }; + 50FC3F931D74BD65001C936A /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 503FAE1C1D74B6C30036585D /* MainMenu.xib */; }; + 50FC3F941D74BD68001C936A /* Icon.icns in Resources */ = {isa = PBXBuildFile; fileRef = 503FAE1E1D74B6C30036585D /* Icon.icns */; }; + 50FC3F951D74BD6F001C936A /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 503FAE201D74B6C30036585D /* main.cpp */; }; + 50FC3F9C1D74C039001C936A /* AppDelegate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E6176B71960FA6300DE83F5 /* AppDelegate.cpp */; }; + 50FC3F9D1D74C03E001C936A /* GameControllerTest.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3E6176BA1960FA6300DE83F5 /* GameControllerTest.cpp */; }; + 50FC3FA11D74C15B001C936A /* GameController.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 50FC3FA01D74C15B001C936A /* GameController.framework */; }; + 50FC3FA41D74C268001C936A /* fonts in Resources */ = {isa = PBXBuildFile; fileRef = 3E6177F01960FEFE00DE83F5 /* fonts */; }; + 50FC3FA51D74C268001C936A /* ipad in Resources */ = {isa = PBXBuildFile; fileRef = 3E6177F11960FEFE00DE83F5 /* ipad */; }; + 50FC3FA61D74C268001C936A /* ipadhd in Resources */ = {isa = PBXBuildFile; fileRef = 3E6177F21960FEFE00DE83F5 /* ipadhd */; }; + 50FC3FA71D74C268001C936A /* iphone in Resources */ = {isa = PBXBuildFile; fileRef = 3E6177F31960FEFE00DE83F5 /* iphone */; }; 527B1F3019EF9819000A1F82 /* Default-667h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 527B1F2E19EF9819000A1F82 /* Default-667h@2x.png */; }; 527B1F3119EF9819000A1F82 /* Default-736h@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 527B1F2F19EF9819000A1F82 /* Default-736h@3x.png */; }; 527B1F3419EF9CF8000A1F82 /* Default-667h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 527B1F3219EF9CF8000A1F82 /* Default-667h@2x.png */; }; @@ -1769,6 +1793,20 @@ remoteGlobalIDString = A07A4C241783777C0073F6A7; remoteInfo = "cocos2dx iOS"; }; + 50FC3F721D74BCC9001C936A /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 1551A33E158F2AB200E66CFE; + remoteInfo = "cocos2dx Mac"; + }; + 50FC3FAA1D74C3D0001C936A /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */; + proxyType = 1; + remoteGlobalIDString = 50FC3F701D74BCC9001C936A; + remoteInfo = "game-controller-test Mac"; + }; A035ACBF178246BD00987F6C /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */; @@ -2434,6 +2472,12 @@ 4B5C5BB41CA114DB00D55A14 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS9.1.sdk/System/Library/Frameworks/Security.framework; sourceTree = DEVELOPER_DIR; }; 500D1CD11CF4A48B00535D35 /* Bug-15594.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "Bug-15594.cpp"; sourceTree = ""; }; 500D1CD21CF4A48B00535D35 /* Bug-15594.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Bug-15594.h"; sourceTree = ""; }; + 503FAE1B1D74B6C30036585D /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = ""; }; + 503FAE1D1D74B6C30036585D /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/MainMenu.xib; sourceTree = ""; }; + 503FAE1E1D74B6C30036585D /* Icon.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = Icon.icns; sourceTree = ""; }; + 503FAE1F1D74B6C30036585D /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 503FAE201D74B6C30036585D /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = main.cpp; sourceTree = ""; }; + 503FAE211D74B6C30036585D /* Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Prefix.pch; sourceTree = ""; }; 5046AB481AF2A8D80060550B /* MaterialSystemTest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MaterialSystemTest.cpp; sourceTree = ""; }; 5046AB491AF2A8D80060550B /* MaterialSystemTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MaterialSystemTest.h; sourceTree = ""; }; 5046AB5A1AF2C4180060550B /* Materials */ = {isa = PBXFileReference; lastKnownFileType = folder; name = Materials; path = "../tests/cpp-tests/Resources/Materials"; sourceTree = ""; }; @@ -2479,6 +2523,8 @@ 50FC18AF1C3371D400DD15A3 /* src */ = {isa = PBXFileReference; lastKnownFileType = folder; name = src; path = "../tests/js-memory-gc-tests/src"; sourceTree = ""; }; 50FC18B21C33720300DD15A3 /* script */ = {isa = PBXFileReference; lastKnownFileType = folder; name = script; path = "../cocos/scripting/js-bindings/script"; sourceTree = ""; }; 50FC18E61C33725200DD15A3 /* js-memory-gc-tests iOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "js-memory-gc-tests iOS.app"; sourceTree = BUILT_PRODUCTS_DIR; }; + 50FC3F901D74BCC9001C936A /* game-controller-test Mac.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "game-controller-test Mac.app"; sourceTree = BUILT_PRODUCTS_DIR; }; + 50FC3FA01D74C15B001C936A /* GameController.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GameController.framework; path = System/Library/Frameworks/GameController.framework; sourceTree = SDKROOT; }; 527B1F2E19EF9819000A1F82 /* Default-667h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-667h@2x.png"; sourceTree = ""; }; 527B1F2F19EF9819000A1F82 /* Default-736h@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-736h@3x.png"; sourceTree = ""; }; 527B1F3219EF9CF8000A1F82 /* Default-667h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-667h@2x.png"; sourceTree = ""; }; @@ -3001,6 +3047,26 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 50FC3F801D74BCC9001C936A /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 50FC3FA11D74C15B001C936A /* GameController.framework in Frameworks */, + 50FC3F811D74BCC9001C936A /* Security.framework in Frameworks */, + 50FC3F821D74BCC9001C936A /* libcocos2d Mac.a in Frameworks */, + 50FC3F831D74BCC9001C936A /* IOKit.framework in Frameworks */, + 50FC3F841D74BCC9001C936A /* libiconv.dylib in Frameworks */, + 50FC3F851D74BCC9001C936A /* libz.dylib in Frameworks */, + 50FC3F861D74BCC9001C936A /* Foundation.framework in Frameworks */, + 50FC3F871D74BCC9001C936A /* AudioToolbox.framework in Frameworks */, + 50FC3F881D74BCC9001C936A /* ApplicationServices.framework in Frameworks */, + 50FC3F891D74BCC9001C936A /* OpenAL.framework in Frameworks */, + 50FC3F8A1D74BCC9001C936A /* QuartzCore.framework in Frameworks */, + 50FC3F8B1D74BCC9001C936A /* OpenGL.framework in Frameworks */, + 50FC3F8C1D74BCC9001C936A /* Cocoa.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; A07A52171783A1D20073F6A7 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -3256,6 +3322,7 @@ 507B43F21C3201360067B53E /* game-controller-test tvOS.app */, 507B44431C336EFA0067B53E /* js-memory-gc-tests Mac.app */, 50FC18E61C33725200DD15A3 /* js-memory-gc-tests iOS.app */, + 50FC3F901D74BCC9001C936A /* game-controller-test Mac.app */, ); name = Products; sourceTree = ""; @@ -4770,6 +4837,7 @@ 29B97323FDCFA39411CA2CEA /* Frameworks */ = { isa = PBXGroup; children = ( + 50FC3FA01D74C15B001C936A /* GameController.framework */, 29DC5A1E1CFFE5E700CF2930 /* CoreText.framework */, 4B5C5BB41CA114DB00D55A14 /* Security.framework */, 4B5C5BAA1CA1149900D55A14 /* Security.framework */, @@ -4879,9 +4947,10 @@ 3E6176B51960FA6300DE83F5 /* game-controller-test */ = { isa = PBXGroup; children = ( + 3E6176DC1960FA6300DE83F5 /* proj.ios */, + 503FAE191D74B6C30036585D /* proj.mac */, 3E6177EF1960FEE300DE83F5 /* Resource */, 3E6176B61960FA6300DE83F5 /* Classes */, - 3E6176DC1960FA6300DE83F5 /* proj.ios */, ); name = "game-controller-test"; path = "../tests/game-controller-test"; @@ -4978,6 +5047,19 @@ name = Products; sourceTree = ""; }; + 503FAE191D74B6C30036585D /* proj.mac */ = { + isa = PBXGroup; + children = ( + 503FAE1A1D74B6C30036585D /* InfoPlist.strings */, + 503FAE1C1D74B6C30036585D /* MainMenu.xib */, + 503FAE1E1D74B6C30036585D /* Icon.icns */, + 503FAE1F1D74B6C30036585D /* Info.plist */, + 503FAE201D74B6C30036585D /* main.cpp */, + 503FAE211D74B6C30036585D /* Prefix.pch */, + ); + path = proj.mac; + sourceTree = ""; + }; 5046AB471AF2A8D80060550B /* MaterialSystemTest */ = { isa = PBXGroup; children = ( @@ -5643,6 +5725,24 @@ productReference = 50FC18E61C33725200DD15A3 /* js-memory-gc-tests iOS.app */; productType = "com.apple.product-type.application"; }; + 50FC3F701D74BCC9001C936A /* game-controller-test Mac */ = { + isa = PBXNativeTarget; + buildConfigurationList = 50FC3F8D1D74BCC9001C936A /* Build configuration list for PBXNativeTarget "game-controller-test Mac" */; + buildPhases = ( + 50FC3F731D74BCC9001C936A /* Resources */, + 50FC3F7C1D74BCC9001C936A /* Sources */, + 50FC3F801D74BCC9001C936A /* Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + 50FC3F711D74BCC9001C936A /* PBXTargetDependency */, + ); + name = "game-controller-test Mac"; + productName = iphone; + productReference = 50FC3F901D74BCC9001C936A /* game-controller-test Mac.app */; + productType = "com.apple.product-type.application"; + }; A07A517F1783A1D20073F6A7 /* cpp-tests iOS */ = { isa = PBXNativeTarget; buildConfigurationList = A07A52261783A1D20073F6A7 /* Build configuration list for PBXNativeTarget "cpp-tests iOS" */; @@ -5758,6 +5858,7 @@ A035ACBB1782469700987F6C /* build all tests Mac */, 1D6058900D05DD3D006BFB54 /* cpp-tests Mac */, 1A0EE1C618CDF6DA004CD58F /* cpp-empty-test Mac */, + 50FC3F701D74BCC9001C936A /* game-controller-test Mac */, 1ABCA28518CD91510087CE3A /* lua-tests Mac */, 1A0EE2B818CDF733004CD58F /* lua-empty-test Mac */, 1856634B1B4155D3009EF2AE /* js-tests Mac */, @@ -6369,6 +6470,20 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 50FC3F731D74BCC9001C936A /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 50FC3FA61D74C268001C936A /* ipadhd in Resources */, + 50FC3F941D74BD68001C936A /* Icon.icns in Resources */, + 50FC3F921D74BD5F001C936A /* InfoPlist.strings in Resources */, + 50FC3FA71D74C268001C936A /* iphone in Resources */, + 50FC3F931D74BD65001C936A /* MainMenu.xib in Resources */, + 50FC3FA41D74C268001C936A /* fonts in Resources */, + 50FC3FA51D74C268001C936A /* ipad in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; A07A518A1783A1D20073F6A7 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; @@ -7165,6 +7280,16 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 50FC3F7C1D74BCC9001C936A /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 50FC3F9C1D74C039001C936A /* AppDelegate.cpp in Sources */, + 50FC3F951D74BD6F001C936A /* main.cpp in Sources */, + 50FC3F9D1D74C03E001C936A /* GameControllerTest.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; A07A51AD1783A1D20073F6A7 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -7585,6 +7710,16 @@ name = "cocos2dx iOS"; targetProxy = 50FC18B81C33725200DD15A3 /* PBXContainerItemProxy */; }; + 50FC3F711D74BCC9001C936A /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + name = "cocos2dx Mac"; + targetProxy = 50FC3F721D74BCC9001C936A /* PBXContainerItemProxy */; + }; + 50FC3FAB1D74C3D0001C936A /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 50FC3F701D74BCC9001C936A /* game-controller-test Mac */; + targetProxy = 50FC3FAA1D74C3D0001C936A /* PBXContainerItemProxy */; + }; A035ACC0178246BD00987F6C /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 1D6058900D05DD3D006BFB54 /* cpp-tests Mac */; @@ -7688,6 +7823,22 @@ name = MainMenu.xib; sourceTree = ""; }; + 503FAE1A1D74B6C30036585D /* InfoPlist.strings */ = { + isa = PBXVariantGroup; + children = ( + 503FAE1B1D74B6C30036585D /* en */, + ); + name = InfoPlist.strings; + sourceTree = ""; + }; + 503FAE1C1D74B6C30036585D /* MainMenu.xib */ = { + isa = PBXVariantGroup; + children = ( + 503FAE1D1D74B6C30036585D /* en */, + ); + name = MainMenu.xib; + sourceTree = ""; + }; 50FC18211C3371C000DD15A3 /* InfoPlist.strings */ = { isa = PBXVariantGroup; children = ( @@ -8565,6 +8716,37 @@ }; name = Release; }; + 50FC3F8E1D74BCC9001C936A /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + CC_TARGET_OS_MAC, + ); + INFOPLIST_FILE = "$(SRCROOT)/../tests/game-controller-test/proj.mac/Info.plist"; + LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks"; + PRODUCT_NAME = "$(TARGET_NAME)"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../external/glfw3/include/mac"; + }; + name = Debug; + }; + 50FC3F8F1D74BCC9001C936A /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + GCC_PRECOMPILE_PREFIX_HEADER = YES; + GCC_PREPROCESSOR_DEFINITIONS = ( + "$(inherited)", + CC_TARGET_OS_MAC, + ); + INFOPLIST_FILE = "$(SRCROOT)/../tests/game-controller-test/proj.mac/Info.plist"; + LD_RUNPATH_SEARCH_PATHS = "@loader_path/../Frameworks"; + PRODUCT_NAME = "$(TARGET_NAME)"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../external/glfw3/include/mac"; + VALIDATE_PRODUCT = YES; + }; + name = Release; + }; A035ACBD1782469800987F6C /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -8965,6 +9147,15 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Debug; }; + 50FC3F8D1D74BCC9001C936A /* Build configuration list for PBXNativeTarget "game-controller-test Mac" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 50FC3F8E1D74BCC9001C936A /* Debug */, + 50FC3F8F1D74BCC9001C936A /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Debug; + }; A035ACBC1782469800987F6C /* Build configuration list for PBXAggregateTarget "build all tests Mac" */ = { isa = XCConfigurationList; buildConfigurations = ( diff --git a/build/cocos2d_tests.xcodeproj/xcshareddata/xcschemes/game-controller-test Mac.xcscheme b/build/cocos2d_tests.xcodeproj/xcshareddata/xcschemes/game-controller-test Mac.xcscheme new file mode 100644 index 0000000000..1477188eb2 --- /dev/null +++ b/build/cocos2d_tests.xcodeproj/xcshareddata/xcschemes/game-controller-test Mac.xcscheme @@ -0,0 +1,91 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cocos/base/CCController-iOS.mm b/cocos/base/CCController-apple.mm similarity index 99% rename from cocos/base/CCController-iOS.mm rename to cocos/base/CCController-apple.mm index 3242c7cf05..ed824ae0c1 100644 --- a/cocos/base/CCController-iOS.mm +++ b/cocos/base/CCController-apple.mm @@ -25,7 +25,7 @@ #include "base/CCController.h" #include "platform/CCPlatformConfig.h" -#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS) +#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_MAC) #include "base/ccMacros.h" #include "base/CCEventDispatcher.h" diff --git a/cocos/base/CCController.cpp b/cocos/base/CCController.cpp index e326a7feec..8fa1c483ba 100644 --- a/cocos/base/CCController.cpp +++ b/cocos/base/CCController.cpp @@ -25,7 +25,7 @@ #include "base/CCController.h" -#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_IOS) +#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_MAC) #include "base/CCEventDispatcher.h" #include "base/CCEventController.h" @@ -112,4 +112,4 @@ void Controller::onAxisEvent(int axisCode, float value, bool isAnalog) NS_CC_END -#endif // #if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) +#endif // (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_MAC) diff --git a/cocos/base/CCEventDispatcher.cpp b/cocos/base/CCEventDispatcher.cpp index fba0cbac76..257165cc84 100644 --- a/cocos/base/CCEventDispatcher.cpp +++ b/cocos/base/CCEventDispatcher.cpp @@ -31,7 +31,7 @@ #include "base/CCEventListenerKeyboard.h" #include "base/CCEventListenerCustom.h" #include "base/CCEventListenerFocus.h" -#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_IOS) +#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_MAC) #include "base/CCEventListenerController.h" #endif #include "2d/CCScene.h" @@ -94,7 +94,7 @@ static EventListener::ListenerID __getListenerID(Event* event) // return UNKNOWN instead. CCASSERT(false, "Don't call this method if the event is for touch."); break; -#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_IOS) +#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_MAC) case Event::Type::GAME_CONTROLLER: ret = EventListenerController::LISTENER_ID; break; diff --git a/tests/game-controller-test/proj.mac/Icon.icns b/tests/game-controller-test/proj.mac/Icon.icns new file mode 100644 index 0000000000..3d09e8fb4f Binary files /dev/null and b/tests/game-controller-test/proj.mac/Icon.icns differ diff --git a/tests/game-controller-test/proj.mac/Info.plist b/tests/game-controller-test/proj.mac/Info.plist new file mode 100644 index 0000000000..608a82cdac --- /dev/null +++ b/tests/game-controller-test/proj.mac/Info.plist @@ -0,0 +1,34 @@ + + + + + CFBundleDevelopmentRegion + en + CFBundleExecutable + ${EXECUTABLE_NAME} + CFBundleIconFile + Icon + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + ${PRODUCT_NAME} + CFBundlePackageType + APPL + CFBundleShortVersionString + 1.0 + CFBundleSignature + ???? + CFBundleVersion + 1 + LSMinimumSystemVersion + ${MACOSX_DEPLOYMENT_TARGET} + NSHumanReadableCopyright + Copyright © 2012. All rights reserved. + NSMainNibFile + MainMenu + NSPrincipalClass + NSApplication + + diff --git a/tests/game-controller-test/proj.mac/Prefix.pch b/tests/game-controller-test/proj.mac/Prefix.pch new file mode 100644 index 0000000000..aa71e76645 --- /dev/null +++ b/tests/game-controller-test/proj.mac/Prefix.pch @@ -0,0 +1,11 @@ +// +// Prefix header for all source files of the 'Paralaxer' target in the 'Paralaxer' project +// + +#ifdef __OBJC__ + #import +#endif + +#ifdef __cplusplus + #include "cocos2d.h" +#endif \ No newline at end of file diff --git a/tests/game-controller-test/proj.mac/en.lproj/InfoPlist.strings b/tests/game-controller-test/proj.mac/en.lproj/InfoPlist.strings new file mode 100644 index 0000000000..477b28ff8f --- /dev/null +++ b/tests/game-controller-test/proj.mac/en.lproj/InfoPlist.strings @@ -0,0 +1,2 @@ +/* Localized versions of Info.plist keys */ + diff --git a/tests/game-controller-test/proj.mac/en.lproj/MainMenu.xib b/tests/game-controller-test/proj.mac/en.lproj/MainMenu.xib new file mode 100644 index 0000000000..3dacdedbd0 --- /dev/null +++ b/tests/game-controller-test/proj.mac/en.lproj/MainMenu.xib @@ -0,0 +1,812 @@ + + + + 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 + + + TestCpp + + 1048576 + 2147483647 + + NSImage + NSMenuCheckmark + + + NSImage + NSMenuMixedState + + submenuAction: + + TestCpp + + YES + + + About TestCpp + + 2147483647 + + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + Preferences… + , + 1048576 + 2147483647 + + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + Services + + 1048576 + 2147483647 + + + submenuAction: + + Services + + YES + + _NSServicesMenu + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + Hide TestCpp + h + 1048576 + 2147483647 + + + + + + Hide Others + h + 1572864 + 2147483647 + + + + + + Show All + + 1048576 + 2147483647 + + + + + + YES + YES + + + 1048576 + 2147483647 + + + + + + Quit TestCpp + 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 + + + TestCpp 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} + + + + diff --git a/tests/game-controller-test/proj.mac/main.cpp b/tests/game-controller-test/proj.mac/main.cpp new file mode 100644 index 0000000000..1814d16c15 --- /dev/null +++ b/tests/game-controller-test/proj.mac/main.cpp @@ -0,0 +1,33 @@ +/**************************************************************************** + 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" + +USING_NS_CC; + +int main(int argc, char *argv[]) +{ + AppDelegate app; + return Application::getInstance()->run(); +}