Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
31,161 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

164 Commits

Author SHA1 Message Date
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