townforge/Urho3D
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
9,836 Commits 3 Branches 3 Tags 168 MiB
upstream-octree
Commit Graph

169 Commits

Author SHA1 Message Date
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 姚伟忠
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 姚伟忠
7a979cad3d Attempt to fix SDL OpenGLES auto-detection for Emscripten on Windows. 2016-04-16 12:29:03 +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
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
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
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 姚伟忠
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
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 姚伟忠
431559c2bd For Travis CI & AppVeyor - unified 'ci' rake task and spring cleaning. 2016-01-06 16:38:58 +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
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 姚伟忠
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 姚伟忠
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
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
Lasse Öörni
9dae13c4ab Disable system bell sounds from Alt key combinations. 2015-03-12 01:03:14 +02: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
Yao Wei Tjong 姚伟忠
8743413816 Attempt to enable precompiled header support for GCC and Clang. 2015-01-29 16:13:41 +08: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 姚伟忠
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 姚伟忠
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 姚伟忠
20e21050e9 Rename everything 'RASPI' to 'RPI'. [ci rebase] 2015-01-04 22:32:38 +08:00
Lasse Öörni
f120aa4be0 Return a writable documents directory on iOS. Contributed by att. 2014-07-29 02:24:49 +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
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
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
Lasse Öörni
6f21f8bc69 Merge branch 'sdl-update' 2014-03-24 23:37:22 +02:00
Yao Wei Tjong 姚伟忠
591c8800b6 Minor fix for SDL build on Raspberry Pi platform. 2014-03-21 23:05:12 +08:00
Yao Wei Tjong 姚伟忠
ed1f820f9b For Travis CI - workaround FindALSA cmake module bug on Ubuntu 12.04. 2014-03-21 21:03:33 +08:00
Lasse Öörni
bc5730680b Fixed SDL build on MinGW. 2014-03-21 14:27:08 +02:00
Lasse Öörni
6f3a79eda3 Fix SDL keyboard event sending on X11. 2014-03-21 13:35:25 +02:00
Lasse Öörni
52aa369f5d Android fixes. Bump required Android SDK required for compiling to 12 due to SDL joystick code. Removed the activity finish request code, as SDLActivity should now cleanly wait for the native thread to exit. 2014-03-21 02:46:42 +02:00
Lasse Öörni
365e0a7ed2 Fixed conflict. Removed nonexistent file from SDL CMakeLists.txt. 2014-03-21 01:48:52 +02:00
Lasse Öörni
1439b1c4be Merge SDL 2.0.3. 2014-03-21 01:44:14 +02:00
Lasse Öörni
4bf765d711 Removed SDL hack to get window handle for Direct3D9. Instead use SDL builtin functionality. 2014-03-18 19:37:18 +02:00
Lasse Öörni
77129bb9cb Added statements for SDL modification to comply with the license. 2014-02-13 15:23:46 +02:00
OvermindDL1
13e07265db Er, right, C code, no static_cast... 2014-02-12 03:03:22 -07:00
OvermindDL1
9f8a1ab977 Tabs to spaces indention changes to match everything else... 2014-02-12 02:48:20 -07:00
OvermindDL1
1ea3e8b0f9 *cough* ignore the duplicate comma... 2014-02-12 02:41:44 -07:00
OvermindDL1
d7f3c9ae66 Added support for raw keyboard keys to all other platforms, passes 0 for ones where there is not a raw code that makes sense, else passes in something sensible. 2014-02-12 02:33:54 -07:00
OvermindDL1
dba4216c86 Changed SDL to support unknown keys and pass them as the unused/raw keysym field as it seems that it used to do... 
Will fix Urho3D to read that field and pass it to the Variant event for the systems to process if wanted.
 2014-02-12 02:12:25 -07:00
Lasse Öörni
9a3f8e5aa5 Call SetProcessDPIAware() function on SDL video initialization to prevent Windows 8.1 from scaling & blurring the window on high DPI settings. Closes #83. 2013-12-22 21:35:31 +02:00
Yao Wei Tjong 姚伟忠
e83d98f016 Fix Urho3D.pc file for Windows and Raspberry Pi platforms. 
Document cross-compiling example using pkg-config for Raspberry Pi platform.
Disable Urho3D.pc file generation for Android and iOS platform.
 2013-11-17 21:26:44 +08:00
