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

25416 Commits

Author SHA1 Message Date
minggo b4f7c9c673 Merge pull request #9141 from MSOpenTech/v3-wp8-devenv 
Fixed WP8 solution folder names to enable building test projects using devenv
 2014-11-18 11:09:27 +08:00
Ricardo Quesada ddec619532 Merge pull request #9143 from ricardoquesada/updated_cocos_console 
Using new cocos-console
 2014-11-17 18:27:52 -08:00
Ricardo Quesada 0da34ffa80 Using new cocos-console 2014-11-17 18:26:37 -08:00
Ricardo Quesada 19ea011dfc Merge pull request #9142 from ricardoquesada/setup_py_fixes 
Setup py fixes
 2014-11-17 18:15:13 -08:00
Ricardo Quesada 71fec06a11 fixes indentation 2014-11-17 18:11:17 -08:00
Ricardo Quesada 99966755e5 sets COCOS_X_ROOT 
sets COCOS_X_ROOT environment variable and also uses PEP8 coding style
 2014-11-17 18:11:08 -08:00
Vladimir Timofeev 95e005d785 Find vorbis, mpg123 and OpenAL libs in unified way. 
Test another way to customize our prebuilt paths...
Cleanups.
 2014-11-18 01:46:41 +03:00
Vladimir Timofeev 731e982b2e Find OpenGL, GLEW and winmm library, improve finding of curl (use pkg-config first, this teoretically can find also dependant libs). 2014-11-17 23:44:16 +03:00
Ricardo Quesada d38e3d23d0 Update CONTRIBUTE.md 2014-11-17 12:30:53 -08:00
Dale Stammen 200cb6d3b4 fixed test solution folder names to enable building project using devenv 2014-11-17 11:52:46 -08:00
Noel Cower 41027463c9 Descend into included directories to check for file inclusion. 
Only applies to directories that are marked as unignored, since the
travis script has the odd problem of not descending into those
directories and, as a result, not recording the files in them.

I'm assuming the failure to descend into included directories is
unintended.
 2014-11-17 08:45:30 -08:00
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
minggo 70fdf6af5d Merge pull request #9137 from natural-law/support-wp8 
Modify the cpp template to support win8.1-universal project.
 2014-11-17 16:09:48 +08:00
zhangbin 365e09e5db Merge branch 'v3' into support-wp8 2014-11-17 16:01:12 +08:00
zhangbin 534570075b Update the reference of submodule cocos2d-console. 2014-11-17 15:57:49 +08:00
Ricardo Quesada 506dd0219a Update CONTRIBUTE.md 2014-11-16 21:06:23 -08:00
minggo a6030dd063 Merge pull request #9108 from nilium/v3-plugin-libjars-unignore 
Permit plugin-x plugins to ship third-party libraries.
 2014-11-17 09:54:42 +08:00
James Chen 8bdf12a8f9 Merge pull request #9135 from CocosRobot/update_cocosfiles_1416159132 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-11-17 09:53:33 +08:00
Vladimir Timofeev b5266e95bf mingw fixes, now project builds with mingw64 and -DUSE_PREBUILT_LIBS=NO (some additional libs hardcoded still) 2014-11-17 01:42:04 +03:00
Vladimir Timofeev 1e8aeb7fd2 Minizip 
1. Add cmake module for finding minizip in system
2. Check that system installed minizip recent enough for us
3. As right minizip exists only for MSYS2 (mingw), use our embedded version on all other platforms
4. Correctly include minizip as <minizip/unzip.h> if it is found from system (make it compatible to current build system, so by default all should stay same)
5. Remove one unused include of unzip.h
 2014-11-16 22:41:37 +03:00
Vladimir Timofeev b7521dcbae Remove unused variables. 2014-11-16 21:14:00 +03:00
CocosRobot 18b0a6cacc [AUTO][ci skip]: updating cocos2dx_files.json 2014-11-16 17:32:13 +00:00
Ricardo Quesada 52fd559fa6 Merge pull request #9134 from ricardoquesada/std_swap 
Using std::swap instead of CC_SWAP
 2014-11-16 09:29:39 -08:00
Ricardo Quesada dcc4c46d5b Using std::swap instead of CC_SWAP 
CC_SWAP is deprecated. Use `std::swap` instead.
 2014-11-16 09:29:05 -08:00
Vladimir Timofeev 5dabf5719c Fix webp searching 2014-11-16 20:08:54 +03:00
Vladimir Timofeev f8c56ebbf9 Fix finding fmodex on ArchLinux 2014-11-16 20:00:51 +03:00
Vladimir Timofeev e3a0e089ba Add FindFMODEX.cmake and use it on linux to find FMOD Ex library 2014-11-16 19:10:45 +03:00
Vladimir Timofeev f8f37b7bf5 Fix comments and formatting in FindTinyXML2.cmake 2014-11-16 19:09:59 +03:00
Vladimir Timofeev 039005ef13 Unify protobuf finding and usage. 
But disable finding until bug with protobuf versions will be resolved.
 2014-11-16 15:29:24 +03:00
