townforge/Urho3D
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
10,192 Commits 3 Branches 3 Tags 168 MiB
wtest
Commit Graph

613 Commits

Author SHA1 Message Date
Yao Wei Tjong 姚伟忠
d53928310c Workaround struct redefinition on some newer MinGW header files. 
Fix #1899.
 2017-04-15 00:55:49 +08:00
Yao Wei Tjong 姚伟忠
0e4060b61a Use no_weak_imports linker flag to ignore weak symbol during detection. 2017-04-13 19:35:23 +08:00
orefkov
e4c5001bfb Copy changes from AngelScript's sources, revision r2382. 
Fixed problem with calling function expecting @&in where the argument was itself a & argument.
https://www.gamedev.net/topic/686912-array-with-objects-handles/
 2017-04-08 20:50:44 +03:00
Yao Wei Tjong 姚伟忠
9daf887f10 Phasing out universal binary build for macOS platform. 
Close #1895.
 2017-04-09 00:04:41 +08:00
Yao Wei Tjong 姚伟忠
240e4d1c54 Fix unnecessary exposure of ik's generated header files. 2017-04-04 13:47:06 +08:00
Yao Wei Tjong 姚伟忠
b3f4b1d9a0 Include memory backtrace source code only when the option is enabled. 
Prevent Web platform to enable the memory backtracing build option.
 2017-04-01 23:32:14 +08:00
Yao Wei Tjong 姚伟忠
e62179f133 Integrate IK sub-library with Urho3D's build system. 2017-04-01 21:28:27 +08:00
Alex Murray
68f8d23411 Fixing issues raised by Mike3D (incorrect offset in sample, exposing auto solve) 2017-03-22 14:23:14 +01:00
TheComet
327965a40c Fixing build on windows, fixing segfault in release builds 2017-03-22 02:15:32 +01:00
TheComet
d2911ad455 Adding ik library to Urho3D thirdparty libs 2017-03-21 15:56:47 +01:00
Yao Wei Tjong
106bfcb919 Merge pull request #1849 from iSLC/master 
Remove duplicate macro in SDL windows joystick implementation.
 2017-03-08 21:42:11 +08:00
Lasse Öörni
48a1f3dcdd Take fix from AngelScript WIP version to fix temp variable corruption. Remove now unnecessary fix from Editor script code. Closes #1850. 2017-03-08 14:26:52 +02:00
Sandu Liviu Catalin
d94a10f488 Remove duplicate macro in SDL windows joystick implementation. 2017-03-07 21:38:50 +02:00
Yao Wei Tjong 姚伟忠
0c88c99112 Allow possibility of building Urho3D without C++ exceptions feature. 
Disallow Android build to turn off C++ RTTI feature.
 2017-03-05 08:46:22 +08:00
Yao Wei Tjong 姚伟忠
f32cbb72b0 Rename Urho3D-CMake-common.cmake module to UrhoCommon.cmake. 
To be consistent with the other modules. Drop the '3D' simply because it sticks out in 'Urho3DCommon'.
 2017-03-05 08:45:39 +08:00
Yao Wei Tjong 姚伟忠
ffd24cafa1 Take advantage of CMAKE_SYSROOT available in the newer CMake. 
Use CMAKE_SYSROOT to manage the sysroot automatically when cross-compiling instead of adding the '--sysroot' flag manually everywhere. We only need to add it manually in places where CMake does not, like in our custom GCC/Clang response file for PCH.
Differentiate between setting up header search path for system headers and for application headers so that GCC/Clang may suppress compilation warnings from the former, if any.
 2017-03-05 08:45:39 +08:00
Yao Wei Tjong 姚伟忠
3b02eeb5eb For CI - suppress all the 3rd-party libraries' warnings. 
Somehow after bumping up the CMake minimum version, CMake configures Xcode to work "better" with xcpretty that now the warnings are piping through the xcpretty's filter. Unfortunately when performing CI build, this is undesirable because not only now the log size is swelling, the build is slower too.
 2017-03-05 08:45:38 +08:00
Yao Wei Tjong 姚伟忠
73c97d9f64 Only add defines at the scope they are actually required. 2017-03-05 08:45:38 +08:00
Yao Wei Tjong 姚伟忠
3d9eb3f694 Bake CC and CXX env-vars in case they are short lived in init process. 2017-03-05 08:45:38 +08:00
Yao Wei Tjong 姚伟忠
bbbbdb0108 Check native compiler toolchain is available before proceeding. 
Some cross-compiling build tree configuration needs native compiler toolchain for host tool building via ExternalProject_Add(). This additional check ensures the native compiler toolchain is available up front before the build tree is even generated. Close #1300.
 2017-03-05 08:45:21 +08:00
