diff --git a/build/cocos2d_tests.xcodeproj/project.pbxproj b/build/cocos2d_tests.xcodeproj/project.pbxproj index ac2f05b40f..f1a8b18e4b 100644 --- a/build/cocos2d_tests.xcodeproj/project.pbxproj +++ b/build/cocos2d_tests.xcodeproj/project.pbxproj @@ -13,6 +13,7 @@ buildPhases = ( ); dependencies = ( + 293CE83A1B43F3ED00F66EF1 /* PBXTargetDependency */, 1ADA8BA418CF277400AE24B9 /* PBXTargetDependency */, 1ADA8BA618CF277400AE24B9 /* PBXTargetDependency */, 1ADA8BA818CF277400AE24B9 /* PBXTargetDependency */, @@ -27,6 +28,7 @@ buildPhases = ( ); dependencies = ( + 293CE83C1B43F3F300F66EF1 /* PBXTargetDependency */, 1ADA8BAC18CF277C00AE24B9 /* PBXTargetDependency */, 1ADA8BAE18CF277C00AE24B9 /* PBXTargetDependency */, 1ADA8BB018CF277C00AE24B9 /* PBXTargetDependency */, @@ -1128,6 +1130,20 @@ remoteGlobalIDString = 1A0EE41918CDF799004CD58F; remoteInfo = "lua-empty-test iOS"; }; + 293CE8391B43F3ED00F66EF1 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */; + proxyType = 1; + remoteGlobalIDString = 1856634B1B4155D3009EF2AE; + remoteInfo = "js-tests Mac"; + }; + 293CE83B1B43F3F300F66EF1 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */; + proxyType = 1; + remoteGlobalIDString = 185663961B4155DD009EF2AE; + remoteInfo = "js-tests iOS"; + }; 3E6177011960FAED00DE83F5 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 46A15F9C1807A4F8005B8026 /* cocos2d_libs.xcodeproj */; @@ -3497,15 +3513,6 @@ path = ZwoptexTest; sourceTree = ""; }; - 1AC35C6F18CECF0C00F37B72 /* VibrateTest */ = { - isa = PBXGroup; - children = ( - 1AC35C6D18CECF0C00F37B72 /* VibrateTest.cpp */, - 1AC35C6E18CECF0C00F37B72 /* VibrateTest.h */, - ); - path = VibrateTest; - sourceTree = ""; - }; 1AC35C6D18CECF1400F37B72 /* proj.ios */ = { isa = PBXGroup; children = ( @@ -3546,6 +3553,15 @@ path = Classes; sourceTree = ""; }; + 1AC35C6F18CECF0C00F37B72 /* VibrateTest */ = { + isa = PBXGroup; + children = ( + 1AC35C6D18CECF0C00F37B72 /* VibrateTest.cpp */, + 1AC35C6E18CECF0C00F37B72 /* VibrateTest.h */, + ); + path = VibrateTest; + sourceTree = ""; + }; 1AC35C9A18CECF1E00F37B72 /* proj.mac */ = { isa = PBXGroup; children = ( @@ -5906,6 +5922,16 @@ target = 1A0EE41918CDF799004CD58F /* lua-empty-test iOS */; targetProxy = 1ADA8BAF18CF277C00AE24B9 /* PBXContainerItemProxy */; }; + 293CE83A1B43F3ED00F66EF1 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 1856634B1B4155D3009EF2AE /* js-tests Mac */; + targetProxy = 293CE8391B43F3ED00F66EF1 /* PBXContainerItemProxy */; + }; + 293CE83C1B43F3F300F66EF1 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 185663961B4155DD009EF2AE /* js-tests iOS */; + targetProxy = 293CE83B1B43F3F300F66EF1 /* PBXContainerItemProxy */; + }; 3E6177001960FAED00DE83F5 /* PBXTargetDependency */ = { isa = PBXTargetDependency; name = "cocos2dx iOS"; diff --git a/tools/tojs/cocos2dx_ui.ini b/tools/tojs/cocos2dx_ui.ini index 8fa317061d..f655c14aa5 100644 --- a/tools/tojs/cocos2dx_ui.ini +++ b/tools/tojs/cocos2dx_ui.ini @@ -30,7 +30,7 @@ headers = %(cocosdir)s/cocos/ui/CocosGUI.h # what classes to produce code for. You can use regular expressions here. When testing the regular # expression, it will be enclosed in "^$", like this: "^Menu*$". -classes = Helper Layout Widget Button CheckBox ImageView Text TextAtlas TextBMFont RichText RichElement RichElementText RichElementImage RichElementCustomNode LoadingBar Slider TextField UICCTextField ScrollView PageView ListView LayoutParameter LinearLayoutParameter RelativeLayoutParameter VideoPlayer HBox VBox RelativeBox Scale9Sprite EditBox$ LayoutComponent +classes = Helper Layout Widget Button CheckBox ImageView Text TextAtlas TextBMFont RichText RichElement RichElementText RichElementImage RichElementCustomNode LoadingBar Slider TextField UICCTextField ScrollView PageView ListView LayoutParameter LinearLayoutParameter RelativeLayoutParameter VideoPlayer HBox VBox RelativeBox Scale9Sprite EditBox$ LayoutComponent RadioButtonGroup RadioButton AbstractCheckButton classes_need_extend = Layout Widget Button CheckBox ImageView Text TextAtlas TextBMFont RichText RichElement RichElementText RichElementImage RichElementCustomNode LoadingBar Slider TextField ScrollView PageView ListView VideoPlayer HBox VBox RelativeBox Scale9Sprite EditBox$ LayoutComponent @@ -66,7 +66,7 @@ base_classes_to_skip = Ref # classes that create no constructor # Set is special and we will use a hand-written constructor -abstract_classes = Helper LayoutManager +abstract_classes = Helper LayoutManager AbstractCheckButton # Determining whether to use script object(js object) to control the lifecycle of native(cpp) object or the other way around. Supported values are 'yes' or 'no'. script_control_cpp = no