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

243 Commits

Author SHA1 Message Date
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
Vlj
483ad109e3 Return of the ASAN option 2014-08-12 20:19:31 +02:00
Vlj
f633736dcc Remove AddressSanitizer build, it doesnt work. 2014-08-12 00:54:14 +02:00
Vlj
0a6a85ea61 Use AddressSanitizer in debug build 2014-08-12 00:32:24 +02:00
Sachith Hasaranga Seneviratne
c3a774fcc9 Merged master 2014-08-01 18:40:05 +05:30
Deve
b11fd2aaf6 xrandr: now it seems to work fine. I enable it for testing. 
This should be useful for people which have two or more display devices. It changes resolution only on main screen and leaves other screens untouched.

Currently I use screen which is the most on left (or on top). Ideally we should be able to choose in settings which screen we want to use. But support it on all platforms is rather too much of work. We could also detect from which screen STK was executed. This can be done differently on different window managers, but nothing impossible. Maybe in future.

Perhaps we should add fallback using old xrandr method.

BTW. in some specific cases it works better than SDL2 ;-)
 2014-07-30 21:30:43 +02:00
Deve
b9eb981fcc Some cleanup with USE_XRANDR flag 2014-07-25 19:24:35 +02:00
Sachith Hasaranga Seneviratne
16e6401fab Merged master, resolved conflict in CMakeLists.txt 2014-07-15 22:28:20 +05:30
hiker
1350cc5985 Applied fix from b69a1d225a 
to fix wiiuse compilation (esp. on travis-ci); enabled WIIUSE by default to test.
 2014-07-14 14:21:02 +10:00
vlj
a17e4c47f9 Disable WIIUSE by default on linux. 2014-07-12 00:46:19 +02:00
vlj
ba38819fff Enable CPP2011 on linux. 2014-07-12 00:38:03 +02:00
Sachith Hasaranga Seneviratne
27de7c6f3c MERGE STK into scripting branch 2014-05-19 08:27:15 +05:30
Deve
b1395a8fe0 Install assets in data directory 2014-05-17 16:28:05 +02:00
Deve
4331a5c0a3 Few more checks for assets 2014-05-17 14:37:55 +02:00
Deve
0b463f5222 Allow to run xrandr instead of vidmode as an option 2014-05-12 20:08:15 +02:00
hiker
d4b263761e Fix #1231 - stk-code/data not found on windows (secondary report). 2014-05-07 13:23:22 +10:00
hiker
84a1e32ade Let cmake test if stk-assets exists in the expected place. If not, 
cmake is aborted with an error message. The option -DCHECK_ASSETS=off
option can be used to disable this test. The latter is also used
for travis.
 2014-04-24 14:22:38 +10:00
hiker
9c35da4b6c Merge branch 'master' of https://github.com/abhishek1995/stk-code into abhishek1995-master 2014-04-24 14:01:37 +10:00
Vincent Lejeune
849709ec1d Revert some CPP2011 related changes. 2014-04-12 00:07:19 +02:00
vlj
443b758e20 Add shaders to MSVC target. 2014-04-11 20:56:23 +02:00
vlj
a6abda9115 Yet another attemp to c++0x support in travisCI 2014-04-11 01:17:42 +02:00
vlj
0d90ecda16 Another attempt at fixing ci build. 2014-04-11 01:01:38 +02:00
vlj
f58cf57768 Add gnu++11 flag to unix build. 2014-04-11 00:42:33 +02:00
Sachith Hasaranga Seneviratne
c8e0d56ce9 Added Build target for AngelScript, Updated Readme,txt 2014-03-16 16:50:14 +05:30