Ricardo Quesada
bc11e24019
Squashed commit of the following:
...
commit 36c2807d07848448c1fed86f4b119205048691bf
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Feb 29 13:11:40 2016 -0800
binary file 82
commit 9b7cd003b12faefd0522d12f765c027efb001ab2
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Feb 29 12:56:39 2016 -0800
fore multiple in windows phone 8.1 too
commit daea8a3ef8d69915e7a9d962fd745a1103011bab
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Feb 29 12:50:45 2016 -0800
force multiple
commit 0fbabdbf99974e95de083d79c7d6ae7cf735e4b6
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Feb 29 10:44:40 2016 -0800
compiles
commit f817766afcd0ffc4ca93f628d55fabc4b5a96ba5
Merge: 7b2cea3 8bf3d33
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Feb 29 09:37:24 2016 -0800
Merge branch 'v3' into chipmunk_v7_2
commit 7b2cea329a56ae2786428d39a499bc12ba3860e6
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Feb 27 01:11:13 2016 -0800
correct paths for win8.1
commit dcf1f046eb1e18474d6f94b2d7dc31fbf1b06cea
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Feb 26 22:46:58 2016 -0800
projects works on win32
commit ab5b14c25ef0fdf224480302f9cb3cc01d5c360c
Merge: 04377cc 9af2f4e
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Feb 26 21:57:10 2016 -0800
Merge branch 'v3' into chipmunk_v7_2
commit 04377cce7f46b2c2016ccc3855fc479c4f6aa516
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Feb 26 21:26:55 2016 -0800
trying to make it compile on win32
commit 7703946d99e1cdc6a57f2ccb2a868818c1367291
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Feb 24 10:28:12 2016 -0800
quick hack to make it compile...
...autogenerated files will fix it.
commit ea35bf3a5894cb80b09ecd0a4a5408dcc19785f5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Feb 24 09:20:59 2016 -0800
Squashed commit of the following:
commit 487e52a7af7cdb40135fd3bd83b2efba0dfe6265
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 23 20:10:13 2016 -0800
compiles.. sort of
commit a7990e2888d5ef1e43b811148b23c0b899105ab3
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 23 19:55:24 2016 -0800
more chipmunk fixes
commit 1174f6ec8201324161d7946af0f493b136a56690
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 23 19:36:15 2016 -0800
more chipmunk fixes
commit 00ac2449ca0c35bd9184310d58e74aaa05bd1323
Merge: f942c5a 0594d3c
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 23 19:29:27 2016 -0800
Merge branch 'chipmunk_v7_squashed' of github.com:ricardoquesada/cocos2d-x into chipmunk_v7_squashed
commit f942c5a3cc7b24f3ac211d781be1b9c9d4ec0fd7
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 23 19:28:51 2016 -0800
correct path for chipmunk
commit 0594d3c4141d390b2566ea76101e383f15ebcaaf
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 23 18:44:05 2016 -0800
compiles on ios
commit 379503399c384ad77d25d68a2f83b71a829b1c04
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 23 17:51:36 2016 -0800
chipmunk include fixes
commit 95839fb7b406a32255853294b016d8c15aec1ed6
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 23 17:09:04 2016 -0800
fixes for cmake + mac
commit 39449ea3b7efccae2946785c1c11433d964ee480
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 23 16:51:25 2016 -0800
correct includes
commit 98e97d7d2f00e6a78d040dcaf17e5a077e9a88c3
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 23 16:35:40 2016 -0800
fixes chipmunk with cmake
commit 337f21f9466703722847635301d841ace9b757cb
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 23 14:42:01 2016 -0800
updates android and linux projects
commit 7111a9993b97f78cf73206804b25665c21a59ca8
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 23 14:18:26 2016 -0800
cosmetic changes
commit ce15038b8d2c0c7ebe31b4e1efe92646b7c70d1b
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 23 06:53:41 2016 -0800
chipmunk autogenerated files
commit 66c71bfa3aaab04abf25f284e2e76ce2a74a98de
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 23 06:47:41 2016 -0800
compatibility both in JS (to reduce space)
and in C for (C++ users)
commit 0f9ffa0a8ab23a19e1f10b04e6987c2288764b1f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 23 06:10:02 2016 -0800
mooooore fixes
commit 9ab23014093677e8eda69b105f50410b8c792aa3
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 23 05:30:58 2016 -0800
doesn't crash with collision handler
commit 69275a16817a038244bbaaff9e82a011b6729cb2
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Feb 23 05:16:29 2016 -0800
adds missing space functions
commit a6b97bbc76cb9ab293356bb7451cfa858353f589
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Feb 22 22:22:27 2016 -0800
queries... better
commit 3442bceca64f5a0ddbbbb1a288146a2a61d87632
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Feb 22 19:48:41 2016 -0800
adds more missing functions
fixes other chipmunk JS issues
commit 3797a033896d059da58a05ce0de832ed9c150eff
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Feb 22 18:30:21 2016 -0800
yep... poly works ok
commit d1bb57776891605b9d3e4fb90736c6869d96b944
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Feb 22 17:28:29 2016 -0800
neede compat files
commit 39ec518d4e089124d9a53fe3a8dce3aa0474c233
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Feb 22 17:28:04 2016 -0800
query working!
commit 71a8001fd6bc03ac674621f5da38a3f8778430b4
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Feb 19 21:57:03 2016 -0800
almost there
commit 9272fdcd06ba188db2fe5701fb2ac21476d54883
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Feb 19 21:18:46 2016 -0800
fixes return values
commit 7218778da846e1e36a510c0a19a5ee76f91db032
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Feb 19 20:36:14 2016 -0800
cpMomentForSegment is manual since parameter 4 is optional
in chipmunk 6, but not in 7
commit 98d5d3e23c2cdb941cc0b1f3ce8275990356e88d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Feb 19 17:29:28 2016 -0800
yeah... process the arguments correctly
works both for functions and auto_classes
commit ce6a4fe3593b4f3b0fcdf11d12e297d789e0d96b
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Feb 19 16:49:00 2016 -0800
compiles and links
fixes some issues with the queries.
returns shapes instad of the queryInfo
commit 3f879482dc6db86e45e4319bc802ccf19b52a46c
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Feb 19 15:03:18 2016 -0800
adds removeCollisionHandler and other fixes
commit 32d825fc7bd323e144db6a1badc4a62420b6ea44
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Feb 18 20:59:24 2016 -0800
compiles... doesn't work yet
commit bd64de81713fb2d7652a538d667d73f05f5d9320
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Feb 17 18:17:39 2016 -0800
WIP: chipmunk bindings
2016-02-29 13:53:00 -08:00
cesarpachon
40f6f76030
AudioEngine:Linux: implementation using FMOD, refactor to SimpleAudioEngine now as wrapper of AUdioEngine, upgrade FMOD binaries
2015-11-26 22:22:05 -05:00
hanxi
b1ed1a8a51
add UIEditBox support linux platform.
2015-09-18 17:11:58 +08:00
Martell Malone
9d7598dad2
fix building with system prebuilt libs
2015-07-22 14:19:22 +01:00
andyque
ce204a11db
remove zlib in linux, because linux use system png and zlib
2015-04-07 23:20:03 +08:00
andyque
9457904fac
fixed freetype2 include issue
2015-04-07 23:20:02 +08:00
Vladimir Timofeev
567c5933bb
cmake: fix GLEW include dir for msvc prebuilt library
2015-01-26 10:02:27 +03:00
Vladimir Timofeev
edb4e770b1
Remove unused code from Find*.cmake modules. All logic with USE_PREBUILT_LIBS are handled in cmake/Modules/CocosUsePrebuiltLibs.cmake
2014-12-20 23:10:28 +03:00
Vladimir Timofeev
4047ba0fda
cmake: on some systems (ubuntu 14.10 for ex) pkg-config --cflags glfw3 returns only special includes, so try search glfw3.h in default locations if fist search fail
2014-11-25 22:51:35 +03:00
Vladimir Timofeev
b299f7f74d
Remove debug info. And add warning message if pkg-config not found.
2014-11-25 16:41:46 +03:00
Vladimir Timofeev
3bb163a979
Add fresh FindPkgConfig.cmake for sure that vendors not overwrite it.
2014-11-25 16:18:07 +03:00
Vladimir Timofeev
43fb2986dc
Additional debug info.
2014-11-25 16:00:05 +03:00
Vladimir Timofeev
a8695b2f86
add some debug info
2014-11-25 13:40:01 +03:00
Vladimir Timofeev
aad8d2e98f
remove some debug output
2014-11-25 07:26:40 +03:00
Vladimir Timofeev
d8980b3a7b
cmake: fixes for old cmake 2.8.12
2014-11-25 07:26:33 +03:00
Vladimir Timofeev
4e2ab8b961
pkg-config return include directory for use as '#include <GLFW/glfw3.h>', but we use '#include "glfw3.h"', fix include dir.
2014-11-25 07:26:17 +03:00
Vladimir Timofeev
2838f57a96
Rewrite FindGLFW3.cmake, so it can found static glfw3 and link all deps.
2014-11-25 07:26:06 +03:00
Vladimir Timofeev
393b3d0971
cmake: Disable try to link with static system installed libs, seems that linux distros not supported this option mostly
2014-11-24 17:24:34 +03:00
Vladimir Timofeev
03401668b8
cmake: fix FindFontconfig.cmake - FONCONFIG_FOUND was not set, when FONTCONFIG_INCLUDE_DIRS was empty (on CentOS 6.5 for example)
2014-11-24 17:23:12 +03:00
Vladimir Timofeev
8c331649dc
fix finding prebuilt fmod on linux
2014-11-20 13:50:55 +03:00
Vladimir Timofeev
499c670a9b
Move prebuilt libraries config to distinct file.
...
Now build system looks more maintanable.
I test with mac, going to test with other platforms.
* All prebuilt libs config moved to
cmake/Modules/CocosUsePrebuiltLibs.cmake
* Wrap plain find_package to our cocos_find_package. It will not try to
call find_package if USE_PREBUILT_LIBS and <pkg>_FOUND set to true.
* Other small fixes.
2014-11-20 12:05:15 +03:00
Vladimir Timofeev
98db27e929
cmake linux fixes: FindFontconfig, find appropriate threads libs
2014-11-19 10:57:18 +03:00
Vladimir Timofeev
2bf77c10e8
Fix build on mingw again, disable USE_PREBUILT_LIBS with mingw (mingw can not link this libs). Eliminate some Find* modules, we can tune prebuilts without modify their code.
2014-11-19 03:28:41 +03:00
Vladimir Timofeev
fe25c860cb
Fixes for freetype, protobuf and more unifications. Also it case of static library in some find* modules we try to use pkg-config first, it is chance to get dependency info
2014-11-19 00:27:25 +03: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
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
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
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
Vladimir Timofeev
1d629dfe7d
Find libtiff
2014-11-16 12:47:59 +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
a3b414f0d5
Use COCOS_EXTERNAL_DIR in Find*.cmake modules
2014-11-15 21:13:25 +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
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
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
Vladimir Timofeev
77ab866090
Move BuildHelpers.CMakeLists.txt to Modules/CocosBuildHelpers.cmake, this name is more standard for cmake include files, and in future this file can be installed to use by external applications.
2014-11-11 10:30:48 +03:00
Vladimir Timofeev
72e59a53a8
cmake: Build application bundles on Mac for test applications (this allow run they from Xcode)
2014-11-11 10:30:48 +03:00
Anton Sokolchenko
41b51168d0
CMake fix for template projects
2014-10-15 16:33:58 +03:00
andyque
db2559ef67
add box2d tinyzml back
2014-09-27 01:26:35 -07:00
martell
07c31bb4e1
Linux: fix glfw3 searching
2014-10-09 05:22:21 +01:00
martell
65795ea022
IOS: Added initial cmake toolchain
...
Signed-off-by: martell <martellmalone@gmail.com>
2014-10-04 00:55:04 +01:00
martell
8a4b8afc6c
Android: added support for building libcocos2d
...
Signed-off-by: martell <martellmalone@gmail.com>
2014-10-03 23:22:35 +01:00
martell
c3172bef50
Finalise Windows cmake support for mingw-w64
...
Signed-off-by: martell <martellmalone@gmail.com>
2014-10-03 23:22:09 +01:00