Yao Wei Tjong 姚伟忠
9f19d51c08 Remove older constructs that have been earmarked previously. 2017-03-05 08:34:41 +08:00
Yao Wei Tjong 姚伟忠
3475afba54 Bump the CMake minimum version in the CMakeLists.txt files. 2017-03-05 08:34:41 +08:00
Yao Wei Tjong 姚伟忠
cdbb694c2a Bake 'SDL_USE_IME' compiler define into SDL config header. 2017-02-19 12:34:55 +08:00
Yao Wei Tjong 姚伟忠
45b1d173cf Realign SDL's CMakeLists.txt with the cherry-picked SDL commits. 
Those commits are mainly for fixing the keyboard input handling on RPI platform.
 2017-02-18 01:21:57 +08:00
Yao Wei Tjong 姚伟忠
4a738662ee Merge commit 'c109e4b51d143493be185f0e74ba7ba2a1411d6e' into cherry-picked-SDL-keyboard-fix 2017-02-18 00:54:58 +08:00
Lasse Öörni
011a8f9ad6 Merge remote-tracking branch 'Florastamine/master' into update-assimp 2017-02-17 11:11:18 +02:00
Lasse Öörni
472d0dc549 Merge remote-tracking branch '1vanK/master' 2017-02-16 12:16:38 +02:00
1vanK
c5014a8399 Update Box2D lib, add RigidBody2D::ApplyLinearImpulseToCenter() 
Avoid requirement C++11 by Box2D lib
 2017-02-15 14:50:27 +03:00
Lasse Öörni
6a490f05f2 Update LibCpuId to 0.4.0. Closes #1819. 2017-02-13 22:20:48 +02:00
Florastamine
74e234a63d Updated Assimp to v3.2 2017-02-12 14:10:43 +07:00
cosmy1
bf64ce42f2 Update SQLite to 3.16.2. 2017-02-05 21:22:12 +01:00
Lasse Öörni
b8ee493454 Restore FreeType gzip debug build fix. 2017-01-31 14:29:12 +02:00
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
Yao Wei Tjong 姚伟忠
64d975ba1a Add initial build support for generic ARM platform. 
Add a new build option "ARM_ABI_FLAGS" for supplying additional ABI compiler flags when targeting generic arm.
Fix Linux build from using OpenGLES instead of GLEW, fix RPI build from using wrong OpenGLES library, fix iOS build from using arm-specific compiler flags directly which would cause problem in universal binary build containing iphonesimulator archs as well.
And other minor refactoring.
 2016-06-10 17:17:21 +08:00
proller
0dc85f14a9 compile on arm arch with opengles2 2016-06-10 17:17:20 +08:00
Yao Wei Tjong 姚伟忠
e260a3354c Revert back to temporarily disable AS wrapper for 64-bit ARM platform. 
The earlier commit lacks the inclusion of logic to enable C++11 standard and boost preprocessor library. However, after locally tested it, it appears that Android NDK 4.9 is not able to able handle it. Need more time to experiment with it in another branch first.
[ci only: Android, OSX] [skip appveyor]
 2016-06-05 23:55:55 +08:00
Yao Wei Tjong 姚伟忠
ccd9dac3c7 Also enable AS wrapper when targeting 64-bit ARM platform. 2016-06-05 22:42:01 +08:00
Lasse Öörni
cc5761d09d Clean up the code to check for AS_MAX_PORTABILITY define so that it could also come from AS' own config. Minor typo fix. 2016-06-04 17:34:33 +03:00
Lasse Öörni
96451d891e Use the proper form of EMSCRIPTEN define throughout. 2016-06-04 12:33:02 +03:00
Lasse Öörni
98dfaf3c75 Add Boost Preprocessor library to Source/ThirdParty. Force C++11 for AngelScript / Emscripten combo. Default to CharacterDemo instead of NinjaSnowWar in Urho3DPlayer on Emscripten due to missing Network subsystem. 2016-06-02 20:55:52 +03:00
Lasse Öörni
0803320a9a Remove mention of AngelScript not being supported on Emscripten. Leave the generic call convention autohandle fix on at all times, since it doesn't hurt. Clarify CommandLine.txt not being able to be read on Emscripten. 2016-06-02 19:27:15 +03:00
nathan
30f9d91bdd Formatted stuff in a format more appropriate for Urho. See previous commit message for build instructions. 
Note that I quadrupled the default emscripten memory size as I found the 32 MB was all but always too small.
 2016-05-31 00:26:39 +02:00
