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

106 Commits

Author SHA1 Message Date
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