ffd8ae1b42
[ci skip]update CMakeLists.txt
2015-03-23 11:33:03 +08:00
01d404c9d4
[ci skip] update version
2015-02-26 10:41:10 +08:00
7956297430
cmake+msvc: disable tests and lua bindings by default (temporarily, until tests will be fixed)
2015-01-26 17:28:58 +03:00
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
86f57f11c6
cmake: eliminate warning about policy on cmake 3.1
2015-01-26 10:17:33 +03:00
991ea4532d
cmake: fix using of external/xxhash for msvc generated project
2015-01-26 10:03:49 +03:00
5d27da2887
cmake: add glew include dirs globally, because windows code uses glew from public headers
2015-01-26 10:03:07 +03:00
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
a2327f9488
Merge pull request #9568 from vovkasm/pull/fix-cmake-link
...
cmake: fix tests linking
2014-12-23 11:49:40 +08:00
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
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
08875d9e83
Append new C flags when adding defines in base CMakeLists.txt.
2014-12-19 16:40:02 -05:00
1cbc0120be
Merge branch 'v3' into v3_flatbuffers
2014-12-01 22:56:18 +08:00
584c7dc7c6
Delete that use protocol buffers
2014-12-01 12:46:29 +08:00
ff473f1537
Modify CMake Error at CMakeLists.txt:284 (add_subdirectory)
2014-11-27 19:59:16 +08:00
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
889f84e540
newest v3 flatbuffers
2014-11-26 13:29:23 +08:00
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
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
9e10d2d32b
Revert "Merge pull request #9193 from pipu/v3_flatbuffers"
...
This reverts commit fa22b126288dce62b94c
2014-11-24 10:19:53 -08:00
6be17520c7
Config android, linux, wp8
2014-11-21 18:08:09 +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
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
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
b7521dcbae
Remove unused variables.
2014-11-16 21:14:00 +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
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
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
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
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
210d8ec985
Compile Box2D tests only if library used in cocos.
2014-11-15 21:16:01 +03:00
a3b414f0d5
Use COCOS_EXTERNAL_DIR in Find*.cmake modules
2014-11-15 21:13:25 +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
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
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
50dcae4bef
fixes compiler warnings
2014-11-14 13:07:34 -08: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
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
e3e3de2d87
Remove unused variable from composed include_directories
2014-11-11 10:30:48 +03:00
90b3786997
small fix
2014-10-15 16:48:47 +03:00
8f150f8610
revert default settings
2014-10-15 16:45:25 +03:00
108b8720e8
Merge branch 'v3' of https://github.com/iSevenDays/cocos2d-x into v3
2014-10-15 16:36:49 +03:00
41b51168d0
CMake fix for template projects
2014-10-15 16:33:58 +03:00
0b63ae6975
Update CMakeLists.txt
...
added iOS/Mac
2014-10-15 16:25:51 +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
5ea0f0c86a
move include
2014-10-14 15:27:36 +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
db2559ef67
add box2d tinyzml back
2014-09-27 01:26:35 -07:00
99dddc1247
Merge branch 'v3' into fixLinuxCompileError
2014-09-27 01:07:10 -07:00
479cd16886
Linux: make glfw3 visable to subprojects
2014-10-09 05:34:27 +01:00
aea729ef01
fix cmakelists.txt of linux platform
2014-10-09 12:01:22 +08:00
9c61477739
linux: fixed include dirs
...
Signed-off-by: martell <martellmalone@gmail.com>
2014-10-03 23:22:43 +01:00
8a4b8afc6c
Android: added support for building libcocos2d
...
Signed-off-by: martell <martellmalone@gmail.com>
2014-10-03 23:22:35 +01:00
c3172bef50
Finalise Windows cmake support for mingw-w64
...
Signed-off-by: martell <martellmalone@gmail.com>
2014-10-03 23:22:09 +01:00
30240a8a37
Multi platform cmake support
...
Signed-off-by: martell <martellmalone@gmail.com>
2014-10-03 23:21:45 +01:00
f258a81263
Enable Static and Shared support in CMakeLists
...
Signed-off-by: martell <martellmalone@gmail.com>
2014-10-03 23:21:37 +01:00
510b8d525b
added flags for shared windows build
...
Signed-off-by: martell <martellmalone@gmail.com>
2014-10-03 23:21:29 +01:00
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
38cdee45f8
English fixes
2014-09-15 09:33:07 -07:00
525fecc4ce
even more cmake fixes
2014-09-11 17:36:49 -07:00
7ca0203fdf
Project Name is Cocos2d-X not Cocos2dX
2014-09-10 16:26:32 -07:00
499d828179
add chipmunk static library for linux
2014-09-10 10:58:20 +08:00
0ead7b6307
Squashed commit of the following:
...
commit b9181ae92541d11119bedd766773ddb01f0bb486
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Sep 9 09:34:40 2014 -0700
Compiles luasocket on Mac
commit 91fc79aa2101867fedfbcd7d846e9508009894e6
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Sep 9 09:12:30 2014 -0700
disables luasockets
commit 31f2ee462708ab7b604b9399eaabd275e2da9e02
Merge: 19099fd 0abe4cb
2014-09-09 12:18:31 -07:00
74fc9931e7
fix compiling error of cpp-tests on linux
2014-08-24 19:12:36 -07:00
030f80a257
one static library for c++ and another one for lua-binding
2014-08-24 03:52:51 -07:00
6259aebdab
Split cocos3d from cocos2d on the android、win32 and linux platform and adjust the related test project
2014-08-17 23:45:56 +08:00
cf0aa36c15
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module
...
Conflicts:
cocos/network/CMakeLists.txt
cocos/storage/CMakeLists.txt
2014-08-07 14:02:50 +08:00
aa4f407851
extract ui,network and storage from cocos2d module and adjust relate CMakeLists.txt
2014-08-07 13:53:13 +08:00
f804331558
fix a spacing error with cmake flags
2014-08-06 15:45:40 +01:00
3bb758668f
BUILD_CppTests: should cover the empty test, Fix bad English
2014-08-06 15:44:09 +01:00
7fad8a4d0d
added tinyxml2 to the option of using external version
2014-08-06 15:43:54 +01:00
421be753b3
add option to opt not to build box2d, chipmunk
2014-08-06 15:43:41 +01:00
75911658aa
Make CMake More Robust
2014-08-06 15:43:19 +01:00
9f0a566b8a
Merge pull request #6945 from John-He-928/mingw-build
...
Fix MinGW build
2014-06-19 22:08:28 +08:00
c785d64ba1
Adjust the xxtea directory structure and modify configs files for platforms
2014-06-04 11:50:04 +08:00
5e82d9db4d
set libws2_32 as standard library for mingw.
2014-05-30 20:14:22 +08:00
44950a57f1
fix mingw32/mingw64 build: use system libs and includes rather than prebuilt ones.
2014-05-29 01:30:14 +08:00
8233b5bf93
fix mingw32/mingw64 compiling
2014-05-28 00:17:09 +08:00
0f67247325
Squashed commit of the following:
...
commit a794d107ad85667e3d754f0b6251fc864dfbf288
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 14:33:49 2014 -0700
Yeah... everything compiles on win32 and wp8
commit 4740be6e4a0d16f742c27996e7ab2c100adc76af
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 13:58:38 2014 -0700
CCIME moved to base
and compiles on Android
commit ff3e1bf1eb27a01019f4e1b56d1aebbe2d385f72
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 13:02:57 2014 -0700
compiles Ok for Windows Phone 8
commit 8160a4eb2ecdc61b5bd1cf56b90d2da6f11e3ebd
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 12:25:31 2014 -0700
fixes for Windows Phone 8
commit 418197649efc93032aee0adc205e502101cdb53d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 11:15:13 2014 -0700
Compiles on Win32
commit 08813ed7cf8ac1079ffadeb1ce78ea9e833e1a33
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 10:08:31 2014 -0700
Compiles on linux!
commit 118896521e5b335a5257090b6863f1fb2a2002fe
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 09:30:42 2014 -0700
moves cocos/2d/platform -> cocos/platform
commit 4fe9319d7717b0c1bccb2db0156eeb86255a89e0
Merge: bd68ec2 511295e
2014-05-16 14:36:00 -07:00
25213c81f6
linux cmake improvements
...
Added cocos/CMakeLists.txt
which controls all the rest of the Cmake files
2014-05-01 13:01:51 -07:00
40fe815ab9
Squashed commit of the following:
...
commit c16dcfaaea0922039aad05bce1f4efed18e04871
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 19:05:18 2014 -0700
more linux fixes
commit 1553795976c9090a1b46deb53d12910fe0676008
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 19:04:04 2014 -0700
more linux fixes
commit 1e43a8cabff33cbf25aa5eb5412f53a878222d83
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 19:02:07 2014 -0700
fixes linux isuses
commit 723a445dd6411f91846da2b801248ad8298174f1
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:58:50 2014 -0700
more linux fixes
commit 533c8025e794fc76cef02f396b3a93b3d7f4cfc8
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:57:33 2014 -0700
more linux fixes
commit 4ba1e84959670bcbf044f18d1c0d4b3cb3be4090
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:53:43 2014 -0700
more linux fixes
commit 1f8e011f306a47ed4134224e5e349929201f0539
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:49:28 2014 -0700
more linux fixes
commit 3e2033100822ff6d532a1b4f012337491dc11920
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:47:43 2014 -0700
more linux fixes
commit 2e708863c75fd032f1b2396dfdf1d31f7a62b713
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:46:00 2014 -0700
more linux fixes
commit 861b5b92a6efd4de7b926c20d636ce9d749b293f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:43:15 2014 -0700
more linux fixes
commit 2a43365a0c1755e9b9cada53301be1a20adb31cf
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:36:06 2014 -0700
more fixes for linux
commit 7d332bf911892f87c7824d2a5da7bf73ce7ec411
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:35:29 2014 -0700
more fixes for linux
commit f1becc17d3316dfe3678c23c9dcedb7a447d9235
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:34:44 2014 -0700
more fixes for linux
commit d2e5959bb0dde921dd5e73be1d8acc3b3f50e51d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:33:45 2014 -0700
fixes for linux
commit ad9b633c352107cf0e8b060a0e23d6e6a3f5e80f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:16:48 2014 -0700
compiles on Windows
commit 4425ee8e5de8f42a2d6050e4470109600dce8b5d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:07:20 2014 -0700
fix builder
2014-04-30 19:09:13 -07:00
8bb8416c26
Improved directory structure
2014-04-29 17:37:36 -07:00
613ba6e5b6
work on linux now
2014-04-25 15:10:37 +08:00
minggo