nathan
d7b0604d93 Made Angelscript work on the Emscripten build. Not thoroughly tested!!! 
-Has been tested by running Urho3DPlayer with the 12_PhysicsStressTest script
 (the file copied in place of NinjaSnowWar.as requested)
-built with "-std=gnu++14 -I/usr/include/boost" for the CMAKE_CXX_FLAGS
 and "-I/usr/include/boost" for the CMAKE_C_FLAGS.
  ** /usr/include/boost contains a simlink pointing to itself so that boost/
     preprocessor____ can be found
-Networking still doesn't work, so NinjaSnowWar shouldn't work
-Debug builds did not work for me: see http://urho3d.prophpbb.com/topic2151.html
-Defining FORCE_AS_PORTABLE can be used to force it to use the generic build
 with, for example, a gcc build (which should allow more apples-to-apples
 testing of the efficiency of the bindings)
-Discussion of this work originally at http://urho3d.prophpbb.com/topic2044.html
 2016-05-30 22:32:48 +02:00
cosmy
e0e43635a4 Update LZ4 compression library. 2016-05-24 16:53:28 +02:00
Yao Wei Tjong 姚伟忠
30f793c747 Merge commit 'a7b0474d11d1bd88efa371581d1a30f7e231b1cd' into master. 2016-05-24 19:47:12 +08:00
cosmy
26d1b6cf54 Fix VS15 compilation error. 2016-05-20 13:06:34 +02:00
cosmy
ff745005ed Update Civetweb code. 2016-05-20 12:40:32 +02:00
cosmy
9a55d403be Update Civetweb documentation files. 2016-05-20 12:39:04 +02:00
Lasse Öörni
d09f67f249 Clean up Image::SavePNG() to use just Image::Save(). Fix jo & stbi_image_write to use wchar paths on Windows. 2016-05-19 17:59:28 +03:00
Lasse Öörni
387f1346e2 Merge remote-tracking branch 'cosmy1/glew-update' 2016-05-19 15:47:05 +03:00
cosmy
94fabf7287 Update GLEW to 1.13. 2016-05-18 23:41:17 +02:00
Lasse Öörni
5e7a3b1265 Disable IRRMESH if IRR is disabled. Closes #1362. 2016-05-15 22:35:02 +03:00
Yao Wei Tjong 姚伟忠
b29a9481c0 Mark the SDL source code changes to comply with its license. 2016-05-11 19:46:44 +08:00
Yao Wei Tjong 姚伟忠
beb9bcd8c7 Fix memory leak in SDL library. 2016-05-11 16:55:37 +08:00
Yao Wei Tjong 姚伟忠
e28e6e5c85 Quick fix to suppress confusing output msgs from SDL's CMakeLists.txt. 
[ci skip]
 2016-04-30 11:33:23 +08:00
Yao Wei Tjong 姚伟忠
6abb199bc6 Use file symlink instead of directory for STB library. 
Fix #1330.
 2016-04-27 20:07:26 +08:00
Yao Wei Tjong 姚伟忠
7a979cad3d Attempt to fix SDL OpenGLES auto-detection for Emscripten on Windows. 2016-04-16 12:29:03 +08:00
Yao Wei Tjong 姚伟忠
e6121551bc Refactor SIMD support. Related to #1293. 2016-04-05 06:35:47 +08:00
Lasse Öörni
93927e39e6 Merge remote-tracking branch 'cosmy1/update-libcpuid' 2016-04-04 19:55:12 +03:00
Yao Wei Tjong 姚伟忠
4d67a73bfc Adjust CMakeLists.txt as now STB is a header-only implementation. 
Additionally, remove all the local changes as they are either not required as the bug has already been fixed upstream or there are other ways to do what we want to do without altering the original code.
 2016-04-03 16:45:40 +08:00
