super-tux-commit Mailing List for Super Tux (Page 16)
Brought to you by:
wkendrick
Menu
▾
▴
super-tux-commit — Messages about commits to the sourcecode.
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
(94) |
Apr
(500) |
May
(531) |
Jun
(196) |
Jul
(224) |
Aug
(193) |
Sep
(117) |
Oct
(115) |
Nov
(319) |
Dec
(97) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(19) |
Feb
|
Mar
(105) |
Apr
(41) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(6) |
| 2007 |
Jan
(1) |
Feb
(2) |
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
(2) |
Aug
(2) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
(4) |
Jul
|
Aug
|
Sep
(7) |
Oct
(12) |
Nov
(26) |
Dec
(39) |
| 2009 |
Jan
(6) |
Feb
(15) |
Mar
(10) |
Apr
(25) |
May
(29) |
Jun
(21) |
Jul
(26) |
Aug
(8) |
Sep
(3) |
Oct
|
Nov
|
Dec
(10) |
| 2010 |
Jan
(5) |
Feb
(5) |
Mar
(2) |
Apr
|
May
(5) |
Jun
|
Jul
(1) |
Aug
(2) |
Sep
(2) |
Oct
(2) |
Nov
|
Dec
|
|
From: Marek M. <wa...@us...> - 2004-11-25 16:22:14
|
Update of /cvsroot/super-tux/supertux/data/levels/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv553/data/levels/test Modified Files: bonusblock.stl Log Message: updated dispenser -- can summon mriceblock, snowball, bouncing_snowball and mrbomb now fixed message display of the secret area trigger ended some more of Nolok's minor troubles :) Index: bonusblock.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/test/bonusblock.stl,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- bonusblock.stl 25 Nov 2004 11:16:02 -0000 1.8 +++ bonusblock.stl 25 Nov 2004 16:22:04 -0000 1.9 @@ -14,6 +14,7 @@ (x 100) (y 170) ) + (secretarea (x 100) (y 170) (message "This is a Secret Area Test")) (tilemap (layer "background") (solid #f) |
|
From: Matze B. <mat...@us...> - 2004-11-25 15:57:24
|
Update of /cvsroot/super-tux/supertux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28084 Modified Files: Jamfile Log Message: we don't need to package all that automake stuff anymore Index: Jamfile =================================================================== RCS file: /cvsroot/super-tux/supertux/Jamfile,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- Jamfile 23 Nov 2004 22:21:22 -0000 1.3 +++ Jamfile 25 Nov 2004 15:57:14 -0000 1.4 @@ -7,8 +7,6 @@ UseAutoconf ; -# for now... -Package INSTALL NEWS README COPYING AUTHORS ChangeLog ABOUT-NLS depcomp - install-sh mkinstalldirs missing ; +# add some additional files to package +Package INSTALL NEWS README COPYING AUTHORS ChangeLog ; -Package Makefile.am src/Makefile.am lib/Makefile.am data/Makefile.am ; |
|
From: Matze B. <mat...@us...> - 2004-11-25 15:55:02
|
Update of /cvsroot/super-tux/supertux/mk/jam In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27499/mk/jam Modified Files: jamcompatibility.jam Log Message: require jam 2.5 Index: jamcompatibility.jam =================================================================== RCS file: /cvsroot/super-tux/supertux/mk/jam/jamcompatibility.jam,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- jamcompatibility.jam 24 Nov 2004 14:10:24 -0000 1.2 +++ jamcompatibility.jam 25 Nov 2004 15:54:49 -0000 1.3 @@ -18,9 +18,11 @@ } } -if $(JAMVERSION) < 2.4 +# we can't use boostjam at the moment as it still has the bug from jam 2.4 where +# settings variables on header targets doesn't work +if $(JAMVERSION) <= 2.4 { - EXIT "Error: This buildsystem requires jam version 2.4 or later." ; + EXIT "Error: This buildsystem requires jam version 2.5 or later." ; } # don't confuse users for now... #if $(JAMVERSION) = 2.4 & $(JAM_DEBUG) |
|
From: Matze B. <mat...@us...> - 2004-11-25 15:41:37
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23967/src Modified Files: player.cpp Log Message: disable collision detection when tux is falling down because he is dead Index: player.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/player.cpp,v retrieving revision 1.206 retrieving revision 1.207 diff -u -d -r1.206 -r1.207 --- player.cpp 25 Nov 2004 00:49:33 -0000 1.206 +++ player.cpp 25 Nov 2004 15:41:28 -0000 1.207 @@ -932,6 +932,7 @@ --player_status.lives; dying = DYING_SQUISHED; dying_timer.start(3.0); + flags |= FLAG_NO_COLLDET; } } |
|
From: Marek M. <wa...@us...> - 2004-11-25 14:59:21
|
Update of /cvsroot/super-tux/supertux/data/levels/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13637/data/levels/test Modified Files: noloktest.stl Log Message: nolok dies properly now :) Index: noloktest.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/test/noloktest.stl,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- noloktest.stl 25 Nov 2004 14:38:07 -0000 1.2 +++ noloktest.stl 25 Nov 2004 14:59:03 -0000 1.3 @@ -27,7 +27,7 @@ (speed 1) (width 25) (height 19) - (tiles 68 69 66 66 66 66 66 66 66 66 66 66 66 66 66 66 66 66 66 66 66 66 66 66 66 68 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 68 68 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 68 68 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 68 68 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 68 68 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 68 68 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 68 68 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 68 68 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 68 68 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 68 68 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 68 68 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 68 68 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 68 68 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 68 68 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 68 68 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 68 68 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 68 68 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 68 68 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 68) + (tiles 68 69 66 66 66 66 66 66 66 66 66 66 66 66 66 66 66 66 66 66 66 66 66 66 66 68 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 68 68 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 68 68 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 68 68 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 68 68 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 68 68 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 68 68 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 68 68 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 68 68 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 68 68 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 68 68 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 68 68 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 68 68 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 68 68 66 66 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 66 66 68 68 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 68 68 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 68 68 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 68 68 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 68) ) (tilemap (layer "foreground") |
|
From: Marek M. <wa...@us...> - 2004-11-25 14:59:20
|
Update of /cvsroot/super-tux/supertux/src/badguy In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13637/src/badguy Modified Files: nolok_01.cpp nolok_01.h Log Message: nolok dies properly now :) Index: nolok_01.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/badguy/nolok_01.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- nolok_01.h 25 Nov 2004 13:19:51 -0000 1.2 +++ nolok_01.h 25 Nov 2004 14:59:04 -0000 1.3 @@ -18,7 +18,7 @@ protected: bool collision_squished(Player& player); Timer2 action_timer; - enum { IDLE, WALKING, JUMPING, SHOOTING }; + enum { WALKING, JUMPING, SHOOTING }; int action; }; Index: nolok_01.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/badguy/nolok_01.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- nolok_01.cpp 25 Nov 2004 14:38:07 -0000 1.3 +++ nolok_01.cpp 25 Nov 2004 14:59:04 -0000 1.4 @@ -87,8 +87,8 @@ HitResponse Nolok_01::collision_solid(GameObject& , const CollisionHit& hit) { - if(fabsf(hit.normal.y) > .5) { // hit floor or roof? - //physic.set_velocity_y(0); + if(fabsf(hit.normal.y) > .5){ // hit floor or roof? + if (action != JUMPING) physic.set_velocity_y(0); } else { // hit right or left dir = dir == LEFT ? RIGHT : LEFT; sprite->set_action(dir == LEFT ? "left" : "right"); |
|
From: Marek M. <wa...@us...> - 2004-11-25 14:38:17
|
Update of /cvsroot/super-tux/supertux/src/badguy In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9380/src/badguy Modified Files: nolok_01.cpp Log Message: fixed a couple of nolok's minor bugs Index: nolok_01.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/badguy/nolok_01.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- nolok_01.cpp 25 Nov 2004 13:19:51 -0000 1.2 +++ nolok_01.cpp 25 Nov 2004 14:38:07 -0000 1.3 @@ -4,19 +4,20 @@ #include "badguy/bouncing_snowball.h" #include "trigger/door.h" -#define SHOOT_TIME 2.5 -#define IDLE_TIME 0.4 +#define WALK_TIME 2.5 +#define SHOOT_TIME 0.4 #define JUMP_TIME 0.3 -static const float WALKSPEED = 80; +static const float WALKSPEED = 90; //TODO: Create sprite, give multiple hitpoints, limit max number of snowballs // Can only be killed when jumping, no idea why +// Stop actions when pause button is hit (probably a general problem of timers) Nolok_01::Nolok_01(LispReader& reader) { reader.read_float("x", start_position.x); reader.read_float("y", start_position.y); - bbox.set_size(31.8, 31.8); + bbox.set_size(31.8, 63.8); sprite = sprite_manager->create("dummyguy"); } @@ -24,7 +25,7 @@ { start_position.x = pos_x; start_position.y = pos_y; - bbox.set_size(31.8, 31.8); + bbox.set_size(31.8, 63.8); sprite = sprite_manager->create("dummyguy"); } @@ -45,7 +46,7 @@ physic.set_velocity_x(dir == LEFT ? -WALKSPEED : WALKSPEED); sprite->set_action(dir == LEFT ? "left" : "right"); action = WALKING; - action_timer.start(SHOOT_TIME); + action_timer.start(WALK_TIME); } void @@ -60,16 +61,16 @@ } else if (action == JUMPING) { sprite->set_action("throw"); - action = IDLE; - action_timer.start(IDLE_TIME); + action = SHOOTING; + action_timer.start(SHOOT_TIME); } - else if (action == IDLE) { - Sector::current()->add_object(new BouncingSnowball(get_pos().x-32, get_pos().y, LEFT)); - Sector::current()->add_object(new BouncingSnowball(get_pos().x, get_pos().y, RIGHT)); + else if (action == SHOOTING) { + Sector::current()->add_object(new BouncingSnowball(get_pos().x - 64, get_pos().y, LEFT)); + Sector::current()->add_object(new BouncingSnowball(get_pos().x + 64, get_pos().y, RIGHT)); physic.set_velocity_x(dir == LEFT ? -WALKSPEED : WALKSPEED); sprite->set_action(dir == LEFT ? "left" : "right"); action = WALKING; - action_timer.start(SHOOT_TIME); + action_timer.start(WALK_TIME); } } } |
|
From: Marek M. <wa...@us...> - 2004-11-25 14:38:17
|
Update of /cvsroot/super-tux/supertux/data/images In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9380/data/images Modified Files: supertux.strf Log Message: fixed a couple of nolok's minor bugs Index: supertux.strf =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/supertux.strf,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- supertux.strf 25 Nov 2004 13:19:36 -0000 1.27 +++ supertux.strf 25 Nov 2004 14:38:00 -0000 1.28 @@ -1126,38 +1126,38 @@ (action (name "left") (x-offset 0) - (y-offset 32) + (y-offset 0) (images "shared/dummyguy-walk-1.png" "shared/dummyguy-walk-2.png")) (action (name "right") (x-offset 0) - (y-offset 32) + (y-offset 0) (mirror-action "left")) (action (name "stand") (x-offset 0) - (y-offset 32) + (y-offset 0) (images "shared/dummyguy-stand.png")) (action (name "throw") (x-offset 0) - (y-offset 32) + (y-offset 0) (images "shared/dummyguy-throw.png")) (action (name "jump") (x-offset 0) - (y-offset 32) + (y-offset 0) (images "shared/dummyguy-jump.png")) (action (name "dead") (x-offset 0) - (y-offset 32) + (y-offset 0) (images "shared/dummyguy-dead.png"))) |
|
From: Marek M. <wa...@us...> - 2004-11-25 14:38:17
|
Update of /cvsroot/super-tux/supertux/data/levels/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9380/data/levels/test Modified Files: noloktest.stl Log Message: fixed a couple of nolok's minor bugs Index: noloktest.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/test/noloktest.stl,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- noloktest.stl 25 Nov 2004 11:16:02 -0000 1.1 +++ noloktest.stl 25 Nov 2004 14:38:07 -0000 1.2 @@ -11,7 +11,7 @@ (background (image "forest1.jpg") (speed 0.5)) (music "Mortimers_chipdisko.mod") - (spawn-points (name "main") (x 100) (y 512)) + (spawn-points (name "main") (x 100) (y 100)) (nolok_01 (x 650) (y 512)) (tilemap (layer "background") |
|
From: Marek M. <wa...@us...> - 2004-11-25 13:20:17
|
Update of /cvsroot/super-tux/supertux/data/images In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23444/data/images Modified Files: supertux.strf Log Message: added (temporary) dispenser sprites improved nolok code Index: supertux.strf =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/supertux.strf,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- supertux.strf 25 Nov 2004 11:16:01 -0000 1.26 +++ supertux.strf 25 Nov 2004 13:19:36 -0000 1.27 @@ -1107,7 +1107,20 @@ (x-offset 0) (y-offset 0) (images "shared/walkingtree-left-small-1.png"))) - + + ; Dispenser + (sprite (name "dispenser") + (action + (name "working") + (x-offset 0) + (y-offset 0) + (images "shared/dispenser-working.png")) + (action + (name "broken") + (x-offset 0) + (y-offset 0) + (images "shared/dispenser-broken.png"))) + ; Dummyguy (sprite (name "dummyguy") (action |
|
From: Marek M. <wa...@us...> - 2004-11-25 13:20:06
|
Update of /cvsroot/super-tux/supertux/src/badguy In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23444/src/badguy Modified Files: dispenser.cpp nolok_01.cpp nolok_01.h Log Message: added (temporary) dispenser sprites improved nolok code Index: nolok_01.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/badguy/nolok_01.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- nolok_01.h 25 Nov 2004 11:16:03 -0000 1.1 +++ nolok_01.h 25 Nov 2004 13:19:51 -0000 1.2 @@ -18,8 +18,8 @@ protected: bool collision_squished(Player& player); Timer2 action_timer; - Timer2 idle_timer; - Timer2 jump_timer; + enum { IDLE, WALKING, JUMPING, SHOOTING }; + int action; }; #endif Index: nolok_01.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/badguy/nolok_01.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- nolok_01.cpp 25 Nov 2004 11:16:03 -0000 1.1 +++ nolok_01.cpp 25 Nov 2004 13:19:51 -0000 1.2 @@ -44,7 +44,8 @@ { physic.set_velocity_x(dir == LEFT ? -WALKSPEED : WALKSPEED); sprite->set_action(dir == LEFT ? "left" : "right"); - action_timer.start(SHOOT_TIME, true); + action = WALKING; + action_timer.start(SHOOT_TIME); } void @@ -52,18 +53,24 @@ { movement = physic.get_movement(elapsed_time); if (action_timer.check()) { - physic.set_velocity_y(700); - jump_timer.start(JUMP_TIME); - } - if (jump_timer.check()) { - sprite->set_action("throw"); - idle_timer.start(IDLE_TIME); - } - if (idle_timer.check()) { - Sector::current()->add_object(new BouncingSnowball(get_pos().x-32, get_pos().y, LEFT)); - Sector::current()->add_object(new BouncingSnowball(get_pos().x, get_pos().y, RIGHT)); - physic.set_velocity_x(dir == LEFT ? -WALKSPEED : WALKSPEED); - sprite->set_action(dir == LEFT ? "left" : "right"); + if (action == WALKING) { + physic.set_velocity_y(700); + action = JUMPING; + action_timer.start(JUMP_TIME); + } + else if (action == JUMPING) { + sprite->set_action("throw"); + action = IDLE; + action_timer.start(IDLE_TIME); + } + else if (action == IDLE) { + Sector::current()->add_object(new BouncingSnowball(get_pos().x-32, get_pos().y, LEFT)); + Sector::current()->add_object(new BouncingSnowball(get_pos().x, get_pos().y, RIGHT)); + physic.set_velocity_x(dir == LEFT ? -WALKSPEED : WALKSPEED); + sprite->set_action(dir == LEFT ? "left" : "right"); + action = WALKING; + action_timer.start(SHOOT_TIME); + } } } Index: dispenser.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/badguy/dispenser.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- dispenser.cpp 25 Nov 2004 11:16:03 -0000 1.5 +++ dispenser.cpp 25 Nov 2004 13:19:37 -0000 1.6 @@ -12,9 +12,8 @@ reader.read_float("cycle", cycle); reader.read_string("badguy", badguy); bbox.set_size(32, 32); - //FIXME: Create dispenser sprite - sprite = sprite_manager->create("dummyguy"); - sprite->set_action("stand"); + sprite = sprite_manager->create("dispenser"); + sprite->set_action("working"); } void @@ -40,7 +39,9 @@ bool Dispenser::collision_squished(Player& player) { - remove_me(); + //FIXME: Should act like a normal tile when killed + sprite->set_action("broken"); + dispense_timer.start(0); player.bounce(*this); return true; } |
|
From: Marek M. <wa...@us...> - 2004-11-25 13:19:49
|
Update of /cvsroot/super-tux/supertux/data/images/shared In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23444/data/images/shared Added Files: dispenser-broken.png dispenser-working.png Log Message: added (temporary) dispenser sprites improved nolok code --- NEW FILE: dispenser-working.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: dispenser-broken.png --- (This appears to be a binary file; contents omitted.) |
|
From: Matze B. <mat...@us...> - 2004-11-25 13:16:18
|
Update of /cvsroot/super-tux/supertux/lib/special In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24663/lib/special Modified Files: collision.cpp Log Message: added missing time calculation to slopes Index: collision.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/lib/special/collision.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- collision.cpp 24 Nov 2004 14:10:22 -0000 1.3 +++ collision.cpp 25 Nov 2004 13:15:57 -0000 1.4 @@ -108,11 +108,15 @@ break; } - float depth = -(normal * p1) - c; + float n_p1 = -(normal * p1); + float depth = n_p1 - c; if(depth < 0) return false; - if(depth < hit.depth) { + float time = depth / -(normal * movement); + if(time < hit.time) { + printf("Time: %f.\n", time); hit.depth = depth; + hit.time = time; hit.normal = normal; } |
|
From: Matze B. <mat...@us...> - 2004-11-25 13:16:17
|
Update of /cvsroot/super-tux/supertux/lib/app In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24663/lib/app Modified Files: tinygettext.cpp Log Message: added missing time calculation to slopes Index: tinygettext.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/lib/app/tinygettext.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- tinygettext.cpp 24 Nov 2004 23:10:01 -0000 1.3 +++ tinygettext.cpp 25 Nov 2004 13:15:56 -0000 1.4 @@ -16,6 +16,7 @@ // You should have received a copy of the GNU General Public License // along with this program; if not, write to the Free Software // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +#include <config.h> #include <sys/types.h> #include <iconv.h> |
Am Donnerstag, den 25.11.2004, 11:16 +0000 schrieb Marek Moeckel: > Update of /cvsroot/super-tux/supertux/data/images/shared > In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29929/data/images/shared > > Added Files: > dummyguy-dead.png dummyguy-jump.png dummyguy-stand.png > dummyguy-throw.png dummyguy-walk-1.png dummyguy-walk-2.png > Log Message: > added badguy Nolok_01, as he may appear as the boss of world 1 (still very basic). > added sprite "Dummyguy" which can be used for badguys that don't have sprites yet (i.e. nolok and dispenser). > added new test level "noloktest.stl", moved dispenser and secretarea tests to that level. > Bugs: Nolok can only be killed when he's jumping; no idea why, probably set the offsets wrong. Also, currently there's no limit on how many snowballs he can throw, so kill him quickly :-) > This is the last thing I'll add before fixing all my other stuff. :-) > Aehm nolok is not the boss of world1, that's a still unnamed yeti. Nolok is the guy who captured penny so he's the boss of the very last world (same as bowser in super mario...) Greetings, Matze |
|
From: Marek M. <wa...@us...> - 2004-11-25 11:16:17
|
Update of /cvsroot/super-tux/supertux/src/trigger In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29929/src/trigger Modified Files: door.cpp door.h Log Message: added badguy Nolok_01, as he may appear as the boss of world 1 (still very basic). added sprite "Dummyguy" which can be used for badguys that don't have sprites yet (i.e. nolok and dispenser). added new test level "noloktest.stl", moved dispenser and secretarea tests to that level. Bugs: Nolok can only be killed when he's jumping; no idea why, probably set the offsets wrong. Also, currently there's no limit on how many snowballs he can throw, so kill him quickly :-) This is the last thing I'll add before fixing all my other stuff. :-) Index: door.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/trigger/door.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- door.cpp 24 Nov 2004 23:10:09 -0000 1.3 +++ door.cpp 25 Nov 2004 11:16:03 -0000 1.4 @@ -42,10 +42,12 @@ sprite = sprite_manager->create("door"); } -Door::Door(int x, int y) +Door::Door(int x, int y, std::string sector, std::string spawnpoint) { bbox.set_pos(Vector(x, y)); bbox.set_size(32, 64); + target_sector = sector; + target_spawnpoint = spawnpoint; sprite = sprite_manager->create("door"); } Index: door.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/trigger/door.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- door.h 20 Nov 2004 22:14:40 -0000 1.1 +++ door.h 25 Nov 2004 11:16:03 -0000 1.2 @@ -31,7 +31,7 @@ { public: Door(LispReader& reader); - Door(int x, int y); + Door(int x, int y, std::string sector, std::string spawnpoint); virtual ~Door(); virtual void write(LispWriter& writer); |
|
From: Marek M. <wa...@us...> - 2004-11-25 11:16:15
|
Update of /cvsroot/super-tux/supertux/src/badguy In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29929/src/badguy Modified Files: bouncing_snowball.cpp bouncing_snowball.h dispenser.cpp Added Files: nolok_01.cpp nolok_01.h Log Message: added badguy Nolok_01, as he may appear as the boss of world 1 (still very basic). added sprite "Dummyguy" which can be used for badguys that don't have sprites yet (i.e. nolok and dispenser). added new test level "noloktest.stl", moved dispenser and secretarea tests to that level. Bugs: Nolok can only be killed when he's jumping; no idea why, probably set the offsets wrong. Also, currently there's no limit on how many snowballs he can throw, so kill him quickly :-) This is the last thing I'll add before fixing all my other stuff. :-) --- NEW FILE: nolok_01.h --- #ifndef __NOLOK01_H__ #define __NOLOK01_H__ #include "badguy.h" #include "timer.h" class Nolok_01 : public BadGuy { public: Nolok_01(LispReader& reader); Nolok_01(float pos_x, float pos_y); void activate(); void write(LispWriter& writer); void active_action(float elapsed_time); HitResponse collision_solid(GameObject& other, const CollisionHit& hit); protected: bool collision_squished(Player& player); Timer2 action_timer; Timer2 idle_timer; Timer2 jump_timer; }; #endif Index: bouncing_snowball.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/badguy/bouncing_snowball.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- bouncing_snowball.cpp 25 Nov 2004 00:49:34 -0000 1.4 +++ bouncing_snowball.cpp 25 Nov 2004 11:16:03 -0000 1.5 @@ -11,14 +11,17 @@ reader.read_float("y", start_position.y); bbox.set_size(31.8, 31.8); sprite = sprite_manager->create("bouncingsnowball"); + set_direction = false; } -BouncingSnowball::BouncingSnowball(float pos_x, float pos_y) +BouncingSnowball::BouncingSnowball(float pos_x, float pos_y, Direction d) { start_position.x = pos_x; start_position.y = pos_y; bbox.set_size(31.8, 31.8); sprite = sprite_manager->create("bouncingsnowball"); + set_direction = true; + initial_direction = d; } void @@ -35,6 +38,7 @@ void BouncingSnowball::activate() { + if (set_direction) {dir = initial_direction;} physic.set_velocity_x(dir == LEFT ? -WALKSPEED : WALKSPEED); sprite->set_action(dir == LEFT ? "left" : "right"); } Index: bouncing_snowball.h =================================================================== RCS file: /cvsroot/super-tux/supertux/src/badguy/bouncing_snowball.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- bouncing_snowball.h 24 Nov 2004 17:33:49 -0000 1.2 +++ bouncing_snowball.h 25 Nov 2004 11:16:03 -0000 1.3 @@ -7,7 +7,7 @@ { public: BouncingSnowball(LispReader& reader); - BouncingSnowball(float pos_x, float pos_y); + BouncingSnowball(float pos_x, float pos_y, Direction d); void activate(); void write(LispWriter& writer); @@ -15,6 +15,8 @@ protected: bool collision_squished(Player& player); + bool set_direction; + Direction initial_direction; }; #endif --- NEW FILE: nolok_01.cpp --- #include <config.h> #include "nolok_01.h" #include "badguy/bouncing_snowball.h" #include "trigger/door.h" #define SHOOT_TIME 2.5 #define IDLE_TIME 0.4 #define JUMP_TIME 0.3 static const float WALKSPEED = 80; //TODO: Create sprite, give multiple hitpoints, limit max number of snowballs // Can only be killed when jumping, no idea why Nolok_01::Nolok_01(LispReader& reader) { reader.read_float("x", start_position.x); reader.read_float("y", start_position.y); bbox.set_size(31.8, 31.8); sprite = sprite_manager->create("dummyguy"); } Nolok_01::Nolok_01(float pos_x, float pos_y) { start_position.x = pos_x; start_position.y = pos_y; bbox.set_size(31.8, 31.8); sprite = sprite_manager->create("dummyguy"); } void Nolok_01::write(LispWriter& writer) { writer.start_list("nolok01"); writer.write_float("x", get_pos().x); writer.write_float("y", get_pos().y); writer.end_list("nolok01"); } void Nolok_01::activate() { physic.set_velocity_x(dir == LEFT ? -WALKSPEED : WALKSPEED); sprite->set_action(dir == LEFT ? "left" : "right"); action_timer.start(SHOOT_TIME, true); } void Nolok_01::active_action(float elapsed_time) { movement = physic.get_movement(elapsed_time); if (action_timer.check()) { physic.set_velocity_y(700); jump_timer.start(JUMP_TIME); } if (jump_timer.check()) { sprite->set_action("throw"); idle_timer.start(IDLE_TIME); } if (idle_timer.check()) { Sector::current()->add_object(new BouncingSnowball(get_pos().x-32, get_pos().y, LEFT)); Sector::current()->add_object(new BouncingSnowball(get_pos().x, get_pos().y, RIGHT)); physic.set_velocity_x(dir == LEFT ? -WALKSPEED : WALKSPEED); sprite->set_action(dir == LEFT ? "left" : "right"); } } bool Nolok_01::collision_squished(Player& player) { sprite->set_action("dead"); kill_squished(player); Sector::current()->add_object(new Door((int)get_pos().x+32, 512, "sector1", "main2")); return true; } HitResponse Nolok_01::collision_solid(GameObject& , const CollisionHit& hit) { if(fabsf(hit.normal.y) > .5) { // hit floor or roof? //physic.set_velocity_y(0); } else { // hit right or left dir = dir == LEFT ? RIGHT : LEFT; sprite->set_action(dir == LEFT ? "left" : "right"); physic.set_velocity_x(-physic.get_velocity_x()); } return CONTINUE; } Index: dispenser.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/badguy/dispenser.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- dispenser.cpp 24 Nov 2004 23:10:05 -0000 1.4 +++ dispenser.cpp 25 Nov 2004 11:16:03 -0000 1.5 @@ -13,7 +13,8 @@ reader.read_string("badguy", badguy); bbox.set_size(32, 32); //FIXME: Create dispenser sprite - sprite = sprite_manager->create("snowball"); + sprite = sprite_manager->create("dummyguy"); + sprite->set_action("stand"); } void @@ -69,6 +70,7 @@ //TODO: Add launching velocity to badguys // Add more badguys and randomizer // Clean up stuff I copied without understanding what it does :) +// Stop dispensing when game is paused // Lots-O-Stuff (tm) void Dispenser::launch_badguy() @@ -78,7 +80,7 @@ if (badguy == "snowball") Sector::current()->add_object(new SnowBall(get_pos().x-2, get_pos().y)); else if (badguy == "bouncingsnowball") - Sector::current()->add_object(new BouncingSnowball(get_pos().x-2, get_pos().y)); + Sector::current()->add_object(new BouncingSnowball(get_pos().x-2, get_pos().y, dir)); else if (badguy == "random") {} } |
|
From: Marek M. <wa...@us...> - 2004-11-25 11:16:13
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29929/src Modified Files: sector.cpp Log Message: added badguy Nolok_01, as he may appear as the boss of world 1 (still very basic). added sprite "Dummyguy" which can be used for badguys that don't have sprites yet (i.e. nolok and dispenser). added new test level "noloktest.stl", moved dispenser and secretarea tests to that level. Bugs: Nolok can only be killed when he's jumping; no idea why, probably set the offsets wrong. Also, currently there's no limit on how many snowballs he can throw, so kill him quickly :-) This is the last thing I'll add before fixing all my other stuff. :-) Index: sector.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/sector.cpp,v retrieving revision 1.47 retrieving revision 1.48 diff -u -d -r1.47 -r1.48 --- sector.cpp 25 Nov 2004 00:49:33 -0000 1.47 +++ sector.cpp 25 Nov 2004 11:16:02 -0000 1.48 @@ -55,6 +55,7 @@ #include "badguy/mrbomb.h" #include "badguy/dispenser.h" #include "badguy/spike.h" +#include "badguy/nolok_01.h" #include "trigger/door.h" #include "trigger/sequence_trigger.h" #include "trigger/secretarea_trigger.h" @@ -158,6 +159,8 @@ return new Dispenser(reader); } else if(name == "spike") { return new Spike(reader); + } else if(name == "nolok_01") { + return new Nolok_01(reader); } #if 0 else if(badguykind_from_string(name) != BAD_INVALID) { |
|
From: Marek M. <wa...@us...> - 2004-11-25 11:16:12
|
Update of /cvsroot/super-tux/supertux/data/levels/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29929/data/levels/test Modified Files: bonusblock.stl Added Files: noloktest.stl Log Message: added badguy Nolok_01, as he may appear as the boss of world 1 (still very basic). added sprite "Dummyguy" which can be used for badguys that don't have sprites yet (i.e. nolok and dispenser). added new test level "noloktest.stl", moved dispenser and secretarea tests to that level. Bugs: Nolok can only be killed when he's jumping; no idea why, probably set the offsets wrong. Also, currently there's no limit on how many snowballs he can throw, so kill him quickly :-) This is the last thing I'll add before fixing all my other stuff. :-) --- NEW FILE: noloktest.stl --- ; Level made using SuperTux's built-in Level Editor (supertux-level (version 2) (name "Nolok Test") (author "Marek") (time 500) (end-sequence-animation "none") (sector (name "main") (gravity 10) (background (image "forest1.jpg") (speed 0.5)) (music "Mortimers_chipdisko.mod") (spawn-points (name "main") (x 100) (y 512)) (nolok_01 (x 650) (y 512)) (tilemap (layer "background") (solid #f) (speed 1) (width 25) (height 19) (tiles 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0) ) (tilemap (layer "interactive") (solid #t) (speed 1) (width 25) (height 19) (tiles 68 69 66 66 66 66 66 66 66 66 66 66 66 66 66 66 66 66 66 66 66 66 66 66 66 68 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 68 68 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 68 68 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 68 68 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 68 68 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 68 68 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 68 68 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 68 68 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 68 68 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 68 68 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 68 68 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 68 68 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 68 68 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 68 68 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 68 68 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 68 68 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 68 68 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 68 68 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 65 68) ) (tilemap (layer "foreground") (solid #f) (speed 1) (width 25) (height 19) (tiles 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0) ) (camera (mode "normal") (backscrolling #t) ) ) (sector (name "sector1") (gravity 10) (music "Mortimers_chipdisko.mod") (background (image "forest1.jpg") (speed 0.5)) (spawn-points (name "main2") (x 100) (y 100)) (secretarea (x 100) (y 100) (message "You found a secret area!")) (dispenser (x 700) (y 500) (badguy "snowball") (cycle 2)) (tilemap (layer "background") (solid #f) (speed 1) (width 25) (height 19) (tiles 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0) ) (tilemap (layer "interactive") (solid #t) (speed 1) (width 25) (height 19) (tiles 9 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 7 15 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 13 12 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 12 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 12 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 12 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 12 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 12 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 12 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 12 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 12 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 12 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 12 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 12 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 12 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 12 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 12 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 21 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 22 20 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 14 23) ) (tilemap (layer "foreground") (solid #f) (speed 1) (width 25) (height 19) (tiles 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0) ) (camera (mode "normal") (backscrolling #t) ) ) ) Index: bonusblock.stl =================================================================== RCS file: /cvsroot/super-tux/supertux/data/levels/test/bonusblock.stl,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- bonusblock.stl 24 Nov 2004 18:19:51 -0000 1.7 +++ bonusblock.stl 25 Nov 2004 11:16:02 -0000 1.8 @@ -9,8 +9,6 @@ (gravity 10.000000) (background (image "arctis.jpg") (speed 0.5)) - (secretarea (x 400) (y 128) (message "You found a secret area!")) - (dispenser (x 500) (y 128) (badguy "bouncingsnowball") (cycle 2)) (spawn-points (name "main") (x 100) |
|
From: Marek M. <wa...@us...> - 2004-11-25 11:16:12
|
Update of /cvsroot/super-tux/supertux/data/images In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29929/data/images Modified Files: supertux.strf Log Message: added badguy Nolok_01, as he may appear as the boss of world 1 (still very basic). added sprite "Dummyguy" which can be used for badguys that don't have sprites yet (i.e. nolok and dispenser). added new test level "noloktest.stl", moved dispenser and secretarea tests to that level. Bugs: Nolok can only be killed when he's jumping; no idea why, probably set the offsets wrong. Also, currently there's no limit on how many snowballs he can throw, so kill him quickly :-) This is the last thing I'll add before fixing all my other stuff. :-) Index: supertux.strf =================================================================== RCS file: /cvsroot/super-tux/supertux/data/images/supertux.strf,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- supertux.strf 25 Nov 2004 00:49:32 -0000 1.25 +++ supertux.strf 25 Nov 2004 11:16:01 -0000 1.26 @@ -1107,7 +1107,48 @@ (x-offset 0) (y-offset 0) (images "shared/walkingtree-left-small-1.png"))) + + ; Dummyguy + (sprite (name "dummyguy") + (action + (name "left") + (x-offset 0) + (y-offset 32) + (images "shared/dummyguy-walk-1.png" + "shared/dummyguy-walk-2.png")) + (action + (name "right") + (x-offset 0) + (y-offset 32) + (mirror-action "left")) + + (action + (name "stand") + (x-offset 0) + (y-offset 32) + (images "shared/dummyguy-stand.png")) + + (action + (name "throw") + (x-offset 0) + (y-offset 32) + (images "shared/dummyguy-throw.png")) + + (action + (name "jump") + (x-offset 0) + (y-offset 32) + (images "shared/dummyguy-jump.png")) + + (action + (name "dead") + (x-offset 0) + (y-offset 32) + (images "shared/dummyguy-dead.png"))) + + + ;; Game elements follow (sprite (name "egg") |
Update of /cvsroot/super-tux/supertux/data/images/shared In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29929/data/images/shared Added Files: dummyguy-dead.png dummyguy-jump.png dummyguy-stand.png dummyguy-throw.png dummyguy-walk-1.png dummyguy-walk-2.png Log Message: added badguy Nolok_01, as he may appear as the boss of world 1 (still very basic). added sprite "Dummyguy" which can be used for badguys that don't have sprites yet (i.e. nolok and dispenser). added new test level "noloktest.stl", moved dispenser and secretarea tests to that level. Bugs: Nolok can only be killed when he's jumping; no idea why, probably set the offsets wrong. Also, currently there's no limit on how many snowballs he can throw, so kill him quickly :-) This is the last thing I'll add before fixing all my other stuff. :-) --- NEW FILE: dummyguy-walk-2.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: dummyguy-walk-1.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: dummyguy-throw.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: dummyguy-dead.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: dummyguy-stand.png --- (This appears to be a binary file; contents omitted.) --- NEW FILE: dummyguy-jump.png --- (This appears to be a binary file; contents omitted.) |
|
From: Matze B. <mat...@us...> - 2004-11-25 01:12:29
|
Update of /cvsroot/super-tux/supertux/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12840/src Modified Files: supertux.cpp Log Message: fix Index: supertux.cpp =================================================================== RCS file: /cvsroot/super-tux/supertux/src/supertux.cpp,v retrieving revision 1.32 retrieving revision 1.33 diff -u -d -r1.32 -r1.33 --- supertux.cpp 23 Nov 2004 22:22:14 -0000 1.32 +++ supertux.cpp 25 Nov 2004 01:12:13 -0000 1.33 @@ -50,7 +50,7 @@ #endif config = new MyConfig; - Setup::init(PACKAGE_NAME, PACKAGE, PACKAGE_VERSION); + Setup::init(PACKAGE_NAME, PACKAGE_NAME, PACKAGE_VERSION); Setup::parseargs(argc, argv); |
|
From: Matze B. <mat...@us...> - 2004-11-25 01:09:40
|
Update of /cvsroot/super-tux/supertux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12167 Modified Files: autogen.sh configure.ac Log Message: remove automake from configure.ac Index: configure.ac =================================================================== RCS file: /cvsroot/super-tux/supertux/configure.ac,v retrieving revision 1.40 retrieving revision 1.41 diff -u -d -r1.40 -r1.41 --- configure.ac 25 Nov 2004 00:49:32 -0000 1.40 +++ configure.ac 25 Nov 2004 01:08:59 -0000 1.41 @@ -12,11 +12,11 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ([2.54]) AC_INIT(supertux, 0.2-cvs) -AC_CONFIG_HEADERS(config.h) AC_CONFIG_SRCDIR([src/supertux.cpp]) +AC_CONFIG_AUX_DIR([mk/autoconf]) AC_CANONICAL_TARGET -AM_INIT_AUTOMAKE -dnl This is obsolete see automake1.7 // AM_CONFIG_HEADER + +AC_CONFIG_HEADERS(config.h) # we don't want the stupid autoconf default -g -O2 test ".$CXXFLAGS" = "." && CXXFLAGS=" " @@ -26,7 +26,6 @@ AC_PROG_CC AC_PROG_CXX AC_PROG_INSTALL -AC_PROG_LIBTOOL dnl Checks for header files. AC_HEADER_DIRENT @@ -78,7 +77,9 @@ AC_MSG_RESULT([no]) fi -AM_ICONV +AC_CHECK_LIB([iconv], [iconv_open]) +AC_TRY_LINK([#include <iconv.h>], [iconv_open(0, 0);],, + AC_MSG_ERROR([Couldn't find iconv library])) dnl =========================================================================== dnl Check for SDL @@ -127,10 +128,7 @@ AC_INIT_JAM AC_CONFIG_FILES([Jamconfig]) -AC_OUTPUT(Makefile - src/Makefile - data/Makefile - lib/Makefile) +AC_OUTPUT echo "" echo "Features:" @@ -141,4 +139,5 @@ echo "" echo "" echo " NOTE: This project uses jam (and not make) as build tool" +echo "" Index: autogen.sh =================================================================== RCS file: /cvsroot/super-tux/supertux/autogen.sh,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- autogen.sh 25 Nov 2004 00:49:32 -0000 1.13 +++ autogen.sh 25 Nov 2004 01:08:59 -0000 1.14 @@ -7,7 +7,6 @@ fi autoheader -libtoolize --force aclocal -I mk/autoconf # generate Jamconfig.in |
Update of /cvsroot/super-tux/supertux/mk/autoconf In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12167/mk/autoconf Modified Files: config.guess config.sub Removed Files: ax_type_socklen_t.m4 codeset.m4 gettext.m4 glibc21.m4 iconv.m4 intdiv0.m4 inttypes-pri.m4 inttypes.m4 inttypes_h.m4 isc-posix.m4 lcmessage.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 nls.m4 po.m4 progtest.m4 stdint_h.m4 uintmax_t.m4 ulonglong.m4 Log Message: remove automake from configure.ac Index: config.guess =================================================================== RCS file: /cvsroot/super-tux/supertux/mk/autoconf/config.guess,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- config.guess 23 Nov 2004 16:47:24 -0000 1.1 +++ config.guess 25 Nov 2004 01:09:01 -0000 1.2 @@ -1,9 +1,9 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003 Free Software Foundation, Inc. -timestamp='2002-11-30' +timestamp='2004-02-02' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -98,14 +98,18 @@ # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still # use `HOST_CC' if defined, but it is deprecated. -# This shell variable is my proudest work .. or something. --bje +# Portable tmp directory creation inspired by the Autoconf team. -set_cc_for_build='tmpdir=${TMPDIR-/tmp}/config-guess-$$ ; -(old=`umask` && umask 077 && mkdir $tmpdir && umask $old && unset old) - || (echo "$me: cannot create $tmpdir" >&2 && exit 1) ; -dummy=$tmpdir/dummy ; -files="$dummy.c $dummy.o $dummy.rel $dummy" ; -trap '"'"'rm -f $files; rmdir $tmpdir; exit 1'"'"' 1 2 15 ; +set_cc_for_build=' +trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; +trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; +: ${TMPDIR=/tmp} ; + { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || + { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || + { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; +dummy=$tmp/dummy ; +tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; case $CC_FOR_BUILD,$HOST_CC,$CC in ,,) echo "int x;" > $dummy.c ; for c in cc gcc c89 c99 ; do @@ -113,15 +117,13 @@ CC_FOR_BUILD="$c"; break ; fi ; done ; - rm -f $files ; if test x"$CC_FOR_BUILD" = x ; then CC_FOR_BUILD=no_compiler_found ; fi ;; ,,*) CC_FOR_BUILD=$CC ;; ,*,*) CC_FOR_BUILD=$HOST_CC ;; -esac ; -unset files' +esac ;' # This is needed to find uname on a Pyramid OSx when run in the BSD universe. # (gh...@no... 1994-08-24) @@ -219,6 +221,9 @@ mvmeppc:OpenBSD:*:*) echo powerpc-unknown-openbsd${UNAME_RELEASE} exit 0 ;; + pegasos:OpenBSD:*:*) + echo powerpc-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; pmax:OpenBSD:*:*) echo mipsel-unknown-openbsd${UNAME_RELEASE} exit 0 ;; @@ -234,72 +239,59 @@ *:OpenBSD:*:*) echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} exit 0 ;; + *:ekkoBSD:*:*) + echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} + exit 0 ;; alpha:OSF1:*:*) if test $UNAME_RELEASE = "V4.0"; then UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` fi + # According to Compaq, /usr/sbin/psrinfo has been available on + # OSF/1 and Tru64 systems produced since 1995. I hope that + # covers most systems running today. This code pipes the CPU + # types through head -n 1, so we only detect the type of CPU 0. + ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` + case "$ALPHA_CPU_TYPE" in + "EV4 (21064)") + UNAME_MACHINE="alpha" ;; + "EV4.5 (21064)") + UNAME_MACHINE="alpha" ;; + "LCA4 (21066/21068)") + UNAME_MACHINE="alpha" ;; + "EV5 (21164)") + UNAME_MACHINE="alphaev5" ;; + "EV5.6 (21164A)") + UNAME_MACHINE="alphaev56" ;; + "EV5.6 (21164PC)") + UNAME_MACHINE="alphapca56" ;; + "EV5.7 (21164PC)") + UNAME_MACHINE="alphapca57" ;; + "EV6 (21264)") + UNAME_MACHINE="alphaev6" ;; + "EV6.7 (21264A)") + UNAME_MACHINE="alphaev67" ;; + "EV6.8CB (21264C)") + UNAME_MACHINE="alphaev68" ;; + "EV6.8AL (21264B)") + UNAME_MACHINE="alphaev68" ;; + "EV6.8CX (21264D)") + UNAME_MACHINE="alphaev68" ;; + "EV6.9A (21264/EV69A)") + UNAME_MACHINE="alphaev69" ;; + "EV7 (21364)") + UNAME_MACHINE="alphaev7" ;; + "EV7.9 (21364A)") + UNAME_MACHINE="alphaev79" ;; + esac # A Vn.n version is a released version. # A Tn.n version is a released field test version. # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. - eval $set_cc_for_build - cat <<EOF >$dummy.s - .data -\$Lformat: - .byte 37,100,45,37,120,10,0 # "%d-%x\n" - - .text - .globl main - .align 4 - .ent main -main: - .frame \$30,16,\$26,0 - ldgp \$29,0(\$27) - .prologue 1 - .long 0x47e03d80 # implver \$0 - lda \$2,-1 - .long 0x47e20c21 # amask \$2,\$1 - lda \$16,\$Lformat - mov \$0,\$17 - not \$1,\$18 - jsr \$26,printf - ldgp \$29,0(\$26) - mov 0,\$16 - jsr \$26,exit - .end main -EOF - $CC_FOR_BUILD -o $dummy $dummy.s 2>/dev/null - if test "$?" = 0 ; then - case `$dummy` in - 0-0) - UNAME_MACHINE="alpha" - ;; - 1-0) - UNAME_MACHINE="alphaev5" - ;; - 1-1) - UNAME_MACHINE="alphaev56" - ;; - 1-101) - UNAME_MACHINE="alphapca56" - ;; - 2-303) - UNAME_MACHINE="alphaev6" - ;; - 2-307) - UNAME_MACHINE="alphaev67" - ;; - 2-1307) - UNAME_MACHINE="alphaev68" - ;; - 3-1307) - UNAME_MACHINE="alphaev7" - ;; - esac - fi - rm -f $dummy.s $dummy && rmdir $tmpdir echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` exit 0 ;; + Alpha*:OpenVMS:*:*) + echo alpha-hp-vms + exit 0 ;; Alpha\ *:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # Should we change UNAME_MACHINE based on the output of uname instead @@ -321,6 +313,9 @@ *:OS/390:*:*) echo i370-ibm-openedition exit 0 ;; + *:OS400:*:*) + echo powerpc-ibm-os400 + exit 0 ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} exit 0;; @@ -338,6 +333,9 @@ NILE*:*:*:dcosx) echo pyramid-pyramid-svr4 exit 0 ;; + DRS?6000:unix:4.0:6*) + echo sparc-icl-nx6 + exit 0 ;; DRS?6000:UNIX_SV:4.2*:7*) case `/usr/bin/uname -p` in sparc) echo sparc-icl-nx7 && exit 0 ;; @@ -410,6 +408,9 @@ *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) echo m68k-unknown-mint${UNAME_RELEASE} exit 0 ;; + m68k:machten:*:*) + echo m68k-apple-machten${UNAME_RELEASE} + exit 0 ;; powerpc:machten:*:*) echo powerpc-apple-machten${UNAME_RELEASE} exit 0 ;; @@ -450,8 +451,7 @@ EOF $CC_FOR_BUILD -o $dummy $dummy.c \ && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ - && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0 - rm -f $dummy.c $dummy && rmdir $tmpdir + && exit 0 echo mips-mips-riscos${UNAME_RELEASE} exit 0 ;; Motorola:PowerMAX_OS:*:*) @@ -535,8 +535,7 @@ exit(0); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0 - rm -f $dummy.c $dummy && rmdir $tmpdir + $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 echo rs6000-ibm-aix3.2.5 elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then echo rs6000-ibm-aix3.2.4 @@ -635,10 +634,20 @@ } EOF (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` - if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi - rm -f $dummy.c $dummy && rmdir $tmpdir + test -z "$HP_ARCH" && HP_ARCH=hppa fi ;; esac + if [ ${HP_ARCH} = "hppa2.0w" ] + then + # avoid double evaluation of $set_cc_for_build + test -n "$CC_FOR_BUILD" || eval $set_cc_for_build + if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null + then + HP_ARCH="hppa2.0w" + else + HP_ARCH="hppa64" + fi + fi echo ${HP_ARCH}-hp-hpux${HPUX_REV} exit 0 ;; ia64:HP-UX:*:*) @@ -672,8 +681,7 @@ exit (0); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0 - rm -f $dummy.c $dummy && rmdir $tmpdir + $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 echo unknown-hitachi-hiuxwe2 exit 0 ;; 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) @@ -731,21 +739,26 @@ CRAY*TS:*:*:*) echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; - CRAY*T3D:*:*:*) - echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; CRAY*T3E:*:*:*) echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; CRAY*SV1:*:*:*) echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; + *:UNICOS/mp:*:*) + echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit 0 ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit 0 ;; + 5000:UNIX_System_V:4.*:*) + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` + FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` + echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" + exit 0 ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} exit 0 ;; @@ -767,8 +780,10 @@ #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` - rm -f $dummy.c && rmdir $tmpdir - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC} + # GNU/KFreeBSD systems have a "k" prefix to indicate we are using + # FreeBSD's kernel, but not the complete OS. + case ${LIBC} in gnu) kernel_only='k' ;; esac + echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC} exit 0 ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin @@ -779,8 +794,8 @@ i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 exit 0 ;; - x86:Interix*:3*) - echo i586-pc-interix3 + x86:Interix*:[34]*) + echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//' exit 0 ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks @@ -801,14 +816,22 @@ echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit 0 ;; *:GNU:*:*) + # the GNU system echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` exit 0 ;; + *:GNU/*:*:*) + # other systems with GNU libc and userland + echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu + exit 0 ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix exit 0 ;; arm*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit 0 ;; + cris:Linux:*:*) + echo cris-axis-linux-gnu + exit 0 ;; ia64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit 0 ;; @@ -832,7 +855,6 @@ #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` - rm -f $dummy.c && rmdir $tmpdir test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 ;; mips64:Linux:*:*) @@ -852,7 +874,6 @@ #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` - rm -f $dummy.c && rmdir $tmpdir test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 ;; ppc:Linux:*:*) @@ -889,6 +910,9 @@ s390:Linux:*:* | s390x:Linux:*:*) echo ${UNAME_MACHINE}-ibm-linux exit 0 ;; + sh64*:Linux:*:*) + echo ${UNAME_MACHINE}-unknown-linux-gnu + exit 0 ;; sh*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu exit 0 ;; @@ -946,9 +970,11 @@ LIBC=gnuaout #endif #endif + #ifdef __dietlibc__ + LIBC=dietlibc + #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` - rm -f $dummy.c && rmdir $tmpdir test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0 test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 ;; @@ -977,6 +1003,9 @@ i*86:atheos:*:*) echo ${UNAME_MACHINE}-unknown-atheos exit 0 ;; + i*86:syllable:*:*) + echo ${UNAME_MACHINE}-pc-syllable + exit 0 ;; i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) echo i386-unknown-lynxos${UNAME_RELEASE} exit 0 ;; @@ -1048,7 +1077,7 @@ exit 0 ;; M68*:*:R3V[567]*:*) test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; - 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0) + 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0) OS_REL='' test -r /etc/.relid \ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` @@ -1146,7 +1175,11 @@ echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} exit 0 ;; *:Darwin:*:*) - echo `uname -p`-apple-darwin${UNAME_RELEASE} + case `uname -p` in + *86) UNAME_PROCESSOR=i686 ;; + powerpc) UNAME_PROCESSOR=powerpc ;; + esac + echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} exit 0 ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) UNAME_PROCESSOR=`uname -p` @@ -1159,7 +1192,7 @@ *:QNX:*:4*) echo i386-pc-qnx exit 0 ;; - NSR-[DGKLNPTVW]:NONSTOP_KERNEL:*:*) + NSR-?:NONSTOP_KERNEL:*:*) echo nsr-tandem-nsk${UNAME_RELEASE} exit 0 ;; *:NonStop-UX:*:*) @@ -1200,6 +1233,12 @@ *:ITS:*:*) echo pdp10-unknown-its exit 0 ;; + SEI:*:*:SEIUX) + echo mips-sei-seiux${UNAME_RELEASE} + exit 0 ;; + *:DragonFly:*:*) + echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + exit 0 ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 @@ -1320,8 +1359,7 @@ } EOF -$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0 -rm -f $dummy.c $dummy && rmdir $tmpdir +$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0 # Apollos put the system type in the environment. --- iconv.m4 DELETED --- --- uintmax_t.m4 DELETED --- --- nls.m4 DELETED --- --- po.m4 DELETED --- --- intdiv0.m4 DELETED --- --- lib-ld.m4 DELETED --- --- ax_type_socklen_t.m4 DELETED --- --- isc-posix.m4 DELETED --- --- lcmessage.m4 DELETED --- --- inttypes-pri.m4 DELETED --- --- glibc21.m4 DELETED --- --- lib-link.m4 DELETED --- --- inttypes_h.m4 DELETED --- --- progtest.m4 DELETED --- --- stdint_h.m4 DELETED --- Index: config.sub =================================================================== RCS file: /cvsroot/super-tux/supertux/mk/autoconf/config.sub,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- config.sub 23 Nov 2004 16:47:24 -0000 1.1 +++ config.sub 25 Nov 2004 01:09:01 -0000 1.2 @@ -1,9 +1,9 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003 Free Software Foundation, Inc. -timestamp='2002-11-30' +timestamp='2004-02-11' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -118,7 +118,8 @@ # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in - nto-qnx* | linux-gnu* | freebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) + nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \ + kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; @@ -228,13 +229,14 @@ | a29k \ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ + | am33_2.0 \ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ - | clipper \ + | c4x | clipper \ | d10v | d30v | dlx | dsp16xx \ | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | i370 | i860 | i960 | ia64 \ - | ip2k \ + | ip2k | iq2000 \ | m32r | m68000 | m68k | m88k | mcore \ | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ @@ -245,21 +247,24 @@ | mips64vr4300 | mips64vr4300el \ | mips64vr5000 | mips64vr5000el \ | mipsisa32 | mipsisa32el \ + | mipsisa32r2 | mipsisa32r2el \ | mipsisa64 | mipsisa64el \ + | mipsisa64r2 | mipsisa64r2el \ | mipsisa64sb1 | mipsisa64sb1el \ | mipsisa64sr71k | mipsisa64sr71kel \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ + | msp430 \ | ns16k | ns32k \ | openrisc | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ - | sh | sh[1234] | sh3e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ + | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \ | strongarm \ - | tahoe | thumb | tic80 | tron \ + | tahoe | thumb | tic4x | tic80 | tron \ | v850 | v850e \ | we32k \ | x86 | xscale | xstormy16 | xtensa \ @@ -294,7 +299,7 @@ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* \ | bs2000-* \ - | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* \ + | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ | clipper-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ @@ -302,7 +307,7 @@ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | i*86-* | i860-* | i960-* | ia64-* \ - | ip2k-* \ + | ip2k-* | iq2000-* \ | m32r-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ | m88110-* | m88k-* | mcore-* \ @@ -315,21 +320,26 @@ | mips64vr4300-* | mips64vr4300el-* \ | mips64vr5000-* | mips64vr5000el-* \ | mipsisa32-* | mipsisa32el-* \ + | mipsisa32r2-* | mipsisa32r2el-* \ | mipsisa64-* | mipsisa64el-* \ + | mipsisa64r2-* | mipsisa64r2el-* \ | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ - | mipstx39 | mipstx39el \ - | none-* | np1-* | ns16k-* | ns32k-* \ + | mipstx39-* | mipstx39el-* \ + | msp430-* \ + | none-* | np1-* | nv1-* | ns16k-* | ns32k-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | pyramid-* \ | romp-* | rs6000-* \ - | sh-* | sh[1234]-* | sh3e-* | sh[34]eb-* | shbe-* \ + | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \ | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ - | tahoe-* | thumb-* | tic30-* | tic4x-* | tic54x-* | tic80-* | tron-* \ + | tahoe-* | thumb-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ + | tron-* \ | v850-* | v850e-* | vax-* \ | we32k-* \ | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \ @@ -353,6 +363,9 @@ basic_machine=a29k-amd os=-udi ;; + abacus) + basic_machine=abacus-unknown + ;; adobe68k) basic_machine=m68010-adobe os=-scout @@ -367,6 +380,12 @@ basic_machine=a29k-none os=-bsd ;; + amd64) + basic_machine=x86_64-pc + ;; + amd64-*) + basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; amdahl) basic_machine=580-amdahl os=-sysv @@ -426,6 +445,10 @@ basic_machine=j90-cray os=-unicos ;; + cr16c) + basic_machine=cr16c-unknown + os=-elf + ;; crds | unos) basic_machine=m68k-crds ;; @@ -716,6 +739,10 @@ np1) basic_machine=np1-gould ;; + nv1) + basic_machine=nv1-cray + os=-unicosmp + ;; nsr-tandem) basic_machine=nsr-tandem ;; @@ -727,6 +754,10 @@ basic_machine=or32-unknown os=-coff ;; + os400) + basic_machine=powerpc-ibm + os=-os400 + ;; OSE68000 | ose68000) basic_machine=m68000-ericsson os=-ose @@ -758,18 +789,24 @@ pentiumpro | p6 | 6x86 | athlon | athlon_*) basic_machine=i686-pc ;; - pentiumii | pentium2) + pentiumii | pentium2 | pentiumiii | pentium3) basic_machine=i686-pc ;; + pentium4) + basic_machine=i786-pc + ;; pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` ;; pentiumpro-* | p6-* | 6x86-* | athlon-*) basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` ;; - pentiumii-* | pentium2-*) + pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` ;; + pentium4-*) + basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` + ;; pn) basic_machine=pn-gould ;; @@ -828,6 +865,10 @@ sb1el) basic_machine=mipsisa64sb1el-unknown ;; + sei) + basic_machine=mips-sei + os=-seiux + ;; sequent) basic_machine=i386-sequent ;; @@ -835,6 +876,9 @@ basic_machine=sh-hitachi os=-hms ;; + sh64) + basic_machine=sh64-unknown + ;; sparclite-wrs | simso-wrs) basic_machine=sparclite-wrs os=-vxworks @@ -901,10 +945,6 @@ basic_machine=i386-sequent os=-dynix ;; - t3d) - basic_machine=alpha-cray - os=-unicos - ;; t3e) basic_machine=alphaev5-cray os=-unicos @@ -913,14 +953,18 @@ basic_machine=t90-cray os=-unicos ;; - tic4x | c4x*) - basic_machine=tic4x-unknown - os=-coff - ;; tic54x | c54x*) basic_machine=tic54x-unknown os=-coff ;; + tic55x | c55x*) + basic_machine=tic55x-unknown + os=-coff + ;; + tic6x | c6x*) + basic_machine=tic6x-unknown + os=-coff + ;; tx39) basic_machine=mipstx39-unknown ;; @@ -934,6 +978,10 @@ tower | tower-32) basic_machine=m68k-ncr ;; + tpf) + basic_machine=s390x-ibm + os=-tpf + ;; udi29k) basic_machine=a29k-amd os=-udi @@ -1023,7 +1071,7 @@ we32k) basic_machine=we32k-att ;; - sh3 | sh4 | sh3eb | sh4eb | sh[1234]le | sh3ele) + sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=sh-unknown ;; sh64) @@ -1102,19 +1150,19 @@ | -aos* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \ - | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ + | -hiux* | -386bsd* | -knetbsd* | -netbsd* | -openbsd* | -ekkobsd* | -kfreebsd* | -freebsd* \ + | -riscix* | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -chorusos* | -chorusrdb* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \ + | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ - | -powermax* | -dnix*) + | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1138,6 +1186,9 @@ -mac*) os=`echo $os | sed -e 's|mac|macos|'` ;; + -linux-dietlibc) + os=-linux-dietlibc + ;; -linux*) os=`echo $os | sed -e 's|linux|linux-gnu|'` ;; @@ -1150,6 +1201,9 @@ -opened*) os=-openedition ;; + -os400*) + os=-os400 + ;; -wince*) os=-wince ;; @@ -1171,6 +1225,9 @@ -atheos*) os=-atheos ;; + -syllable*) + os=-syllable + ;; -386bsd) os=-bsd ;; @@ -1193,6 +1250,9 @@ -sinix*) os=-sysv4 ;; + -tpf*) + os=-tpf + ;; -triton*) os=-sysv3 ;; @@ -1223,6 +1283,12 @@ -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) os=-mint ;; + -aros*) + os=-aros + ;; + -kaos*) + os=-kaos + ;; -none) ;; *) @@ -1254,6 +1320,9 @@ arm*-semi) os=-aout ;; + c4x-* | tic4x-*) + os=-coff + ;; # This must come before the *-dec entry. pdp10-*) os=-tops20 @@ -1432,9 +1501,15 @@ -mvs* | -opened*) vendor=ibm ;; + -os400*) + vendor=ibm + ;; -ptx*) vendor=sequent ;; + -tpf*) + vendor=ibm + ;; -vxsim* | -vxworks* | -windiss*) vendor=wrs ;; --- codeset.m4 DELETED --- --- gettext.m4 DELETED --- --- inttypes.m4 DELETED --- --- ulonglong.m4 DELETED --- --- lib-prefix.m4 DELETED --- |
|
From: Matze B. <mat...@us...> - 2004-11-25 00:53:04
|
Update of /cvsroot/super-tux/supertux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8367 Removed Files: ABOUT-NLS Log Message: this file contains mostly misinformation now, that we use tinygettext --- ABOUT-NLS DELETED --- |
248 messages has been excluded from this view by a project administrator.
