axmol/cocos/ui/CMakeLists.txt

72 lines
1.6 KiB
CMake
Raw Normal View History

if(WINDOWS AND BUILD_SHARED_LIBS)
ADD_DEFINITIONS (-D_USEGUIDLL)
endif()
if(WINDOWS)
set(COCOS_UI_SPECIFIC_SRC
ui/UIEditBox/UIEditBoxImpl-win32.cpp
)
elseif(MACOSX)
set(COCOS_UI_SPECIFIC_SRC
ui/UIEditBox/UIEditBoxImpl-mac.mm
Squashed commit of the following: commit 36c2807d07848448c1fed86f4b119205048691bf Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Mon Feb 29 13:11:40 2016 -0800 binary file 82 commit 9b7cd003b12faefd0522d12f765c027efb001ab2 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Mon Feb 29 12:56:39 2016 -0800 fore multiple in windows phone 8.1 too commit daea8a3ef8d69915e7a9d962fd745a1103011bab Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Mon Feb 29 12:50:45 2016 -0800 force multiple commit 0fbabdbf99974e95de083d79c7d6ae7cf735e4b6 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Mon Feb 29 10:44:40 2016 -0800 compiles commit f817766afcd0ffc4ca93f628d55fabc4b5a96ba5 Merge: 7b2cea3 8bf3d33 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Mon Feb 29 09:37:24 2016 -0800 Merge branch 'v3' into chipmunk_v7_2 commit 7b2cea329a56ae2786428d39a499bc12ba3860e6 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sat Feb 27 01:11:13 2016 -0800 correct paths for win8.1 commit dcf1f046eb1e18474d6f94b2d7dc31fbf1b06cea Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Feb 26 22:46:58 2016 -0800 projects works on win32 commit ab5b14c25ef0fdf224480302f9cb3cc01d5c360c Merge: 04377cc 9af2f4e Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Feb 26 21:57:10 2016 -0800 Merge branch 'v3' into chipmunk_v7_2 commit 04377cce7f46b2c2016ccc3855fc479c4f6aa516 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Feb 26 21:26:55 2016 -0800 trying to make it compile on win32 commit 7703946d99e1cdc6a57f2ccb2a868818c1367291 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Feb 24 10:28:12 2016 -0800 quick hack to make it compile... ...autogenerated files will fix it. commit ea35bf3a5894cb80b09ecd0a4a5408dcc19785f5 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Feb 24 09:20:59 2016 -0800 Squashed commit of the following: commit 487e52a7af7cdb40135fd3bd83b2efba0dfe6265 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue Feb 23 20:10:13 2016 -0800 compiles.. sort of commit a7990e2888d5ef1e43b811148b23c0b899105ab3 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue Feb 23 19:55:24 2016 -0800 more chipmunk fixes commit 1174f6ec8201324161d7946af0f493b136a56690 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue Feb 23 19:36:15 2016 -0800 more chipmunk fixes commit 00ac2449ca0c35bd9184310d58e74aaa05bd1323 Merge: f942c5a 0594d3c Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue Feb 23 19:29:27 2016 -0800 Merge branch 'chipmunk_v7_squashed' of github.com:ricardoquesada/cocos2d-x into chipmunk_v7_squashed commit f942c5a3cc7b24f3ac211d781be1b9c9d4ec0fd7 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue Feb 23 19:28:51 2016 -0800 correct path for chipmunk commit 0594d3c4141d390b2566ea76101e383f15ebcaaf Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue Feb 23 18:44:05 2016 -0800 compiles on ios commit 379503399c384ad77d25d68a2f83b71a829b1c04 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue Feb 23 17:51:36 2016 -0800 chipmunk include fixes commit 95839fb7b406a32255853294b016d8c15aec1ed6 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue Feb 23 17:09:04 2016 -0800 fixes for cmake + mac commit 39449ea3b7efccae2946785c1c11433d964ee480 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue Feb 23 16:51:25 2016 -0800 correct includes commit 98e97d7d2f00e6a78d040dcaf17e5a077e9a88c3 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue Feb 23 16:35:40 2016 -0800 fixes chipmunk with cmake commit 337f21f9466703722847635301d841ace9b757cb Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue Feb 23 14:42:01 2016 -0800 updates android and linux projects commit 7111a9993b97f78cf73206804b25665c21a59ca8 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue Feb 23 14:18:26 2016 -0800 cosmetic changes commit ce15038b8d2c0c7ebe31b4e1efe92646b7c70d1b Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue Feb 23 06:53:41 2016 -0800 chipmunk autogenerated files commit 66c71bfa3aaab04abf25f284e2e76ce2a74a98de Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue Feb 23 06:47:41 2016 -0800 compatibility both in JS (to reduce space) and in C for (C++ users) commit 0f9ffa0a8ab23a19e1f10b04e6987c2288764b1f Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue Feb 23 06:10:02 2016 -0800 mooooore fixes commit 9ab23014093677e8eda69b105f50410b8c792aa3 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue Feb 23 05:30:58 2016 -0800 doesn't crash with collision handler commit 69275a16817a038244bbaaff9e82a011b6729cb2 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue Feb 23 05:16:29 2016 -0800 adds missing space functions commit a6b97bbc76cb9ab293356bb7451cfa858353f589 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Mon Feb 22 22:22:27 2016 -0800 queries... better commit 3442bceca64f5a0ddbbbb1a288146a2a61d87632 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Mon Feb 22 19:48:41 2016 -0800 adds more missing functions fixes other chipmunk JS issues commit 3797a033896d059da58a05ce0de832ed9c150eff Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Mon Feb 22 18:30:21 2016 -0800 yep... poly works ok commit d1bb57776891605b9d3e4fb90736c6869d96b944 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Mon Feb 22 17:28:29 2016 -0800 neede compat files commit 39ec518d4e089124d9a53fe3a8dce3aa0474c233 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Mon Feb 22 17:28:04 2016 -0800 query working! commit 71a8001fd6bc03ac674621f5da38a3f8778430b4 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Feb 19 21:57:03 2016 -0800 almost there commit 9272fdcd06ba188db2fe5701fb2ac21476d54883 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Feb 19 21:18:46 2016 -0800 fixes return values commit 7218778da846e1e36a510c0a19a5ee76f91db032 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Feb 19 20:36:14 2016 -0800 cpMomentForSegment is manual since parameter 4 is optional in chipmunk 6, but not in 7 commit 98d5d3e23c2cdb941cc0b1f3ce8275990356e88d Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Feb 19 17:29:28 2016 -0800 yeah... process the arguments correctly works both for functions and auto_classes commit ce6a4fe3593b4f3b0fcdf11d12e297d789e0d96b Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Feb 19 16:49:00 2016 -0800 compiles and links fixes some issues with the queries. returns shapes instad of the queryInfo commit 3f879482dc6db86e45e4319bc802ccf19b52a46c Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Feb 19 15:03:18 2016 -0800 adds removeCollisionHandler and other fixes commit 32d825fc7bd323e144db6a1badc4a62420b6ea44 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Thu Feb 18 20:59:24 2016 -0800 compiles... doesn't work yet commit bd64de81713fb2d7652a538d667d73f05f5d9320 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Feb 17 18:17:39 2016 -0800 WIP: chipmunk bindings
2016-03-01 05:53:00 +08:00
ui/UIEditBox/Mac/CCUIEditBoxMac.mm
ui/UIEditBox/Mac/CCUIMultilineTextField.m
ui/UIEditBox/Mac/CCUIPasswordTextField.m
ui/UIEditBox/Mac/CCUISingleLineTextField.m
ui/UIEditBox/Mac/CCUITextFieldFormatter.m
)
elseif(LINUX)
set(COCOS_UI_SPECIFIC_SRC
2015-06-06 14:20:16 +08:00
ui/UIEditBox/UIEditBoxImpl-linux.cpp
)
Squashed commit of the following: commit 59e43a3c80f4af8998e4a14f6463bd7a91617d5f Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Mar 2 15:19:48 2016 -0800 uses new naming convention for projects uses _ instead of - commit f97ba56608d48b17909649c8617ba9047b566196 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Mar 2 14:49:22 2016 -0800 fooling cmake for real commit 20c2560f75eab952e5131b484284bf20cb07fe07 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Mar 2 14:43:05 2016 -0800 fooling cmake commit a0ada44bc82941830f6c71219a1492d28c28c306 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Mar 2 14:26:59 2016 -0800 makes CMake for Mac happy commit 656b4f5e2dd741215a4699db979fe1b0dce60298 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Mar 2 13:50:15 2016 -0800 linux fix commit fa98aeac8505c764f4a69f15c8a8ff1123fad2a3 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Mar 2 11:18:18 2016 -0800 links correctly! commit 9c56ce7143d3a35b44d33f246cec093ca9eaa7d9 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue Mar 1 17:44:58 2016 -0800 Squashed commit of the following: commit 2ef52723dae44204c047cb177d5a5670fb659c79 Merge: 8a5c998 25cf1f1 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue Mar 1 16:54:04 2016 -0800 Merge branch 'v3' into cmake_android commit 8a5c9981192e344fffc9f14be5cb14f66eccfa24 Author: Chaoren Lin <chaorenl@google.com> Date: Thu Feb 11 18:34:46 2016 -0800 Fix module name in Android template to match CMake project. commit be85e19e852a9d5fbd6c58cea60c75fe47a5a576 Author: Chaoren Lin <chaorenl@google.com> Date: Thu Feb 11 18:27:45 2016 -0800 Add missing platform specific source file to CMake project. commit 705389ac6582107a381d0cbc56268eaa98ffc5c3 Author: Chaoren Lin <chaorenl@google.com> Date: Wed Feb 10 19:21:12 2016 -0800 Find AndroidNdkModules.cmake relative to android.toolchain.cmake. commit a10075e2cb30af2e1f9a30da99efac880658ad6b Author: Chaoren Lin <chaorenl@google.com> Date: Wed Feb 10 19:03:11 2016 -0800 Remove cpp-empty-test from project templates. commit e070fcbf210b8628f75785e738202a80a95ac0ff Author: WenhaiLin <wenhai.lin@chukong-inc.com> Date: Mon Aug 31 09:56:03 2015 +0800 Fix CMake for Android Target
2016-03-03 08:51:54 +08:00
ELSEIF(ANDROID)
set(COCOS_UI_SPECIFIC_SRC
ui/UIEditBox/UIEditBoxImpl-android.cpp
ui/UIVideoPlayer-android.cpp
ui/UIWebViewImpl-android.cpp
)
endif()
#todo: android UIWebViewImpl and UIVideoPlayer
# will add when doing android support
set(COCOS_UI_SRC
ui/CocosGUI.cpp
ui/UIButton.cpp
ui/UIAbstractCheckButton.cpp
ui/UICheckBox.cpp
ui/UIRadioButton.cpp
ui/UIDeprecated.cpp
ui/UIHBox.cpp
ui/UIHelper.cpp
ui/UIImageView.cpp
ui/UILayout.cpp
ui/UILayoutManager.cpp
ui/UILayoutParameter.cpp
ui/UIListView.cpp
ui/UILoadingBar.cpp
ui/UIPageView.cpp
ui/UIPageViewIndicator.cpp
ui/UIRelativeBox.cpp
ui/UIRichText.cpp
ui/UIScale9Sprite.cpp
ui/UIScrollView.cpp
ui/UIScrollViewBar.cpp
ui/UISlider.cpp
ui/UIText.cpp
ui/UITextAtlas.cpp
ui/UITextBMFont.cpp
ui/UITextField.cpp
ui/UIVBox.cpp
ui/UIWebView.cpp
ui/UIWidget.cpp
ui/UIEditBox/UIEditBox.cpp
ui/UILayoutComponent.cpp
Squashed commit of the following: commit 36c2807d07848448c1fed86f4b119205048691bf Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Mon Feb 29 13:11:40 2016 -0800 binary file 82 commit 9b7cd003b12faefd0522d12f765c027efb001ab2 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Mon Feb 29 12:56:39 2016 -0800 fore multiple in windows phone 8.1 too commit daea8a3ef8d69915e7a9d962fd745a1103011bab Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Mon Feb 29 12:50:45 2016 -0800 force multiple commit 0fbabdbf99974e95de083d79c7d6ae7cf735e4b6 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Mon Feb 29 10:44:40 2016 -0800 compiles commit f817766afcd0ffc4ca93f628d55fabc4b5a96ba5 Merge: 7b2cea3 8bf3d33 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Mon Feb 29 09:37:24 2016 -0800 Merge branch 'v3' into chipmunk_v7_2 commit 7b2cea329a56ae2786428d39a499bc12ba3860e6 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Sat Feb 27 01:11:13 2016 -0800 correct paths for win8.1 commit dcf1f046eb1e18474d6f94b2d7dc31fbf1b06cea Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Feb 26 22:46:58 2016 -0800 projects works on win32 commit ab5b14c25ef0fdf224480302f9cb3cc01d5c360c Merge: 04377cc 9af2f4e Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Feb 26 21:57:10 2016 -0800 Merge branch 'v3' into chipmunk_v7_2 commit 04377cce7f46b2c2016ccc3855fc479c4f6aa516 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Feb 26 21:26:55 2016 -0800 trying to make it compile on win32 commit 7703946d99e1cdc6a57f2ccb2a868818c1367291 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Feb 24 10:28:12 2016 -0800 quick hack to make it compile... ...autogenerated files will fix it. commit ea35bf3a5894cb80b09ecd0a4a5408dcc19785f5 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Feb 24 09:20:59 2016 -0800 Squashed commit of the following: commit 487e52a7af7cdb40135fd3bd83b2efba0dfe6265 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue Feb 23 20:10:13 2016 -0800 compiles.. sort of commit a7990e2888d5ef1e43b811148b23c0b899105ab3 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue Feb 23 19:55:24 2016 -0800 more chipmunk fixes commit 1174f6ec8201324161d7946af0f493b136a56690 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue Feb 23 19:36:15 2016 -0800 more chipmunk fixes commit 00ac2449ca0c35bd9184310d58e74aaa05bd1323 Merge: f942c5a 0594d3c Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue Feb 23 19:29:27 2016 -0800 Merge branch 'chipmunk_v7_squashed' of github.com:ricardoquesada/cocos2d-x into chipmunk_v7_squashed commit f942c5a3cc7b24f3ac211d781be1b9c9d4ec0fd7 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue Feb 23 19:28:51 2016 -0800 correct path for chipmunk commit 0594d3c4141d390b2566ea76101e383f15ebcaaf Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue Feb 23 18:44:05 2016 -0800 compiles on ios commit 379503399c384ad77d25d68a2f83b71a829b1c04 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue Feb 23 17:51:36 2016 -0800 chipmunk include fixes commit 95839fb7b406a32255853294b016d8c15aec1ed6 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue Feb 23 17:09:04 2016 -0800 fixes for cmake + mac commit 39449ea3b7efccae2946785c1c11433d964ee480 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue Feb 23 16:51:25 2016 -0800 correct includes commit 98e97d7d2f00e6a78d040dcaf17e5a077e9a88c3 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue Feb 23 16:35:40 2016 -0800 fixes chipmunk with cmake commit 337f21f9466703722847635301d841ace9b757cb Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue Feb 23 14:42:01 2016 -0800 updates android and linux projects commit 7111a9993b97f78cf73206804b25665c21a59ca8 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue Feb 23 14:18:26 2016 -0800 cosmetic changes commit ce15038b8d2c0c7ebe31b4e1efe92646b7c70d1b Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue Feb 23 06:53:41 2016 -0800 chipmunk autogenerated files commit 66c71bfa3aaab04abf25f284e2e76ce2a74a98de Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue Feb 23 06:47:41 2016 -0800 compatibility both in JS (to reduce space) and in C for (C++ users) commit 0f9ffa0a8ab23a19e1f10b04e6987c2288764b1f Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue Feb 23 06:10:02 2016 -0800 mooooore fixes commit 9ab23014093677e8eda69b105f50410b8c792aa3 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue Feb 23 05:30:58 2016 -0800 doesn't crash with collision handler commit 69275a16817a038244bbaaff9e82a011b6729cb2 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Tue Feb 23 05:16:29 2016 -0800 adds missing space functions commit a6b97bbc76cb9ab293356bb7451cfa858353f589 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Mon Feb 22 22:22:27 2016 -0800 queries... better commit 3442bceca64f5a0ddbbbb1a288146a2a61d87632 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Mon Feb 22 19:48:41 2016 -0800 adds more missing functions fixes other chipmunk JS issues commit 3797a033896d059da58a05ce0de832ed9c150eff Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Mon Feb 22 18:30:21 2016 -0800 yep... poly works ok commit d1bb57776891605b9d3e4fb90736c6869d96b944 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Mon Feb 22 17:28:29 2016 -0800 neede compat files commit 39ec518d4e089124d9a53fe3a8dce3aa0474c233 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Mon Feb 22 17:28:04 2016 -0800 query working! commit 71a8001fd6bc03ac674621f5da38a3f8778430b4 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Feb 19 21:57:03 2016 -0800 almost there commit 9272fdcd06ba188db2fe5701fb2ac21476d54883 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Feb 19 21:18:46 2016 -0800 fixes return values commit 7218778da846e1e36a510c0a19a5ee76f91db032 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Feb 19 20:36:14 2016 -0800 cpMomentForSegment is manual since parameter 4 is optional in chipmunk 6, but not in 7 commit 98d5d3e23c2cdb941cc0b1f3ce8275990356e88d Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Feb 19 17:29:28 2016 -0800 yeah... process the arguments correctly works both for functions and auto_classes commit ce6a4fe3593b4f3b0fcdf11d12e297d789e0d96b Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Feb 19 16:49:00 2016 -0800 compiles and links fixes some issues with the queries. returns shapes instad of the queryInfo commit 3f879482dc6db86e45e4319bc802ccf19b52a46c Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Fri Feb 19 15:03:18 2016 -0800 adds removeCollisionHandler and other fixes commit 32d825fc7bd323e144db6a1badc4a62420b6ea44 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Thu Feb 18 20:59:24 2016 -0800 compiles... doesn't work yet commit bd64de81713fb2d7652a538d667d73f05f5d9320 Author: Ricardo Quesada <ricardoquesada@gmail.com> Date: Wed Feb 17 18:17:39 2016 -0800 WIP: chipmunk bindings
2016-03-01 05:53:00 +08:00
ui/UIEditBox/UIEditBoxImpl-common.cpp
Squashed commit of the following: commit 87b7c3e404a9b6cce6d4f6bc8565e7feef429ee0 Author: geron-cn <c.ever.fallen@gmail.com> Date: Thu Mar 3 13:43:04 2016 +0800 change enum to enum class use tabitem as pointer to replace _currentTabItemIndex commit c0830cc581b8a07d6eed63268bf5be6a828c113a Merge: 3663156 166931a Author: geron-cn <c.ever.fallen@gmail.com> Date: Thu Mar 3 11:48:44 2016 +0800 Merge remote-tracking branch 'gero/tabview' into tabcontrol commit 366315624143ff01c3e2b22b415ab79050e381e4 Author: geron-cn <c.ever.fallen@gmail.com> Date: Thu Mar 3 11:48:15 2016 +0800 Squashed commit of the following: commit 166931a28c8736ab58b7c4319c1139b5e4865a9e Author: geron-cn <c.ever.fallen@gmail.com> Date: Wed Mar 2 21:35:06 2016 +0800 fix commit e0eb069846a8ceb4b726c3c945801c944404b102 Author: geron-cn <c.ever.fallen@gmail.com> Date: Wed Mar 2 21:30:44 2016 +0800 fix active deactive in tabcontrol commit aeb1c857cab23299e44a86ac1f627c7bd5fa5a6d Author: geron-cn <c.ever.fallen@gmail.com> Date: Wed Mar 2 20:16:22 2016 +0800 fix active -1 commit e57796cbbae851e8cff52656b3265c80c2e8f6f7 Author: geron-cn <c.ever.fallen@gmail.com> Date: Wed Mar 2 16:00:51 2016 +0800 fix merge file commit cdd44f1c577ad190bc175896107a48fbb36b65bb Merge: 1658ad6 6bf55ed Author: geron-cn <c.ever.fallen@gmail.com> Date: Wed Mar 2 15:57:48 2016 +0800 Merge branch 'v3' of github.com:cocos2d/cocos2d-x into tabview # Conflicts: # cocos/ui/CMakeLists.txt commit 1658ad6f4a2bd0889d6cc020072d7fb9192cafc3 Author: geron-cn <c.ever.fallen@gmail.com> Date: Wed Mar 2 15:27:31 2016 +0800 configure for win8.1 commit ec236bff711b72952d48ec4d8b9137b4812b7a72 Author: geron-cn <c.ever.fallen@gmail.com> Date: Tue Mar 1 10:20:23 2016 +0800 configure for iOS mac twos android linux commit 9d6678a4388461a791abe968fa637df2fc6839d3 Author: geron-cn <c.ever.fallen@gmail.com> Date: Tue Mar 1 10:02:17 2016 +0800 add lack files commit 1f2b5a3e989b05f67a705c81a20c75d3e0ed88a1 Author: geron-cn <c.ever.fallen@gmail.com> Date: Mon Feb 29 22:05:22 2016 +0800 add test case for TabControl commit 97b8d8d87a37881b33ebe90478392150ef341b3e Author: geron-cn <c.ever.fallen@gmail.com> Date: Mon Feb 29 15:43:29 2016 +0800 add const to getter setter commit f49a0483049d2aa7e21bcbe10e553c207adc4bdf Author: geron-cn <c.ever.fallen@gmail.com> Date: Mon Feb 29 14:50:04 2016 +0800 format the comments commit a1989a8f89d33ef8d9eefff6c8117b45977308ad Author: geron-cn <c.ever.fallen@gmail.com> Date: Mon Feb 29 11:51:06 2016 +0800 remove reference commit 1a573e68d30cc56bed9b2338cbbd311e2541fdfd Author: geron-cn <c.ever.fallen@gmail.com> Date: Mon Feb 29 11:40:04 2016 +0800 configure for win8.1 commit c015ac54028534202f62ff85f9a9d4b62b12801e Author: geron-cn <c.ever.fallen@gmail.com> Date: Mon Feb 29 11:27:54 2016 +0800 fix error commit 91c4ac9ae73d4e7efcee389d7af5ec7178c94836 Author: geron-cn <c.ever.fallen@gmail.com> Date: Mon Feb 29 11:25:51 2016 +0800 add interface commit eaf3e237cdcb9c49cd4161691471a8761f8dbdae Author: geron-cn <c.ever.fallen@gmail.com> Date: Sun Feb 28 03:21:22 2016 +0800 fix compile error for tw-os commit 3bfaa2976751e844a591ae5524bfd81249927c7c Author: geron-cn <c.ever.fallen@gmail.com> Date: Sun Feb 28 03:04:23 2016 +0800 fix linux compile error commit fafe3ad660e644924fd02665b77e1df4076a4802 Author: geron-cn <c.ever.fallen@gmail.com> Date: Sun Feb 28 02:54:34 2016 +0800 re-indent code with X-Code commit f8dfe5b551b0bb0a1a1d7b15556db700a35651a5 Author: geron-cn <c.ever.fallen@gmail.com> Date: Sun Feb 28 02:37:51 2016 +0800 add reader configure for android commit 07033f7b6074edf8a333e40c2382a09a2b2325e4 Author: geron-cn <c.ever.fallen@gmail.com> Date: Sun Feb 28 02:22:00 2016 +0800 format code, remove some warning commit 22ed160628f1946d0ccbdf6fc066ec80e56ae611 Author: geron-cn <c.ever.fallen@gmail.com> Date: Sun Feb 28 02:02:27 2016 +0800 configure for mac project commit de21cea12c0a898ea95f9951022be85bdddeefaf Author: geron-cn <c.ever.fallen@gmail.com> Date: Sat Feb 27 18:28:10 2016 +0800 add comment for apis commit b9cebf881a5cd4ecbb740b98cff7dc61183b1db2 Author: geron-cn <c.ever.fallen@gmail.com> Date: Sat Feb 27 15:32:46 2016 +0800 fix parse objects in container commit 53bcce68b053a5b918a29735fed393c210d9cc2c Author: geron-cn <c.ever.fallen@gmail.com> Date: Fri Feb 26 22:10:54 2016 +0800 fix flatbuffer parse commit 9cbdbdc5d046751ae1398dd622ccab0e2797d055 Author: geron-cn <c.ever.fallen@gmail.com> Date: Fri Feb 26 18:26:07 2016 +0800 Init ui::TabControl commit 166931a28c8736ab58b7c4319c1139b5e4865a9e Author: geron-cn <c.ever.fallen@gmail.com> Date: Wed Mar 2 21:35:06 2016 +0800 fix commit e0eb069846a8ceb4b726c3c945801c944404b102 Author: geron-cn <c.ever.fallen@gmail.com> Date: Wed Mar 2 21:30:44 2016 +0800 fix active deactive in tabcontrol commit aeb1c857cab23299e44a86ac1f627c7bd5fa5a6d Author: geron-cn <c.ever.fallen@gmail.com> Date: Wed Mar 2 20:16:22 2016 +0800 fix active -1 commit e57796cbbae851e8cff52656b3265c80c2e8f6f7 Author: geron-cn <c.ever.fallen@gmail.com> Date: Wed Mar 2 16:00:51 2016 +0800 fix merge file commit cdd44f1c577ad190bc175896107a48fbb36b65bb Merge: 1658ad6 6bf55ed Author: geron-cn <c.ever.fallen@gmail.com> Date: Wed Mar 2 15:57:48 2016 +0800 Merge branch 'v3' of github.com:cocos2d/cocos2d-x into tabview # Conflicts: # cocos/ui/CMakeLists.txt commit 1658ad6f4a2bd0889d6cc020072d7fb9192cafc3 Author: geron-cn <c.ever.fallen@gmail.com> Date: Wed Mar 2 15:27:31 2016 +0800 configure for win8.1 commit ec236bff711b72952d48ec4d8b9137b4812b7a72 Author: geron-cn <c.ever.fallen@gmail.com> Date: Tue Mar 1 10:20:23 2016 +0800 configure for iOS mac twos android linux commit 9d6678a4388461a791abe968fa637df2fc6839d3 Author: geron-cn <c.ever.fallen@gmail.com> Date: Tue Mar 1 10:02:17 2016 +0800 add lack files commit 1f2b5a3e989b05f67a705c81a20c75d3e0ed88a1 Author: geron-cn <c.ever.fallen@gmail.com> Date: Mon Feb 29 22:05:22 2016 +0800 add test case for TabControl commit 97b8d8d87a37881b33ebe90478392150ef341b3e Author: geron-cn <c.ever.fallen@gmail.com> Date: Mon Feb 29 15:43:29 2016 +0800 add const to getter setter commit f49a0483049d2aa7e21bcbe10e553c207adc4bdf Author: geron-cn <c.ever.fallen@gmail.com> Date: Mon Feb 29 14:50:04 2016 +0800 format the comments commit a1989a8f89d33ef8d9eefff6c8117b45977308ad Author: geron-cn <c.ever.fallen@gmail.com> Date: Mon Feb 29 11:51:06 2016 +0800 remove reference commit 1a573e68d30cc56bed9b2338cbbd311e2541fdfd Author: geron-cn <c.ever.fallen@gmail.com> Date: Mon Feb 29 11:40:04 2016 +0800 configure for win8.1 commit c015ac54028534202f62ff85f9a9d4b62b12801e Author: geron-cn <c.ever.fallen@gmail.com> Date: Mon Feb 29 11:27:54 2016 +0800 fix error commit 91c4ac9ae73d4e7efcee389d7af5ec7178c94836 Author: geron-cn <c.ever.fallen@gmail.com> Date: Mon Feb 29 11:25:51 2016 +0800 add interface commit eaf3e237cdcb9c49cd4161691471a8761f8dbdae Author: geron-cn <c.ever.fallen@gmail.com> Date: Sun Feb 28 03:21:22 2016 +0800 fix compile error for tw-os commit 3bfaa2976751e844a591ae5524bfd81249927c7c Author: geron-cn <c.ever.fallen@gmail.com> Date: Sun Feb 28 03:04:23 2016 +0800 fix linux compile error commit fafe3ad660e644924fd02665b77e1df4076a4802 Author: geron-cn <c.ever.fallen@gmail.com> Date: Sun Feb 28 02:54:34 2016 +0800 re-indent code with X-Code commit f8dfe5b551b0bb0a1a1d7b15556db700a35651a5 Author: geron-cn <c.ever.fallen@gmail.com> Date: Sun Feb 28 02:37:51 2016 +0800 add reader configure for android commit 07033f7b6074edf8a333e40c2382a09a2b2325e4 Author: geron-cn <c.ever.fallen@gmail.com> Date: Sun Feb 28 02:22:00 2016 +0800 format code, remove some warning commit 22ed160628f1946d0ccbdf6fc066ec80e56ae611 Author: geron-cn <c.ever.fallen@gmail.com> Date: Sun Feb 28 02:02:27 2016 +0800 configure for mac project commit de21cea12c0a898ea95f9951022be85bdddeefaf Author: geron-cn <c.ever.fallen@gmail.com> Date: Sat Feb 27 18:28:10 2016 +0800 add comment for apis commit b9cebf881a5cd4ecbb740b98cff7dc61183b1db2 Author: geron-cn <c.ever.fallen@gmail.com> Date: Sat Feb 27 15:32:46 2016 +0800 fix parse objects in container commit 53bcce68b053a5b918a29735fed393c210d9cc2c Author: geron-cn <c.ever.fallen@gmail.com> Date: Fri Feb 26 22:10:54 2016 +0800 fix flatbuffer parse commit 9cbdbdc5d046751ae1398dd622ccab0e2797d055 Author: geron-cn <c.ever.fallen@gmail.com> Date: Fri Feb 26 18:26:07 2016 +0800 Init ui::TabControl
2016-03-03 14:17:48 +08:00
ui/UITabControl.cpp
${COCOS_UI_SPECIFIC_SRC}
)