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

76 Commits

Author SHA1 Message Date
minggo 030f80a257 one static library for c++ and another one for lua-binding 2014-08-24 03:52:51 -07:00
zhangbin 0019d9a061 Optimize the win32 projects configuration. 2014-06-20 10:50:43 +08:00
Mircea Rila 70d7d5b493 add VS2013 support for box2d, chipmunk 2014-05-09 10:53:44 +03:00
James Chen 32b2b20a32 Re-adds box2d and chipmuck sources, we need to use prebuilt libraries for them too. 2014-05-07 13:40:39 +08:00
James Chen 0f36374d86 Removed external folder 2014-05-05 13:04:53 +08:00
Anton Sokolchenko d778a947f5 Fix incompatible pointer conversion 2014-04-12 18:29:50 +03:00
Xiaosong Gao d82c4bed75 In Mac OS X 10.9 and Xcode 5.1, it is a warning "Declaration shadows a local variable" in a new ios/mac project. 2014-04-11 08:07:18 +08:00
Anton Sokolchenko e063e97a5d Incompatible pointer type? 
Why sizeof(void**) and not sizeof(void*)?
 2014-04-09 11:44:01 +03:00
Dale Stammen aa0ef00de3 added external libs for wp8 2014-03-28 12:02:27 -07:00
James Chen 8ca714fa67 Windows will not include <alloca.h>. 2014-03-26 19:43:34 +08:00
James Chen d9b4b70ed7 Removed unused include file. 2014-03-26 19:28:10 +08:00
zhangcheng 58a61d94fb add use CCComRender as parent for attaching component 2014-03-26 16:39:32 +08:00
Ricardo Quesada c82933e3c4 chipmunk fixes for Linux 2014-03-25 16:46:10 -07:00
Ricardo Quesada 473a6b19ee Upgrades to Chipmunk 6.2.1 2014-03-25 10:37:35 -07:00
James Chen 2a3481f20c Moves temp files to CURRENT_BINARY_DIR. 2014-01-06 23:44:36 -08:00
minggo 1e15071dc7 remove makefiles 2013-11-11 17:29:48 +08:00
James Chen 9be8ca3714 [cmake] output lib to root/lib 2013-11-04 21:03:08 +08:00
minggo 6a664d480a issue #2905:samples build ok on linux 2013-10-22 18:01:56 +08:00
minggo 63c13d8eaa issue #2905:simplify Android.mk dependence 2013-10-18 14:18:36 +08:00
minggo 95acb1b9e3 issue #2905: helloworld build ok on android 2013-10-14 14:01:00 +08:00
minggo 4313c46e93 issue #2905:adjust folder structure 2013-10-12 11:22:05 +08:00
minggo bcb171e3c9 fix line end in windows 2013-09-20 22:23:13 +08:00
boyu0 02649a1329 closed #2434: Use android_mk_generator.py to generate Box2D and chipmunk's Android.mk file 2013-08-22 17:47:49 +08:00
James Chen a5067f63dd Merge pull request #3372 from pyrasis/tizen_2.2 
[Tizen] Fix Debug Settings
 2013-08-05 22:51:06 -07:00
Lee, Jae-Hong 3db495ab0e [Tizen] Fix Debug Settings. 
- fix debugging failure problem
 2013-08-06 01:26:56 +09:00
minggo 9cba2c42c1 closed #2434: simply Android.mk 2013-08-02 17:33:27 +08:00
James Chen 343c98af13 Fixing warnings of the order of member variables and fixing errors for tizen projects. 2013-07-29 14:07:57 +08:00
Thomas Perl 309269e8e2 Fix building of chipmunk on Linux 2013-07-24 20:18:42 +02:00
Thomas Perl 62958c8321 Qt5 build support (initial work) 2013-07-24 20:18:42 +02:00
minggo 687c088b51 issue #2412:remove blackberry and marmalade port because they don't support c++11 2013-07-19 13:55:03 +08:00
Lee, Jae-Hong 9322e5594b Support Tizen 2.2 SDK. 
- Update project files.
- based on develop branch.
- HelloCpp, SimpleGame, HelloLua, TestLua available to build.
 2013-07-10 13:04:08 +09:00
minggo 04465622b7 issue #2129:remove prefix of types in ccTypes.h 2013-07-05 16:49:22 +08:00
James Chen ad7d606b48 Merge pull request #2703 from sergey-shambir/linux_qmake 
close #2332: [Linux] Adding project part for QtCreator.
 2013-06-25 21:57:20 -07:00
Ricardo Quesada ef6f67902f Adds mac workspace 
for the moment it includes TestCpp.
But Chipmunk, Box2d, cocos2dx, extensions and CocosDenshion are libraries
Like in the iOS project
 2013-06-24 18:04:05 -07:00
James Chen 8dc8fec180 issue #2325: Updating project configuration, tested on iPad 3. 2013-06-24 18:32:06 +08:00
James Chen b870488aad issue #2325: [iOS] Using Workspace to manage all projects. TBD, also apply to Mac port. 2013-06-24 15:31:18 +08:00
James Chen 53a372669a closed #2322: Updating all win32 project configurations, improvement by using Multi-processor Compilation. 2013-06-23 17:25:34 +08:00
Lee, Jae-Hong 2f8b24d05c Fix compile error. 2013-06-20 19:20:27 +09:00
James Chen b60e891b09 issue #2129: Don't use CGPoint in chipmunk since we are using cocos2d-x rather than cocos2d-iphone. 2013-06-20 13:02:20 +08:00
James Chen 8b298fab0e issue #2284: fixing windows build. 2013-06-16 11:19:47 +08:00
James Chen 0de1a4ebd8 Merge pull request #2877 from pyrasis/tizen_2.1 
Support Tizen device
 2013-06-12 22:56:23 -07:00
Lee, Jae-Hong 1bd3f10601 Support Tizen device. 2013-06-12 10:20:18 +09:00
Ricardo Quesada e770121711 updates chipmunk2d to v6.1.5 2013-06-11 17:03:20 -07:00
Sergey Shambir 984ed75b9a Linux: added project part for QtCreator. 
Allows easily setup cocos2d on Linux in QtCreator IDE.
 2013-06-02 10:15:14 +04:00
Lee, Jae-Hong 220ac4982a Update projects to Tizen 2.1 SDK. 2013-05-22 16:55:18 +09:00
Lee, Jae-Hong 81a59e96d9 Update chipmunk project for Tizen. 2013-05-16 20:13:44 +09:00
Lee, Jae-Hong 67c898d308 Set output filename. 2013-05-16 20:12:53 +09:00
Lee, Jae-Hong 9bbfdf2adb Adding placeholder.txt files. 2013-05-16 20:12:31 +09:00
Lee, Jae-Hong 840cf6a104 Adding chipmunk project for tizen. 2013-05-16 20:06:09 +09:00
James Gregory 9b68a65fee Compile Chipmunk as C++ rather than C so that calling from C++ code works under Emscripten. 2013-05-06 21:17:22 -07:00