Benau
59045cd064
Merge remote-tracking branch 'origin/master'
2018-01-13 15:44:57 +08:00
Deve
24772eb9d7
GLEW_ERROR_NO_GLX_DISPLAY needs glew 2.1
2018-01-13 00:41:53 +01:00
Deve
226c2bbed5
Merge branch 'master' into unbundle-glew2
2018-01-13 00:13:45 +01:00
Benau
26a481e478
Allow using system libsquish
2018-01-11 14:40:33 +08:00
Deve
62fe84ecc7
Fixed server-only build
2018-01-09 20:35:33 +01:00
Deve
88897cae1d
Enable wayland for testing.
...
It's not 100% ready yet, but some testing won't hurt.
It's possible to switch between wayland/x11 using
export IRR_DEVICE_TYPE=x11
or
export IRR_DEVICE_TYPE=wayland
so that x11 device can be forced in wayland session.
2018-01-07 21:23:21 +01:00
Deve
92f7caf696
Fixed cygwin warning
2018-01-07 21:15:08 +01:00
Benau
7797115867
Add SP for correct normal and easier shader system
2017-12-25 14:00:10 +08:00
Rémi Verschelde
e3264d1de3
CMake: Add option to use system GLEW 2.0+
...
The option is enabled by default, but the system version will only be used
if found and newer than 2.0.0 (to ensure that https://sourceforge.net/p/glew/patches/40/
is fixed). When missing, we silently fallback to the vendored source code,
so there is no change for e.g. Windows compilation.
2017-11-22 11:54:38 +01:00
Deve
a67be44422
Allow to compile STKRelease build with debug symbols.
...
It may be useful for decoding backtraces from our linux static package.
2017-11-12 23:59:12 +01:00
Deve
08be02af8f
Fixed 64-bit dependencies.
...
Thanks to qwertychouskie for finding it.
2017-11-05 21:54:43 +01:00
auria.mg
204e715637
Fix build
2017-10-17 20:08:15 -04:00
Deve
77161cc583
Avoid compilation errors for GLES
2017-10-17 23:34:19 +02:00
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
