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

57 Commits

Author SHA1 Message Date
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
James Gregory a79326c0ac Remove -DLINUX from Emscripten chipmunk makefile 2013-05-06 20:59:49 -07:00
James Gregory c45e5797cf Add Makefiles for Emscripten + Emscripten external 2013-05-06 20:58:02 -07:00
James Chen edc8444ca4 Updating blackberry project configurations. 2013-04-27 14:07:54 +08:00
Sam Clegg 7ad171d8ee Use same top level Makefile for nacl and linux builds. 
Also, re-use some of the concepts from the linux build
system (such as quite by default) in the nacl build.

Fix remaining warnings in NaCl builds.
 2013-03-06 13:02:55 -08:00
Sam Clegg 8677dad3c6 Improved build system from linux. 
This change makes several fundamental improvements to the linux
build system:

- Remove duplication: a lot of the common make logic is now in
  a central shared makefile: cocos2dx/proj.linux/cocos2dx.mk

- Quiet by default: unless you specify V=1 on the commandline
  the output is now very clean and quiet.

- Dependencies: gcc's automatic dependancy generation is now
  used (-MMD).  This means that if you change a header file
  then all the object that depend on it now get rebuilt.

- Don't store objects in the source tree: previously object
  files were stored alongside the sources, which meant that
  debug and release object clobbered each other which leads
  to confusion and lots of unnecessary rebuilding.Q

- Library dependencies: each binary now depends on the libraries
  it links aginst.  This means that if the cocos2dx library
  changes then all examples will get re-linked.

- Top level Makefile: there is now a top level Makefile that
  can be shared/used by any platform the uses make as the
  build system (for example NaCl).  Everything can be built
  by simply running 'make' at the top level. e.g:

    make DEBUG=1
    make DEBUG=1 clean
 2013-03-06 13:02:55 -08:00
Sam Clegg 33c422d1d5 Add new port: Native Client 2013-03-02 12:15:24 -08:00
James Chen 2626005d20 issue #1712: Updating project setting for blackberry. 2013-02-17 16:26:08 +08:00
James Chen 1e5431bcc5 issue #1770: Adding webp support for blackberry and marmalade. 2013-02-06 10:52:13 +08:00
johnangel 16269d952d Detect VS2012 Update 1 2013-01-10 11:55:30 +01:00
johnangel 674bb8e728 Setting PlatformToolSet to v110_xp instead of default v110 in Visual Studio 2012 for Windows XP support, leaving default v100 in Visual Studio 2010. 2013-01-07 11:51:05 +01:00
James Chen 9bd302e35b fixed #1627: VS version check in project file. 2012-12-29 13:54:46 +08:00
James Chen f2f3aa55bf Merge branch 'gles20' of https://github.com/johnangel/cocos2d-x into iss-vs2012 
Conflicts:
	samples/Cpp/HelloCpp/proj.win32/HelloCpp.vcxproj
	samples/Cpp/TestCpp/proj.win32/TestCpp.vcxproj
	samples/Javascript/CocosDragonJS/proj.win32/CocosDragonJS.vcxproj
	samples/Javascript/MoonWarriors/proj.win32/MoonWarriors.vcxproj
	samples/Javascript/TestJavascript/proj.win32/TestJavascript.vcxproj
	samples/Javascript/WatermelonWithMe/proj.win32/WatermelonWithMe.vcxproj
	samples/Lua/HelloLua/proj.win32/HelloLua.vcxproj
	samples/Lua/TestLua/proj.win32/TestLua.win32.vcxproj
	scripting/javascript/bindings/generated
	scripting/lua/proj.win32/liblua.vcxproj
 2012-12-29 09:48:22 +08:00
johnangel 08cd9e37fc Setting PlatformToolSet to v110_xp for Visual Studio 2012 only. 2012-12-24 10:27:56 +01:00
ivzave fcce930188 repair linux eclipse build & add 64-bit project configurations 2012-12-22 07:14:59 +04:00
unknown adb68ddbb6 Enable Windows XP support in Visual Studio 2012 Update 1. 
Not tested with Visual Studio 2010, not sure will it work with PlatformToolset v110_xp.
 2012-12-19 19:28:25 +01:00
James Chen ba3a183856 Reverted chipmunk_types.h 2012-12-04 14:46:10 +08:00
James Chen 494806167b Temporary commit. 2012-11-29 15:26:24 +08:00
James Chen 3d275dc8cf issue #1564: Updated Chipmunk to v6.1.2. 2012-11-20 16:15:21 +08:00
James Chen f2e0df4de3 issue #1565: Removed VS2008 support. 2012-11-19 14:42:27 +08:00