Commit Graph

581 Commits

Author SHA1 Message Date
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
Yao Wei Tjong 姚伟忠
ba837af5a4 Add skeleton project for AutoBinder tool.
[ci only: Annotate]
2015-09-24 19:57:18 +08:00
Lasse Öörni
b6b0f01794 Merge branch 'update-assimp' 2015-09-21 19:14:25 +03:00
Lasse Öörni
07374ffb3f Remove unnecessary line from Assimp CMakeLists. 2015-09-16 11:48:42 +03:00
Lasse Öörni
08293b4cf4 Fix non-MSVC build. 2015-09-15 18:58:49 +03:00
Lasse Öörni
eee58fe742 Nullcheck tiles before operating on them in DetourNavMesh & DetourTileCache destructors. Closes #895. 2015-09-15 17:17:52 +03:00
Lasse Öörni
6f75a777cb Fixes for non-C++11 support. 2015-09-15 16:31:54 +03:00
Lasse Öörni
07dab99469 Update Assimp to latest head from github. Closes #786. 2015-09-15 14:29:53 +03:00
Yao Wei Tjong 姚伟忠
fe6d397609 Revert back whitespaces found in the original 3rdparty source file.
Make life easier when we have merged from upstream again.
2015-09-11 15:19:56 +08:00
Yao Wei Tjong 姚伟忠
a2d8f8670e Revert back the generated toluabind.c. 2015-09-10 15:18:48 +08:00
Yao Wei Tjong 姚伟忠
71a8f6d104 Parameterise the asset directory indicator character(s) using env-var. 2015-09-10 00:51:58 +08:00
Yao Wei Tjong 姚伟忠
ac2b2ba121 Add new JNI function to interface with AssetManager.list() method.
Fix #855.
2015-09-08 22:37:45 +08:00
aster2013
27aaabd6d7 Move spriter from ThirdParty to Urho2D, credit to @weitjong. 2015-09-08 13:52:30 +08:00
aster2013
5d50ad4b71 Change SetAnimtion function in AnimatedSprite2D. 2015-09-06 20:37:15 +08:00
aster2013
0cded698e4 Merge from spine-spriter branch.
Main changes:
     Make spriter as a lib
     Enable spine support in AnimatedSprite2D and Animation2D.