Yao Wei Tjong 姚伟忠
81146fb816 Merge commit '5fa31a5194c0bf3a93662670a6e8f77cb6efddc0' as 'Source/ThirdParty/STB' 2016-04-03 16:44:10 +08:00
Yao Wei Tjong 姚伟忠
7a8986813f Replace Source/ThirdParty/STB subdirectory with subtree. 2016-04-03 16:44:06 +08:00
cosmy
b8054fc057 Update libcpuid to 0.2.2 2016-04-02 22:29:34 +02:00
Yao Wei Tjong 姚伟忠
ce434a5057 Attempt to fix nanodbc library build using VS2015. 
Disable URHO3D_DATABASE_ODBC build option when MSVC compiler version is less than 14.0 (VS2015).
[skip travis]
 2016-03-31 13:29:51 +08:00
Yao Wei Tjong 姚伟忠
929d8acbae Misc. bug fixes and refactoring in configuring SDL library build. 
- Fix the regex to get the shared library soname correctly.
- Use the GCC_ATOMIC and CLOCK_GETTIME whenever they are available.
- Reorganize the if-else block in the SDL CMakeLists.txt to prevent Unix-like platforms (e.g. Android) from entering the block meant for genuine Unix/Linux.
- and more.
 2016-03-30 07:15:20 +08:00
cosmy
918f3fdcc6 Initialize all class members in DetourCrowd 2016-03-26 14:28:01 +01:00
cosmy
7f4ddfcd33 Add contributor name in file header 2016-03-26 14:25:46 +01:00
cosmy
8e4d21f6ae Initialize all class members in DetourTileCache 2016-03-26 14:04:02 +01:00
Yao Wei Tjong 姚伟忠
433a97a351 Follow the latest code convention for source code modification. 2016-03-25 10:16:46 +08:00
Lasse Öörni
ea3f05c1c5 Restore the explicit xpath_node copy constructor. 2016-03-24 23:49:20 +02:00
Lasse Öörni
3a51592493 Merge remote-tracking branch 'cosmy1/update_pugixml' 2016-03-24 23:15:25 +02:00
cosmy
ec3cbc37b6 Update pugixml from 1.5 to 1.7 2016-03-24 15:50:00 +01:00
cosmy
5bcc6663a4 Remove extra stb header 2016-03-24 15:46:55 +01:00
cosmy
52d2ca5ee0 Remove unused STB headers 2016-03-24 05:22:06 +01:00
Yao Wei Tjong 姚伟忠
72549e108d Merge commit '286f5cf9e60df25c409df07e1033478b62ddbe55' into master 2016-03-23 16:19:00 +08:00
Yao Wei Tjong 姚伟忠
bb59c16cac Merge commit 'd7560271d1699c7dc6762ca26a70f8f366491ad5' into master. 2016-03-23 16:18:31 +08:00
Lasse Öörni
4d3d2affbb Disable the in_title_click data & focus_click_pending tests for SDL windows mouse warp, as it seems to lead into issues when regaining focus. Closes #1258. 2016-03-19 12:10:08 +02:00
Gunnar Kriik
20c31802db Applied patch to fix undefined reference error when compiling for Wayland on Linux. 
This has been fixed in SDL, but no SDL release has been made that includes this fix.

The SDL fix can be found here:
https://hg.libsdl.org/SDL/rev/330f500d5815

In the mean time, this fixes Urho3D compilation on Linux.
 2016-03-17 19:04:09 +01:00
Yao Wei Tjong 姚伟忠
be2ae85427 Fix all the cross-compiling builds due to bugs in SDL CMakeLists.txt. 
Fix SDL library build on iOS platform.
 2016-03-16 01:45:09 +08:00
Yao Wei Tjong 姚伟忠
06bcfbeb7b Fix all the cross-compiling builds due to bugs in SDL CMakeLists.txt. 
Fix SDL library build on Web platform.
 2016-03-16 01:45:08 +08:00
Yao Wei Tjong 姚伟忠
3e40a5ebeb Fix all the cross-compiling builds due to bugs in SDL CMakeLists.txt. 
Fix SDL library build on Windows platform.
 2016-03-16 01:45:08 +08:00
Yao Wei Tjong 姚伟忠
f5fcfc48f1 Set CMake minimum version to 3.2.3 for Windows platform. 
This is in preparation to use optional components feature of find_package() command for FindDirectX.cmake module (was FindDirect3D).
 2016-03-16 01:45:08 +08:00
Yao Wei Tjong 姚伟忠
71efb146cb Refactor the CPU instruction extensions detection mechanism. 
Fix SDL build on the latest Raspbian Jessie release.
 2016-03-16 01:45:08 +08:00
