pandamicro
a2a32ef58c
Release docs for v3.7.1
2015-07-25 15:16:39 +08:00
Martell Malone
3e0ada4c84
fix building with system prebuilt libs
2015-07-23 09:12:00 +01:00
Martell Malone
9d7598dad2
fix building with system prebuilt libs
2015-07-22 14:19:22 +01:00
Ricardo Quesada
4c88be9520
removes -fno-excpetion and -fexception from cmake
2015-07-06 12:09:50 -07:00
pandamicro
276ce3a0a7
Update versions
2015-06-19 09:56:19 +08:00
pandamicro
0216d05eee
Merge pull request #12102 from super626/navigation2
...
3D Navigation
2015-06-15 13:39:05 +08:00
Oscar Utbult
3a4b6bf52b
Add debug flag -Wextra
2015-06-10 23:02:13 +02:00
yangxiao
c782d63bef
add 3d navigation
2015-05-29 16:45:33 +08:00
andyque
c7d698362f
add JSB to jenkins
2015-05-25 16:37:08 +08:00
yangxiao
2391558c96
add physics3d support
2015-05-08 15:49:33 +08:00
minggo
4acd231f89
merge v3.6
2015-04-30 13:46:08 +08:00
minggo
454ca26653
[ci skip] update version
2015-04-27 16:47:22 +08:00
zhangbin
252e5e1183
Make the lua projects temporarily works well.
2015-04-24 10:17:38 +08:00
zhangbin
b42307286c
Solve the error when run js-tests on linux.
2015-04-23 16:51:57 +08:00
zhangbin
dcca32bd82
Update the CMakeLists & the remote url of submodule js-bindings.
2015-04-23 14:23:19 +08:00
WenhaiLin
55d3cc1252
Update the js-tests CMake files.
2015-04-23 10:42:44 +08:00
zhangbin
1f491cf656
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3-jsb
...
Conflicts:
build/cocos2d-wp8.sln
2015-04-16 17:04:07 +08:00
zhangbin
75e24a1aea
Add js related target for linux.
2015-04-15 14:02:04 +08:00
minggo
a87741af5f
[ci skip] update version
2015-04-14 10:47:05 +08:00
minggo
3a1a7c0122
[ci skip] update version
2015-04-07 10:38:01 +08:00
Ricardo Quesada
4646e49d15
cmake fix
...
policy CMP0054 only works with cmake 3.1+, not cmake 3.0
2015-04-05 23:23:28 -07:00
minggo
ffd8ae1b42
[ci skip]update CMakeLists.txt
2015-03-23 11:33:03 +08:00
minggo
01d404c9d4
[ci skip] update version
2015-02-26 10:41:10 +08:00
Vladimir Timofeev
7956297430
cmake+msvc: disable tests and lua bindings by default (temporarily, until tests will be fixed)
2015-01-26 17:28:58 +03:00
Vladimir Timofeev
004ee0b785
cmake+msvc: Use inline debug info (/Z7) format. Or internal error may occur because some dependant libs compiled with Z7 format.
2015-01-26 15:29:03 +03:00
Vladimir Timofeev
86f57f11c6
cmake: eliminate warning about policy on cmake 3.1
2015-01-26 10:17:33 +03:00
Vladimir Timofeev
991ea4532d
cmake: fix using of external/xxhash for msvc generated project
2015-01-26 10:03:49 +03:00
Vladimir Timofeev
5d27da2887
cmake: add glew include dirs globally, because windows code uses glew from public headers
2015-01-26 10:03:07 +03:00
Vladimir Timofeev
fc5023c9e7
cmake: add ZLIB_INCLUDE_DIRS to include directories before external/unzip compile (fix compilation with msvc)
2015-01-26 10:02:46 +03:00
minggo
a2327f9488
Merge pull request #9568 from vovkasm/pull/fix-cmake-link
...
cmake: fix tests linking
2014-12-23 11:49:40 +08:00
Vladimir Timofeev
1aef6338fc
cmake: remove unneeded flatbuffers code... only FLATBUFFERS_INCLUDE_DIRS should be set (for now to our external/flatbuffers directory)
2014-12-20 20:12:26 +03:00
Vladimir Timofeev
69a7b0ac3a
Why we ever linking with flatbuffers compiler library???
...
On windows mingw platform all executables as a result will be flatc command line utils (((
Because flatbuffers target contains "main" function...
Fix it by not set FLATBUFFERS_LIBRARIES at all (because it header-only library!)
2014-12-20 20:12:12 +03:00
Nick Barrios
08875d9e83
Append new C flags when adding defines in base CMakeLists.txt.
2014-12-19 16:40:02 -05:00
pipu
1cbc0120be
Merge branch 'v3' into v3_flatbuffers
2014-12-01 22:56:18 +08:00
pipu
584c7dc7c6
Delete that use protocol buffers
2014-12-01 12:46:29 +08:00
pipu
ff473f1537
Modify CMake Error at CMakeLists.txt:284 (add_subdirectory)
2014-11-27 19:59:16 +08:00
Vladimir Timofeev
552080cb69
Fix modules include path to be relative project directory.
...
This change allow to include cocos project directory from another CMakeFiles.txt (with add_subdirectory). And will allow anyone to connect cocos as submodule to their project easily.
2014-11-26 11:03:22 +03:00
pipu
889f84e540
newest v3 flatbuffers
2014-11-26 13:29:23 +08:00
Vladimir Timofeev
a562c70c73
Merge remote-tracking branch 'origin/v3' into cmake-linux-mac-fixes
...
* origin/v3:
Update CHANGELOG
Update AUTHORS
fixed typo
Updates definition of Complete.
[AUTO][ci skip]: updating cocos2dx_files.json
Revert "Merge pull request #9193 from pipu/v3_flatbuffers"
Skip binding nodeWithFlatBuffers of CSLoader for lua
2014-11-25 15:24:07 +03:00
Vladimir Timofeev
4e048951ff
cmake: add policy CMP0017 to fix warnings on 2.8.8 cmake and set it to NEW for predictable include behaviour
2014-11-25 14:19:49 +03:00
Ricardo Quesada
9e10d2d32b
Revert "Merge pull request #9193 from pipu/v3_flatbuffers"
...
This reverts commit fa22b12628
, reversing
changes made to 8dce62b94c
.
2014-11-24 10:19:53 -08:00
pipu
6be17520c7
Config android, linux, wp8
2014-11-21 18:08:09 +08: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
b0a6cf1182
Use standard cmake control variable to control static or dynamic build BUILD_SHARED_LIBS
2014-11-18 17:48:54 +03:00
Vladimir Timofeev
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
Vladimir Timofeev
d200bdcca0
fix Winmm linking
2014-11-18 10:07:11 +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
b7521dcbae
Remove unused variables.
2014-11-16 21:14:00 +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
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
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
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
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
50dcae4bef
fixes compiler warnings
2014-11-14 13:07:34 -08: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
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
e3e3de2d87
Remove unused variable from composed include_directories
2014-11-11 10:30:48 +03:00
Anton Sokolchenko
90b3786997
small fix
2014-10-15 16:48:47 +03:00
Anton Sokolchenko
8f150f8610
revert default settings
2014-10-15 16:45:25 +03:00
Anton Sokolchenko
108b8720e8
Merge branch 'v3' of https://github.com/iSevenDays/cocos2d-x into v3
2014-10-15 16:36:49 +03:00
Anton Sokolchenko
41b51168d0
CMake fix for template projects
2014-10-15 16:33:58 +03:00
Anton Sokolchenko
0b63ae6975
Update CMakeLists.txt
...
added iOS/Mac
2014-10-15 16:25:51 +03:00
Anton Sokolchenko
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
andyque
5ea0f0c86a
move include
2014-10-14 15:27:36 +08:00
andyque
96660cb653
fix linux compile
2014-10-13 18:19:49 +08:00
andyque
750c61dd30
fix linux compile error
2014-09-27 01:55:41 -07:00
andyque
db2559ef67
add box2d tinyzml back
2014-09-27 01:26:35 -07:00
andyque
99dddc1247
Merge branch 'v3' into fixLinuxCompileError
2014-09-27 01:07:10 -07:00
martell
479cd16886
Linux: make glfw3 visable to subprojects
2014-10-09 05:34:27 +01:00
andyque
aea729ef01
fix cmakelists.txt of linux platform
2014-10-09 12:01:22 +08:00
martell
9c61477739
linux: fixed include dirs
...
Signed-off-by: martell <martellmalone@gmail.com>
2014-10-03 23:22:43 +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
martell
30240a8a37
Multi platform cmake support
...
Signed-off-by: martell <martellmalone@gmail.com>
2014-10-03 23:21:45 +01:00
martell
f258a81263
Enable Static and Shared support in CMakeLists
...
Signed-off-by: martell <martellmalone@gmail.com>
2014-10-03 23:21:37 +01:00
martell
510b8d525b
added flags for shared windows build
...
Signed-off-by: martell <martellmalone@gmail.com>
2014-10-03 23:21:29 +01:00
martell
d9228d31c0
added support for static and shared builds on windows
...
Signed-off-by: martell <martellmalone@gmail.com>
2014-10-03 23:20:18 +01:00
Ricardo Quesada
38cdee45f8
English fixes
2014-09-15 09:33:07 -07:00
Ricardo Quesada
525fecc4ce
even more cmake fixes
2014-09-11 17:36:49 -07:00
Ricardo Quesada
7ca0203fdf
Project Name is Cocos2d-X not Cocos2dX
2014-09-10 16:26:32 -07:00
andyque
499d828179
add chipmunk static library for linux
2014-09-10 10:58:20 +08:00