2015-09-05 22:23:35 +08:00
Yao Wei Tjong 姚伟忠
3e765ba446 Minor code clean up for build system.
Suppress tolua++ tool not found message in the stderr stream on initial build.
Raise a fatal error message when user attempting to generate VS2008 project with spaces in the source/build tree path.
2015-09-04 13:14:52 +08:00
Yao Wei Tjong 姚伟忠
2731e48405 Improve build robustness. Prevent make clean to remove toluabind.c. 2015-09-03 20:14:23 +08:00
Yao Wei Tjong 姚伟忠
4914b0e71c Remove file generation timestamp to avoid unnecessary git diff. 2015-09-02 22:40:11 +08:00
Yao Wei Tjong 姚伟忠
d71b76ed27 Add automation to generate toluabind.c and toluabind.h. 2015-09-02 17:40:01 +08:00
Yao Wei Tjong 姚伟忠
61647bb887 Optimize Lua Variant class bindings.
Take advantage of Lua being type-less by binding generic methods that can handle all the supported data type conversion.
At the same time reduce the amount of the overloads generated by tolua++ which could be potentially just dead code.
2015-08-24 13:26:25 +08:00
Lasse Öörni
d4696f92a0 Make sure adding & deleting RigidBody2D fixtures doesn't reset the mass when not wanted (useFixtureMass = false). Fixed some mistaken if statement logic, and improved some RigidBody2D comments. Note that when useFixtureMass = false, you must set nonzero inertia to get rotation. Closes #844. 2015-08-19 18:19:31 +03:00
Yao Wei Tjong 姚伟忠
27cc9c4277 Add filter and obstacle avoidance type attribute to CrowdManager class.
Enhance Editor to have functionality to edit the CrowdManager's filter and obstacle avoidance type attributes.
2015-08-16 15:43:12 +08:00
Yao Wei Tjong 姚伟忠
c9bc4cbae3 Add new event for crowd agent formation.
Add convenient methods for querying point, path, raycast, etc using crowd's extent and filter type configuration.
2015-08-16 15:43:12 +08:00
Yao Wei Tjong 姚伟忠
549b6fd8be Add crowd update callback support. Remove redundant vectors. 2015-08-16 15:43:12 +08:00
Yao Wei Tjong 姚伟忠
2c3033d62a Limit interface to use only crowd agent's parameters and public APIs. 2015-08-16 15:43:12 +08:00
Yao Wei Tjong 姚伟忠
373d989d53 For Travis CI - keep the backup logic simple and stupid.
Related to commit 9d1a66d108
[ci skip]
2015-08-15 11:18:06 +08:00
cosmy
4f1c071452 Const references
Fixed some parameters wrongly passed by value
2015-08-14 15:10:20 +02:00
Yao Wei Tjong 姚伟忠
8658afabb0 Clean up tolua++ bindings for handling (POD)Vector to table conversion.
Any C++ classes (either RefCounted or not) that are exposed to Lua scripting should be now supported in this conversion via new template function implementation. There should be no need to modify the ToluaUtils.cpp and .h anymore.
2015-08-12 01:17:56 +08:00
Yao Wei Tjong 姚伟忠
1f3f5e4933 Suppress unavoidable build warnings when generating Lua bindings. 2015-08-10 22:49:50 +08:00
Yao Wei Tjong 姚伟忠
777889580f Cancel the GCC -ffast-math option only when the flag is found. 2015-08-10 18:51:27 +08:00
Yao Wei Tjong 姚伟忠
8acb9e6441 Fix Variant and VariantMap bindings to Lua. Close #820.
Add Lua bindings to return VariantVector as table of Variant.
Fix Lua database demo. It is in full working condition now.
[ci only: database, OSX]
2015-08-10 01:51:26 +08:00
Yao Wei Tjong 姚伟忠
d8181e0b5b Update to nanodbc release 2.2.2.
No need for local modifications anymore as they are already merged into nanodbc upstream repo.
2015-08-10 01:51:26 +08:00
Yao Wei Tjong 姚伟忠
d39a80b1a9 Pass compiler defines from the ODBC config tool to our build system.
Make FindODBC module to prefer unixODBC over libiodbc when both ODBC driver managers are available.
2015-08-10 01:51:26 +08:00
Yao Wei Tjong 姚伟忠
0e2af9c788 Initial ODBC API support.
Enhance db demo to work with ODBC database connectioon string.
2015-08-10 01:51:25 +08:00
Yao Wei Tjong 姚伟忠
7d6f0ffeab Fix Database subsystem on Emscripten build.
[ci only: Emscripten]
2015-08-10 01:51:25 +08:00
Yao Wei Tjong 姚伟忠
560ef3bb37 Add Database subsystem. Add new build option to enable it.
Initial C++ sample database demo using execute immediate mode.
2015-08-10 01:51:25 +08:00
Yao Wei Tjong 姚伟忠
7a80b37c22 Fix URHO3D_PACKAGING build option on Windows platform with SHARED lib.
[ci scan]
2015-07-12 19:04:19 +08:00
Yao Wei Tjong 姚伟忠
f0d107d3db Add new build option to support non-PCH build.
In order to achieve this, the Precompiled.h is now included back in all the Urho3D implementation source file. So, when the Precompiled.h is not being force-included in the PCH build, then the compiler is still able to find all the required symbol declarations. By doing so, it should also fix the indexer in some IDEs to index all the Urho3D declared symbols correctly whether it is a PCH build or not.
2015-07-07 23:43:56 +08:00
Lasse Öörni
4306985a47 Fix uninitialized variable in DetourCrowd. Closes #753. 2015-06-26 12:26:11 +03:00
Yao Wei Tjong 姚伟忠
6923bd0736 Install tools to the 'bin/tool' directory.
Related to commit 6b6447eb8c.
2015-06-10 18:39:39 +08:00
Lasse Öörni
fd8703dcec Flush the DetourTileCache update queue if necessary, when adding or removing an obstacle. Closes #726. 2015-05-17 18:31:52 +03:00
Yao Wei Tjong 姚伟忠
5cd6272bf6 Fix iOS "unsupported architecture" issue when precompiling PCH.
When using Xcode, instead of precompiling PCH using our own build rules, simply switch on the Xcode support for PCH and delegate the task to it.
2015-05-13 16:41:26 +08:00
Yao Wei Tjong 姚伟忠
252206a207 Decouple Physics subsystem from DetourCrowd implementation.
Also minor code clean up (dot the i's and cross the t's).
2015-05-07 16:52:18 +08:00
JSandusky
567a29d74e Implementation of DetourCrowd and DetourTileCache
Added Components:
- DynamicNavigationMesh (uses DetourTileCache)
- Obstacle (interacts with DynamicNavigationMesh)
- DetourCrowdManager (uses DetourCrowd for crowd control)
- CrowdAgent (interacts with DetourCrowdManager)
- NavArea (marks area types)

