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

115 Commits

Author SHA1 Message Date
Noel Cower 590975d08d Also un-ignore libs dir under plugins. 
The configure script isn't smart enough to check if there are
un-ignored files in a directory, so this fixes that.
 2014-11-17 08:26:23 -08:00
Noel Cower fbdf0201c6 Permit plugin-x plugins to ship third-party libraries. 
Ignoring the libs directory's .jar files is strange. I'm not sure
whoever put the total block over libs/ knew that this is the standard
Android library directory and not just for NDK-compiled assets.

More granular ignores over libs/ contents would be better in the
future, but this fixes the odd sdk/ directory hack plugins currently
use and lets the Android build system auto-link libraries that're
shipped with plugins instead of forcing Cocos developers to manually
sift through a plugin's Android dependencies and include them by hand.
 2014-11-13 09:20:09 -08:00
heliclei ec92f81446 [ci skip]update travis ci to use ndk-r9d 2014-07-03 11:02:04 +08:00
James Chen 14639d812e Update config.gitingore 2014-05-15 18:29:54 +08:00
James Chen bd82c119b6 Updates travis.yml, adds email notification to @Minggo and @James 2014-05-13 21:26:25 +08:00
James Chen e3ccf41ed9 Only build 'merge build' 2014-05-12 21:59:32 +08:00
James Chen 91d684d077 Updates travis script to add mac host support 2014-05-12 21:55:11 +08:00
James Chen 36c4a407ee Adds travis_mac.yml 2014-05-12 21:54:24 +08:00
James Chen a617680cae Updates travis script 2014-05-07 15:06:20 +08:00
James Chen b76a6a5dda updates travis-script. 2014-05-07 13:48:39 +08:00
James Chen 6c1791eae6 Updates travis-script, removed using download-deps.py now, 'external' is 
a submodule module now. please use `git submodule update --init` to
fetch it.
 2014-05-05 13:14:28 +08:00
James Chen 53488092a4 Updates before-install.sh 2014-05-04 19:09:51 +08:00
James Chen 7fca2c05e2 Update travis script 2014-05-04 15:42:50 +08:00
James Chen 188d843767 Update travis script 2014-05-04 15:38:42 +08:00
James Chen 1634ae30c5 'develop' -> 'v3' branch for travis ci. 2014-04-28 11:28:03 +08:00
zhangbin 0c82a4a3e0 Add tools/bindings-generator & tools/tolua into the lua project template. 2014-03-27 15:38:01 +08:00
James Chen b8eee8e1a4 [ci] Updates travis scripts. only commit relevant folder. 2014-03-25 17:07:15 +08:00
James Chen bb190fe78a [ci] Updates travis scripts. 2014-03-25 16:24:08 +08:00
James Chen 04038a912f [travis ci] Sort file list in generate-template-files.py. 2014-03-12 20:34:49 +08:00
James Chen c4752b260b Updates tools/travis-scripts/generate-template-files.py. 2014-03-12 20:18:55 +08:00
chuanweizhang2013 884229e898 modify generate-template-files 2014-03-12 17:20:15 +08:00
James Chen cbd9cbaf71 travis builds all tests projects for Android. 2014-03-11 19:10:36 +08:00
James Chen 38160ff7d7 Corrects a mistake in generate-bindings.sh 2014-03-10 19:18:55 +08:00
James Chen 7d3a6c999d Updates before-install.sh. 2014-03-10 18:24:28 +08:00
James Chen 9c18c804f5 Typo fix. 2014-03-10 18:20:51 +08:00
James Chen 124b18f53a Re-add CocosRobot send bindings glue codes to cocos2d-x repo. 2014-03-10 18:13:39 +08:00
James Chen a5f668a0bf [travis ci] Build testcpp only. 2014-03-10 12:06:33 +08:00
James Chen c2cd349da5 Uses 'generate-tempate-files.py' to generate cocos2dx_files.json 2014-03-06 14:56:46 +08:00
James Chen 5ca25d854f [travis ci] Updates generate-cocosfiles.sh. 2014-03-06 14:10:50 +08:00
James Chen 738a4f5deb Uncomments '.generate-cocosfiles.sh'. 2014-03-06 14:00:48 +08:00
James Chen dfdb6c4158 [travis ci] Adds 'for-each-file-in-dir.sh' for generating file list in cocos2d. CocosRobot will send a PR for that change. 2014-03-06 13:54:24 +08:00
James Chen 7e9a120e25 Fix travis build fails. 2014-02-27 16:23:38 +08:00
James Chen e4837e7f94 issue #4116: Removes script-bindings codes. 2014-02-26 21:34:06 +08:00
James Chen 1cd5ad3626 Updates COMMITTAG 
Skips to build the Pull Request of updating cocos_files.json.
 2014-02-13 13:58:55 +08:00
James Chen b5710e04ba issue #4020: Adds execute permission for generate-cocosfile.sh. 2014-02-13 11:52:16 +08:00
James Chen 2fef642300 issue #4020: Typo fix, elif -> if. 2014-02-13 11:42:23 +08:00
James Chen 772cdf5739 issue #4020: Updates before-install.sh. and comment fix in generate-cocosfiles.sh. 2014-02-13 11:38:28 +08:00
James Chen a56b7e4f3f closed #4020: cocos_files.json should be auto-generated by CocosRobot. 2014-02-13 11:33:11 +08:00
Éloi Rivard 8adca38efa Linux javascript bindings support. 
- Adds Linux javascript test.
- Adds Linux javascript template.
- Adds Travis CI test.
 2014-02-13 01:42:14 +01:00
Éloi Rivard 79e3c05ef1 Minor debugging messages and guards. 
Dependencies installation is skipped on linux distributions that does not use .deb package format.
 2014-02-13 01:25:23 +01:00
James Chen d779aaa967 Defines NDK_ROOT and PYTHON_BIN in top level. 2014-02-11 14:12:13 +08:00
James Chen d8f89b8045 Exports PYTHON_BIN variable. 2014-02-11 14:02:34 +08:00
James Chen c97b6cb197 Uses genbindings.py instead of genbindings.sh and genbindings.bat. 2014-02-10 18:30:22 +08:00
James Chen e0e37424f0 [Travis-CI] Removes openmw ppa since we’re using glfw3 rather than sdl2. 2014-02-07 21:11:30 +08:00
James Chen 667cd04ee6 Update run-script.sh, samples -> tests. 2014-02-01 12:33:15 +08:00
James Chen 3f8f36df68 issue #3828: Updates travis script. 2014-01-28 16:23:16 +08:00
James Chen 6d491e66cf issue #3828: Updates travis-scripts/run-script.sh 2014-01-28 16:11:54 +08:00
James Chen d980d33d56 issue #3823: install_glfw.sh will not skip if it was installed. Since it will not be updated if we find a new version of glfw. 
BTW, install script will not be invoked in every build after we switch to cmake.
 2014-01-23 01:07:28 -08:00
James Chen 048298c6a0 issue #3823: Updates travis-ci script to use the latest release of glfw (v3.0.4). 2014-01-23 15:57:10 +08:00
lihex 3b9d4c7a39 issue #3781, Update travis-scripts, llvm-installing parts no need now. 2014-01-22 11:28:53 +08:00