Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
28,259 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

36 Commits

Author SHA1 Message Date
WenhaiLin 2caff4e64d [ci skip]Update comments 2015-03-24 14:12:58 +08:00
WenhaiLin 78a8ba7f98 [ci skip]Update comments 2015-03-23 22:17:59 +08:00
joshuastray 32c6bc05b9 fix typo of file name 2014-10-17 16:29:37 +08:00
joshuastray eba3642aef add missing CC_DLL for localstorage 2014-10-17 11:52:59 +08:00
Dale Stammen fd638f00b7 removed old WP8 project files 2014-10-14 14:09:52 -07:00
martell 73980195c0 wp8: use CC_STATIC because libs are static 2014-10-09 06:33:46 +01:00
martell 30240a8a37 Multi platform cmake support 
Signed-off-by: martell <martellmalone@gmail.com>
 2014-10-03 23:21:45 +01:00
Ricardo Quesada 6f3ca63f00 Moved base/CCPlatform* -> platform/CCPlatform* 2014-09-09 17:17:07 -07:00
Ricardo Quesada f5e54f8e69 Fixes for linux compilation 2014-09-09 17:01:07 -07:00
Dhilan007 bef774a14a Adjust android.mk for cocos2d and related module 2014-08-27 22:54:28 +08:00
minggo 030f80a257 one static library for c++ and another one for lua-binding 2014-08-24 03:52:51 -07:00
minggo cdd67be77a use LOCAL_STATIC_LIBRARIES instead of LOCAL_WHOLE_STATIC_LIBRARIES 2014-08-19 15:29:40 +08:00
samuele3hu 3c31af4523 Update CMakeLists.txt for storage 2014-08-07 15:07:29 +08:00
samuele3hu cf0aa36c15 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module 
Conflicts:
	cocos/network/CMakeLists.txt
	cocos/storage/CMakeLists.txt
 2014-08-07 14:02:50 +08:00
samuele3hu aa4f407851 extract ui,network and storage from cocos2d module and adjust relate CMakeLists.txt 2014-08-07 13:53:13 +08:00
martell 75911658aa Make CMake More Robust 2014-08-06 15:43:19 +01:00
Huabing.Xu bca92772dd remove unused windows localstorage project file 2014-07-29 15:23:07 +08:00
Dhilan007 6cff8cb564 fixed warn and replace NULL with nullptr. 2014-07-10 00:45:27 +08:00
zhangbin 0019d9a061 Optimize the win32 projects configuration. 2014-06-20 10:50:43 +08:00
Mircea Rila b66b4c6f1d upgrade win32 projects for Visual Studio 2013 (solves Platform Toolset v100 not found). 
remove C4005 warnings after upgrading projects
 2014-05-07 17:41:04 +03:00
Ricardo Quesada 32f3fedb37 Moves cocos/2d/Android.mk to cocos/Android.mk 
Easier to find Android.mk
 2014-05-01 14:09:26 -07:00
Ricardo Quesada 25213c81f6 linux cmake improvements 
Added cocos/CMakeLists.txt
which controls all the rest of the Cmake files
 2014-05-01 13:01:51 -07:00
Ricardo Quesada 9b118e5e96 Squashed commit of the following: 
commit 519fcd7f68e3586c376fd5e8d4a0ee220a48d225
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sat Apr 26 10:10:06 2014 -0700

    Updates templates files

commit 2b07843ebe592f56b2abc544ccf66d441bb19fc5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sat Apr 26 10:08:19 2014 -0700

    compiles on Windows

commit b175522ef7205eaab3bd3f26c27c5d6514cbe2a4
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sat Apr 26 09:55:30 2014 -0700

    adds cocos2d.h

commit 4c3d14f929bac017b93ca843b4f149d352264a30
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sat Apr 26 09:54:24 2014 -0700

    re-adds missing files

commit f729181728959260d14c4152555534f5beec8e05
Merge: 148da79 2adac67
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sat Apr 26 09:51:12 2014 -0700

    Merge branch 'includes_fixes' of github.com:ricardoquesada/cocos2d-x into includes_fixes

commit 148da79010c5dffeab885933624cffaf3d588852
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sat Apr 26 09:49:12 2014 -0700

    Adds SimpleAudioEngine

commit 2adac67019180ec82b7bd03f0b67c12f62e29e77
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sat Apr 26 09:47:45 2014 -0700

    Compiles for Android

commit 4a300d1b9225fa5708f25a69a50bb531f0ac1a32
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sat Apr 26 09:13:35 2014 -0700

    Fixes the includes
 2014-04-26 10:11:22 -07:00
Dale Stammen b2d3dbf0fe added wp8 support files and projects 2014-03-28 15:39:20 -07:00
Éloi Rivard 3fb2b61591 Linux local storage support. Depends on libsqlite3-dev 2014-02-13 00:53:51 +01:00
Lee, Jae-Hong e5d45583b7 [Win32] fix localStorageGetItem crash when column text is NULL. 2014-01-22 17:37:29 +09:00
James Chen 1c31871543 Compilation fixes in LocalStorage. include localStorage.h. 2014-01-20 23:01:44 +08:00
James Chen e5f723774d Updates jsbindings and localStorage. 2014-01-20 22:45:40 +08:00
James Chen 8b6763a6ac LocalStorage: const char* —> const std::string&. 2014-01-20 22:31:56 +08:00
James Chen 432534d857 #include “cocos2d.h” was FORBIDDEN in cocos modules. Reduces the dependence when header file changes. 2014-01-20 17:31:12 +08:00
walzer d4c1aa92d5 add copyrights for 2014, in folders other then 2d. 2014-01-07 11:47:11 +08:00
Dhilan007 a68d92ff5a perfect vs-project configuration 2013-10-31 10:51:38 +08:00
Dhilan007 232f0d598b issues #2905:add new vs project 2013-10-21 22:21:11 +08:00
minggo 8f9756f030 issue #2905:TestJavascript build ok on Android 2013-10-17 11:28:57 +08:00
minggo 6fc2be62f5 issue #2905: testcpp bild ok on Android 2013-10-15 18:00:03 +08:00
minggo 4313c46e93 issue #2905:adjust folder structure 2013-10-12 11:22:05 +08:00