Yao Wei Tjong 姚伟忠
14d4e0d378 Fix all the cross-compiling builds due to bugs in SDL CMakeLists.txt. 
Fix SDL library build on Linux, Android, and RPI platforms.
 2016-03-16 01:45:08 +08:00
Yao Wei Tjong 姚伟忠
a09a153f5e Integrate SDL's original CMakeLists.txt into Urho3D build system. 
Close #1046. Close #1123. Close #1172.
 2016-03-16 01:44:11 +08:00
Yao Wei Tjong 姚伟忠
ccf6648eb3 Utilize new SDLActivity's get arguments feature. 2016-03-16 01:42:01 +08:00
Yao Wei Tjong 姚伟忠
714014baff Merge commit '295b0a95b345c060ea489ab6111cb4fff13124fd' as 'Source/ThirdParty/SDL' 2016-03-16 01:05:38 +08:00
Yao Wei Tjong 姚伟忠
d8a39273da Replace Source/ThirdParty/SDL subdirectory with subtree. 2016-03-16 01:05:35 +08:00
Lasse Öörni
21e9ea07f2 Restore stb_image header credits. 2016-03-08 01:32:40 +02:00
dragonCASTjosh
405e86db46 Removed Unused STB librarys and added Urho specific changes to STB 2016-03-05 12:27:26 +00:00
dragonCASTjosh
10a92cd49a changes to CMake to add headers 2016-02-29 00:32:43 +00:00
dragonCASTjosh
f67f35f002 Changes to fix the compile error 2016-02-29 00:23:26 +00:00
dragonCASTjosh
6313b6f80e Initial Work (May not work) 2016-02-24 11:46:18 +00:00
Yao Wei Tjong 姚伟忠
6e0a447ebb Break fix for SDL library build when using Raspbian Jessie. 
[ci only: RPI] [skip appveyor]
 2016-02-22 23:26:41 +08:00
Lasse Öörni
4b7307ca2f Always disable use of aligned structs in Bullet API. Closes #1193 and #1134. 2016-02-20 23:18:29 +02:00
Yao Wei Tjong 姚伟忠
7c2be809c0 Don't use Clang color diagnostics when building LuaJIT_universal. 2016-02-03 15:40:40 +08:00
Yao Wei Tjong 姚伟忠
911d26674a Fix luajit (interpreter) target dependency. 
It should just depend on LuaJIT_universal custom target instead of LuaJIT target when the custom target is available. This ensures parallel build always ends up in a deterministic/desired order. The issue was picked up thanks to Travis CI again.
[ci only: OSX] [skip appveyor]
 2016-02-03 11:48:11 +08:00
Yao Wei Tjong 姚伟忠
1e311acb6a Speed up build for Debug configuration by building only active arch. 2016-02-02 22:19:57 +08:00
Lasse Öörni
e92a5c1c5f Merge remote-tracking branch 'TheComet93/c89_sdl_msvc2012_fix' 2016-01-26 17:01:30 +02:00
urho3d-travis-ci
c4f6f315ff Travis CI: bump copyright to 2016. 
[ccache clear]
 2016-01-26 13:55:03 +00:00
TheComet
180fff7011 Using whitespace instead of tabs 2016-01-26 00:15:35 +01:00
TheComet
717f0d518c Fixes code that is not compliant with the C89 standard when compiling with MSVC 2016-01-26 00:08:31 +01:00
Yao Wei Tjong 姚伟忠
41b87b3690 Merge commit '3d5994381df631739187c89bd0c2752900ae6c2a' as 'Source/ThirdParty/nanodbc' 2016-01-25 15:59:30 +08:00
Yao Wei Tjong 姚伟忠
c1ae46ec41 Replace Source/ThirdParty/nanodbc subdirectory with subtree. 2016-01-25 15:59:26 +08:00
Yao Wei Tjong 姚伟忠
a68c36b7e5 Merge commit 'bcd587a1bef9d8ed0e37d38b0b00b4faf43cea6c' into master. 2016-01-24 13:25:41 +08:00
Yao Wei Tjong 姚伟忠
d267c5ee3c Fix build system to find 32-bit readline package correctly on Debian. 2016-01-22 13:41:29 +08:00
Yao Wei Tjong 姚伟忠
1066c52fb6 Fix build system to find 32-bit packages correctly on Linux. 2016-01-22 12:01:23 +08:00
Yao Wei Tjong 姚伟忠
105aa2699e Use Readline library when it is found for Lua and isql. 2016-01-22 02:05:30 +08:00
Yao Wei Tjong 姚伟忠
17734a1b77 Enable LuaJIT universal binary build on iOS platform. 2016-01-21 10:56:58 +08:00
Yao Wei Tjong 姚伟忠
44e7322e4e Enable LuaJIT universal binary build on OSX platform. 
Enable universal binary executables by default when targeting 64-bit OSX platform.
 2016-01-21 10:56:58 +08:00
