[Super-tux-commit] supertux/src SConscript,1.5,1.6 resources.cpp,1.56,1.57 worldmap.cpp,1.131,1.132

[Matze B. <mat...@us...>]

Update of /cvsroot/super-tux/supertux/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31556/src

Modified Files:
	SConscript resources.cpp worldmap.cpp 
Log Message:
implemented an install target in scons

Index: SConscript
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/SConscript,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- SConscript	20 Nov 2004 22:14:37 -0000	1.5
+++ SConscript	21 Nov 2004 03:21:24 -0000	1.6
@@ -1,13 +1,16 @@
+import os
 Import('*')
 
-supertux_src = Glob(
-    dirs=[".", "object", "badguy", "trigger"],
-    pattern="*.cpp"
-)
+supertux_src = Glob("*.cpp") \
+             + Glob("object/*.cpp") \
+             + Glob("badguy/*.cpp") \
+             + Glob("trigger/*.cpp")
 app = env.Program(
     target="supertux",
     source = supertux_src
 )
 AddPostAction(app, "ln -sf $TARGET .")
+InstallExec(["supertux"])
+
 Default(app)
 

Index: worldmap.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/worldmap.cpp,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -d -r1.131 -r1.132
--- worldmap.cpp	20 Nov 2004 22:38:35 -0000	1.131
+++ worldmap.cpp	21 Nov 2004 03:21:25 -0000	1.132
@@ -488,7 +488,7 @@
   enter_level = false;
 
   name = "<no title>";
-  music = "SALCON.MOD";
+  music = "salcon.mod";
 
   global_frame_counter = 0;
 

Index: resources.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/resources.cpp,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- resources.cpp	20 Nov 2004 22:38:35 -0000	1.56
+++ resources.cpp	21 Nov 2004 03:21:25 -0000	1.57
@@ -249,7 +249,7 @@
 
   /* Herring song */
   herring_song = SoundManager::get
-                   ()->load_music(datadir + "/music/SALCON.MOD");
+                   ()->load_music(datadir + "/music/salcon.mod");
   level_end_song = SoundManager::get
                      ()->load_music(datadir + "/music/leveldone.mod");
 }