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

25439 Commits

Author SHA1 Message Date
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
Ricardo Quesada 8fd633926f externals: using v21 2014-11-14 15:31:48 -08:00
Ricardo Quesada ac5ffea643 Merge pull request #9101 from super626/v3 
Add uv animation test
 2014-11-14 14:18:37 -08:00
Ricardo Quesada bc0c3d5a3f Merge pull request #9085 from jicheol-ryu/v3 
fix bug - potential memory leak.
 2014-11-14 14:17:13 -08:00
Ricardo Quesada d6b656c9ed Merge pull request #9125 from CocosRobot/update_cocosfiles_1415999444 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-11-14 14:14:42 -08:00
CocosRobot c227ba9e40 [AUTO][ci skip]: updating cocos2dx_files.json 2014-11-14 21:10:45 +00:00
Ricardo Quesada 4ab77acd57 Merge pull request #9124 from ricardoquesada/compiler_warnings 
fixes compiler warnings
 2014-11-14 13:08:11 -08:00
Ricardo Quesada 50dcae4bef fixes compiler warnings 2014-11-14 13:07:34 -08:00
Ricardo Quesada 9f8ed96681 Merge pull request #9121 from vovkasm/cmake-fix-glfw3-find 
This should fix and unify finding GLFW3 for all desktop archs.
 2014-11-14 11:29:33 -08:00
Ricardo Quesada 1b44f4b605 Merge pull request #9115 from vovkasm/win32-audioengine-mingw-fix 
Fix compile errors with recent mingw.
 2014-11-14 11:22:35 -08:00
minggo 6d08b33a68 Merge pull request #9107 from Dhilan007/v3-audio-includefix 
Remove unneeded include in AudioEngine.h
 2014-11-14 20:09:33 +08:00
zhangbin 4ef7c9f948 Modify the cpp template & tests to support compiling wp8-xaml & win8.1-universal project by console. 2014-11-14 16:48:14 +08:00
Vladimir Timofeev 48108e548a Fix compile errors with recent mingw. 
Constify arguments to copy constuctors. Without this gcc fail to compile if classes used inside containers.
Error message is rather cryptic: " error: 'constexpr std::pair<_T1, _T2>::pair(const std::pair<_T1, _T2>&) [with _T1 = const int; _T2 = cocos2d::experimental::AudioPlayer]' declared to take const reference, but implicit declaration would take non-const"
 2014-11-14 10:52:17 +03:00
Vladimir Timofeev 5a833a1792 This should fix and unify finding GLFW3 for all desktop archs. 
Instead of using glfw3 on each required configuration, use it centralized way.
Add our prebuilt location to search paths, so FindGLFW3.cmake can find it also.
 2014-11-14 10:43:49 +03:00
Dhilan007 ac0fb68989 fix compiling error caused by disable CC_ENABLE_SCRIPT_BINDING 2014-11-14 15:04:32 +08:00
Ricardo Quesada 3bd466ce49 Merge pull request #9110 from martell/cmake 
Cmake fixes and build fixes
 2014-11-13 16:08:00 -08:00
Ricardo Quesada 2e3b2d9f28 Merge pull request #9080 from vovkasm/cmake-refactoring 
Cmake refactorings and fixes
 2014-11-13 15:42:47 -08:00
martell d8be5a8af4 fix includes so that minizip builds correctly on Mingw-w64 2014-11-13 23:27:04 +00:00
martell 3de4906797 Make use of options for cc builder, cc studio and spine 2014-11-13 23:25:21 +00: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
Dhilan007 f52c3e5a83 Remove unneeded include in AudioEngine.h 2014-11-13 22:02:28 +08:00
minggo 596537ebcc [ci skip] Update CHANGELOG 2014-11-13 19:03:08 +08:00
minggo 156be2e633 Merge pull request #9077 from super626/fixscene 
fix Scene::setScale does not work #9031
 2014-11-13 18:59:49 +08:00
minggo 906316df62 Merge pull request #8985 from samuele3hu/v3_new_spine 
Fix error that the type judgment of lua value would parse string —> int or int —> string
 2014-11-13 18:59:19 +08:00
minggo f753368246 Merge pull request #9017 from cpascal/fix_error_refleakdetection 
Fixed compile error with CC_REF_LEAK_DETECTION
 2014-11-13 18:56:46 +08:00
minggo 133d51cad1 Merge pull request #9026 from cpascal/fix_error_scriptbinding_off 
Fixed compile error with CC_ENABLE_SCRIPT_BINDING=0
 2014-11-13 18:53:40 +08:00
minggo 306518cebf Merge pull request #9035 from samuele3hu/v3_fix 
Fix’ the error that Cocos2dxLuaJavaBridge' was optimized because of usage of LOCAL_STATIC_LIBRARIES in the Android.mk
 2014-11-13 18:49:44 +08:00
minggo d6eea4dc3c Merge pull request #9037 from G17hao/patch-8 
Update CCBone.cpp
 2014-11-13 18:46:48 +08:00
teivaz 2d75ceafb7 - set const modifier to ClippingNode::hasContent() 2014-11-13 12:43:05 +02:00
minggo d965062866 Merge pull request #9066 from cpascal/fix_bundlereader 
Fixed "warning: bundle reader out of range"
 2014-11-13 18:38:06 +08:00
minggo 5f1ca44f0c Merge pull request #9071 from mikandi/feature/android-build-native-with-spaces 
Android build_native.py with spaces in path
 2014-11-13 18:37:37 +08:00
minggo 63f2f8da76 Merge pull request #9092 from zawasp/touch-callbakcs 
define touch callback types
 2014-11-13 18:07:39 +08:00
minggo 222adb22dd Merge pull request #9104 from super626/camera 
add comments to camera and scene
 2014-11-13 18:04:44 +08:00
yangxiao d50670af4b add comment to camera and scene 2014-11-13 17:30:49 +08:00