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

142 Commits

Author SHA1 Message Date
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
Sachith Hasaranga Seneviratne
7e4cf23ee3 Removed unnecessary projectfiles 2014-03-16 16:36:18 +05:30