Changes:
- Refactor NavigationMesh build process
- Addition of cylinder debug rendering
- Exposed Area Type Costs in navigation

CrowdNavigation sample for Lua, Angelscript, and C++ using
DynamicNavigationMesh, Obstacle, CrowdAgent, and DetourCrowdManager
components.
2015-05-04 22:14:00 -04:00
Yao Wei Tjong 姚伟忠
2aa2cab2c6 Fix Assimp's CMakeLists.txt so the lib built successfully on Xcode.
Close #709.
For Travis CI - when performing a release, keep the CI mirror branches around for a little longer just in case we need to restart the CI job again due to Travis CI build error.
2015-05-02 21:05:49 +08:00
Lasse Öörni
830eede29b Restore old check for forceinline in stb_vorbis to fix MinGW build. 2015-05-01 15:56:40 +03:00
Lasse Öörni
20ac7fb2e5 Update STB libraries. 2015-05-01 15:33:39 +03:00
Lasse Öörni
e6c8acdf40 Add contributor credit. Mark AngelScript modifications. 2015-04-29 13:57:55 +03:00
Joshua Cearley
0b2228b7cd Support MinGW 4.7 ABIs on Clang. 2015-04-28 18:34:05 -05:00
Lasse Öörni
9d9ea418e3 Disable use of fullscreen space on OS/X to fix black screen on fullscreen switch. 2015-04-03 14:47:30 +03:00
Yao Wei Tjong 姚伟忠
6125f08716 Fix MinGW build when PackageTool is built for both host and target. 2015-03-30 20:47:13 +08:00
Lasse Öörni
d06ffe1445 Merge pull request #680 from urho3d/render-refactor
Render refactor
2015-03-24 23:34:39 +02:00
Lasse Öörni
64600d5526 Enable GLEW experimental mode only on a 3.2+ context so that OpenGL 2 extensions can be checked strictly. 2015-03-22 19:00:04 +02:00
Lasse Öörni
ac60622d6b Fix WinXP compatibility of kNet's Clock class. 2015-03-22 15:16:54 +02:00
Lasse Öörni
9dae13c4ab Disable system bell sounds from Alt key combinations. 2015-03-12 01:03:14 +02:00
Lasse Öörni
f660213930 Fix AngelScript API compile on VS2015. Add CMake bat file for VS2015. 2015-03-07 01:09:13 +02:00
Lasse Öörni
6fd6efc4c3 Update PugiXml to 1.5. Do not attempt to parse .txt & .icns files as xml in the editor resource browser, to prevent log spam. 2015-03-04 16:10:21 +02:00
Yao Wei Tjong 姚伟忠
02572a9ec5 Add generic support for embedding and loading files for Emscripten.
Via the following source file property "EMCC_OPTION". The supported property values are: js-library, pre-js, post-js, embed-file, preload-file, shell-file. The files are added as link dependency so a relink will automatically occur when they are modified (have newer timestamp than target).
2015-03-03 01:16:40 +08:00
Lasse Öörni
20756b554d Applied btGjkPairDetector fix from Bullet head revision. 2015-02-26 11:17:45 +02:00
Yao Wei Tjong 姚伟忠
cf77a15e6f Fix Android build with LuaJIT enabled on Mac OS X host system. Take 2. 2015-02-25 22:46:11 +08:00
Yao Wei Tjong 姚伟忠
904aedef93 Fix Android build with LuaJIT enabled on Mac OS X host system.
Close #670.
2015-02-25 19:07:53 +08:00
Lasse Öörni
0c48c9df87 Fix Assimp to not give negative light direction. Fix FOV handling for spot lights in AssetImporter. Added error prints to Editor if fails to execute AssetImporter. Closes #669. 2015-02-24 12:19:25 +02:00
Lasse Öörni
e6ab7f5ccc More kNet include order fixes. 2015-02-19 16:27:44 +02:00
Lasse Öörni
2d3f9bf141 Include Socket.h earlier in kNet to potentially fix Winsock.h / Winsock2.h conflict. 2015-02-19 15:25:01 +02:00
Yao Wei Tjong 姚伟忠
10e477bbc8 Add flag to consider 'unresolved symbol' as an error. 2015-02-16 14:51:28 +08:00
Yao Wei Tjong 姚伟忠
a77e24d8ad Enable external project macro users to find and use PackageTool.
Adjust software packaging for Emscripten.
2015-02-13 21:31:59 +08:00
Yao Wei Tjong 姚伟忠
bb438ac6d9 Fetch the Emscripten SDL2 port in an orderly fashion. 2015-02-13 21:31:59 +08:00
Yao Wei Tjong 姚伟忠
6e0ff48059 Suppress linker warnings. Minor doc update. 2015-02-13 21:23:05 +08:00
Yao Wei Tjong 姚伟忠
19ab396e74 Add new Emscripten/CMake toolchain file based on Urho3D convention.
Use EMSCRIPTEN_ROOT_PATH environment variable to specify the root path to the emscripten, instead of the original EMSCRIPTEN environment variable exported in emsdk_set_env.sh.
This is because the original EMSCRIPTEN environment variable name clashes with our build scripts.
2015-02-13 21:23:05 +08:00
Lasse Öörni
5e133eb639 Added file modification remark with credit to prettywriter.h. Added indentation parameter to several SaveXML() functions including Node & Scene. Code convention edit to use String& throughout. Removed outdated remark of being only able to save to File. 2015-02-10 19:32:45 +02:00
Lasse Öörni
70054dd036 Merge remote-tracking branch 'stinkfist/indent' 2015-02-10 18:21:27 +02:00
Stinkfist0
4b9e4f6097 User-configurable indentation for XML and JSON files (AS and Lua bindings included). Closes #591 2015-02-10 17:18:52 +02:00
Lasse Öörni
5ab72bf620 Merge remote-tracking branch 'friesencr/sprite_packer' 2015-02-09 23:40:09 +02:00
Chris Friesen
6f383f64df SpritePacker cli 2015-02-07 12:40:01 -06:00
Lasse Öörni
d0d400b1a6 Windows.h in lowercase in kNet to fix case-sensitive MinGW cross-compile. 2015-02-03 15:44:31 +02:00
Lasse Öörni
a2da4d9763 Include kNet memory leak check only on MSVC to fix possible build error. 2015-02-03 13:51:18 +02:00
Lasse Öörni
4d69285422 Update to kNet master branch latest revision, with Urho's custom flow control re-applied on top. Fixes #645. 2015-02-03 01:56:07 +02:00
Lasse Öörni
bb2ebf7568 Bump copyright to 2015. 2015-01-31 21:03:53 +02:00
Yao Wei Tjong 姚伟忠
9c61a7673b Add option to exclude individual C++ source file from using PCH.
Clean up enable_pch() macro and minor update on code comments.
2015-01-29 16:13:43 +08:00
Yao Wei Tjong 姚伟忠
51178c4328 Enable PCH for Assimp library with GCC/Clang compilers too.
Simplify to always use force include when enabling the PCH.
2015-01-29 16:13:43 +08:00
Yao Wei Tjong 姚伟忠
8743413816 Attempt to enable precompiled header support for GCC and Clang. 2015-01-29 16:13:41 +08:00
Lasse Öörni
4d8ad0888f Clang friction fix from bullet3 repo. 2015-01-28 14:02:33 +02:00
Lasse Öörni
e67d9d3065 Include iOS 8 orientation fix conditionally. Fixes #635. 2015-01-25 23:49:35 +02:00
Lasse Öörni
f1545328b3 Hack fix for window size on iOS 8. Fix screen joysticks not resizing along with the screen. Note that there may still be other iOS 8 orientation bugs, for example related to the screen keyboard. These are pending a proper fix from SDL. Closes #553. 2015-01-23 11:29:35 +02:00
Yao Wei Tjong 姚伟忠
75c1d9780c Fix red screen issue on affected Android devices models, e.g. S3. 2015-01-22 20:07:16 +08:00
Yao Wei Tjong 姚伟忠
05dd995b85 Refactor all the codes and scripts to use the renamed 'bin' subdir. 2015-01-18 21:40:54 +08:00
Yao Wei Tjong 姚伟忠
d8c2d801d9 Update the comment on the build rule. [ci skip]
Related to commit 8682ba781a
2015-01-16 13:26:33 +08:00
Yao Wei Tjong 姚伟忠
8682ba781a Install header files for Lua/LuaJIT and tolua++ 3rd party libraries.
Fixes #610.
2015-01-16 13:20:44 +08:00
Yao Wei Tjong 姚伟忠
dc620f1f6a Code clean up. [ci skip] 2015-01-07 22:02:41 +08:00
Yao Wei Tjong 姚伟忠
35307869ee Clean up to remove unused CMake variables.
LIBS is now defunct. No more dual purpose usage.
INCLUDE_DIRS_ONLY is renamed to INCLUDE_DIRS.
LINK_LIBS_ONLY is renamed to LIBS.
2015-01-07 21:51:00 +08:00
Yao Wei Tjong 姚伟忠
eb4a7663b5 Avoid hardcoding rapidjson as dependency to Urho3D library. 2015-01-07 21:25:20 +08:00
Yao Wei Tjong 姚伟忠
42fb33d0e4 Suppress the dummy target comment appearing in build log on each build. 2015-01-05 22:31:32 +08:00
Yao Wei Tjong 姚伟忠
2b353512c3 Fix freetype2 headers installation - missed one file earlier. 2015-01-04 22:40:40 +08:00
Yao Wei Tjong 姚伟忠
4c17b03173 Remove existing include path abstraction.
Remove engine's sub-CMakeLists.txt.
2015-01-04 22:32:42 +08:00
Yao Wei Tjong 姚伟忠
1cbbb6b805 Finalize SDK-like include dirs clean up. Fix build using MSVC. 2015-01-04 22:32:41 +08:00
Yao Wei Tjong 姚伟忠
4feb135281 Clean up SDK include dirs. Refactor FindUrho3D CMake module.
For Travis CI - add new steps to install the Urho3D SDK and to reference Urho3D library from the installed SDK.
2015-01-04 22:32:41 +08:00
Yao Wei Tjong 姚伟忠
16e05862ab Preparation for SDK include dir cleaning up. 2015-01-04 22:32:40 +08:00
Yao Wei Tjong 姚伟忠
a6a9e9891f Clean up the LuaJIT build script - use normal replace in escaping vars. 2015-01-04 22:32:39 +08:00
Yao Wei Tjong 姚伟忠
8e6fe0da14 Refactor LuaJIT build scripts - no more generated CMakeLists.txt. 2015-01-04 22:32:39 +08:00
Yao Wei Tjong 姚伟忠
67e415acc8 Fine tune LuaJIT target arch detection logic. 2015-01-04 22:32:39 +08:00
Yao Wei Tjong 姚伟忠
0af8a30650 Fix 32-bit LuaJIT build for Linux&OSX. Fix host tool building for iOS. 2015-01-04 22:32:39 +08:00
Yao Wei Tjong 姚伟忠
4db162eb62 Lua/LuaJIT host tool building while cross-compiling in one go.
For Travis CI - reenable CI build with Lua/LuaJIT build option turned on.
2015-01-04 22:32:39 +08:00
Yao Wei Tjong 姚伟忠
20e21050e9 Rename everything 'RASPI' to 'RPI'. [ci rebase] 2015-01-04 22:32:38 +08:00
Yao Wei Tjong 姚伟忠
d8a3b8b4f4 Make repo root is also CMake source tree for the Urho3D project.
Build tree location is now fully user defined. The build tree location could also be the same as source tree, although it is not recommended.
2015-01-04 22:32:38 +08:00
aster2013
5eed296f37 Add comment for modify third-party code. 2014-11-22 00:43:00 +08:00
aster2013
4058e45acb Fix compile warning in tolua. 2014-11-21 22:00:15 +08:00
Yao Wei Tjong 姚伟忠
0fb99af9e4 Misc. fixes and enhancement for Android platform.
- Add initial support for ndk-gdb. Enable via new 'URHO3D_NDK_GDB' build option.
- Enhance rake android task: more effective loop to wait for Android device, ability to pick library to run from SampleLauncher from the adb shell.
- Fix "buildvm" tool name for Android to derive from the correct NDK ABI CMake's variable.
- Fix Android toolchain to copy shared STL library to the correct Android library output directory.
2014-11-19 21:50:37 +08:00
Yao Wei Tjong 姚伟忠
733b0bbaeb Fix AngelScript library to support Android ABI arm64-v8a (untested). 2014-11-19 21:48:26 +08:00
Yao Wei Tjong 姚伟忠
12dd2699c5 Tighten the check to detect Android ABI x86_64 in AngelScript library.
Related to commit b7ab0ad4f8970d52b290b2789a94aefc669b9cfb.
2014-11-19 21:48:26 +08:00
Yao Wei Tjong 姚伟忠
dd4eadb958 Fix AngelScript library to support Android ABI x86_64. 2014-11-19 21:48:25 +08:00
Yao Wei Tjong 姚伟忠
c711d450ed Name Android buildvm tool for LuaJIT library differently based on ABI. 2014-11-19 21:48:25 +08:00
Lasse Öörni
02c595c8b7 Disable Bullet's built-in profiler, as the results are not being used. 2014-11-03 14:06:26 +02:00
Lasse Öörni
2f7402f6ba Delete kNet server listen sockets properly so that the server can be stopped and restarted. Closes #480. 2014-10-04 17:50:22 +03:00
Lasse Öörni
f120aa4be0 Return a writable documents directory on iOS. Contributed by att. 2014-07-29 02:24:49 +03:00
Lasse Öörni
562a2e2d77 Update to AngelScript 2.29.1. Closes #412. 2014-07-26 12:27:32 +03:00
Yao Wei Tjong 姚伟忠
08f08e460b Improve the reliablity to find SDL_android_main.c when using SDK.
Replace usage of URHO3D_INSTALL_PREFIX environment variable with the more standard CMake's own CMAKE_PREFIX_PATH environment variable to define prefix path of non-standard SDK installation location.
2014-07-17 15:15:15 +08:00
Lasse Öörni
92ad14b2fe Fix memory allocation for the resources directory on iOS. 2014-06-25 22:47:55 +03:00
Lasse Öörni
d9d39592dd Update to AngelScript 2.29.0. 2014-06-25 22:20:59 +03:00
Yao Wei Tjong 姚伟忠
11c41c64bc Reinstate the Assimp fix for Raspberry Pi build.
Remove unsupported GCC attribute to suppress the warnings when building Assimp library (commit: 50556078d6).
2014-06-11 14:34:00 +08:00
Yao Wei Tjong 姚伟忠
a6a0a6d802 Fix native debug configuration build of Assimp using MinGW compiler.
By removing the CMAKE_CROSSCOMPILING condition check, the workaround is now applied for both native and cross-compiling cases.
2014-06-10 12:23:08 +08:00
Lasse Öörni
dd657eab8d Update assimp to newest git revision. 2014-06-07 15:57:34 +03:00
Lasse Öörni
21eb3d8bc9 Add Android accelerometer value clamping. Closes #350. 2014-05-16 11:48:59 +03:00
Yao Wei Tjong 姚伟忠
c1b506ee54 Clean up build scripts to avoid code duplication. 2014-05-16 13:12:52 +08:00
Yao Wei Tjong 姚伟忠
b1fbab4953 Be explicit in setting the file permissions when installing.
Closes #352.
2014-05-15 21:14:09 +08:00
Lasse Öörni
6b7f1d842c Added functions to remove one recorded touch gesture, or all touch gestures. 2014-05-13 22:55:37 +03:00
aster2013
460da659ee Add JSON support in Urho3D. 2014-04-19 22:21:05 +08:00
Lasse Öörni
9b833e371a Always hide the status bar independent of window flags. 2014-04-19 17:01:10 +03:00
aster
e0737e6c46 Replace Char event with TextInput event for CJK IME support. 2014-04-16 13:47:14 +08:00
Lasse Öörni
9906e7ed25 Gesture recording/load/save support and gesture events. SDL fixes to gesture events. Closes #304. 2014-04-15 23:48:04 +03:00
Yao Wei Tjong 姚伟忠
cea3743ea7 Filesystem class also captures stderr when executing console command.
Turn on SDL filesystem support for Linux platform.
2014-04-11 14:56:36 +08:00
Yao Wei Tjong 姚伟忠
46285baf97 Refactor build scripts to group Urho3D specific build option.
Initial support of project configuration and generation via cmake-gui.
2014-04-05 00:20:56 +08:00
Yao Wei Tjong 姚伟忠
20edf417ce Fix LuaJIT search path which was broken after v2.0.3 update. 2014-03-27 14:09:40 +08:00
Lasse Öörni
6f21f8bc69 Merge branch 'sdl-update' 2014-03-24 23:37:22 +02:00