[Super-tux-commit] supertux TODO,1.90,1.91 autogen.sh,1.12,1.13 configure.ac,1.39,1.40 Makefile.am,1.10,NONE

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

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

Modified Files:
	TODO autogen.sh configure.ac 
Removed Files:
	Makefile.am 
Log Message:
implement spikes as objects and remove automake system

Index: configure.ac
===================================================================
RCS file: /cvsroot/super-tux/supertux/configure.ac,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- configure.ac	23 Nov 2004 22:21:22 -0000	1.39
+++ configure.ac	25 Nov 2004 00:49:32 -0000	1.40
@@ -139,3 +139,6 @@
 echo " Debug Mode:     $enable_debug"
 echo " OpenGL Support: $enable_opengl"
 echo ""
+echo ""
+echo "       NOTE: This project uses jam (and not make) as build tool"
+

--- Makefile.am DELETED ---

Index: TODO
===================================================================
RCS file: /cvsroot/super-tux/supertux/TODO,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -d -r1.90 -r1.91
--- TODO	24 Nov 2004 23:10:01 -0000	1.90
+++ TODO	25 Nov 2004 00:49:32 -0000	1.91
@@ -44,12 +44,12 @@
     few pixels higher) - hopefully ok
  * it's impossible to go into passages that have exactly the size of tux,
    either reduce collision rectangle by DELTA or round collision coordinates to
-   integers... 
+   integers... - ok for tux and most badguys
  ** implement 1up - ok
  ** implement star - ok
  * bring back the enemies
-    - add activation again
-    - make api simpler
+    - add activation again - ok
+    - make api simpler - ok
     - implement jumpy - ok
     -* implement spiky - ok
     - implement snowball - ok
@@ -69,7 +69,7 @@
     for  after big commit...
  * smoke clouds are too fast
  * some shots disappear in the ground with a "max collision depth reached"
-   message
+   message - ok
  * rework collision detection to take movement into account - this should fix
     the egg suddenly turning directions and the somtimes strange behaviour
     when hitting a block from the side when falling.
@@ -89,7 +89,7 @@
  ** having a star doesn't kill enemies - ok
  * tux always jumps to full height at the moment - ok
  * invisble blocks are visible and make the game crash when bumped - ok
- * reimplement spikes as objects
+ * reimplement spikes as objects - ok
  * what to do when stuck under tiles (after using duck-sliding)
  * do we want multi hit scores again?
  * tux doesn't stop at igloo anymore

Index: autogen.sh
===================================================================
RCS file: /cvsroot/super-tux/supertux/autogen.sh,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- autogen.sh	23 Nov 2004 19:36:27 -0000	1.12
+++ autogen.sh	25 Nov 2004 00:49:32 -0000	1.13
@@ -18,11 +18,5 @@
 echo 'INSTALL ?= "@INSTALL@" ;' >> Jamconfig.in
 echo 'JAMCONFIG_READ = yes ;' >> Jamconfig.in
 
-# we need a minimum of automake 1.6 and automake 1.8 seems to be buggy
-# this doesn't seem to work well
-# see AUTOMAKE_OPTIONS in Makefile.am
-export WANT_AUTOMAKE=1.6
-
-automake --copy --add-missing
 autoconf