Commit Graph

581 Commits

Author SHA1 Message Date
Lasse Öörni 23c5dd19e8 Merge pull request #1777 from urho3d/update-freetype
Update FreeType to 2.7.1.
2017-01-27 12:16:03 +02:00
Lasse Öörni 2ebbbd477b Update FreeType to 2.7.1. 2017-01-21 13:21:43 +02:00
Lasse Öörni da8a39cf5a Unconditionally disable the x86 syscall prologs / epilogs on GCC, since the assembler error related to cfi instructions could also happen on newer versions. 2017-01-18 19:57:16 +02:00
Lasse Öörni 459923949c Old GCC version check in as_callfunc_x86.cpp for CI. 2017-01-17 17:29:34 +02:00
Lasse Öörni 883b5105cb Merge branch 'master' into update-angelscript 2017-01-07 16:40:55 +02:00
Lasse Öörni e22de44be5 Restore Urho3D tweaks to as_config.h and earlier ifdef check for C++11 features. 2017-01-06 15:54:42 +02:00
Lasse Öörni 080bf36f9f Restore earlier ifdef for AS type traits due to some Android CI builds failing. 2017-01-06 11:12:55 +02:00
Lasse Öörni a6a99c1faf Clang internal error workaround to as_callfunc_x86.cpp 2017-01-02 01:32:43 +02:00
urho3d-travis-ci ee054a1507 Travis CI: bump copyright to 2017.
[ccache clear]
2017-01-01 13:01:31 +00:00
Lasse Öörni 6b03450f46 Compiler incompatibility fix for UINT64_MAX. 2016-12-30 19:13:32 +02:00
Lasse Öörni dae1c615a9 Initial work to update to AngelScript 2.31.2. 2016-12-29 19:51:46 +02:00
Yao Wei Tjong 姚伟忠 d4e74a35c0 Set the default for SDL's VIDEO_MIR build option to FALSE.
Related to issue #1714.
2016-12-16 22:24:21 +08:00
Yao Wei Tjong 姚伟忠 e045b29c59 Split 3rd-party licenses into its own file. 2016-12-05 23:28:39 +08:00
Yao Wei Tjong 姚伟忠 f1d1b757b8 Change all CMakeLists.txt to use LF for consistency sake. 2016-12-05 22:33:59 +08:00
Yao Wei Tjong 姚伟忠 e071b20967 Another attempt to auto-detect clock_gettime() on Apple platforms.
It is strange that Apple does not honour the deployment target and only based on base SDK when defining __CLOCK_AVAILABILITY internally.
[ci only: OSX]
2016-11-30 01:55:16 +08:00
Yao Wei Tjong 姚伟忠 9290ebf6e0 Use auto-detection for clock_gettime() function on Apple platforms.
Fix #1692 [ci only: OSX]
2016-11-29 22:50:08 +08:00
Yao Wei Tjong 姚伟忠 1efb0d9085 Enable IME for Linux platform. Only tested using ibus. 2016-11-23 01:59:55 +08:00
Yao Wei Tjong 姚伟忠 2fb158d089 Add support for FCITX (an alternative IME to ibus). 2016-11-20 13:50:24 +08:00
Yao Wei Tjong 姚伟忠 05690e0a36 Fix #1681 for good. The ibus devel pacakge is optional once more. 2016-11-20 01:25:59 +08:00
Yao Wei Tjong 姚伟忠 b2af56a14b Minor bug fixes. 2016-11-20 01:24:10 +08:00
Yao Wei Tjong 姚伟忠 98d1eba903 Fix Android build error due to declaration after statement (using GCC).
Close #1690 [ci only: Android]
2016-11-19 13:07:54 +08:00
Yao Wei Tjong 姚伟忠 628e4b2795 Quick fix for #1681 on Linux build, requires ibus-dev(el) package. 2016-11-17 01:20:47 +08:00
Yao Wei Tjong 姚伟忠 ad97bfacd0 Fix Android build. 2016-11-09 23:10:02 +08:00
Yao Wei Tjong 姚伟忠 805932a498 Merge commit '8eb652a0d09b97901540c9721f5afb37b903a286' into upstream.master 2016-11-09 23:08:19 +08:00
Yao Wei Tjong 姚伟忠 82f7fd56d0 Remove CMake workaround for Bullet library building.
The workaround is not needed anymore as the offending code has been patched.
[ci only: master] [skip appveyor]
2016-10-11 22:33:25 +08:00
Lasse Öörni 00f414416e Explicitly cast infinity to float in btVector3 code to prevent narrowing errors on TDM-GCC. Closes #1637. 2016-10-11 10:16:15 +03:00
Lasse Öörni bf4591b158 Define WINVER in SDL_windowsjoystick.c if not defined. Related to #1629. 2016-10-04 16:28:20 +03:00
Lasse Öörni eb62fd941b Next attempt to fix civetweb for XCode 8. 2016-09-18 00:27:25 +03:00
Lasse Öörni c1ad7ea5b7 Modified Civetweb patch from Josh Engebretson. Related to #1588. 2016-09-16 23:11:32 +03:00
1vanK 6323aed69a Add NavigationPushiness::NAVIGATIONPUSHINESS_NONE 2016-09-11 15:38:57 +03:00
Yao Wei Tjong 姚伟忠 11f319c2cd Fix the version check so the MinGW workaround is applied for >= 6.1.0.
Close #1552.
2016-08-31 14:52:35 +08:00
Yao Wei Tjong 姚伟忠 02e1aec083 Add "-Wno-narrowing" compiler flag to MinGW 6.1.0 for all build config. 2016-08-25 18:21:58 +08:00
Yao Wei Tjong 姚伟忠 4b964a6989 Workaround MinGW build issue when using version 6.1.0 and above.
Fix internal compilation error by reducing the optimization level from -O3 to -O2. Suppress compilation error caused by narrowing conversions.
2016-08-25 08:49:44 +08:00
Yao Wei Tjong 姚伟忠 b21ff1895e Fix overlinking of EGL library in FindVideoCore.cmake module.
Remove hardcoding of indirect dependency libraries list in the FindUrho3D.cmake module. Instead we now rely on the linker to find those indirect dependencies automatically with our hint via "-runpath-link" linker flag, especially when cross-compiling.
Also setup GLESv2 (and GLESv1_CM) for Raspberry-Pi in the same manner as generic ARM and Android platforms.
2016-08-07 18:22:46 +08:00
Yao Wei Tjong 姚伟忠 87bee872e8 Add extra linker flags to make 64-bit ARM cross-compiling possible.
When cross-compiling we have already defined '--sysroot' to find the direct library dependencies. However when a shared library has its own dependencies (DT_NEEDED) then we need to supply extra linker flags to help the linker to find those indirect library dependecies in the sysroot.
Actually we also had this problem for 32-bit ARM cross-compiling, but we cheated in the earlier CI build jobs by using Linaro/Raspbian compiler toolchain. Somehow the Raspbian's linker simply "ignores" those indirect library dependencies or it uses other mean to locate them (but I doubt that), and so it does not have linker issues with libreadline.so (depends on tinfo), libGLESv2.so (depends on glapi), etc. The other ARM compiler toolchains from Linaro seem to be more strict in this regard. Most likely the raspbian's linker is a gold linker.
This commit could also potentially fix a known issue in our FindUrho3D.cmake module where we have to hardcode the library dependencies that libUrho3D.so in turn depends on (to be investigated later).
2016-08-05 18:41:52 +08:00
Lasse Öörni 97d1e7d44e Prevent dependency of Civetweb from pthread library on recent MinGW versions. 2016-08-02 23:37:00 +03:00
Yao Wei Tjong 姚伟忠 f9b23104dd Fix Mir and Wayland auto-detection to also check on EGL. 2016-08-03 00:16:25 +08:00
Yao Wei Tjong 姚伟忠 576b6ea7cf Better multiarch support in auto-detection.
This should also solve the problem with cross-compiling other target triplets as there is no more hardcoding.
2016-08-03 00:16:25 +08:00
Yao Wei Tjong 姚伟忠 fb881c3360 Use CMake to auto-detect and define _TIMESPEC_DEFINED as necessary. 2016-06-30 21:01:41 +08:00
TheComet 7031ae8799 fixes #1444 2016-06-29 19:18:14 +02:00
Yao Wei Tjong 姚伟忠 35a616448a Merge commit 'a1a9ce7817286783347acfbcce94bfd659915b66' into master. 2016-06-23 22:05:25 +08:00
Yao Wei Tjong 姚伟忠 993e82f9ec Fix cross-compiling builds using X11 shared libraries. 2016-06-23 20:08:34 +08:00
Yao Wei Tjong 姚伟忠 2f4ed29be8 For CI - attempt to fix broken multiarch support in older CMake.
This should be a non-issue when we have migrated to CMake 3.2.3 (now under development in refactor-buildsystem branch).
2016-06-23 00:23:12 +08:00
Yao Wei Tjong 姚伟忠 fff8b782b1 Fix cross-compiling builds using readline shared library. 2016-06-22 18:06:21 +08:00
Yao Wei Tjong 姚伟忠 a5b4512966 Reduce direct exposure to SDL headers as much as possible. 2016-06-11 21:58:22 +08:00
Yao Wei Tjong 姚伟忠 d0bcac5fe0 Ensure iPhoneOS and iPhoneSimulator use the same code path.
This commit should also fix the issue reported in issue #1369.
2016-06-11 13:11:38 +08:00
Loic Blot ef949533c6 Update to SQLite 3.13.0 2016-06-10 22:04:35 +03:00
Yao Wei Tjong 姚伟忠 3ab69da3af Use __ANDROID__ compiler define consistently. 2016-06-10 20:28:07 +08:00
Yao Wei Tjong 姚伟忠 991b0c5986 Undefine first before redefine to suppress the compilation warnings. 2016-06-10 19:53:17 +08:00
Yao Wei Tjong 姚伟忠 5bdd519ce7 Another attempt to reenable AS wrapper for 64-bit ARM platform.
For CI - switch all the Android CI jobs to use Clang compiler toolchian instead of GCC compiler toolchain. The old GCC 4.9 is not able to handle C++11 standard for AS wrapper. Besides, the latest change log in Android NDK has marked GCC as deprecated and recommended developers to migrate to Clang.
2016-06-10 17:17:21 +08:00