Yao Wei Tjong 姚伟忠
36620dd819 Avoid hardcoding of include dirs in the Urho3D.pc.in input file. 
Also revert decision to use smaller letter case cmake destination directory in previous commit :).
 2013-11-16 16:21:13 +08:00
Yao Wei Tjong 姚伟忠
d7942132f1 Configure and install Urho3D.pc file for pkg-config tool. 
This is useful for Urho3D library user via SDK installation without having CMake installed.
 2013-11-15 18:33:51 +08:00
Yao Wei Tjong 姚伟忠
a96a94a4f6 Fix FindUrho3D.cmake module to include back SDL headers as dep. 
Install SDL headers for all platforms (not just Android).
 2013-11-06 08:04:48 +08:00
Yao Wei Tjong 姚伟忠
bd3ee3f932 Fix the destination template dir for GCC only. 
Android build on Windows platform should also use the same template location installed in the NDK or standalone toolchain.
 2013-11-05 17:05:31 +08:00
Yao Wei Tjong 姚伟忠
24c11dda23 Revert "Setup Android template directory for both Windows and non-Windows." 
This reverts commit 06f7d73922.
 2013-11-05 17:00:43 +08:00
Yao Wei Tjong 姚伟忠
06f7d73922 Setup Android template directory for both Windows and non-Windows. 2013-11-05 16:36:14 +08:00
Yao Wei Tjong 姚伟忠
8a571ae437 Document how to install library and how to find it from installed SDK. 2013-11-05 15:52:37 +08:00
Yao Wei Tjong 姚伟忠
e8fbcf8a82 Add 'install' option for cross-compiling build and IOS as well. 
Note: there is a known bug in CMake/Xcode generator that prevents iOS targets (library and bundle) to be installed correctly (see http://public.kitware.com/Bug/bug_relationship_graph.php?bug_id=12506&graph=dependency).
 2013-11-04 00:13:49 +08:00
Yao Wei Tjong 姚伟忠
b45de628e7 Reduce 3rd-party headers installation to as minimum as possible. 2013-11-03 06:28:41 +08:00
Yao Wei Tjong 姚伟忠
52ff881c54 Add 'install' option (currently only available for native build). 
Also enhance FindUrho3D.cmake module to find Urho3D library in the Urho3D SDK installation location.
 2013-11-02 16:45:44 +08:00
Yao Wei Tjong 姚伟忠
95a9c71a21 Fixed runtime issue on Raspberry Pi with Pidora as OS. 2013-10-30 12:31:32 +08:00
Yao Wei Tjong 姚伟忠
953f87d052 Fixed mouse motion spin bug. 
This bug only manifests itself when the SDL video driver has "WarpMouse" function implemented, like RPI video driver, in conjuction with call to SDL_SendMouseMotion() with relative event position.
 2013-10-29 23:48:03 +08:00
Yao Wei Tjong 姚伟忠
9e09e958dc Fixed event handling for Raspberry Pi. 2013-10-29 13:58:47 +08:00
Yao Wei Tjong 姚伟忠
6cf19fa9ce Fixed Raspberry Pi error (could open Window). 2013-10-28 22:30:01 +08:00
Lasse Öörni
c1a1864a40 Fixed black window on subsequent application starts on Android. Removed GL synchronization before swapping buffers, which should be unnecessary. 2013-10-28 05:06:23 +02:00
Lasse Öörni
e74ee4ce52 Fixed exiting on Android. 2013-10-28 01:45:44 +02:00
Lasse Öörni
f299c0d815 Fixed Android GL context destroy / restore. Removed project.properties file, as it's generated by the command "android update project". 2013-10-27 14:58:41 +02:00
Lasse Öörni
afa6c4ccc3 Initial SDL 2.0.1 merge. Windows tested OK. Android will crash when returning to the application. 2013-10-27 03:11:36 +03:00
Lasse Öörni
9d0eb0ffae If a rigid body is kinematic, set it to never deactivate itself. 2013-10-12 21:22:47 +03:00
Lasse Öörni
8d5aa5bbd2 Fix UNICODE define in SDL not taking effect properly with new MinGW. 2013-10-12 18:37:58 +03:00