Yao Wei Tjong 姚伟忠
0906da48ba Fix LuaJIT build for VS build to suppress unknown option warnings. 
[ci only: AppVeyor]
 2016-01-15 21:02:56 +08:00
Lasse Öörni
c46f414034 Reset SDL's internal in_title_click variable whenever a normal mouse up/down event is received. Fixes #1151. 2016-01-14 22:52:20 +02:00
Yao Wei Tjong 姚伟忠
e61cf6fc40 Upgrade to LuaJIT v2.1 (unstable) branch. 2016-01-13 01:22:01 +08:00
Yao Wei Tjong 姚伟忠
b36135489f Merge commit '643fa4aad86bba3567b3b7441e36c2cbd438d79c' into master 2016-01-13 01:21:26 +08:00
Yao Wei Tjong 姚伟忠
5a97c68a49 Fix a regression issue caused by external project target renaming. 
Close #1137.
 2016-01-09 19:25:44 +08:00
Yao Wei Tjong 姚伟忠
d01bdbf2df Merge commit '68be709e44b87216b5c41a626571d8a8f44938e9' as 'Source/ThirdParty/LuaJIT' 2016-01-08 18:14:37 +08:00
Yao Wei Tjong 姚伟忠
7d65d52455 Remove LuaJIT subdirectory. It will be added back as subtree. 2016-01-08 18:13:52 +08:00
Yao Wei Tjong 姚伟忠
21b01fcd5b Refactor how the EXE and SHARED linker flags are being setup. 2016-01-06 16:38:59 +08:00
Yao Wei Tjong 姚伟忠
bc64b053a3 Bake URHO3D_LUAJIT as downstream project needs extra linker flags. 
Without these extra linker flags the executable would most likely get a runtime error, especially when targeting 64-bit OSX platform.
 2016-01-06 16:38:59 +08:00
Yao Wei Tjong 姚伟忠
431559c2bd For Travis CI & AppVeyor - unified 'ci' rake task and spring cleaning. 2016-01-06 16:38:58 +08:00
Lasse Öörni
dce2345b8a Disable BT_USE_SSE_IN_API in OSX debug mode. Closes #1132. 2016-01-04 22:07:18 +02:00
Yao Wei Tjong 姚伟忠
68e2813298 Attempt to use try_run logic to auto-discover build options. 
For AppVeyor - let URHO3D_D3D11 be auto-discovered when scaffolding.
Close #1066.
 2015-12-25 10:37:56 +08:00
Lasse Öörni
b49837f462 Added note of library modification. 2015-12-14 17:27:29 +02:00
Pranjal Raihan
b03a89c0e7 Fix narrowing conversion from int to unsigned char in jo_jpeg 2015-12-14 17:27:27 +02:00
Yao Wei Tjong 姚伟忠
1cd242273e Verify found Urho3D library has matching ABI with the chosen compiler. 
Check the CMake minimum version before setting project name as recommended by CMake.
Minor documentation update on how to setup downstream projects using Urho3D library as external library.
For AppVeyor - attempt to add scaffolding test using Urho3D SDK.
 2015-12-14 22:43:00 +08:00
Yao Wei Tjong 姚伟忠
55286eb820 Fix host-tool building. 
[skip appveyor]
 2015-12-13 17:43:54 +08:00
Yao Wei Tjong 姚伟忠
510f7e31df Add new CMake module to detect PulseAudio development library. 
[ccache clear] [ci only: RPI]
 2015-11-27 01:17:29 +08:00
