56baabfe50
update glfw to 3.2.1 ( #18434 )
2017-11-02 15:25:12 +08:00
d07794052f
Update license to 2017 ( #17362 )
...
* Typo: CopyRight -> Copyright
* Copyright update: chukong-inc.com -> Chukong Technologies Inc.
* [js files] Copyright update: 2014 -> 2014-2017
* [cpp files] Copyright update: 2014 -> 2014-2017
* Copyright update: 2015 -> 2015-2017
* [js files] Copyright update: 2014 -> 2014-2017
* Copyright update: 2016 -> 2016-2017
* Copyright update: 2013 -> 2013-2017
* Copyright update: 201?-201? -> 201?-2017
* License year fixes.
* Liscene year fix in CCRay.cpp
* Updates license years in CCGLProgramState.h & CCGLProgramStateCache.h
2017-02-14 14:36:57 +08:00
b1f2a056b2
Refactor WebSocket to support SSL (wss) ( #17172 )
...
* Refactors WebSocket:
1. Supports wss protocol
2. Uses only one libwebsockets context, multiple wsi instances to avoid multi-thread issues
3. Uses lws_create_vhost to create multiple virtual host, different protocols works
* Adds openssl include path to xcode project configuration.
* mac doesn’t depend on curl
* ca file path should be full path.
* More bug fixes like which in https://github.com/cocos2d/cocos2d-x/pull/6986
* Remove curl dependence for mac
* Updates Andorid.mk
* [win32] Adds wss support for win32, and updates openssl, libcurl, libwebsockets libraries.
* Updates external/config.json to 118.
* [win32] Updates cocos/2d/libcocos2d.vcxproj to fix compilation error while building in release mode.
* Linux support websocket ssl connection.
* Updates external/config.json
* Updates install-deps-linux.sh
* Adds dependence of binutils, print ld version
* Updates travis scripts.
* Updates travis scripts.
* Updates travis script, don’t output log while extracting.
* update before-install.sh
* updates before-install.sh
* updates before-install.sh
* don’t output log for installing software.
* Updates config.json to 120.
2017-01-19 13:55:14 +08:00
5b83fa1ac0
Fix LNK4098 and LNK2001 warnings ( #16372 )
...
* Fix LNK4098 warnings
Fixes these two warnings:
```
warning: LNK4098: defaultlib 'MSVCRT' conflicts with use of other libs; use /NODEFAULTLIB:library
warning: LNK4098: defaultlib 'LIBCMT' conflicts with use of other libs; use /NODEFAULTLIB:library
```
* Fix LNK2001 error
The `version` library is not linked for MSVC compiler and it produces these errors when compiling with MSVC 19.
```
cocos2dInternal.lib(CCApplication-win32.cpp.obj) : error LNK2001: unresolved external symbol _GetFileVersionInfoSizeW@8
cocos2dInternal.lib(CCApplication-win32.cpp.obj) : error LNK2001: unresolved external symbol _GetFileVersionInfoW@16
cocos2dInternal.lib(CCApplication-win32.cpp.obj) : error LNK2001: unresolved external symbol _VerQueryValueW@16
```
This commit fixes that problem
2016-08-22 15:50:17 +08:00
6778ebf451
Merge pull request #15853 from ricardoquesada/vr_squashed
...
Squashed commit of the following:
2016-06-17 10:15:20 +08:00
180c2f1e9a
Squashed commit of the following:
...
VR support for cocos2d-x
commit 087aff0aec24b81418fa2678ce0cae2d4c1e2e01
Merge: b32d329 fc44d0dfd3b6d4#11 from songchengjiang/riq_vr
daydream VR platform supporting
commit cc936afac44518a00b90ec3133aaac5d00f0b91f
Author: songchengjiang <moses_jc@sina.com>
Date: Mon Jun 6 10:38:27 2016 +0800
remove VR 3rdparty dependence
commit 5f7a1a9c80f84cc915763ad6f52ffc524dd59309
Author: songchengjiang <moses_jc@sina.com>
Date: Mon Jun 6 10:34:37 2016 +0800
remove VR 3rdparty dependence
commit 3f72ecde2a259357a137bec1e99e731a2e78df84
Author: songchengjiang <moses_jc@sina.com>
Date: Mon Jun 6 10:28:43 2016 +0800
remove VR 3rdparty dependence
commit 2e56f032d1daced1b66b984acacc6f5007f5ecc3
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Jun 3 10:45:44 2016 -0300
fix: started android support
commit 1910c9c488ee4315110081b60438aa1b7c1011f2
Author: songchengjiang <moses_jc@sina.com>
Date: Thu Jun 2 15:58:34 2016 +0800
add CCVRGvrRenderer and CCVRGvrHeadTracker framework
commit 96200eedea9234287153d71b4f198077cc49389a
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue May 31 13:07:44 2016 -0300
fix: little fixes
commit a2eb8114b2969beca83762ba829c8cb809b1615a
Merge: 20a74e0 5fddebc
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue May 31 12:12:59 2016 -0300
Merge pull request #10 from songchengjiang/riq_vr
bugs fixed
commit 5fddebcae997db9e1a4108413d73b0d057a61e83
Author: songchengjiang <moses_jc@sina.com>
Date: Fri May 27 15:57:30 2016 +0800
parameter corrected
commit 925aad012ae513ebeeec682b003123a3c543759f
Merge: 9b5e02f 20a74e0
Author: songchengjiang <songcheng.jiang@chukong-inc.com>
Date: Fri May 27 15:46:13 2016 +0800
Merge branch 'vr' of https://github.com/ricardoquesada/cocos2d-x into riq_vr
Conflicts:
cocos/2d/CCScene.cpp
commit 9b5e02fa7c9fcdd15cfea99769560ed30b976e9e
Author: songchengjiang <songcheng.jiang@chukong-inc.com>
Date: Fri May 27 14:36:31 2016 +0800
fixed ProjectionMatrix error on oculus platform
fixed ScrollView error on oculus platform
commit 3c63ead1943d1cf8aa3c0fd722a4b3834db323b1
Author: songchengjiang <moses_jc@sina.com>
Date: Fri May 27 10:51:46 2016 +0800
bugs fixed
mobile VR platforms:
fixed ProjectionMatrix error
fixed culling error of ScrollView
commit 20a74e064708e6bf9d15cc5551d1f86af9d24010
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 20 09:22:45 2016 -0300
fix: setAdditionalTransform support reference
commit 8341df82a02683b8e4ae02654e90617a2e5ced6d
Merge: 83751de 469d38d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed May 18 07:38:49 2016 -0700
Merge pull request #8 from songchengjiang/riq_vr
Finished VR integration of SKDs based on VRProtocol
commit 469d38d778cd5f947098a08d8fd14ca6f32b0502
Author: songchengjiang <moses_jc@sina.com>
Date: Wed May 18 15:32:32 2016 +0800
fix bug of deepoon's headtracking
commit 83751deac133910c24321ddaddff93bf736de884
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue May 17 09:41:17 2016 -0700
fix: Scene inverts the eye matrix
commit 41ae41969a71fd5b07396faac78e777c4afbe5c4
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue May 17 06:54:34 2016 -0700
fix: inversed matrix for camera
commit 049dee721356a47b19f5e51a0face6a5a1647095
Author: songchengjiang <songcheng.jiang@chukong-inc.com>
Date: Tue May 17 15:51:57 2016 +0800
add headtracker of oculus
commit 3f6478352a4baebc684105156389655edbac7e6f
Author: songchengjiang <moses_jc@sina.com>
Date: Tue May 17 14:22:56 2016 +0800
add headtracker of SKDs
gearvr/deepoon/cardboard
commit 59df985b72adf0dbb5a4c66c80ae7299b16ae909
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon May 16 22:12:23 2016 -0700
fix: head tracker works
commit 306c59da0175708c96b5757f5f27afd6a6592fe3
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon May 16 17:55:43 2016 -0700
fix: adds missing methods to `VRIHeadTracker`
commit 91100b8a86d78801fbcd08e99427d6a6363ad69b
Author: songchengjiang <songcheng.jiang@chukong-inc.com>
Date: Mon May 16 14:17:21 2016 +0800
Rename Oculus's files
commit 01ef6215de936a8d8bb15f9ec195cb81b2b4b18f
Author: songchengjiang <moses_jc@sina.com>
Date: Mon May 16 11:41:56 2016 +0800
Rename files based on riq's changes
commit 734efbb045064d24df095c5b8fc604ef2aab1dea
Merge: 91449c9 769a883
Author: songchengjiang <songcheng.jiang@chukong-inc.com>
Date: Mon May 16 09:57:57 2016 +0800
Merge branch 'riq_vr' of https://github.com/songchengjiang/cocos2d-x into riq_vr
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/vr/CCVRGeneric.cpp
cocos/vr/CCVRGenericHeadTracker.h
commit 91449c9d23e357549cb1aeae6d1454274def1aab
Merge: d3e4550 a33faaf
Author: songchengjiang <songcheng.jiang@chukong-inc.com>
Date: Mon May 16 09:54:44 2016 +0800
Merge branch 'vr' of https://github.com/ricardoquesada/cocos2d-x into riq_vr
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/platform/CCGLView.cpp
commit a33faafa1a2b6cffdc32d87f3c1c321f46f94789
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat May 14 00:57:54 2016 -0700
fix: adds head tracker
commit ea348cf72d3e54dc3864571bff1405909dbb65c9
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 13 18:40:32 2016 -0700
fix: removes red background
commit 113c7debe9a35fc142183a9012cac40063e17efe
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 13 18:39:31 2016 -0700
fix: centers image
commit 769a883c93f4f7c6191462626845f01d6f8596fe
Author: songchengjiang <moses_jc@sina.com>
Date: Fri May 13 20:36:19 2016 +0800
Merge branch 'vr' of https://github.com/ricardoquesada/cocos2d-x into riq_vr
commit d3e45501cd2cada87735390a407fbd44e61cd84e
Author: songchengjiang <songcheng.jiang@chukong-inc.com>
Date: Fri May 13 17:52:46 2016 +0800
update win32 project for VR
commit ba0fdb8b8e1efaf8fdf88e044e701fb5bedb4839
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu May 12 23:21:50 2016 -0700
fix: no hardcoded values
code is simpler, fixed a few bugs
commit b30596cdae4cdcf39d960a39661a79200b27c7a8
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu May 12 21:50:18 2016 -0700
fix: simplified distortion
commit 37b184f084e7b50bac9a5a3c59a87f8f03440b53
Author: songchengjiang <songcheng.jiang@chukong-inc.com>
Date: Fri May 13 09:39:34 2016 +0800
finished VR rendering of Oculus
commit f7d74cd0a2479541c0546d0ec41fe4f867405fcc
Author: songchengjiang <moses_jc@sina.com>
Date: Thu May 12 10:00:43 2016 +0800
Finished GearVR and Deepoon VR rendering integration
commit 776fb4fd7420f1c14403eb476df1e9716362f1e5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed May 11 16:56:57 2016 -0700
fix: distortion working... with too many hardcoded values
time to "un-hardcode" the values
commit 0584773cca88c5b3dee72821830841f617cfb21c
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue May 10 19:49:07 2016 -0700
feat: distortion WIP
commit 9b5ef01776eaa617dd4677c3824e50c1f9da41c6
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue May 10 15:49:17 2016 -0700
fix: simpler
one texture that holds both left and right eye
commit bfff504c499c253a0c36b342e6b5bcb0edf4fed7
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon May 9 10:50:43 2016 -0700
fix: Camera code is cleaner
commit fcf730bc2afc6c4552787273577e1942088c2e42
Author: songchengjiang <moses_jc@sina.com>
Date: Mon May 9 16:43:58 2016 +0800
support cardboard VR rendering
commit f88b834b70fbfb28db0c8442e68984c61192d7cc
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 6 21:16:10 2016 -0700
fix: proj fixes. works ok in any resolution
commit f980a616837b0f259d9564e622c78e0f4869ed53
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 6 19:08:47 2016 -0700
fix: renders ok in any device
commit 4799ad32ea38ddd217e80e868c3d9021c03e88ce
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Apr 28 16:46:30 2016 -0700
fix: renders something
fix: passing camera to scene
adds a way to return user camera
fix: stereo rendering works
fix: viewport left is correct
fix: scissor is not needed...
fix: works!
fix: minor fixes
fix: new approach... almost working
fix: camera is moved
whitespace fixes
fix: whitespaces
fix: new line
commit c137a53aba227cf2e2a1809b55cb9b3da25d432b
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 27 18:56:41 2016 -0700
fix: VR refactor... still WIP
commit 16fde77d71b8309e982bf6fa4f4ee0acea5fc0d1
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Apr 26 22:21:21 2016 -0700
feat: VR, initial commit
2016-06-15 11:33:25 -07:00
dac9be5016
Various CMake improvements
...
- Added c++_shared (LLVM) to Android toolchain options. Fixed AndroidNdkGdb.cmake.
- Fixed includes when not using prebuilt libs. Added option to use sources in external when not using prebuilt libs.
- Added option in CMake to be able build Box2D without using it as physics library in cocos2d-x (similar to what is done in the Visual Studio solution).
2016-06-14 10:20:57 -04:00
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
minggo