ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,951 Commits 9 Branches 28 Tags 433 MiB
c905447a4b
Commit Graph

266 Commits

Author SHA1 Message Date
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
hiker
9299eca758 Fixed compilation after moving the windows installer to a different directory. 2016-04-22 07:54:40 +10:00
Marianne Gagnon
33defa44b7 Merge most modifications by egirsova to build 64-bits on OS X 2016-03-21 20:16:59 -04:00
Benau
61113bbef9 Silence warning as auria suggested 2016-01-18 09:52:34 +08:00
deve
92248399d0 Update project version :P 2015-12-03 14:48:03 +01:00
deve
cbc8d84fc4 Allow to enable wiiuse build for mingw in cmake. 
Still disabled by default because it only works with mingw-w64. It won't work with other compiler versions due to some inconsistencies in header files. But at least it's possible now to enable it without modifying cmake file.
 2015-12-03 14:47:08 +01:00
Benau
b9b2b538fa Clean up freetype code 
1. Remove all ifdef of freetype

2. Require freetype in CMake

3. Clean up declaration

4. Add leak check

5. Make script language display better in title
 2015-10-30 18:08:02 +08:00
Deve
c81243fc1a Merge branch 'master' into wayland 2015-10-28 22:43:02 +01:00
Deve
af68dd9046 Fixed compilation 2015-10-28 22:28:12 +01:00
Marianne Gagnon
dd975de74f Remove the font tool, which is no longer necessary 2015-10-18 20:10:31 -04:00
Marianne Gagnon
cee6d9d611 Merge branch 'master' into freetype_lazyloadchar 2015-10-17 21:34:19 -04:00
Deve
91db8620f8 Some work on support 64-bit windows compilation using mingw 2015-10-13 01:05:41 +02:00
Benau
3a5ec83ae9 Basic render of text using freetype 
This is a testing version of stk using freetype

It enable better arabic font display with less blurred glyph to all fonts thanks to hinting provide by freetype.

TODO: billboard text
 2015-10-04 11:59:44 +08:00
Deve
bfa92bc339 Don't complain about angelscript library not found in system 2015-09-07 18:14:57 +02:00
Deve
bd49fa4fd8 Move adding definition to other definitions 2015-09-06 21:00:50 +02:00
Deve
c124f5f371 Remove unused code from cmake. 
We are using now two different repositories (svn and git), and still creating the package without attached libraries doesn't have a sense.
 2015-09-06 20:58:12 +02:00
Deve
4498870cb8 Merge pull request #2271 from konstin/network_cmake 
Allow enabeling Network Multiplayer through CMake flags
 2015-09-06 20:33:10 +02:00
Deve
8a42fab5f1 Declare HAVE_STRUCT_TIMESPEC also for future Visual Studio versions 2015-09-02 17:41:44 +02:00
konstin
25082f2fbc Add description 2015-08-08 14:31:32 +02:00
konstin
c79c51e6c7 allow enabeling Network Multiplayer through CMake flags 2015-08-08 14:29:14 +02:00
Deve
a3abb57480 Build wiiuse on VS2015 2015-08-06 19:57:22 +02:00
deve
a0e54bb0b8 Avoid timespec structure redeclaration on VS2015. 
Still seems to be a bit messy, because in newer pthread header (gcc 5.1) I see _TIMESPEC_DEFINED instead of HAVE_STRUCT_TIMESPEC. But it should work with our dependencies files.

And still wiiuse library needs to be recompiled to make it working with VS2015.
 2015-08-06 10:00:08 +02:00
Marianne Gagnon
f651321ceb Using system angelscript must now be explicitely requested through an option, shouldn't be enabled by default as this will mostly lead to build errors due to finding a different version 2015-06-15 18:46:06 -04:00
Igor Gnatenko
7005f3b069 build: allow to use system angelscript 
Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
 2015-05-18 17:23:28 +03:00
Deve
5e56f8904a MinGW: Allow to compile wiiuse. 
Still disabled by default because it requires mingw-w64 and it may not work with other versions.
 2015-03-31 19:27:07 +02:00
Deve
cd67daf4a3 MinGW: Don't show console window in release mode. 
Removed unused cmake option.
 2015-03-30 20:12:25 +02:00
deve
df656fbf64 Allow to compile project using cygwin. 
Note that you need to have all dependencies in cygwin directory (can be easily installed).
Atm. wiimote and joystick events are disabled.
 2015-03-25 09:16:15 +01:00
