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