Yao Wei Tjong 姚伟忠
86037b99dc Quick fix for RPI cross-compiling build on a host with PulseAudio. 2015-11-25 00:15:37 +08:00
Yao Wei Tjong 姚伟忠
8296370cf3 Only check for pkg-config when targeting Linux platform. 2015-11-22 09:48:43 +08:00
Lasse Öörni
e4b5140cab Eliminate KNET_UNIX define from kNet build and consequently from Urho3D client programs. 2015-11-16 14:31:05 +02:00
Lasse Öörni
a47c72aa4b Use _WIN32 define in kNet. 2015-11-16 14:31:04 +02:00
Lasse Öörni
c1893c7c51 CMakeLists formatting. 2015-11-16 14:31:03 +02:00
Jordan Patterson
bc917769d1 Build SDL with PulseAudio if available 2015-11-16 14:31:01 +02:00
Jordan Patterson
d01b7315ab Backport XRandR and memory leak fix 
https://hg.libsdl.org/SDL/rev/d3fa6d0d3793
https://hg.libsdl.org/SDL/rev/5fa8cf552d05
 2015-11-11 18:06:59 -07:00
Yao Wei Tjong 姚伟忠
deaa23a140 Ensure SIMD code path is being used when BT_USE_SSE is on. 
Related to ommit dabfcff14e.
 2015-10-30 13:18:29 +08:00
Yao Wei Tjong 姚伟忠
dabfcff14e Enable BT_USE_SSE on Windows platform using MinGW compiler toolchain. 2015-10-29 23:30:15 +08:00
Yao Wei Tjong 姚伟忠
d31fbf2f45 Fix LuaJIT SSE2 detection on 32-bit MSVC build. 2015-10-29 21:49:34 +08:00
Yao Wei Tjong 姚伟忠
2e4a076e5e Fix LuaJIT SSE2 detection on 32-bit MinGW build. 2015-10-29 19:48:07 +08:00
Yao Wei Tjong 姚伟忠
fa82c55efd Suppress warnings on MinGW build. 2015-10-29 11:24:03 +08:00
Lasse Öörni
239ab98315 Omit static keyword from kNet's custom debug memory allocation functions to allow compilation on VS2015 Update 1. 2015-10-28 20:16:23 +02:00
Yao Wei Tjong 姚伟忠
d7eee3b134 Only update the toluabind.c back to source tree when it is opted. 2015-10-19 16:12:57 +08:00
Yao Wei Tjong 姚伟忠
e03965fbbf Mark local changes in Bullet source files for NEON support on Android. 2015-10-17 10:54:15 +08:00
Yao Wei Tjong 姚伟忠
8a447c7eda Enable BT_USE_SSE on Linux platform & BT_USE_NEON on Android platform. 
Add new build option URHO3D_NEON to enable/disable NEON code branch.
Fix a bug where previously URHO3D_SSE was also erroneously being used to switch off BT_USE_NEON on iOS.
Add new build option URHO3D_DEPLOYMENT_TARGET to set the GCC/Clang target arch (-march compiler flag). Default value is 'native'. Setting this to any cpu type higher than Pentium 4 may influence the effective SSE level being used in the build. The BulletPhysics library may switch to use higher level SSE as the result, for instance.
 2015-10-16 16:32:28 +08:00
Lasse Öörni
2cc066d709 Update Bullet to 2.83.6. Thanks to Jukka for the initial work & Emscripten fix. Closes #929. 2015-10-09 16:52:51 +03:00
Yao Wei Tjong 姚伟忠
e1341f7261 Replace the usage of Emscripten define and include to follow its norm. 
Close #921.
[ci only: Emscripten]
 2015-10-06 17:42:15 +08:00
Yao Wei Tjong 姚伟忠
5961b7f2d6 Always use file symlinks for dummy custom library targets. 
So that when in fallback mode, the post-build step will use copy_if_different for each individual file to avoid unnecessary file copying and triggering subsequent dependency to rebuild. Close #913.
 2015-10-06 11:40:36 +08:00
JSandusky
57cff2fcd3 Apply Urho3D specific config changes 2015-09-29 20:24:32 +03:00
JSandusky
928c08d22e Update Angelscript to 2.30.2, resolves #892 in Urho3D master 2015-09-29 20:24:31 +03:00
JSandusky
8239cc2e5e Update Angelscript to 2.30.1 2015-09-29 20:24:30 +03:00
Yao Wei Tjong 姚伟忠
566d0767e2 Fix Android and Rasperry-Pi cross-compiling build due to LuaJIT change. 
[ci only: Android, RPI]
 2015-09-26 13:12:08 +08:00
Yao Wei Tjong 姚伟忠
add1c2c67b Fix a typo which had caused wrong LuaJIT OS to be detected. 2015-09-26 12:50:50 +08:00