deve
26054a1c60 MinGW: Better pthread names order 2015-03-03 07:17:48 +01:00
Deve
89d5cee4c1 MinGW: Better finding libraries 2015-03-02 19:30:26 +01:00
deve
cb7eab4f03 MinGW: Support for make install 2015-03-02 13:56:48 +01:00
Deve
0f56a4f6d3 Fixed compilation with cmake 3.2 2015-02-22 10:01:46 +01:00
Vincent Lejeune
874d63f5bc WIP wayland 2015-02-01 18:53:12 +01:00
Deve
2c8639f105 Correct icons path 2015-01-30 18:36:10 +01:00
Marianne Gagnon
8755b1b72a Fix CMake files on OS X to be packaging-friendly 2015-01-27 20:09:00 -05:00
deve
b2f918455b Fixed mingw compilation 2015-01-19 10:52:11 +01:00
Vincent Lejeune
0577099551 Move zlib/libpng/jpeglib outside of irrlicht tree and use system lib on linux 2015-01-18 02:02:10 +01:00
auriamg
432102b067 Merge pull request #1899 from konstin/dev 
Add the ability to override asset search patch in cmake; close #1415
 2015-01-13 18:04:09 -05:00
konstin
2c7474af02 adding the possibility to override STK_INSTALL_DATA_DIR_ABSOLUTE; This was necessary to create a ppa 2015-01-12 22:48:06 +01:00
deve
d2c8f2b225 Better finding pthread library. 
In some case it was found for me in C:\Program Files\Supertuxkart 0.8.1
 2015-01-08 13:24:15 +01:00
Deve
144cdc8f68 Fixed file extension. 2014-11-08 21:05:11 +01:00
Tobias Markus
53339cf417 Fix linking on OSX 2014-11-01 22:55:19 +01:00
Marianne Gagnon
139f20b39d Merge remote-tracking branch 'sachith/ScriptEngine' 
Conflicts:
	CMakeLists.txt
	sources.cmake
	src/io/file_manager.cpp
	src/io/file_manager.hpp
	src/modes/world.hpp
	src/tracks/track.hpp
	src/tracks/track_object_presentation.cpp
 2014-10-27 18:43:09 -04:00
deve
d5faa23e0c Use CMAKE_CXX_FLAGS instead of add_definitions for additional flags 2014-10-08 14:03:23 +02:00
deve
0943f0ed76 Add debug flags for mingw 2014-09-29 13:35:17 +02:00
hiker
3d4f054df8 Fix pre cmake 3.0 usage. 2014-09-23 21:01:04 +10:00
deve
8eb51f78b4 Fixed warning in cmake 3.0 and above. 
If I understand correctly, the COMPILE_DEFINITIONS_DEBUG property is ignored in newer versions of cmake. I fixed it by forcing to use old method.
 2014-09-23 09:11:39 +02:00
hiker
69473b1811 Try to include glew in stk. 2014-09-15 16:33:46 +10:00
Sachith Hasaranga Seneviratne
10e2634f22 Merged master 2014-09-13 08:45:41 +05:30
deve
e6ab299f37 Fixed mingw compilation 2014-09-12 09:01:35 +02:00
Sachith Hasaranga Seneviratne
118db58a02 Merged Master 2014-09-07 11:28:15 +05:30
vlj
b63654a40c Detect Glew in CMake 2014-09-05 18:19:10 +02:00
vlj
9866ecea29 Enable openMP flags in cmake 2014-09-03 17:18:49 +02:00
deve
e57b927c96 Allow to compile STK on Windows using MinGW compiler. 
It needs vorbis dll's as additional dependencies.

TODO: add an alternative to inet_ntop function.
TODO: link wiimote library
 2014-09-03 14:08:23 +02:00
Deve
0fa38161b5 Install icons in $PREFIX/share/icons/hicolor path. 
Don't use static paths in .desktop file. Actually I don't know about any application which uses it :P
 2014-08-24 21:58:34 +02:00
Deve
4584464798 Add icon to exe file as resource. 
It's hard to test for me because currently I can compile it only on virtual machine and it takes long time.
But it should work.
 2014-08-21 21:38:59 +02:00
Sachith Hasaranga Seneviratne
e9fc465a32 changed back to working version 2014-08-14 15:57:25 +05:30
Deve
7a9e77da01 Exit cmake with error if xrandr library was not found. 2014-08-13 19:34:53 +02:00
Sachith Hasaranga Seneviratne
a695c197b2 Merge master 2014-08-13 12:12:51 +05:30