Commit Graph

223 Commits

Author SHA1 Message Date
Benau
88e15147b8 Merge remote-tracking branch 'origin/win-64bit' 2017-10-17 00:55:22 +08:00
Deve
126991118d Now only irrlicht depends on x11 2017-09-27 21:45:08 +02:00
Deve
71334bac5b Move xrandr to irrlicht cmake file and also fixed indentations 2017-09-18 22:14:43 +02:00
Deve
8a3cdb4fef Don't link with useless libs.
Also remove custom script for xrandr.
2017-09-05 00:19:55 +02:00
hiker
f3d56b37df Merge branch 'master' into win-64bit 2017-08-16 17:29:57 +10:00
Deve
a89b2f5df2 Minor tweak for linux icon.
On freedesktop specs they suggest to use 48x48 icon.
2017-07-30 12:56:25 +02:00
Deve
20850c9811 Remove unused cmake option 2017-07-18 00:11:09 +02:00
Deve
1fd6a8aa86 Make sure that we are not using files from our zlib/libpng when STK is compiled with shared libraries.
It's possible that STK was using these files for compilation when cmake was run from main directory. In this case compiled files are stored in stk-code/lib, so that CMAKE_CURRENT_BINARY_DIR is stk-code/lib/irrlicht rather than stk-code/build/lib/irrlicht and we include whole lib/libpng rather than non-existing directory.
2017-07-10 21:14:28 +02:00
QwertyChouskie
76257f68c5 Avoid error when libopenglrecorder not found (#2871)
* Avoid error when libopenglrecorder not found

* Full fix
2017-06-27 19:56:53 -04:00
QwertyChouskie
a2d831c1ea Handle missing libopenglrecorder gracefully (#2867)
* Handle missing libopenglrecorder gracefully

* Tweak readme

* Change version to "git"

* fail when version !== git

* oops

gota do my research :/
2017-06-22 20:27:29 -04:00
Deve
15ce5b4ebf Fixed windows compilation 2017-06-05 21:54:44 +02:00
Deve
e02a8f4448 Allow to make single build with both x11 and wayland device 2017-05-06 21:53:32 +02:00
Deve
e27df23415 Draw mouse cursor 2017-05-04 21:06:40 +02:00
Deve
035c33f960 Merge branch 'master' into wayland 2017-04-22 21:11:10 +02:00
Benau
4de0ca83aa Move capture right before glfencesync if possible 2017-04-13 13:59:36 +08:00
Benau
b1f9ce2dbd Remove libwebm and recorder code 2017-04-12 11:51:59 +08:00
Deve
91e7c51ae7 Make sure we don't link with GLU 2017-04-08 12:31:09 +02:00
hiker
5e5d86bc6d On windows look for the 64-bit dependency package in dependencies-64bit.
This allows installation compiling 32 and 64-bit windows versions from
the same repo without switching dependencies.
2017-04-06 23:59:01 +10:00
deve
70d7fdd197 Fixed mingw compilation.
It should be possible to simplify it with something like
find_library(CURL_LIBRARIES NAMES libcurl libcurldll PATHS "${PROJECT_SOURCE_DIR}/dependencies/lib")
so you can look if it works on Visual Studio.

And as far as I see pkgconfig is used only on unix. Btw. I'm also not sure if it should be if(UNIX AND NOT APPLE) ?
2017-04-06 11:39:53 +02:00
Benau
1a072d609f Add vp9 encode support, though it encodes very slowly 2017-04-05 01:10:44 +08:00
Benau
b7c709c709 Allow muxing mjpeg with vorbis audio with mkv
Not sure if playable in with all players
2017-04-04 16:12:09 +08:00
Benau
b0d0a0739e Add CMake flag to enable / disable recorder 2017-04-04 14:23:04 +08:00
Benau
2d4bfa9fb0 Use shared library for vpx on msvc 2017-04-03 14:32:07 +08:00
Benau
19f88e3939 Allow stk to be built with 64bit msvc
Please use lastest adv_recording_64 branch in repo
2017-04-03 01:33:13 +08:00
Benau
8a5e28251e Fix mingw build 2017-04-02 14:55:55 +08:00
Benau
8a8b388170 Allow pulseaudio to be loaded dynamically 2017-04-01 15:21:58 +08:00
Benau
cacbdbd668 Allow recording audio in windows using wasapi 2017-04-01 00:52:38 +08:00
Benau
9039324145 Allow muxing into webm using libwebm 2017-03-30 13:30:21 +08:00
Benau
be103dd666 Implement real time vp8 encoding 2017-03-25 16:30:41 +08:00
Benau
a68c085e95 Use pulseaudio + vorbisenc for sound recording (linux for now) 2017-03-24 21:51:17 +08:00
deve
4df773d283 Some fixes in cmake.
Note that you need updated dependencies on windows.
2017-03-22 10:24:33 +01:00
Benau
196b2b722c Fix mac build 2017-03-22 07:42:48 +08:00
Benau
547d28a9e4 Use jpeg-turbo library in msvc 2017-03-21 09:17:39 +08:00
Benau
feb66664f4 Don't build graphics utils if server only or gles 2017-03-16 11:29:16 +08:00
Benau
ce76abf4fe Merge remote-tracking branch 'origin/master' into hq_mipmap_generator 2017-03-16 11:23:27 +08:00
Benau
cc2c2c6f33 Remove the usage of openmp in stk, see #2810 2017-03-16 08:42:53 +08:00
Benau
76aa38e5b4 Try HQMipmapGenerator 2017-03-13 10:28:43 +08:00
hiker
019e61ec66 iFixed pi compilation. 2016-11-16 00:19:09 +11:00
hiker
ae36208e29 Merge remote-tracking branch 'origin/master' into new-pi 2016-11-15 12:38:21 +11:00
hiker
feae91042a Explicitly disable X11 compilation for windows. No idea why it is
defined in CGUIEditbox now, but it somehow is ;(
2016-11-14 18:25:00 +11:00
hiker
61a3d10e10 More Compile SERVER_ONLY, still not fully working. 2016-11-12 00:09:39 +11:00
hiker
8d9bb9c30f Cherry picked commits from old pi branch (which was based on dumb client). 2016-11-11 17:21:59 +11:00
Deve
08202f2fa8 Remove USE_XRANDR flag from cmake.
Our vidmode code is old, has some bugs (eg. resolution is not restored properly in some cases), doesn't have multi monitor support and IMO shouldn't be used in current state.

If someone really wants to use it, the flags can be set directly in IrrCompileConfig.h.
2016-08-12 23:39:12 +02:00
Deve
0f7976e5f8 Merge branch 'master' into gles 2016-07-11 23:23:02 +02:00
Deve
3728adf1c5 The gles renderer is currently supported only on linux 2016-07-09 03:03:15 +02:00
Benau
aa0edb65dc Use cmake to find libbfd 2016-06-24 08:59:39 +08:00
Deve
d13716a917 Initial linux version.
Currently works only with irrlicht-based renderer because shaders are not ported yet.
2016-06-24 02:47:13 +02:00
Benau
6222ce650f Add optional linux crash reporting with backtrace (using libbfd)
Notice:

To get backtrace too for leak check, you need to
define GET_STACK_TRACE in leak_check.cpp, but will slow down STK
2016-06-23 16:18:17 +08:00
Deve
56c6062a81 One more tweak..... 2016-06-04 00:10:56 +02:00
hiker
0f79dcc238 Fixed FreeBSD builds (freebsd installs Freetype etc in /usr/local/lib,
but does not search in that directory for libraries).
2016-05-31 13:43:07 +10:00