e7864cdb89
Removed unnecessary search paths.
2016-03-22 16:04:12 +08:00
6a31f43a27
compiles on Mac. adds missing libs and files
2016-03-04 10:47:19 -08:00
028f8c28e1
Squashed commit of the following:
...
commit 59e43a3c80f4af8998e4a14f6463bd7a91617d5f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Mar 2 15:19:48 2016 -0800
uses new naming convention for projects
uses _ instead of -
commit f97ba56608d48b17909649c8617ba9047b566196
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Mar 2 14:49:22 2016 -0800
fooling cmake for real
commit 20c2560f75eab952e5131b484284bf20cb07fe07
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Mar 2 14:43:05 2016 -0800
fooling cmake
commit a0ada44bc82941830f6c71219a1492d28c28c306
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Mar 2 14:26:59 2016 -0800
makes CMake for Mac happy
commit 656b4f5e2dd741215a4699db979fe1b0dce60298
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Mar 2 13:50:15 2016 -0800
linux fix
commit fa98aeac8505c764f4a69f15c8a8ff1123fad2a3
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Mar 2 11:18:18 2016 -0800
links correctly!
commit 9c56ce7143d3a35b44d33f246cec093ca9eaa7d9
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Mar 1 17:44:58 2016 -0800
Squashed commit of the following:
commit 2ef52723dae44204c047cb177d5a5670fb659c79
Merge: 8a5c998 25cf1f1
2016-03-02 16:51:54 -08:00
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
b1ed1a8a51
add UIEditBox support linux platform.
2015-09-18 17:11:58 +08:00
6e138e7b9b
add clipper to cmakelist
2015-06-16 17:09:27 +08:00
c782d63bef
add 3d navigation
2015-05-29 16:45:33 +08:00
2391558c96
add physics3d support
2015-05-08 15:49:33 +08:00
e93f39fae1
fix typo
2015-03-05 17:05:08 +08:00
a229793e31
fix Linux glfw linker error on v3
2015-03-05 16:34:51 +08:00
991ea4532d
cmake: fix using of external/xxhash for msvc generated project
2015-01-26 10:03:49 +03:00
8a5c78b213
update external config to v3-deps-28.zip and update cocos2d-x version to rc2
2014-12-04 14:23:44 +08:00
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
98db27e929
cmake linux fixes: FindFontconfig, find appropriate threads libs
2014-11-19 10:57:18 +03:00
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
b0a6cf1182
Use standard cmake control variable to control static or dynamic build BUILD_SHARED_LIBS
2014-11-18 17:48:54 +03:00
ba2f74e76c
Fix OpenAL include paths, cmake search include paths for case, when openal includes as "#include <al.h>"
2014-11-18 17:27:43 +03:00
d200bdcca0
fix Winmm linking
2014-11-18 10:07:11 +03:00
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
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
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
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
e3a0e089ba
Add FindFMODEX.cmake and use it on linux to find FMOD Ex library
2014-11-16 19:10:45 +03:00
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
33786678eb
Add finding curl. Fix some leftovers from websockets.
2014-11-16 13:55:42 +03:00
c7bff5ea9e
Find libwebsockets in unified way
2014-11-16 13:22:54 +03:00
1d629dfe7d
Find libtiff
2014-11-16 12:47:59 +03:00
d9337cdbd3
Find libpng and zlib unified way.
2014-11-16 00:21:11 +03:00
9334f0b569
Add custom FindJPEG.cmake module.
2014-11-15 21:16:39 +03:00
673fdc461d
Unify Box2D usage and finding (not compilable, may be fix that later...)
2014-11-15 17:46:13 +03:00
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
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
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
53d23ce5f3
Unify WebP usage.
2014-11-15 10:27:56 +03:00
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
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
3bd466ce49
Merge pull request #9110 from martell/cmake
...
Cmake fixes and build fixes
2014-11-13 16:08:00 -08:00
3de4906797
Make use of options for cc builder, cc studio and spine
2014-11-13 23:25:21 +00:00
0059c93757
cmake: protobuf should be linked with cocos2d.a in every platform (not only on linux)
2014-11-11 10:30:48 +03:00
2befd74b0e
add needed link library for linux
2014-10-18 15:40:47 +08:00
a49b337bbc
Update CMakeLists.txt
2014-10-15 17:37:58 +03:00
8f150f8610
revert default settings
2014-10-15 16:45:25 +03:00
41b51168d0
CMake fix for template projects
2014-10-15 16:33:58 +03:00
fc35cc2efe
CMake fix for Mac Os X.
...
You can open project with CLion and see that everything works.
2014-10-15 00:19:29 +03:00
1d02270c21
fix CMakeLists for Mac Os
2014-10-14 19:17:00 +03:00
5ea0f0c86a
move include
2014-10-14 15:27:36 +08:00
2d4761966a
fix jenkins linux compile error and add protobuf to ignore list
2014-10-14 15:11:50 +08:00
96660cb653
fix linux compile
2014-10-13 18:19:49 +08:00
750c61dd30
fix linux compile error
2014-09-27 01:55:41 -07:00
8a4b8afc6c
Android: added support for building libcocos2d
...
Signed-off-by: martell <martellmalone@gmail.com>
2014-10-03 23:22:35 +01:00
Xpol Wan