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

205 Commits

Author SHA1 Message Date
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
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
Sachith Hasaranga Seneviratne
df67597ec7 added AS library 2014-03-16 14:44:05 +05:30
Sachith Hasaranga Seneviratne
2fe031d24d Added CmakeLists entry and comments to point to where to switch between linux and windows 2014-03-15 10:52:15 +05:30
abhishek1995
96fe29eb84 Update CMakeLists.txt 2014-03-06 21:13:53 +05:30
abhishek1995
62869dc92f Update CMakeLists.txt 
This commit includes checking whether ../data directory (from build directory) and ../../stk-assets directory (from build directory) exists or not. If they don't exist, then it gives error message for the corresponding directory. I have included the code for this on line 320.
 2014-03-06 20:51:09 +05:30
KroArtem
d2179e960d #1156, fix quotes in CMakeLists files, see http://cmake.org/Wiki/CMake/Language_Syntax#Quoting for more info 2014-02-21 23:09:10 +04:00
samuncle
65a72f2ba8 Correcting a bug with the linker 2014-01-22 02:26:30 +01:00
hiker
e891adc8a4 Improved cmake configuration to copy the dlls into the bin 
folder, which makes it much easier to start STK from within VS
(just set supertuxkart to be the startup project). Note that
this requires the new dependencies_for_0.8.2.zip to be installed!
 2014-01-22 10:23:08 +11:00
hikerstk
1265abd4a0 Remove definition of NDEBUG for VS (since VS will define this 
automatically in release builds), and add -DDEBUG in VS only
for debug builds.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14956 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2014-01-07 02:04:31 +00:00
hikerstk
86b1b67c61 Fixed windows compilation (missing lib), and some compiler warnings. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14641 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-12-06 03:54:31 +00:00
hikerstk
ac0b0eb7fb Fixed name of supertuxkart.appdata, added (untested) installation support for that file. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14585 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-11-28 06:20:36 +00:00
auria
9e7e80eed3 Restore missing OSX files and adjust CMakeList 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14518 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-11-22 00:27:33 +00:00
hikerstk
fb186d676c Enable wiiuse by default. 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14469 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-11-17 23:01:21 +00:00
funto66
3478d55236 Only expose USE_CPP2011 option for relevant platforms (UNIX-like) 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14432 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-11-14 22:17:46 +00:00
funto66
1b76d5d04d Enable multi-processor compilation on Visual Studio (faster) 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14284 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-10-22 13:28:06 +00:00
deveee
0647c7cd4c Testing commit 
Added the same icons which are for Windows - in src/windows_installer/icon.ico.
They have higher quality than previous. I also added icon 128x128 as default.
It looks much better in Gnome 3.x and probably other desktop environmetns.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13606 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-08-30 18:46:11 +00:00
hikerstk
72a2b69695 1) Moved header and source file into the same folder for VS. 
2) Fixed using/building WIIUSE on VS when created from cmake.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13417 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-08-05 06:10:31 +00:00
hikerstk
12deb466be Fixed several problems when createing VS project files with cmake: 
1) gcc flags were used, and -Wall for irrlicht caused 1000's of
   useless warning messages.
2) Force static build of irrlicht.
3) Remove unnecessary dist target (which is unix only).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@13349 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-07-25 07:19:30 +00:00
auria
1cb4d02075 Some minor cleanup in cmake 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12556 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-03-15 23:02:05 +00:00
auria
cab6469443 Complete Cmake OSX 10.7 support. Hopefully Cmake is now ready to take over the manually maintained Xcode project 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12553 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-03-14 23:10:20 +00:00
auria
8baa499323 Tweak CMake's ability to generate Xcode projects in addition to makefiles on OSX 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12550 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-03-14 02:06:09 +00:00
auria
a9056ee6bc Adapt CMake to make it able to compile on OSX in 10.5 compatibility mode. The next step might be removing the Xcode project, less maintenance... 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12549 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-03-14 01:39:23 +00:00
auria
d4fa9e0cb6 Finalize integration of cmake build on osx with builtin irrlicht 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12548 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-03-13 04:03:26 +00:00
auria
af17db18c4 Integrate irrlicht into the STK build system 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12546 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-03-13 01:31:09 +00:00
auria
0a3f9b6d93 Update for Wiiuse build on OSX, hope I broke nothing 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12451 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-02-04 00:15:45 +00:00
auria
c44dbf4214 Work on tutorial 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12373 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2013-01-17 02:20:12 +00:00
auria
18ad621664 Update OSX compilation. Still uses irrlicht from the dependency pack 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11870 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2012-11-06 01:46:41 +00:00
auria
6487c5220c Switch CMake build system to use internal irrlicht on Linux. Probably breaks OSX, more to come 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11868 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2012-11-06 01:18:10 +00:00
auria
011d6c98f0 Move libs to a new directory 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11598 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2012-09-18 23:09:12 +00:00
undef-in-ed
0b329b1542 Bugfix: Overwriting PATH breaks gcc toolchain on some systems 
This has been the reason for the IRRLICHT_WITH_XF86VM and
IRRLICHT_WITHOUT_XF86VM failures on some Linux machines.

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11197 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2012-05-07 17:40:18 +00:00
undef-in-ed
5b6f7d7c31 CMake: finer control of install destinations 
https://sourceforge.net/apps/trac/supertuxkart/ticket/271

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10982 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2012-03-16 23:15:23 +00:00
undef-in-ed
d606e7eab9 CMake: integrate (optional) "dependencies" directory 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10978 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2012-03-15 12:51:08 +00:00
undef-in-ed
3234653cea CMake: linking of pthread 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10977 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2012-03-15 12:50:51 +00:00
undef-in-ed
70bb244bbb CMake: fix whitespace errors 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10976 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2012-03-15 12:50:36 +00:00
undef-in-ed
9c1d373c4b CMake: workaround for Xxf86vm when building on X11 platforms 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10974 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2012-03-15 12:49:44 +00:00
undef-in-ed
6e148e2aaf CMake: mimic folder hierarchy with source_group for MSVC 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10973 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2012-03-15 12:41:52 +00:00
auria
bdac17c748 CMake can now also generate cygwin makefiles 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10962 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2012-03-12 00:48:52 +00:00
auria
f639458f26 CMake can now generate visual c++ projects 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10959 178a84e3-b1eb-0310-8ba1-8eac791a3b58
 2012-03-10 23:16:57 +00:00