Vladimir Timofeev d224dc0ce7 Remove incorrect includes. 
No sure about to remove comment, because it important, but work in this direction in progress now, so I remove it also.
 2014-11-16 14:12:29 +03:00
Vladimir Timofeev 33786678eb Add finding curl. Fix some leftovers from websockets. 2014-11-16 13:55:42 +03:00
Vladimir Timofeev c7bff5ea9e Find libwebsockets in unified way 2014-11-16 13:22:54 +03:00
Filipe Lemos 0898af21ab Fix Back Key behaviour and Director::getInstance()->end() on WP8 2014-11-16 10:16:16 +00:00
Vladimir Timofeev 1d629dfe7d Find libtiff 2014-11-16 12:47:59 +03:00
Vladimir Timofeev 1c2fa8714e Fix building with system installed chipmunk on Mac. We should define CP_USE_CGPOINTS=0, or chipmunk will try use apple defined geometry types that conflicts with cocos types. 2014-11-16 12:19:19 +03:00
Vladimir Timofeev d9337cdbd3 Find libpng and zlib unified way. 2014-11-16 00:21:11 +03:00
Vladimir Timofeev 9334f0b569 Add custom FindJPEG.cmake module. 2014-11-15 21:16:39 +03:00
Vladimir Timofeev 210d8ec985 Compile Box2D tests only if library used in cocos. 2014-11-15 21:16:01 +03:00
Vladimir Timofeev a3b414f0d5 Use COCOS_EXTERNAL_DIR in Find*.cmake modules 2014-11-15 21:13:25 +03:00
Vladimir Timofeev 673fdc461d Unify Box2D usage and finding (not compilable, may be fix that later...) 2014-11-15 17:46:13 +03:00
Vladimir Timofeev 2863b95c61 Make FindTinyXML2.cmake use included macroses from same directory, as other our Find*.cmake modules 2014-11-15 17:07:46 +03:00
Vladimir Timofeev 27ef26270c Unify TinyXML2 usage. 
* should be included as simple "tinyxml2.h", but on some files was "tinyxml2/tinyxml2.h", replace this.
* Add cmake/Modules/FindTinyXML2.cmake
* As tinyxml2 for now has not prebuilt, instead sources included, add their as subdirectory if USE_PREBUILT_LIBS
 2014-11-15 14:43:50 +03:00
Vladimir Timofeev 60e5803698 Improve FindFreetype.cmake for Mac 2014-11-15 14:41:19 +03:00
Vladimir Timofeev b6dc5244b8 Try to fix building without chipmunk, by define CC_USE_PHYSICS=0, but lua bindings still fail. 2014-11-15 13:38:10 +03:00
Vladimir Timofeev eb0159b2b7 Unify usage of chipmunk library 
* cmake/Modules/FindChipmunk.cmake now can find prebuilt chipmunk libs
* follow USE_CHIPMUNK variable (although at the moment cocos can't build without chipmunk)
* come cleanups and formatting
 2014-11-15 13:17:23 +03:00
Vladimir Timofeev aaff42d6a9 Fix WebP usage. 
* Introduce config variable USE_WEBP (ON by default, but disabled for unsupported archs WINRT and WP8)
* Set CC_USE_WEBP define according to USE_WEBP variable
* add WebP include directories to search patch only for libcocos compilation (it not used in public headers)
 2014-11-15 11:31:10 +03:00
Vladimir Timofeev 53d23ce5f3 Unify WebP usage. 2014-11-15 10:27:56 +03:00
Vladimir Timofeev ddce662ec3 Unify usage of prebuilt libraries in cmake builds. 
* introduce config variable USE_PREBUILT_LIBS (default: ON). When OFF, cmake will not use prebuilt libs, only try find system installed libraries.
* FindGLFW3.cmake now search our prebuilt library (if USE_PREBULT_LIBS)
* FindFreetype.cmake also

This and next changes should simplify our CMakeLists.txt files and USE_PREBUILT_LIBS config allow external package developers to integrate cocos to their packaging system.
 2014-11-15 10:27:56 +03:00
Ricardo Quesada a893cc9b30 ooops 
commited by mistake debug messages
 2014-11-14 15:33:13 -08:00
Ricardo Quesada a5255a7154 Merge pull request #9126 from ricardoquesada/v21_externals 
externals: using v21
 2014-11-14 15:32:22 -08:00