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

72 Commits

Author SHA1 Message Date
Sam Clegg 04d7d5a061 [NaCl] Add support for building using glibc toolchain. 
BUG=
R=binji@chromium.org

Review URL: https://codereview.chromium.org/14694016
 2013-06-20 12:56:14 -07:00
Sam Clegg 47878c1855 [NaCl] Remove legacy nacl_mounts usage. 
Also add nacl SDK version check to ensure the SDK contains
a recent version of nacl_io.
 2013-06-20 12:56:12 -07:00
Sam Clegg 40766006bd [NaCl] Fix NaCl build which had been disabled. 
Since switching to C++11 the NaCL build was disabled.
This re-enables the ARM configuration which uses a
more recent version of gcc.  This means that that NaCl
code paths will at least be test until we can find a way
to re-enable the X86 build.
 2013-06-20 12:56:12 -07:00
Lee, Jae-Hong 2f8b24d05c Fix compile error. 2013-06-20 19:20:27 +09:00
James Chen 1fb9f44d15 issue #2129: Removing CC prefix for samples module. 2013-06-20 14:17:10 +08:00
James Chen 3cd82c8bf3 Merge pull request #2917 from pyrasis/tizen_2.1 
[Tizen] Enable Hardware Acceleration.
 2013-06-18 04:32:18 -07:00
Lee, Jae-Hong 4b828cfff2 Enable Hardware Acceleration. 2013-06-18 19:17:49 +09:00
James Chen c0d44cb2e4 fixed #2129: Rename m_iVar to _var, remove CC prefixes. 2013-06-15 14:03:30 +08:00
minggo a221f06592 issue #2284: fix bugs after merging master 2013-06-14 14:34:50 +08:00
minggo cd5bcb87af issue #2284: merge master and fixed some conflicts 2013-06-13 17:54:05 +08:00
Lee, Jae-Hong 1bd3f10601 Support Tizen device. 2013-06-12 10:20:18 +09:00
James Chen b0669b4f7d [Tizen] Updating project configurations. 2013-06-09 18:56:22 +08:00
James Chen aee8e829ca [Android] Updating Application.mk for HelloLua and TestLua. 2013-06-08 17:28:03 +08:00
James Chen bf781feba1 [NaCL] Updating project. 2013-06-08 16:08:55 +08:00
James Chen 51aa2433fc Updating makefile for native client. 2013-06-08 15:35:45 +08:00
James Chen 3fc675a6df [BB] Updating project configuration. especially for multi-platform-cpp/lua template. 2013-06-07 18:38:00 +08:00
James Chen fc2c068a66 [BB] Updating project configuration. 2013-06-07 18:17:07 +08:00
James Chen 9298492384 Updating project configuration for Blackberry port. 2013-06-07 16:52:49 +08:00
James Chen ed4b9b2bb3 Marmalade projects fix. 2013-06-06 14:26:35 +08:00
minggo cdf09c04ea issue #2103:make HelloLua & TestLua work on vs2010 2013-06-05 17:43:49 +08:00
minggo 7bd9717944 make lua works ok on iOS 2013-06-04 15:12:16 +08:00
minggo 4f484cbcbf enable c++11 for android projects 2013-06-03 11:02:41 +08:00
minggo 2cdb48bc22 enable c++11 for iOS projects 2013-06-03 10:57:06 +08:00
samuele3hu 8b5450ef4a issue #2103 modify some build script 2013-05-24 13:55:05 +08:00
samuele3hu 0a1c12a2d3 issue #2103 add some overlapping file and delete some comment line 2013-05-24 13:45:06 +08:00
samuele3hu 338c7c8d67 issue #2103 add more test lua 2013-05-24 11:42:27 +08:00
Lee, Jae-Hong 6acd8c66c2 Adding lua libaray and sample projects for Tizen. 2013-05-22 21:45:53 +09:00
James Gregory 5a23190672 Add main.cpp files for app samples 2013-05-06 20:58:43 -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
James Chen 5b45f85216 [HelloLua] print ~> cclog 2013-04-27 09:48:35 +08:00
minggo 89591fdccc fixed #2084:add lua loader for all platforms 2013-04-26 12:12:19 +08:00
James Chen 5337234e22 Android also uses executeScript to load lua source file or byte code file. So unused codes need to be deleted. 2013-04-25 21:31:52 +08:00
James Chen a005852fa5 issue #1847: Using luajit for win32. 2013-04-17 10:46:38 +08:00
James Chen 6a56bb6d73 issue #1847: [iOS] Using LuaJit for HelloLua and TestLua. 2013-04-17 09:51:28 +08:00
James Chen 79d58bcdb9 issue #1847: Adding sources of Luajit2.0.1-hotfix, and adding android support. 2013-04-16 17:34:58 +08:00
minggo 07eaf286fb add c project setting for lua samples 2013-03-19 16:49:16 +08:00
minggo 42b74758f5 change Android.Manifest.xml to unix style 2013-03-19 16:30:11 +08:00
minggo 0a8b4f923f delete parameter(-o igncr) when running build_native.sh in eclipse project 2013-03-19 13:48:32 +08:00
folecr 6dba49f25b Android build_native.sh now reads local.properties for environment variables 2013-03-15 16:44:16 -07:00
Sam Clegg 9eb9524659 Add 'make run' target for linux projects. 
Also, a few other linux build system improvements:
- Add linux build of SimpleGame
- Update multi-platform templates to use new common
  build system.
- Remove redundant main.h files.
 2013-03-08 10:01:03 -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 4d0aa01c4b Fix all gcc warnings in NaCl build. 2013-03-05 17:01:40 -08:00
Sam Clegg 33c422d1d5 Add new port: Native Client 2013-03-02 12:15:24 -08:00
James Chen 9cc4b7ab29 fixed a bug of respond touch events in hello.lua. The event type is string now. 2013-02-20 12:03:21 +08:00
James Chen 8c261c1789 issue #1770: Updating linux makefile. 2013-02-06 15:59:29 +08:00
minggo 07cd6d2bb2 issue #1689:modify lua samples to make them work correctly 2013-02-04 14:50:45 +08:00
minggo a771bc8183 issue #1689:modify lua Android.mk 2013-02-04 12:02:21 +08:00
minggo 3ea562b4ad fix some logical errors and compiling errors 2013-01-28 23:19:57 +08:00