rpms/scorched3d/devel scorched3d-41.1-64bit.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 scorched3d-help.patch, 1.4, 1.5 scorched3d-syslibs.patch, 1.5, 1.6 scorched3d.spec, 1.25, 1.26 sources, 1.6, 1.7 scorched3d-openal.patch, 1.2, NONE scorched3d-wx26.patch, 1.2, NONE scorched3d-wx28.patch, 1.1, NONE
Hans de Goede (jwrdegoede)
fedora-extras-commits at redhat.com
Tue Nov 6 21:32:12 UTC 2007
Author: jwrdegoede
Update of /cvs/extras/rpms/scorched3d/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7280
Modified Files:
.cvsignore scorched3d-help.patch scorched3d-syslibs.patch
scorched3d.spec sources
Added Files:
scorched3d-41.1-64bit.patch
Removed Files:
scorched3d-openal.patch scorched3d-wx26.patch
scorched3d-wx28.patch
Log Message:
* Tue Nov 6 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 41.1-1
- New upstream release 41.1
scorched3d-41.1-64bit.patch:
--- NEW FILE scorched3d-41.1-64bit.patch ---
diff -ur scorched/src/actions/AddTarget.cpp scorched.cvs/src/actions/AddTarget.cpp
--- scorched/src/actions/AddTarget.cpp 2007-09-10 00:14:37.000000000 +0200
+++ scorched.cvs/src/actions/AddTarget.cpp 2007-11-05 22:01:35.000000000 +0100
@@ -58,7 +58,7 @@
if (context_->optionsGame->getActionSyncCheck())
{
context_->actionController->addSyncCheck(
- formatString("AddTarget : %u %s %li,%li,%li",
+ formatString("AddTarget : %u %s %i,%i,%i",
playerId,
target->getName(),
position_[0].getInternal(),
diff -ur scorched/src/actions/Explosion.cpp scorched.cvs/src/actions/Explosion.cpp
--- scorched/src/actions/Explosion.cpp 2007-10-22 00:06:58.000000000 +0200
+++ scorched.cvs/src/actions/Explosion.cpp 2007-11-05 22:01:35.000000000 +0100
@@ -215,7 +215,7 @@
const char *Explosion::getActionDetails()
{
- return formatString("%li,%li,%li %s",
+ return formatString("%i,%i,%i %s",
position_[0].getInternal(), position_[1].getInternal(), position_[2].getInternal(),
weapon_->getParent()->getName());
}
diff -ur scorched/src/actions/Laser.cpp scorched.cvs/src/actions/Laser.cpp
--- scorched/src/actions/Laser.cpp 2007-09-03 00:48:48.000000000 +0200
+++ scorched.cvs/src/actions/Laser.cpp 2007-11-05 22:01:35.000000000 +0100
@@ -71,7 +71,7 @@
const char *Laser::getActionDetails()
{
- return formatString("%li,%li,%li %li,%li,%li %s",
+ return formatString("%i,%i,%i %i,%i,%i %s",
position_[0].getInternal(), position_[1].getInternal(), position_[2].getInternal(),
direction_[0].getInternal(), direction_[1].getInternal(), direction_[2].getInternal(),
weapon_->getParent()->getName());
diff -ur scorched/src/actions/Lightning.cpp scorched.cvs/src/actions/Lightning.cpp
--- scorched/src/actions/Lightning.cpp 2007-09-03 00:48:49.000000000 +0200
+++ scorched.cvs/src/actions/Lightning.cpp 2007-11-05 22:01:36.000000000 +0100
@@ -81,7 +81,7 @@
const char *Lightning::getActionDetails()
{
- return formatString("%li,%li,%li %li,%li,%li %s",
+ return formatString("%i,%i,%i %i,%i,%i %s",
position_[0].getInternal(), position_[1].getInternal(), position_[2].getInternal(),
velocity_[0].getInternal(), velocity_[1].getInternal(), velocity_[2].getInternal(),
weapon_->getParent()->getName());
diff -ur scorched/src/actions/Resurrection.cpp scorched.cvs/src/actions/Resurrection.cpp
--- scorched/src/actions/Resurrection.cpp 2007-09-10 00:14:37.000000000 +0200
+++ scorched.cvs/src/actions/Resurrection.cpp 2007-11-05 22:01:36.000000000 +0100
@@ -68,7 +68,7 @@
if (context_->optionsGame->getActionSyncCheck())
{
context_->actionController->addSyncCheck(
- formatString("TankRez: %u %li, %li, %li",
+ formatString("TankRez: %u %i, %i, %i",
tank->getPlayerId(),
position_[0].getInternal(),
position_[1].getInternal(),
diff -ur scorched/src/actions/ShotBounce.cpp scorched.cvs/src/actions/ShotBounce.cpp
--- scorched/src/actions/ShotBounce.cpp 2007-09-03 00:48:49.000000000 +0200
+++ scorched.cvs/src/actions/ShotBounce.cpp 2007-11-05 22:01:36.000000000 +0100
@@ -68,7 +68,7 @@
const char *ShotBounce::getActionDetails()
{
- return formatString("%li,%li,%li %li,%li,%li %s",
+ return formatString("%i,%i,%i %i,%i,%i %s",
startPosition_[0].getInternal(), startPosition_[1].getInternal(), startPosition_[2].getInternal(),
velocity_[0].getInternal(), velocity_[1].getInternal(), velocity_[2].getInternal(),
weapon_->getParent()->getName());
diff -ur scorched/src/actions/ShotProjectile.cpp scorched.cvs/src/actions/ShotProjectile.cpp
--- scorched/src/actions/ShotProjectile.cpp 2007-10-07 16:23:43.000000000 +0200
+++ scorched.cvs/src/actions/ShotProjectile.cpp 2007-11-05 22:01:36.000000000 +0100
@@ -71,7 +71,7 @@
const char *ShotProjectile::getActionDetails()
{
- return formatString("%li,%li,%li %li,%li,%li %s",
+ return formatString("%i,%i,%i %i,%i,%i %s",
startPosition_[0].getInternal(), startPosition_[1].getInternal(), startPosition_[2].getInternal(),
velocity_[0].getInternal(), velocity_[1].getInternal(), velocity_[2].getInternal(),
weapon_->getParent()->getName());
diff -ur scorched/src/actions/TankDamage.cpp scorched.cvs/src/actions/TankDamage.cpp
--- scorched/src/actions/TankDamage.cpp 2007-10-20 19:54:40.000000000 +0200
+++ scorched.cvs/src/actions/TankDamage.cpp 2007-11-05 22:01:36.000000000 +0100
@@ -77,7 +77,7 @@
const char *TankDamage::getActionDetails()
{
- return formatString("%u %li %s",
+ return formatString("%u %i %s",
damagedPlayerId_, damage_.getInternal(), weapon_->getParent()->getName());
}
@@ -192,7 +192,7 @@
if (context_->optionsGame->getActionSyncCheck())
{
context_->actionController->addSyncCheck(
- formatString("TankDamage: %u %li",
+ formatString("TankDamage: %u %i",
damagedTarget->getPlayerId(),
damagedTarget->getLife().getLife().getInternal()));
}
diff -ur scorched/src/actions/TankFalling.cpp scorched.cvs/src/actions/TankFalling.cpp
--- scorched/src/actions/TankFalling.cpp 2007-10-22 00:06:59.000000000 +0200
+++ scorched.cvs/src/actions/TankFalling.cpp 2007-11-05 22:01:37.000000000 +0100
@@ -156,7 +156,7 @@
if (context_->optionsGame->getActionSyncCheck())
{
context_->actionController->addSyncCheck(
- formatString("TankFalling: %u %li, %li, %li",
+ formatString("TankFalling: %u %i, %i, %i",
current->getPlayerId(),
position.getPosition()[0].getInternal(),
position.getPosition()[1].getInternal(),
diff -ur scorched/src/actions/Teleport.cpp scorched.cvs/src/actions/Teleport.cpp
--- scorched/src/actions/Teleport.cpp 2007-09-10 00:14:37.000000000 +0200
+++ scorched.cvs/src/actions/Teleport.cpp 2007-11-05 22:01:37.000000000 +0100
@@ -120,7 +120,7 @@
if (context_->optionsGame->getActionSyncCheck())
{
context_->actionController->addSyncCheck(
- formatString("Telport: %u %li, %li, %li",
+ formatString("Telport: %u %i, %i, %i",
tank->getPlayerId(),
position_[0].getInternal(),
position_[1].getInternal(),
@@ -136,7 +136,7 @@
if (context_->optionsGame->getActionSyncCheck())
{
context_->actionController->addSyncCheck(
- formatString("Telport: %u %li, %li, %li",
+ formatString("Telport: %u %i, %i, %i",
tank->getPlayerId(),
position_[0].getInternal(),
position_[1].getInternal(),
@@ -160,7 +160,7 @@
const char *Teleport::getActionDetails()
{
- return formatString("%u %li,%li,%li %s",
+ return formatString("%u %i,%i,%i %s",
weaponContext_.getPlayerId(),
position_[0].getInternal(),
position_[1].getInternal(),
diff -ur scorched/src/common/FixedVector.cpp scorched.cvs/src/common/FixedVector.cpp
--- scorched/src/common/FixedVector.cpp 2007-09-03 00:48:49.000000000 +0200
+++ scorched.cvs/src/common/FixedVector.cpp 2007-11-05 19:03:59.000000000 +0100
@@ -39,8 +39,7 @@
root = root >> 1; \
}
-static long long
-iSqrt(long long value)
+static long long iSqrtLL(long long value)
{
long long root = 0;
@@ -71,15 +70,62 @@
return root;
}
-fixed FixedVector::Magnitude()
+static long iSqrtL(long value)
{
- long long a = ((long long)V[0].getInternal()*V[0].getInternal())/FIXED_RESOLUTION;
- long long b = ((long long)V[1].getInternal()*V[1].getInternal())/FIXED_RESOLUTION;
- long long c = ((long long)V[2].getInternal()*V[2].getInternal())/FIXED_RESOLUTION;
-
- long long res = a + b + c;
- long long result = iSqrt(res);
- result *= 100;
+ long root = 0;
+
+ sqrt_step( 0);
+ sqrt_step( 2);
+ sqrt_step( 4);
+ sqrt_step( 6);
+ sqrt_step( 8);
+ sqrt_step(10);
+ sqrt_step(12);
+ sqrt_step(14);
+ sqrt_step(16);
+ sqrt_step(18);
+ sqrt_step(20);
+ sqrt_step(22);
+ sqrt_step(24);
+ sqrt_step(26);
+ sqrt_step(28);
+ sqrt_step(30);
+
+ // round to the nearest integer, cuts max error in half
- return fixed(true, (long) result);//(V[0]*V[0] + V[1]*V[1] + V[2]*V[2]).sqrt();
+ if(root < value)
+ {
+ ++root;
+ }
+
+ return root;
+}
+
+fixed FixedVector::Magnitude()
+{
+ if (sizeof(long) == 8)
+ {
+ long a = ((long)V[0].getInternal()*V[0].getInternal())/FIXED_RESOLUTION;
+ long b = ((long)V[1].getInternal()*V[1].getInternal())/FIXED_RESOLUTION;
+ long c = ((long)V[2].getInternal()*V[2].getInternal())/FIXED_RESOLUTION;
+
+ long res = a + b + c;
+ long result = iSqrtL(res);
+ result *= 100;
+
+ return fixed(true, (int) result);
+ }
+ else if (sizeof(long long) == 8)
+ {
+ long long a = ((long long)V[0].getInternal()*V[0].getInternal())/FIXED_RESOLUTION;
+ long long b = ((long long)V[1].getInternal()*V[1].getInternal())/FIXED_RESOLUTION;
+ long long c = ((long long)V[2].getInternal()*V[2].getInternal())/FIXED_RESOLUTION;
+
+ long long res = a + b + c;
+ long long result = iSqrtLL(res);
+ result *= 100;
+
+ return fixed(true, (int) result);
+ }
+ return fixed(0);
}
diff -ur scorched/src/common/RandomGenerator.cpp scorched.cvs/src/common/RandomGenerator.cpp
--- scorched/src/common/RandomGenerator.cpp 2007-09-03 00:48:49.000000000 +0200
+++ scorched.cvs/src/common/RandomGenerator.cpp 2007-11-05 02:28:09.000000000 +0100
@@ -23,7 +23,6 @@
#include <SDL/SDL_net.h>
#include <stdlib.h>
#include <stdio.h>
-#include <limits.h>
// Yes you guessed it, a really sucky way to create cross platform
// random numbers. Store them in a file and read them in each system!
@@ -82,12 +81,6 @@
return lvalue | rvalue;
}
-/*float RandomGenerator::getRandFloat()
-{
- unsigned int y = getRandUInt();
- return float(y) / float(UINT_MAX);
-}*/
-
fixed RandomGenerator::getRandFixed()
{
unsigned int rd = getRandUInt();
diff -ur scorched/src/common/fixed.cpp scorched.cvs/src/common/fixed.cpp
--- scorched/src/common/fixed.cpp 2007-09-29 13:33:35.000000000 +0200
+++ scorched.cvs/src/common/fixed.cpp 2007-11-05 22:01:37.000000000 +0100
@@ -23,8 +23,8 @@
#include "fixed.h"
#include <math.h>
#include <stdlib.h>
-#include <limits.h>
#include <string.h>
+#include <limits.h>
#include <common/DefinesAssert.h>
#include <common/DefinesString.h>
#include <common/Logger.h>
@@ -42,7 +42,37 @@
#define _XLN_10 23025 // 2.30258509299404568402
#define XLN_10 fixed(true,_XLN_10)
-fixed fixed::MAX_FIXED(true, LONG_MAX);
+fixed fixed::MAX_FIXED(true, INT_MAX); // 32 bit
+
+inline int fixed_internal_mult(int a, int b)
+{
+ int c = 0;
+ if (sizeof(long) == 8)
+ {
+ c = (int)((((long)a)*((long)b))/FIXED_RESOLUTION);
+ }
+ else if (sizeof(long long) == 8)
+ {
+ c = (int)((((long long)a)*((long long)b))/FIXED_RESOLUTION);
+ }
+ return c;
+}
+
+inline int fixed_internal_div(int a, int b)
+{
+ if(b == 0) return 0xFFFFFFF;
+
+ int c = 0;
+ if (sizeof(long) == 8)
+ {
+ c = (int)((((long)a)*((long)FIXED_RESOLUTION))/b);
+ }
+ else if (sizeof(long long) == 8)
+ {
+ c = (int)((((long long)a)*((long long)FIXED_RESOLUTION))/b);
+ }
+ return c;
+}
fixed::fixed(const char *nVal)
{
@@ -80,8 +110,8 @@
f[fp] = '\0';
DIALOG_ASSERT(ip < 15 && fp < 15);
- long ipa = atol(i);
- long fpa = atol(f);
+ int ipa = atoi(i);
+ int fpa = atoi(f);
m_nVal = ipa * FIXED_RESOLUTION + fpa;
if (neg) m_nVal =- m_nVal;
@@ -95,12 +125,12 @@
char buffer[15];
if (m_nVal < 0)
{
- snprintf(buffer, 15, "%li", -m_nVal);
+ snprintf(buffer, 15, "%i", -m_nVal);
result[r++] = '-';
}
else
{
- snprintf(buffer, 15, "%li", m_nVal);
+ snprintf(buffer, 15, "%i", m_nVal);
}
int len = strlen(buffer);
@@ -138,41 +168,23 @@
fixed fixed::operator*(fixed b)
{
- fixed a;
- a.m_nVal = (long)(((long long)m_nVal*b.m_nVal)/FIXED_RESOLUTION);
-
- if (a.getInternal() < 0 && m_nVal > 0 && b.m_nVal > 0)
- {
- Logger::log("Fixed overflow");
- }
-
- return a;
+ return fixed(true, fixed_internal_mult(m_nVal, b.m_nVal));
}
fixed fixed::operator/(fixed b)
{
- if( b == fixed(0) ) return fixed(true, 0xFFFFFFFL);
- fixed a;
- a.m_nVal = (long)(((long long)m_nVal*FIXED_RESOLUTION/b.m_nVal));
- return a;
+ return fixed(true, fixed_internal_div(m_nVal, b.m_nVal));
}
-fixed fixed::operator*=(fixed val)
+fixed fixed::operator*=(fixed b)
{
- long res = (long)(((long long)m_nVal*val.m_nVal)/FIXED_RESOLUTION);
-
- if (res < 0 && m_nVal > 0 && val.m_nVal > 0)
- {
- Logger::log("Fixed overflow");
- }
- m_nVal = res;
-
+ m_nVal = fixed_internal_mult(m_nVal, b.m_nVal);
return *this;
}
-fixed fixed::operator/=(fixed val)
+fixed fixed::operator/=(fixed b)
{
- m_nVal = (long)(((long long)m_nVal*FIXED_RESOLUTION)/val.m_nVal);
+ m_nVal = fixed_internal_div(m_nVal, b.m_nVal);
return *this;
}
@@ -187,10 +199,9 @@
root = root >> 1; \
}
-static long
-iSqrt(long value)
+static int iSqrt(int value)
{
- long root = 0;
+ int root = 0;
sqrt_step( 0);
sqrt_step( 2);
@@ -231,8 +242,7 @@
*/
-static
-fixed iLog2( fixed p_Base )
+static fixed iLog2( fixed p_Base )
{
fixed w = 0;
fixed y = 0;
@@ -266,8 +276,7 @@
*/
-static
-fixed iExp2(fixed p_Base)
+static fixed iExp2(fixed p_Base)
{
fixed w;
fixed y;
@@ -279,8 +288,7 @@
return y;
}
-static
-fixed ipow( fixed p_Base, fixed p_Power )
+static fixed ipow( fixed p_Base, fixed p_Power )
{
if( p_Base < fixed(0) && p_Power%2 != fixed(0) )
return - iExp2( (p_Power * iLog2( -p_Base )) );
@@ -288,15 +296,14 @@
return iExp2( (p_Power * iLog2(absx( p_Base ))) );
}
-static
-fixed ilog10( fixed p_Base )
+static fixed ilog10( fixed p_Base )
{
return iLog2( p_Base ) / XLN_10;
}
fixed fixed::sqrt()
{
- long val = iSqrt(m_nVal);
+ int val = iSqrt(m_nVal);
val *= 100;
return fixed(true, val);
}
@@ -370,11 +377,10 @@
//
// Only accurate from -PI/2 to PI/2
-static
-fixed _sinx(fixed x)
+static fixed _sinx(fixed x)
{
fixed xpwr;
- long xftl;
+ int xftl;
fixed xresult;
bool positive;
@@ -383,7 +389,7 @@
xftl = 1;
positive = true;
- // Note: 12! largest for long
+ // Note: 12! largest for int
for(int i = 1; i < 7; i+=2)
{
if( positive )
@@ -487,7 +493,7 @@
fixed fixed::fromFloat(float flt)
{
fixed result;
- result.m_nVal = long(flt * FIXED_RESOLUTION_FLOAT);
+ result.m_nVal = int(flt * FIXED_RESOLUTION_FLOAT);
return result;
}
diff -ur scorched/src/common/fixed.h scorched.cvs/src/common/fixed.h
--- scorched/src/common/fixed.h 2007-09-10 00:14:37.000000000 +0200
+++ scorched.cvs/src/common/fixed.h 2007-11-05 19:03:59.000000000 +0100
@@ -25,13 +25,13 @@
#ifndef _FIXED_H
#define _FIXED_H
-#define FIXED_RESOLUTION 10000L
+#define FIXED_RESOLUTION 10000
#define FIXED_RESOLUTION_FLOAT 10000.0f
class fixed
{
private:
- long m_nVal;
+ int m_nVal;
public:
fixed()
{
@@ -43,7 +43,7 @@
m_nVal = fixedVal.m_nVal;
}
- fixed(bool bInternal, long nVal)
+ fixed(bool bInternal, int nVal)
{
m_nVal = nVal;
}
@@ -53,11 +53,6 @@
m_nVal = nVal*FIXED_RESOLUTION;
}
- fixed(long nVal)
- {
- m_nVal = nVal*FIXED_RESOLUTION;
- }
-
fixed(int nVal)
{
m_nVal = nVal*FIXED_RESOLUTION;
@@ -134,7 +129,7 @@
return (int)(m_nVal/FIXED_RESOLUTION);
}
- long getInternal()
+ int getInternal()
{
return m_nVal;
}
diff -ur scorched/src/coms/ComsSyncCheckMessage.cpp scorched.cvs/src/coms/ComsSyncCheckMessage.cpp
--- scorched/src/coms/ComsSyncCheckMessage.cpp 2007-09-28 14:21:55.000000000 +0200
+++ scorched.cvs/src/coms/ComsSyncCheckMessage.cpp 2007-11-05 22:01:37.000000000 +0100
@@ -175,7 +175,7 @@
if (actualheight != sentheight)
{
- syncCheckLog(formatStringBuffer("%li %li",
+ syncCheckLog(formatStringBuffer("%i %i",
actualheight.getInternal(), sentheight.getInternal()));
heightDiffs++;
}
diff -ur scorched/src/engine/ActionController.cpp scorched.cvs/src/engine/ActionController.cpp
--- scorched/src/engine/ActionController.cpp 2007-09-12 19:00:01.000000000 +0200
+++ scorched.cvs/src/engine/ActionController.cpp 2007-11-05 22:01:37.000000000 +0100
@@ -188,7 +188,7 @@
if (context_->optionsGame->getActionSyncCheck())
{
addSyncCheck(
- formatString("Add Action : %li %s:%s",
+ formatString("Add Action : %i %s:%s",
time_.getInternal(),
action->getActionType(),
action->getActionDetails()));
@@ -307,7 +307,7 @@
if (context_->optionsGame->getActionSyncCheck())
{
addSyncCheck(
- formatString("Rm Action : %li %s:%s",
+ formatString("Rm Action : %i %s:%s",
time_.getInternal(),
act->getActionType(),
act->getActionDetails()));
diff -ur scorched/src/engine/PhysicsParticleObject.cpp scorched.cvs/src/engine/PhysicsParticleObject.cpp
--- scorched/src/engine/PhysicsParticleObject.cpp 2007-10-27 22:49:54.000000000 +0200
+++ scorched.cvs/src/engine/PhysicsParticleObject.cpp 2007-11-05 22:01:37.000000000 +0100
@@ -121,7 +121,7 @@
if (context_->optionsGame->getActionSyncCheck())
{
context_->actionController->addSyncCheck(
- formatString("Shot Collision : %i %i %li,%li,%li",
+ formatString("Shot Collision : %i %i %i,%i,%i",
(int) action,
(int) collision.collisionId,
position_[0].getInternal(),
diff -ur scorched/src/engine/ShotState.cpp scorched.cvs/src/engine/ShotState.cpp
--- scorched/src/engine/ShotState.cpp 2007-09-12 19:00:02.000000000 +0200
+++ scorched.cvs/src/engine/ShotState.cpp 2007-11-05 22:01:37.000000000 +0100
@@ -80,7 +80,7 @@
!target->isTarget())
{
context_.actionController->addSyncCheck(
- formatString("TargetDef : %u %s %li %li,%li,%li %li,%li,%li %s",
+ formatString("TargetDef : %u %s %i %i,%i,%i %i,%i,%i %s",
target->getPlayerId(),
target->getName(),
target->getLife().getLife().getInternal(),
diff -ur scorched/src/landscapemap/DeformLandscape.cpp scorched.cvs/src/landscapemap/DeformLandscape.cpp
--- scorched/src/landscapemap/DeformLandscape.cpp 2007-09-10 00:14:37.000000000 +0200
+++ scorched.cvs/src/landscapemap/DeformLandscape.cpp 2007-11-05 22:01:37.000000000 +0100
@@ -39,7 +39,7 @@
if (context.optionsGame->getActionSyncCheck())
{
context.actionController->addSyncCheck(
- formatString("Deform : %li,%li,%li %li %s",
+ formatString("Deform : %i,%i,%i %i %s",
pos[0].getInternal(), pos[1].getInternal(), pos[2].getInternal(),
radius.getInternal(), (down?"Down":"Up")));
}
@@ -143,7 +143,7 @@
if (context.optionsGame->getActionSyncCheck())
{
context.actionController->addSyncCheck(
- formatString("Flatten : %li,%li,%li %li",
+ formatString("Flatten : %i,%i,%i %i",
tankPos[0].getInternal(), tankPos[1].getInternal(), tankPos[2].getInternal(),
size.getInternal()));
}
diff -ur scorched/src/target/TargetSpace.cpp scorched.cvs/src/target/TargetSpace.cpp
--- scorched/src/target/TargetSpace.cpp 2007-10-20 19:54:40.000000000 +0200
+++ scorched.cvs/src/target/TargetSpace.cpp 2007-11-05 22:01:38.000000000 +0100
@@ -179,7 +179,7 @@
std::string targets;
if (result)
{
- targets.append(formatString("%u:%li,%li,%li ",
+ targets.append(formatString("%u:%i,%i,%i ",
result->getPlayerId(),
result->getLife().getTargetPosition()[0].getInternal(),
result->getLife().getTargetPosition()[1].getInternal(),
@@ -187,7 +187,7 @@
}
context_->actionController->addSyncCheck(
- formatString("CollisionSet : %li,%li,%li %s",
+ formatString("CollisionSet : %i,%i,%i %s",
position[0].getInternal(),
position[1].getInternal(),
position[2].getInternal(),
@@ -266,7 +266,7 @@
itor != collisionTargets.end();
itor++)
{
- targets.append(formatString("%u:%li,%li,%li ",
+ targets.append(formatString("%u:%i,%i,%i ",
itor->second->getPlayerId(),
itor->second->getLife().getTargetPosition()[0].getInternal(),
itor->second->getLife().getTargetPosition()[1].getInternal(),
@@ -274,7 +274,7 @@
}
context_->actionController->addSyncCheck(
- formatString("CollisionSet : %li,%li,%li %li \"%s\"",
+ formatString("CollisionSet : %i,%i,%i %i \"%s\"",
position[0].getInternal(),
position[1].getInternal(),
position[2].getInternal(),
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scorched3d/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore 22 Nov 2006 22:14:14 -0000 1.6
+++ .cvsignore 6 Nov 2007 21:31:37 -0000 1.7
@@ -1 +1 @@
-Scorched3D-40.1d-src.tar.gz
+Scorched3D-41.1-src.tar.gz
scorched3d-help.patch:
Index: scorched3d-help.patch
===================================================================
RCS file: /cvs/extras/rpms/scorched3d/devel/scorched3d-help.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- scorched3d-help.patch 2 Nov 2006 20:45:26 -0000 1.4
+++ scorched3d-help.patch 6 Nov 2007 21:31:37 -0000 1.5
@@ -1,11 +1,11 @@
-diff -ur scorched.orig/src/scorched/MainDialog.cpp scorched/src/scorched/MainDialog.cpp
---- scorched.orig/src/scorched/MainDialog.cpp 2006-05-14 17:00:11.000000000 +0200
-+++ scorched/src/scorched/MainDialog.cpp 2006-07-16 11:05:27.000000000 +0200
-@@ -122,8 +122,8 @@
+diff -up scorched/src/common/DefinesScorched.cpp.help scorched/src/common/DefinesScorched.cpp
+--- scorched/src/common/DefinesScorched.cpp.help 2007-10-15 21:06:24.000000000 +0200
++++ scorched/src/common/DefinesScorched.cpp 2007-10-15 21:07:15.000000000 +0200
+@@ -55,8 +55,8 @@ void showURL(const char *url)
#ifdef __DARWIN__
system(formatString("open %s", url));
#else
-- system(formatString("mozilla %s", url));
+- system(formatString("firefox %s", url));
- dialogMessage("Web site location", formatString("%s", url));
+ system(formatString("htmlview %s&", url));
+// dialogMessage("Web site location", formatString("%s", url));
scorched3d-syslibs.patch:
Index: scorched3d-syslibs.patch
===================================================================
RCS file: /cvs/extras/rpms/scorched3d/devel/scorched3d-syslibs.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- scorched3d-syslibs.patch 18 Apr 2007 13:46:04 -0000 1.5
+++ scorched3d-syslibs.patch 6 Nov 2007 21:31:37 -0000 1.6
@@ -1,27 +1,6 @@
---- scorched/src/coms/NetServerProtocol.cpp.syslibs 2006-08-04 15:35:15.000000000 +0200
-+++ scorched/src/coms/NetServerProtocol.cpp 2006-10-31 20:11:27.000000000 +0100
-@@ -22,7 +22,7 @@
- #include <coms/NetMessagePool.h>
- #include <coms/NetServerRead.h>
- #include <common/Logger.h>
--#include <zlib/zlib.h>
-+#include <zlib.h>
-
- NetServerProtocol::NetServerProtocol()
- {
---- scorched/src/coms/ComsMessageSender.cpp.syslibs 2006-09-08 17:07:59.000000000 +0200
-+++ scorched/src/coms/ComsMessageSender.cpp 2006-10-31 20:11:27.000000000 +0100
-@@ -27,7 +27,7 @@
- #include <tank/TankContainer.h>
- #include <client/ScorchedClient.h>
- #include <server/ScorchedServer.h>
--#include <zlib/zlib.h>
-+#include <zlib.h>
- #include <set>
-
- bool ComsMessageSender::sendToServer(ComsMessage &message)
+diff -up scorched/src/XML/XMLParser.h.syslibs scorched/src/XML/XMLParser.h
--- scorched/src/XML/XMLParser.h.syslibs 2006-05-01 01:42:52.000000000 +0200
-+++ scorched/src/XML/XMLParser.h 2006-10-31 20:11:27.000000000 +0100
++++ scorched/src/XML/XMLParser.h 2007-10-31 20:45:00.000000000 +0100
@@ -21,7 +21,7 @@
#if !defined(__INCLUDE_XMLParserh_INCLUDE__)
#define __INCLUDE_XMLParserh_INCLUDE__
@@ -31,1112 +10,628 @@
#include <XML/XMLNode.h>
class XMLParser
---- scorched/src/scorched/Makefile.am.syslibs 2006-10-27 20:48:23.000000000 +0200
-+++ scorched/src/scorched/Makefile.am 2006-10-31 20:12:35.000000000 +0100
-@@ -271,7 +271,6 @@
- ../common/Vector4.h \
- ../common/VectorLib.cpp \
- ../common/VectorLib.h \
+diff -up scorched/src/scorcheds/Makefile.am.syslibs scorched/src/scorcheds/Makefile.am
+--- scorched/src/scorcheds/Makefile.am.syslibs 2007-10-31 11:12:14.000000000 +0100
++++ scorched/src/scorcheds/Makefile.am 2007-10-31 20:45:00.000000000 +0100
+@@ -113,7 +113,6 @@ scorched3ds_SOURCES = \
+ ../common/ProgressCounter.h \
+ ../common/RandomGenerator.cpp \
+ ../common/RandomGenerator.h \
- ../common/snprintf.c \
- ../3dsparse/ASEModelFactory.cpp \
- ../3dsparse/ASEModelFactory.h \
- ../3dsparse/Bone.cpp \
-@@ -637,96 +636,6 @@
- ../weapons/WeaponTypeAction.h \
- ../weapons/WeaponVelocity.cpp \
- ../weapons/WeaponVelocity.h \
-- ../ode/array.cpp \
-- ../ode/array.h \
-- ../ode/collision.h \
-- ../ode/collision_kernel.cpp \
-- ../ode/collision_kernel.h \
-- ../ode/collision_quadtreespace.cpp \
-- ../ode/collision_space.cpp \
-- ../ode/collision_space.h \
-- ../ode/collision_space_internal.h \
-- ../ode/collision_std.cpp \
-- ../ode/collision_std.h \
-- ../ode/collision_transform.cpp \
-- ../ode/collision_transform.h \
-- ../ode/collision_trimesh.h \
-- ../ode/collision_util.cpp \
-- ../ode/collision_util.h \
-- ../ode/common.h \
-- ../ode/compatibility.h \
-- ../ode/contact.h \
-- ../ode/error.cpp \
-- ../ode/error.h \
-- ../ode/export-dif.cpp \
-- ../ode/export-dif.h \
-- ../ode/fastdot.c \
-- ../ode/fastldlt.c \
-- ../ode/fastlsolve.c \
-- ../ode/fastltsolve.c \
-- ../ode/joint.cpp \
-- ../ode/joint.h \
-- ../ode/lcp.cpp \
-- ../ode/lcp.h \
-- ../ode/mass.cpp \
-- ../ode/mass.h \
-- ../ode/mat.cpp \
-- ../ode/mat.h \
-- ../ode/matrix.cpp \
-- ../ode/matrix.h \
-- ../ode/memory.cpp \
-- ../ode/memory.h \
-- ../ode/misc.cpp \
-- ../ode/misc.h \
-- ../ode/objects-internal.h \
-- ../ode/objects.h \
-- ../ode/obstack.cpp \
-- ../ode/obstack.h \
-- ../ode/ode.cpp \
-- ../ode/ode.h \
-- ../ode/odecpp.h \
-- ../ode/odecpp_collision.h \
-- ../ode/odecpp_old.h \
-- ../ode/odemath.cpp \
-- ../ode/odemath.h \
-- ../ode/quickstep.cpp \
-- ../ode/quickstep.h \
-- ../ode/rotation.cpp \
-- ../ode/rotation.h \
-- ../ode/step.cpp \
-- ../ode/step.h \
-- ../ode/stepfast.cpp \
-- ../ode/testing.cpp \
-- ../ode/testing.h \
-- ../ode/timer.cpp \
-- ../ode/timer.h \
-- ../ode/util.cpp \
-- ../ode/util.h \
-- ../zlib/adler32.c \
-- ../zlib/compress.c \
-- ../zlib/crc32.c \
-- ../zlib/deflate.c \
-- ../zlib/deflate.h \
-- ../zlib/gzio.c \
-- ../zlib/infblock.c \
-- ../zlib/infblock.h \
-- ../zlib/infcodes.c \
-- ../zlib/infcodes.h \
-- ../zlib/inffast.c \
-- ../zlib/inffast.h \
-- ../zlib/inffixed.h \
-- ../zlib/inflate.c \
-- ../zlib/inftrees.c \
-- ../zlib/inftrees.h \
-- ../zlib/infutil.c \
-- ../zlib/infutil.h \
-- ../zlib/trees.c \
-- ../zlib/trees.h \
-- ../zlib/uncompr.c \
-- ../zlib/zconf.h \
-- ../zlib/zlib.h \
-- ../zlib/zutil.c \
-- ../zlib/zutil.h \
- ../actions/AddTarget.cpp \
- ../actions/AddTarget.h \
- ../actions/Animation.cpp \
-@@ -1134,14 +1043,6 @@
+ ../common/SplineCurve.cpp \
+ ../common/SplineCurve.h \
+ ../common/SplinePath.cpp \
+@@ -347,29 +346,14 @@ scorched3ds_SOURCES = \
+ ../net/NetServerUDP.h \
+ ../net/NetServerUDPDestination.cpp \
+ ../net/NetServerUDPDestination.h \
+- ../XML/ascii.h \
+- ../XML/asciitab.h \
+- ../XML/expat.h \
+- ../XML/expat_config.h \
+- ../XML/iasciitab.h \
+- ../XML/internal.h \
+- ../XML/latin1tab.h \
+- ../XML/nametab.h \
+- ../XML/utf8tab.h \
+- ../XML/winconfig.h \
+ ../XML/XMLFile.cpp \
+ ../XML/XMLFile.h \
+ ../XML/XMLNode.cpp \
+ ../XML/XMLNode.h \
+- ../XML/xmlparse.c \
+ ../XML/XMLParser.cpp \
../XML/XMLParser.h \
+- ../XML/xmlrole.c \
+- ../XML/xmlrole.h \
../XML/XMLStringBuffer.cpp \
../XML/XMLStringBuffer.h \
+- ../XML/xmltok.c \
+- ../XML/xmltok.h \
+ ../engine/Action.cpp \
+ ../engine/Action.h \
+ ../engine/ActionController.cpp \
+@@ -790,5 +774,5 @@ scorched3ds_SOURCES = \
+ ../movement/TargetMovementEntrySpline.h
+
+ AM_CPPFLAGS = -I../porting -I.. -DS3D_SERVER=1 @SDL_CFLAGS@ @MYSQL_CFLAGS@
+-LDADD = @SDL_LIBS@ @MYSQL_LIBS@
++LDADD = @SDL_LIBS@ @MYSQL_LIBS@ -lexpat
+
+diff -up scorched/src/scorcheds/Makefile.in.syslibs scorched/src/scorcheds/Makefile.in
+--- scorched/src/scorcheds/Makefile.in.syslibs 2007-10-31 11:20:54.000000000 +0100
++++ scorched/src/scorcheds/Makefile.in 2007-10-31 20:46:32.000000000 +0100
+@@ -72,7 +72,7 @@ am_scorched3ds_OBJECTS = AddTarget.$(OBJ
+ OptionsGame.$(OBJEXT) OptionsMasterListServer.$(OBJEXT) \
+ OptionsParameters.$(OBJEXT) OptionsScorched.$(OBJEXT) \
+ OptionsTransient.$(OBJEXT) ProgressCounter.$(OBJEXT) \
+- RandomGenerator.$(OBJEXT) snprintf.$(OBJEXT) \
++ RandomGenerator.$(OBJEXT) \
+ SplineCurve.$(OBJEXT) SplinePath.$(OBJEXT) \
+ StatsLogger.$(OBJEXT) StatsLoggerDatabase.$(OBJEXT) \
+ StatsLoggerFile.$(OBJEXT) StatsLoggerMySQL.$(OBJEXT) \
+@@ -140,9 +140,8 @@ am_scorched3ds_OBJECTS = AddTarget.$(OBJ
+ NetOptions.$(OBJEXT) NetServerTCP.$(OBJEXT) \
+ NetServerTCPProtocol.$(OBJEXT) NetServerTCPRead.$(OBJEXT) \
+ NetServerUDP.$(OBJEXT) NetServerUDPDestination.$(OBJEXT) \
+- XMLFile.$(OBJEXT) XMLNode.$(OBJEXT) xmlparse.$(OBJEXT) \
+- XMLParser.$(OBJEXT) xmlrole.$(OBJEXT) \
+- XMLStringBuffer.$(OBJEXT) xmltok.$(OBJEXT) Action.$(OBJEXT) \
++ XMLFile.$(OBJEXT) XMLNode.$(OBJEXT) XMLParser.$(OBJEXT) \
++ XMLStringBuffer.$(OBJEXT) Action.$(OBJEXT) \
+ ActionController.$(OBJEXT) ActionReferenced.$(OBJEXT) \
+ EventContainer.$(OBJEXT) GameState.$(OBJEXT) \
+ GameStateI.$(OBJEXT) GameStateStimulusI.$(OBJEXT) \
+@@ -511,7 +510,6 @@ scorched3ds_SOURCES = \
+ ../common/ProgressCounter.h \
+ ../common/RandomGenerator.cpp \
+ ../common/RandomGenerator.h \
+- ../common/snprintf.c \
+ ../common/SplineCurve.cpp \
+ ../common/SplineCurve.h \
+ ../common/SplinePath.cpp \
+@@ -745,29 +743,14 @@ scorched3ds_SOURCES = \
+ ../net/NetServerUDP.h \
+ ../net/NetServerUDPDestination.cpp \
+ ../net/NetServerUDPDestination.h \
+- ../XML/ascii.h \
+- ../XML/asciitab.h \
- ../XML/expat.h \
- ../XML/expat_config.h \
+- ../XML/iasciitab.h \
+- ../XML/internal.h \
+- ../XML/latin1tab.h \
+- ../XML/nametab.h \
+- ../XML/utf8tab.h \
- ../XML/winconfig.h \
+ ../XML/XMLFile.cpp \
+ ../XML/XMLFile.h \
+ ../XML/XMLNode.cpp \
+ ../XML/XMLNode.h \
- ../XML/xmlparse.c \
+ ../XML/XMLParser.cpp \
+ ../XML/XMLParser.h \
- ../XML/xmlrole.c \
- ../XML/xmlrole.h \
+ ../XML/XMLStringBuffer.cpp \
+ ../XML/XMLStringBuffer.h \
- ../XML/xmltok.c \
- ../XML/xmltok.h \
- ../target/Target.cpp \
- ../target/Target.h \
- ../target/TargetContainer.cpp \
---- scorched/src/scorched/Makefile.in.syslibs 2006-10-30 19:10:42.000000000 +0100
-+++ scorched/src/scorched/Makefile.in 2006-10-31 20:19:02.000000000 +0100
-@@ -372,7 +372,6 @@
- ../common/Vector4.h \
- ../common/VectorLib.cpp \
- ../common/VectorLib.h \
+ ../engine/Action.cpp \
+ ../engine/Action.h \
+ ../engine/ActionController.cpp \
+@@ -1188,7 +1171,7 @@ scorched3ds_SOURCES = \
+ ../movement/TargetMovementEntrySpline.h
+
+ AM_CPPFLAGS = -I../porting -I.. -DS3D_SERVER=1 @SDL_CFLAGS@ @MYSQL_CFLAGS@
+-LDADD = @SDL_LIBS@ @MYSQL_LIBS@
++LDADD = @SDL_LIBS@ @MYSQL_LIBS@ -lexpat
+ all: all-am
+
+ .SUFFIXES:
+@@ -1639,10 +1622,6 @@ distclean-compile:
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/aseFile.tab.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/fixed.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/main.Po at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/snprintf.Po at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/xmlparse.Po at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/xmlrole.Po at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/xmltok.Po at am__quote@
+
+ .c.o:
+ @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@@ -1658,62 +1637,6 @@ distclean-compile:
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+-snprintf.o: ../common/snprintf.c
+- at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT snprintf.o -MD -MP -MF $(DEPDIR)/snprintf.Tpo -c -o snprintf.o `test -f '../common/snprintf.c' || echo '$(srcdir)/'`../common/snprintf.c
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/snprintf.Tpo $(DEPDIR)/snprintf.Po
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../common/snprintf.c' object='snprintf.o' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o snprintf.o `test -f '../common/snprintf.c' || echo '$(srcdir)/'`../common/snprintf.c
+-
+-snprintf.obj: ../common/snprintf.c
+- at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT snprintf.obj -MD -MP -MF $(DEPDIR)/snprintf.Tpo -c -o snprintf.obj `if test -f '../common/snprintf.c'; then $(CYGPATH_W) '../common/snprintf.c'; else $(CYGPATH_W) '$(srcdir)/../common/snprintf.c'; fi`
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/snprintf.Tpo $(DEPDIR)/snprintf.Po
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../common/snprintf.c' object='snprintf.obj' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o snprintf.obj `if test -f '../common/snprintf.c'; then $(CYGPATH_W) '../common/snprintf.c'; else $(CYGPATH_W) '$(srcdir)/../common/snprintf.c'; fi`
+-
+-xmlparse.o: ../XML/xmlparse.c
+- at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xmlparse.o -MD -MP -MF $(DEPDIR)/xmlparse.Tpo -c -o xmlparse.o `test -f '../XML/xmlparse.c' || echo '$(srcdir)/'`../XML/xmlparse.c
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/xmlparse.Tpo $(DEPDIR)/xmlparse.Po
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../XML/xmlparse.c' object='xmlparse.o' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xmlparse.o `test -f '../XML/xmlparse.c' || echo '$(srcdir)/'`../XML/xmlparse.c
+-
+-xmlparse.obj: ../XML/xmlparse.c
+- at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xmlparse.obj -MD -MP -MF $(DEPDIR)/xmlparse.Tpo -c -o xmlparse.obj `if test -f '../XML/xmlparse.c'; then $(CYGPATH_W) '../XML/xmlparse.c'; else $(CYGPATH_W) '$(srcdir)/../XML/xmlparse.c'; fi`
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/xmlparse.Tpo $(DEPDIR)/xmlparse.Po
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../XML/xmlparse.c' object='xmlparse.obj' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xmlparse.obj `if test -f '../XML/xmlparse.c'; then $(CYGPATH_W) '../XML/xmlparse.c'; else $(CYGPATH_W) '$(srcdir)/../XML/xmlparse.c'; fi`
+-
+-xmlrole.o: ../XML/xmlrole.c
+- at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xmlrole.o -MD -MP -MF $(DEPDIR)/xmlrole.Tpo -c -o xmlrole.o `test -f '../XML/xmlrole.c' || echo '$(srcdir)/'`../XML/xmlrole.c
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/xmlrole.Tpo $(DEPDIR)/xmlrole.Po
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../XML/xmlrole.c' object='xmlrole.o' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xmlrole.o `test -f '../XML/xmlrole.c' || echo '$(srcdir)/'`../XML/xmlrole.c
+-
+-xmlrole.obj: ../XML/xmlrole.c
+- at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xmlrole.obj -MD -MP -MF $(DEPDIR)/xmlrole.Tpo -c -o xmlrole.obj `if test -f '../XML/xmlrole.c'; then $(CYGPATH_W) '../XML/xmlrole.c'; else $(CYGPATH_W) '$(srcdir)/../XML/xmlrole.c'; fi`
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/xmlrole.Tpo $(DEPDIR)/xmlrole.Po
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../XML/xmlrole.c' object='xmlrole.obj' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xmlrole.obj `if test -f '../XML/xmlrole.c'; then $(CYGPATH_W) '../XML/xmlrole.c'; else $(CYGPATH_W) '$(srcdir)/../XML/xmlrole.c'; fi`
+-
+-xmltok.o: ../XML/xmltok.c
+- at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xmltok.o -MD -MP -MF $(DEPDIR)/xmltok.Tpo -c -o xmltok.o `test -f '../XML/xmltok.c' || echo '$(srcdir)/'`../XML/xmltok.c
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/xmltok.Tpo $(DEPDIR)/xmltok.Po
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../XML/xmltok.c' object='xmltok.o' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xmltok.o `test -f '../XML/xmltok.c' || echo '$(srcdir)/'`../XML/xmltok.c
+-
+-xmltok.obj: ../XML/xmltok.c
+- at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xmltok.obj -MD -MP -MF $(DEPDIR)/xmltok.Tpo -c -o xmltok.obj `if test -f '../XML/xmltok.c'; then $(CYGPATH_W) '../XML/xmltok.c'; else $(CYGPATH_W) '$(srcdir)/../XML/xmltok.c'; fi`
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/xmltok.Tpo $(DEPDIR)/xmltok.Po
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../XML/xmltok.c' object='xmltok.obj' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xmltok.obj `if test -f '../XML/xmltok.c'; then $(CYGPATH_W) '../XML/xmltok.c'; else $(CYGPATH_W) '$(srcdir)/../XML/xmltok.c'; fi`
+-
+ .cpp.o:
+ @am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+diff -up scorched/src/scorched/Makefile.am.syslibs scorched/src/scorched/Makefile.am
+--- scorched/src/scorched/Makefile.am.syslibs 2007-10-14 23:05:52.000000000 +0200
++++ scorched/src/scorched/Makefile.am 2007-10-31 20:45:00.000000000 +0100
+@@ -63,7 +63,6 @@ scorched3d_SOURCES = \
+ ../common/ProgressCounter.h \
+ ../common/RandomGenerator.cpp \
+ ../common/RandomGenerator.h \
- ../common/snprintf.c \
- ../3dsparse/ASEModelFactory.cpp \
- ../3dsparse/ASEModelFactory.h \
- ../3dsparse/Bone.cpp \
-@@ -738,96 +737,6 @@
- ../weapons/WeaponTypeAction.h \
- ../weapons/WeaponVelocity.cpp \
- ../weapons/WeaponVelocity.h \
-- ../ode/array.cpp \
-- ../ode/array.h \
-- ../ode/collision.h \
-- ../ode/collision_kernel.cpp \
-- ../ode/collision_kernel.h \
-- ../ode/collision_quadtreespace.cpp \
-- ../ode/collision_space.cpp \
-- ../ode/collision_space.h \
-- ../ode/collision_space_internal.h \
-- ../ode/collision_std.cpp \
-- ../ode/collision_std.h \
-- ../ode/collision_transform.cpp \
-- ../ode/collision_transform.h \
-- ../ode/collision_trimesh.h \
-- ../ode/collision_util.cpp \
-- ../ode/collision_util.h \
-- ../ode/common.h \
-- ../ode/compatibility.h \
-- ../ode/contact.h \
-- ../ode/error.cpp \
-- ../ode/error.h \
-- ../ode/export-dif.cpp \
-- ../ode/export-dif.h \
-- ../ode/fastdot.c \
-- ../ode/fastldlt.c \
-- ../ode/fastlsolve.c \
-- ../ode/fastltsolve.c \
-- ../ode/joint.cpp \
-- ../ode/joint.h \
-- ../ode/lcp.cpp \
-- ../ode/lcp.h \
-- ../ode/mass.cpp \
-- ../ode/mass.h \
-- ../ode/mat.cpp \
-- ../ode/mat.h \
-- ../ode/matrix.cpp \
-- ../ode/matrix.h \
-- ../ode/memory.cpp \
-- ../ode/memory.h \
-- ../ode/misc.cpp \
-- ../ode/misc.h \
-- ../ode/objects-internal.h \
-- ../ode/objects.h \
-- ../ode/obstack.cpp \
-- ../ode/obstack.h \
-- ../ode/ode.cpp \
-- ../ode/ode.h \
-- ../ode/odecpp.h \
-- ../ode/odecpp_collision.h \
-- ../ode/odecpp_old.h \
-- ../ode/odemath.cpp \
-- ../ode/odemath.h \
-- ../ode/quickstep.cpp \
-- ../ode/quickstep.h \
-- ../ode/rotation.cpp \
-- ../ode/rotation.h \
-- ../ode/step.cpp \
-- ../ode/step.h \
-- ../ode/stepfast.cpp \
-- ../ode/testing.cpp \
-- ../ode/testing.h \
-- ../ode/timer.cpp \
-- ../ode/timer.h \
-- ../ode/util.cpp \
-- ../ode/util.h \
-- ../zlib/adler32.c \
-- ../zlib/compress.c \
-- ../zlib/crc32.c \
-- ../zlib/deflate.c \
-- ../zlib/deflate.h \
-- ../zlib/gzio.c \
-- ../zlib/infblock.c \
-- ../zlib/infblock.h \
-- ../zlib/infcodes.c \
-- ../zlib/infcodes.h \
-- ../zlib/inffast.c \
-- ../zlib/inffast.h \
-- ../zlib/inffixed.h \
-- ../zlib/inflate.c \
-- ../zlib/inftrees.c \
-- ../zlib/inftrees.h \
-- ../zlib/infutil.c \
-- ../zlib/infutil.h \
-- ../zlib/trees.c \
-- ../zlib/trees.h \
-- ../zlib/uncompr.c \
-- ../zlib/zconf.h \
-- ../zlib/zlib.h \
-- ../zlib/zutil.c \
-- ../zlib/zutil.h \
- ../actions/AddTarget.cpp \
- ../actions/AddTarget.h \
- ../actions/Animation.cpp \
-@@ -1235,14 +1144,6 @@
+ ../common/Vector.cpp \
+ ../common/Vector.h \
+ ../common/Vector4.cpp \
+@@ -78,29 +77,14 @@ scorched3d_SOURCES = \
+ ../net/NetInterface.h \
+ ../net/UniqueIdStore.cpp \
+ ../net/UniqueIdStore.h \
+- ../XML/ascii.h \
+- ../XML/asciitab.h \
+- ../XML/expat.h \
+- ../XML/expat_config.h \
+- ../XML/iasciitab.h \
+- ../XML/internal.h \
+- ../XML/latin1tab.h \
+- ../XML/nametab.h \
+- ../XML/utf8tab.h \
+- ../XML/winconfig.h \
+ ../XML/XMLFile.cpp \
+ ../XML/XMLFile.h \
+ ../XML/XMLNode.cpp \
+ ../XML/XMLNode.h \
+- ../XML/xmlparse.c \
+ ../XML/XMLParser.cpp \
../XML/XMLParser.h \
+- ../XML/xmlrole.c \
+- ../XML/xmlrole.h \
../XML/XMLStringBuffer.cpp \
../XML/XMLStringBuffer.h \
+- ../XML/xmltok.c \
+- ../XML/xmltok.h \
+ ../tankai/TankAINames.cpp \
+ ../tankai/TankAINames.h \
+ ../landscapedef/LandscapeDefinitionsBase.cpp \
+@@ -122,5 +106,5 @@ scorched3d_SOURCES = \
+ ../wxdialogs/SettingsDialog.h
+
+ AM_CPPFLAGS = -I../porting -I.. @WX_CFLAGS@ @FT2_CFLAGS@ @SDL_CFLAGS@
+-LDADD = @WX_LIBS@ @FT2_LIBS@ @SDL_LIBS@
++LDADD = @WX_LIBS@ @FT2_LIBS@ @SDL_LIBS@ -lexpat
+
+diff -up scorched/src/scorched/Makefile.in.syslibs scorched/src/scorched/Makefile.in
+--- scorched/src/scorched/Makefile.in.syslibs 2007-10-31 11:20:47.000000000 +0100
++++ scorched/src/scorched/Makefile.in 2007-10-31 20:45:00.000000000 +0100
+@@ -62,12 +62,11 @@ am_scorched3d_OBJECTS = main.$(OBJEXT) S
+ OptionEntry.$(OBJEXT) OptionsGame.$(OBJEXT) \
+ OptionsMasterListServer.$(OBJEXT) OptionsParameters.$(OBJEXT) \
+ ProgressCounter.$(OBJEXT) RandomGenerator.$(OBJEXT) \
+- snprintf.$(OBJEXT) Vector.$(OBJEXT) Vector4.$(OBJEXT) \
++ Vector.$(OBJEXT) Vector4.$(OBJEXT) \
+ VectorLib.$(OBJEXT) NetBuffer.$(OBJEXT) \
+ NetBufferPool.$(OBJEXT) NetInterface.$(OBJEXT) \
+ UniqueIdStore.$(OBJEXT) XMLFile.$(OBJEXT) XMLNode.$(OBJEXT) \
+- xmlparse.$(OBJEXT) XMLParser.$(OBJEXT) xmlrole.$(OBJEXT) \
+- XMLStringBuffer.$(OBJEXT) xmltok.$(OBJEXT) \
++ XMLParser.$(OBJEXT) XMLStringBuffer.$(OBJEXT) \
+ TankAINames.$(OBJEXT) LandscapeDefinitionsBase.$(OBJEXT) \
+ CreateDialogs.$(OBJEXT) DialogUtils.$(OBJEXT) \
+ DisplayDialog.$(OBJEXT) KeyDialog.$(OBJEXT) \
+@@ -289,7 +288,6 @@ scorched3d_SOURCES = \
+ ../common/ProgressCounter.h \
+ ../common/RandomGenerator.cpp \
+ ../common/RandomGenerator.h \
+- ../common/snprintf.c \
+ ../common/Vector.cpp \
+ ../common/Vector.h \
+ ../common/Vector4.cpp \
+@@ -304,29 +302,14 @@ scorched3d_SOURCES = \
+ ../net/NetInterface.h \
+ ../net/UniqueIdStore.cpp \
+ ../net/UniqueIdStore.h \
+- ../XML/ascii.h \
+- ../XML/asciitab.h \
- ../XML/expat.h \
- ../XML/expat_config.h \
+- ../XML/iasciitab.h \
+- ../XML/internal.h \
+- ../XML/latin1tab.h \
+- ../XML/nametab.h \
+- ../XML/utf8tab.h \
- ../XML/winconfig.h \
+ ../XML/XMLFile.cpp \
+ ../XML/XMLFile.h \
+ ../XML/XMLNode.cpp \
+ ../XML/XMLNode.h \
- ../XML/xmlparse.c \
+ ../XML/XMLParser.cpp \
+ ../XML/XMLParser.h \
- ../XML/xmlrole.c \
- ../XML/xmlrole.h \
+ ../XML/XMLStringBuffer.cpp \
+ ../XML/XMLStringBuffer.h \
- ../XML/xmltok.c \
- ../XML/xmltok.h \
- ../target/Target.cpp \
- ../target/Target.h \
- ../target/TargetContainer.cpp \
-@@ -1471,7 +1372,7 @@
- SplinePath.$(OBJEXT) StatsLogger.$(OBJEXT) \
- StatsLoggerFile.$(OBJEXT) StatsLoggerMySQL.$(OBJEXT) \
- Triangle.$(OBJEXT) Vector.$(OBJEXT) Vector4.$(OBJEXT) \
-- VectorLib.$(OBJEXT) snprintf.$(OBJEXT) \
-+ VectorLib.$(OBJEXT) \
- ASEModelFactory.$(OBJEXT) Bone.$(OBJEXT) Face.$(OBJEXT) \
- ImageID.$(OBJEXT) ImageStore.$(OBJEXT) MSModelFactory.$(OBJEXT) \
- Mesh.$(OBJEXT) MeshLOD.$(OBJEXT) MeshLODTri.$(OBJEXT) \
-@@ -1558,22 +1459,7 @@
- WeaponTankPosition.$(OBJEXT) WeaponTankVelocity.$(OBJEXT) \
- WeaponTeamAction.$(OBJEXT) WeaponTeleport.$(OBJEXT) \
- WeaponTranslate.$(OBJEXT) WeaponTypeAction.$(OBJEXT) \
-- WeaponVelocity.$(OBJEXT) array.$(OBJEXT) \
-- collision_kernel.$(OBJEXT) collision_quadtreespace.$(OBJEXT) \
-- collision_space.$(OBJEXT) collision_std.$(OBJEXT) \
-- collision_transform.$(OBJEXT) collision_util.$(OBJEXT) \
-- error.$(OBJEXT) export-dif.$(OBJEXT) fastdot.$(OBJEXT) \
-- fastldlt.$(OBJEXT) fastlsolve.$(OBJEXT) fastltsolve.$(OBJEXT) \
-- joint.$(OBJEXT) lcp.$(OBJEXT) mass.$(OBJEXT) mat.$(OBJEXT) \
-- matrix.$(OBJEXT) memory.$(OBJEXT) misc.$(OBJEXT) \
-- obstack.$(OBJEXT) ode.$(OBJEXT) odemath.$(OBJEXT) \
-- quickstep.$(OBJEXT) rotation.$(OBJEXT) step.$(OBJEXT) \
-- stepfast.$(OBJEXT) testing.$(OBJEXT) timer.$(OBJEXT) \
-- util.$(OBJEXT) adler32.$(OBJEXT) compress.$(OBJEXT) \
-- crc32.$(OBJEXT) deflate.$(OBJEXT) gzio.$(OBJEXT) \
-- infblock.$(OBJEXT) infcodes.$(OBJEXT) inffast.$(OBJEXT) \
-- inflate.$(OBJEXT) inftrees.$(OBJEXT) infutil.$(OBJEXT) \
-- trees.$(OBJEXT) uncompr.$(OBJEXT) zutil.$(OBJEXT) \
-+ WeaponVelocity.$(OBJEXT) \
- AddTarget.$(OBJEXT) Animation.$(OBJEXT) \
- CallbackWeapon.$(OBJEXT) CameraPositionAction.$(OBJEXT) \
- Explosion.$(OBJEXT) Laser.$(OBJEXT) Lightning.$(OBJEXT) \
-@@ -1677,7 +1563,6 @@
- TankAIStrings.$(OBJEXT) ScorchedShips.$(OBJEXT) Ship.$(OBJEXT) \
- ShipGroup.$(OBJEXT) XMLFile.$(OBJEXT) XMLNode.$(OBJEXT) \
- XMLParser.$(OBJEXT) XMLStringBuffer.$(OBJEXT) \
-- xmlparse.$(OBJEXT) xmlrole.$(OBJEXT) xmltok.$(OBJEXT) \
- Target.$(OBJEXT) TargetContainer.$(OBJEXT) \
- TargetDamageCalc.$(OBJEXT) TargetDefinition.$(OBJEXT) \
- TargetGroupEntry.$(OBJEXT) TargetLife.$(OBJEXT) \
-@@ -2252,36 +2137,9 @@
- @AMDEP_TRUE@ ./$(DEPDIR)/WindowSetup.Po ./$(DEPDIR)/XMLFile.Po \
- @AMDEP_TRUE@ ./$(DEPDIR)/XMLNode.Po ./$(DEPDIR)/XMLParser.Po \
- @AMDEP_TRUE@ ./$(DEPDIR)/XMLStringBuffer.Po \
-- at AMDEP_TRUE@ ./$(DEPDIR)/adler32.Po ./$(DEPDIR)/array.Po \
- @AMDEP_TRUE@ ./$(DEPDIR)/aseFile.lex.Po \
- @AMDEP_TRUE@ ./$(DEPDIR)/aseFile.tab.Po \
-- at AMDEP_TRUE@ ./$(DEPDIR)/collision_kernel.Po \
-- at AMDEP_TRUE@ ./$(DEPDIR)/collision_quadtreespace.Po \
-- at AMDEP_TRUE@ ./$(DEPDIR)/collision_space.Po \
-- at AMDEP_TRUE@ ./$(DEPDIR)/collision_std.Po \
-- at AMDEP_TRUE@ ./$(DEPDIR)/collision_transform.Po \
-- at AMDEP_TRUE@ ./$(DEPDIR)/collision_util.Po \
-- at AMDEP_TRUE@ ./$(DEPDIR)/compress.Po ./$(DEPDIR)/crc32.Po \
-- at AMDEP_TRUE@ ./$(DEPDIR)/deflate.Po ./$(DEPDIR)/error.Po \
-- at AMDEP_TRUE@ ./$(DEPDIR)/export-dif.Po ./$(DEPDIR)/fastdot.Po \
-- at AMDEP_TRUE@ ./$(DEPDIR)/fastldlt.Po ./$(DEPDIR)/fastlsolve.Po \
-- at AMDEP_TRUE@ ./$(DEPDIR)/fastltsolve.Po ./$(DEPDIR)/gzio.Po \
-- at AMDEP_TRUE@ ./$(DEPDIR)/infblock.Po ./$(DEPDIR)/infcodes.Po \
-- at AMDEP_TRUE@ ./$(DEPDIR)/inffast.Po ./$(DEPDIR)/inflate.Po \
-- at AMDEP_TRUE@ ./$(DEPDIR)/inftrees.Po ./$(DEPDIR)/infutil.Po \
-- at AMDEP_TRUE@ ./$(DEPDIR)/joint.Po ./$(DEPDIR)/lcp.Po \
-- at AMDEP_TRUE@ ./$(DEPDIR)/main.Po ./$(DEPDIR)/mass.Po \
-- at AMDEP_TRUE@ ./$(DEPDIR)/mat.Po ./$(DEPDIR)/matrix.Po \
-- at AMDEP_TRUE@ ./$(DEPDIR)/memory.Po ./$(DEPDIR)/misc.Po \
-- at AMDEP_TRUE@ ./$(DEPDIR)/obstack.Po ./$(DEPDIR)/ode.Po \
-- at AMDEP_TRUE@ ./$(DEPDIR)/odemath.Po ./$(DEPDIR)/quickstep.Po \
-- at AMDEP_TRUE@ ./$(DEPDIR)/rotation.Po ./$(DEPDIR)/snprintf.Po \
-- at AMDEP_TRUE@ ./$(DEPDIR)/step.Po ./$(DEPDIR)/stepfast.Po \
-- at AMDEP_TRUE@ ./$(DEPDIR)/testing.Po ./$(DEPDIR)/timer.Po \
-- at AMDEP_TRUE@ ./$(DEPDIR)/trees.Po ./$(DEPDIR)/uncompr.Po \
-- at AMDEP_TRUE@ ./$(DEPDIR)/util.Po ./$(DEPDIR)/xmlparse.Po \
-- at AMDEP_TRUE@ ./$(DEPDIR)/xmlrole.Po ./$(DEPDIR)/xmltok.Po \
-- at AMDEP_TRUE@ ./$(DEPDIR)/zutil.Po
-+ at AMDEP_TRUE@ ./$(DEPDIR)/main.Po
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- CCLD = $(CC)
-@@ -2468,7 +2326,6 @@
- Vector.$(OBJEXT): ../common/Vector.cpp
- Vector4.$(OBJEXT): ../common/Vector4.cpp
- VectorLib.$(OBJEXT): ../common/VectorLib.cpp
--snprintf.$(OBJEXT): ../common/snprintf.c
- ASEModelFactory.$(OBJEXT): ../3dsparse/ASEModelFactory.cpp
- Bone.$(OBJEXT): ../3dsparse/Bone.cpp
- Face.$(OBJEXT): ../3dsparse/Face.cpp
-@@ -2658,50 +2515,6 @@
- WeaponTranslate.$(OBJEXT): ../weapons/WeaponTranslate.cpp
- WeaponTypeAction.$(OBJEXT): ../weapons/WeaponTypeAction.cpp
- WeaponVelocity.$(OBJEXT): ../weapons/WeaponVelocity.cpp
--array.$(OBJEXT): ../ode/array.cpp
--collision_kernel.$(OBJEXT): ../ode/collision_kernel.cpp
--collision_quadtreespace.$(OBJEXT): ../ode/collision_quadtreespace.cpp
--collision_space.$(OBJEXT): ../ode/collision_space.cpp
--collision_std.$(OBJEXT): ../ode/collision_std.cpp
--collision_transform.$(OBJEXT): ../ode/collision_transform.cpp
--collision_util.$(OBJEXT): ../ode/collision_util.cpp
--error.$(OBJEXT): ../ode/error.cpp
--export-dif.$(OBJEXT): ../ode/export-dif.cpp
--fastdot.$(OBJEXT): ../ode/fastdot.c
--fastldlt.$(OBJEXT): ../ode/fastldlt.c
--fastlsolve.$(OBJEXT): ../ode/fastlsolve.c
--fastltsolve.$(OBJEXT): ../ode/fastltsolve.c
--joint.$(OBJEXT): ../ode/joint.cpp
--lcp.$(OBJEXT): ../ode/lcp.cpp
--mass.$(OBJEXT): ../ode/mass.cpp
--mat.$(OBJEXT): ../ode/mat.cpp
--matrix.$(OBJEXT): ../ode/matrix.cpp
--memory.$(OBJEXT): ../ode/memory.cpp
--misc.$(OBJEXT): ../ode/misc.cpp
--obstack.$(OBJEXT): ../ode/obstack.cpp
--ode.$(OBJEXT): ../ode/ode.cpp
--odemath.$(OBJEXT): ../ode/odemath.cpp
--quickstep.$(OBJEXT): ../ode/quickstep.cpp
--rotation.$(OBJEXT): ../ode/rotation.cpp
--step.$(OBJEXT): ../ode/step.cpp
--stepfast.$(OBJEXT): ../ode/stepfast.cpp
--testing.$(OBJEXT): ../ode/testing.cpp
--timer.$(OBJEXT): ../ode/timer.cpp
--util.$(OBJEXT): ../ode/util.cpp
--adler32.$(OBJEXT): ../zlib/adler32.c
--compress.$(OBJEXT): ../zlib/compress.c
--crc32.$(OBJEXT): ../zlib/crc32.c
--deflate.$(OBJEXT): ../zlib/deflate.c
--gzio.$(OBJEXT): ../zlib/gzio.c
--infblock.$(OBJEXT): ../zlib/infblock.c
--infcodes.$(OBJEXT): ../zlib/infcodes.c
--inffast.$(OBJEXT): ../zlib/inffast.c
--inflate.$(OBJEXT): ../zlib/inflate.c
--inftrees.$(OBJEXT): ../zlib/inftrees.c
--infutil.$(OBJEXT): ../zlib/infutil.c
--trees.$(OBJEXT): ../zlib/trees.c
--uncompr.$(OBJEXT): ../zlib/uncompr.c
--zutil.$(OBJEXT): ../zlib/zutil.c
- AddTarget.$(OBJEXT): ../actions/AddTarget.cpp
- Animation.$(OBJEXT): ../actions/Animation.cpp
- CallbackWeapon.$(OBJEXT): ../actions/CallbackWeapon.cpp
-@@ -2902,9 +2715,6 @@
- XMLNode.$(OBJEXT): ../XML/XMLNode.cpp
- XMLParser.$(OBJEXT): ../XML/XMLParser.cpp
- XMLStringBuffer.$(OBJEXT): ../XML/XMLStringBuffer.cpp
--xmlparse.$(OBJEXT): ../XML/xmlparse.c
--xmlrole.$(OBJEXT): ../XML/xmlrole.c
--xmltok.$(OBJEXT): ../XML/xmltok.c
- Target.$(OBJEXT): ../target/Target.cpp
- TargetContainer.$(OBJEXT): ../target/TargetContainer.cpp
- TargetDamageCalc.$(OBJEXT): ../target/TargetDamageCalc.cpp
-@@ -3593,57 +3403,9 @@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/XMLNode.Po at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/XMLParser.Po at am__quote@
+ ../tankai/TankAINames.cpp \
+ ../tankai/TankAINames.h \
+ ../landscapedef/LandscapeDefinitionsBase.cpp \
+@@ -348,7 +331,7 @@ scorched3d_SOURCES = \
+ ../wxdialogs/SettingsDialog.h
+
+ AM_CPPFLAGS = -I../porting -I.. @WX_CFLAGS@ @FT2_CFLAGS@ @SDL_CFLAGS@
+-LDADD = @WX_LIBS@ @FT2_LIBS@ @SDL_LIBS@
++LDADD = @WX_LIBS@ @FT2_LIBS@ @SDL_LIBS@ -lexpat
+ all: all-am
+
+ .SUFFIXES:
+@@ -466,10 +449,6 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/XMLStringBuffer.Po at am__quote@
-- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/adler32.Po at am__quote@
-- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/array.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/fixed.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/main.Po at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/snprintf.Po at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/xmlparse.Po at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/xmlrole.Po at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/xmltok.Po at am__quote@
+
+ .c.o:
+ @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@@ -485,62 +464,6 @@ distclean-compile:
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
+
+-snprintf.o: ../common/snprintf.c
+- at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT snprintf.o -MD -MP -MF $(DEPDIR)/snprintf.Tpo -c -o snprintf.o `test -f '../common/snprintf.c' || echo '$(srcdir)/'`../common/snprintf.c
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/snprintf.Tpo $(DEPDIR)/snprintf.Po
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../common/snprintf.c' object='snprintf.o' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o snprintf.o `test -f '../common/snprintf.c' || echo '$(srcdir)/'`../common/snprintf.c
+-
+-snprintf.obj: ../common/snprintf.c
+- at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT snprintf.obj -MD -MP -MF $(DEPDIR)/snprintf.Tpo -c -o snprintf.obj `if test -f '../common/snprintf.c'; then $(CYGPATH_W) '../common/snprintf.c'; else $(CYGPATH_W) '$(srcdir)/../common/snprintf.c'; fi`
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/snprintf.Tpo $(DEPDIR)/snprintf.Po
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../common/snprintf.c' object='snprintf.obj' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o snprintf.obj `if test -f '../common/snprintf.c'; then $(CYGPATH_W) '../common/snprintf.c'; else $(CYGPATH_W) '$(srcdir)/../common/snprintf.c'; fi`
+-
+-xmlparse.o: ../XML/xmlparse.c
+- at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xmlparse.o -MD -MP -MF $(DEPDIR)/xmlparse.Tpo -c -o xmlparse.o `test -f '../XML/xmlparse.c' || echo '$(srcdir)/'`../XML/xmlparse.c
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/xmlparse.Tpo $(DEPDIR)/xmlparse.Po
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../XML/xmlparse.c' object='xmlparse.o' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xmlparse.o `test -f '../XML/xmlparse.c' || echo '$(srcdir)/'`../XML/xmlparse.c
+-
+-xmlparse.obj: ../XML/xmlparse.c
+- at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xmlparse.obj -MD -MP -MF $(DEPDIR)/xmlparse.Tpo -c -o xmlparse.obj `if test -f '../XML/xmlparse.c'; then $(CYGPATH_W) '../XML/xmlparse.c'; else $(CYGPATH_W) '$(srcdir)/../XML/xmlparse.c'; fi`
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/xmlparse.Tpo $(DEPDIR)/xmlparse.Po
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../XML/xmlparse.c' object='xmlparse.obj' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xmlparse.obj `if test -f '../XML/xmlparse.c'; then $(CYGPATH_W) '../XML/xmlparse.c'; else $(CYGPATH_W) '$(srcdir)/../XML/xmlparse.c'; fi`
+-
+-xmlrole.o: ../XML/xmlrole.c
+- at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xmlrole.o -MD -MP -MF $(DEPDIR)/xmlrole.Tpo -c -o xmlrole.o `test -f '../XML/xmlrole.c' || echo '$(srcdir)/'`../XML/xmlrole.c
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/xmlrole.Tpo $(DEPDIR)/xmlrole.Po
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../XML/xmlrole.c' object='xmlrole.o' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xmlrole.o `test -f '../XML/xmlrole.c' || echo '$(srcdir)/'`../XML/xmlrole.c
+-
+-xmlrole.obj: ../XML/xmlrole.c
+- at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xmlrole.obj -MD -MP -MF $(DEPDIR)/xmlrole.Tpo -c -o xmlrole.obj `if test -f '../XML/xmlrole.c'; then $(CYGPATH_W) '../XML/xmlrole.c'; else $(CYGPATH_W) '$(srcdir)/../XML/xmlrole.c'; fi`
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/xmlrole.Tpo $(DEPDIR)/xmlrole.Po
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../XML/xmlrole.c' object='xmlrole.obj' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xmlrole.obj `if test -f '../XML/xmlrole.c'; then $(CYGPATH_W) '../XML/xmlrole.c'; else $(CYGPATH_W) '$(srcdir)/../XML/xmlrole.c'; fi`
+-
+-xmltok.o: ../XML/xmltok.c
+- at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xmltok.o -MD -MP -MF $(DEPDIR)/xmltok.Tpo -c -o xmltok.o `test -f '../XML/xmltok.c' || echo '$(srcdir)/'`../XML/xmltok.c
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/xmltok.Tpo $(DEPDIR)/xmltok.Po
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../XML/xmltok.c' object='xmltok.o' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xmltok.o `test -f '../XML/xmltok.c' || echo '$(srcdir)/'`../XML/xmltok.c
+-
+-xmltok.obj: ../XML/xmltok.c
+- at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xmltok.obj -MD -MP -MF $(DEPDIR)/xmltok.Tpo -c -o xmltok.obj `if test -f '../XML/xmltok.c'; then $(CYGPATH_W) '../XML/xmltok.c'; else $(CYGPATH_W) '$(srcdir)/../XML/xmltok.c'; fi`
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/xmltok.Tpo $(DEPDIR)/xmltok.Po
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../XML/xmltok.c' object='xmltok.obj' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xmltok.obj `if test -f '../XML/xmltok.c'; then $(CYGPATH_W) '../XML/xmltok.c'; else $(CYGPATH_W) '$(srcdir)/../XML/xmltok.c'; fi`
+-
+ .cpp.o:
+ @am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+diff -up scorched/src/scorchedc/Makefile.am.syslibs scorched/src/scorchedc/Makefile.am
+--- scorched/src/scorchedc/Makefile.am.syslibs 2007-10-31 11:12:14.000000000 +0100
++++ scorched/src/scorchedc/Makefile.am 2007-10-31 20:45:00.000000000 +0100
+@@ -123,7 +123,6 @@ scorched3dc_SOURCES = \
+ ../common/RandomGenerator.h \
+ ../common/sha2.cpp \
+ ../common/sha2.h \
+- ../common/snprintf.c \
+ ../common/SplineCurve.cpp \
+ ../common/SplineCurve.h \
+ ../common/SplinePath.cpp \
+@@ -358,29 +357,14 @@ scorched3dc_SOURCES = \
+ ../net/SecureID.h \
+ ../net/UniqueIdStore.cpp \
+ ../net/UniqueIdStore.h \
+- ../XML/ascii.h \
+- ../XML/asciitab.h \
+- ../XML/expat.h \
+- ../XML/expat_config.h \
+- ../XML/iasciitab.h \
+- ../XML/internal.h \
+- ../XML/latin1tab.h \
+- ../XML/nametab.h \
+- ../XML/utf8tab.h \
+- ../XML/winconfig.h \
+ ../XML/XMLFile.cpp \
+ ../XML/XMLFile.h \
+ ../XML/XMLNode.cpp \
+ ../XML/XMLNode.h \
+- ../XML/xmlparse.c \
+ ../XML/XMLParser.cpp \
+ ../XML/XMLParser.h \
+- ../XML/xmlrole.c \
+- ../XML/xmlrole.h \
+ ../XML/XMLStringBuffer.cpp \
+ ../XML/XMLStringBuffer.h \
+- ../XML/xmltok.c \
+- ../XML/xmltok.h \
+ ../engine/Action.cpp \
+ ../engine/Action.h \
+ ../engine/ActionController.cpp \
+@@ -776,7 +760,6 @@ scorched3dc_SOURCES = \
+ ../GLEXT/GLConsoleRules.h \
+ ../GLEXT/GLDynamicVertexArray.cpp \
+ ../GLEXT/GLDynamicVertexArray.h \
+- ../GLEXT/glew.c \
+ ../GLEXT/GLFont2d.cpp \
+ ../GLEXT/GLFont2d.h \
+ ../GLEXT/GLFrameBufferObject.cpp \
+@@ -1346,5 +1329,5 @@ scorched3dc_SOURCES = \
+ ../GLSL/GLSLShaderSetup.h
+
+ AM_CPPFLAGS = -I../porting -I.. @FFTW_CFLAGS@ @AL_CFLAGS@ @FT2_CFLAGS@ @OGG_CFLAGS@ @SDL_CFLAGS@
+-LDADD = @FFTW_LIBS@ @AL_LIBS@ @FT2_LIBS@ @GL_LIBS@ @OGG_LIBS@ @SDL_LIBS@
++LDADD = @FFTW_LIBS@ @AL_LIBS@ @FT2_LIBS@ @GL_LIBS@ @OGG_LIBS@ @SDL_LIBS@ -lGLEW -lexpat
+
+diff -up scorched/src/scorchedc/Makefile.in.syslibs scorched/src/scorchedc/Makefile.in
+--- scorched/src/scorchedc/Makefile.in.syslibs 2007-10-31 11:20:51.000000000 +0100
++++ scorched/src/scorchedc/Makefile.in 2007-10-31 20:47:06.000000000 +0100
+@@ -74,7 +74,7 @@ am_scorched3dc_OBJECTS = AddTarget.$(OBJ
+ OptionsGame.$(OBJEXT) OptionsMasterListServer.$(OBJEXT) \
+ OptionsParameters.$(OBJEXT) OptionsScorched.$(OBJEXT) \
+ OptionsTransient.$(OBJEXT) ProgressCounter.$(OBJEXT) \
+- RandomGenerator.$(OBJEXT) sha2.$(OBJEXT) snprintf.$(OBJEXT) \
++ RandomGenerator.$(OBJEXT) sha2.$(OBJEXT) \
+ SplineCurve.$(OBJEXT) SplinePath.$(OBJEXT) \
+ StatsLogger.$(OBJEXT) StatsLoggerFile.$(OBJEXT) \
+ ToolTip.$(OBJEXT) Triangle.$(OBJEXT) Vector.$(OBJEXT) \
+@@ -142,8 +142,7 @@ am_scorched3dc_OBJECTS = AddTarget.$(OBJ
+ NetServerTCPProtocol.$(OBJEXT) NetServerTCPRead.$(OBJEXT) \
+ NetServerUDP.$(OBJEXT) NetServerUDPDestination.$(OBJEXT) \
+ SecureID.$(OBJEXT) UniqueIdStore.$(OBJEXT) XMLFile.$(OBJEXT) \
+- XMLNode.$(OBJEXT) xmlparse.$(OBJEXT) XMLParser.$(OBJEXT) \
+- xmlrole.$(OBJEXT) XMLStringBuffer.$(OBJEXT) xmltok.$(OBJEXT) \
++ XMLNode.$(OBJEXT) XMLParser.$(OBJEXT) XMLStringBuffer.$(OBJEXT) \
+ Action.$(OBJEXT) ActionController.$(OBJEXT) \
+ ActionReferenced.$(OBJEXT) EventContainer.$(OBJEXT) \
+ GameState.$(OBJEXT) GameStateI.$(OBJEXT) \
+@@ -241,7 +240,7 @@ am_scorched3dc_OBJECTS = AddTarget.$(OBJ
+ GLConsoleRuleFnIAdapter.$(OBJEXT) \
+ GLConsoleRuleMethod.$(OBJEXT) \
+ GLConsoleRuleMethodIAdapter.$(OBJEXT) GLConsoleRules.$(OBJEXT) \
+- GLDynamicVertexArray.$(OBJEXT) glew.$(OBJEXT) \
++ GLDynamicVertexArray.$(OBJEXT) \
+ GLFont2d.$(OBJEXT) GLFrameBufferObject.$(OBJEXT) \
+ GLGlobalState.$(OBJEXT) GLImage.$(OBJEXT) \
+ GLImageFactory.$(OBJEXT) GLImageHandle.$(OBJEXT) \
+@@ -656,7 +655,6 @@ scorched3dc_SOURCES = \
+ ../common/RandomGenerator.h \
+ ../common/sha2.cpp \
+ ../common/sha2.h \
+- ../common/snprintf.c \
+ ../common/SplineCurve.cpp \
+ ../common/SplineCurve.h \
+ ../common/SplinePath.cpp \
+@@ -891,29 +889,14 @@ scorched3dc_SOURCES = \
+ ../net/SecureID.h \
+ ../net/UniqueIdStore.cpp \
+ ../net/UniqueIdStore.h \
+- ../XML/ascii.h \
+- ../XML/asciitab.h \
+- ../XML/expat.h \
+- ../XML/expat_config.h \
+- ../XML/iasciitab.h \
+- ../XML/internal.h \
+- ../XML/latin1tab.h \
+- ../XML/nametab.h \
+- ../XML/utf8tab.h \
+- ../XML/winconfig.h \
+ ../XML/XMLFile.cpp \
+ ../XML/XMLFile.h \
+ ../XML/XMLNode.cpp \
+ ../XML/XMLNode.h \
+- ../XML/xmlparse.c \
+ ../XML/XMLParser.cpp \
+ ../XML/XMLParser.h \
+- ../XML/xmlrole.c \
+- ../XML/xmlrole.h \
+ ../XML/XMLStringBuffer.cpp \
+ ../XML/XMLStringBuffer.h \
+- ../XML/xmltok.c \
+- ../XML/xmltok.h \
+ ../engine/Action.cpp \
+ ../engine/Action.h \
+ ../engine/ActionController.cpp \
+@@ -1309,7 +1292,6 @@ scorched3dc_SOURCES = \
+ ../GLEXT/GLConsoleRules.h \
+ ../GLEXT/GLDynamicVertexArray.cpp \
+ ../GLEXT/GLDynamicVertexArray.h \
+- ../GLEXT/glew.c \
+ ../GLEXT/GLFont2d.cpp \
+ ../GLEXT/GLFont2d.h \
+ ../GLEXT/GLFrameBufferObject.cpp \
+@@ -1879,7 +1861,7 @@ scorched3dc_SOURCES = \
+ ../GLSL/GLSLShaderSetup.h
+
+ AM_CPPFLAGS = -I../porting -I.. @FFTW_CFLAGS@ @AL_CFLAGS@ @FT2_CFLAGS@ @OGG_CFLAGS@ @SDL_CFLAGS@
+-LDADD = @FFTW_LIBS@ @AL_LIBS@ @FT2_LIBS@ @GL_LIBS@ @OGG_LIBS@ @SDL_LIBS@
++LDADD = @FFTW_LIBS@ @AL_LIBS@ @FT2_LIBS@ @GL_LIBS@ @OGG_LIBS@ @SDL_LIBS@ -lGLEW -lexpat
+ all: all-am
+
+ .SUFFIXES:
+@@ -2603,13 +2585,8 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/aseFile.lex.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/aseFile.tab.Po at am__quote@
-- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/collision_kernel.Po at am__quote@
-- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/collision_quadtreespace.Po at am__quote@
-- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/collision_space.Po at am__quote@
-- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/collision_std.Po at am__quote@
-- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/collision_transform.Po at am__quote@
-- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/collision_util.Po at am__quote@
-- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/compress.Po at am__quote@
-- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/crc32.Po at am__quote@
-- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/deflate.Po at am__quote@
-- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/error.Po at am__quote@
-- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/export-dif.Po at am__quote@
-- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/fastdot.Po at am__quote@
-- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/fastldlt.Po at am__quote@
-- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/fastlsolve.Po at am__quote@
-- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/fastltsolve.Po at am__quote@
-- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gzio.Po at am__quote@
-- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/infblock.Po at am__quote@
-- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/infcodes.Po at am__quote@
-- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/inffast.Po at am__quote@
-- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/inflate.Po at am__quote@
-- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/inftrees.Po at am__quote@
-- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/infutil.Po at am__quote@
-- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/joint.Po at am__quote@
-- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/lcp.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/fixed.Po at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/glew.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/main.Po at am__quote@
-- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mass.Po at am__quote@
-- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mat.Po at am__quote@
-- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/matrix.Po at am__quote@
-- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/memory.Po at am__quote@
-- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/misc.Po at am__quote@
-- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/obstack.Po at am__quote@
-- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ode.Po at am__quote@
-- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/odemath.Po at am__quote@
-- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/quickstep.Po at am__quote@
-- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/rotation.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/sha2.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/snprintf.Po at am__quote@
-- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/step.Po at am__quote@
-- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/stepfast.Po at am__quote@
-- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/testing.Po at am__quote@
-- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/timer.Po at am__quote@
-- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/trees.Po at am__quote@
-- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/uncompr.Po at am__quote@
-- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/util.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/xmlparse.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/xmlrole.Po at am__quote@
- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/xmltok.Po at am__quote@
-- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/zutil.Po at am__quote@
- distclean-depend:
- -rm -rf ./$(DEPDIR)
-@@ -3660,269 +3422,6 @@
- @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- $(COMPILE) -c `cygpath -w $<`
+ .c.o:
+ @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@@ -2625,76 +2602,6 @@ distclean-compile:
+ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
-snprintf.o: ../common/snprintf.c
-- at AMDEP_TRUE@ source='../common/snprintf.c' object='snprintf.o' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ depfile='$(DEPDIR)/snprintf.Po' tmpdepfile='$(DEPDIR)/snprintf.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o snprintf.o `test -f '../common/snprintf.c' || echo '$(srcdir)/'`../common/snprintf.c
+- at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT snprintf.o -MD -MP -MF $(DEPDIR)/snprintf.Tpo -c -o snprintf.o `test -f '../common/snprintf.c' || echo '$(srcdir)/'`../common/snprintf.c
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/snprintf.Tpo $(DEPDIR)/snprintf.Po
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../common/snprintf.c' object='snprintf.o' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o snprintf.o `test -f '../common/snprintf.c' || echo '$(srcdir)/'`../common/snprintf.c
-
-snprintf.obj: ../common/snprintf.c
-- at AMDEP_TRUE@ source='../common/snprintf.c' object='snprintf.obj' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ depfile='$(DEPDIR)/snprintf.Po' tmpdepfile='$(DEPDIR)/snprintf.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o snprintf.obj `cygpath -w ../common/snprintf.c`
--
--fastdot.o: ../ode/fastdot.c
-- at AMDEP_TRUE@ source='../ode/fastdot.c' object='fastdot.o' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ depfile='$(DEPDIR)/fastdot.Po' tmpdepfile='$(DEPDIR)/fastdot.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o fastdot.o `test -f '../ode/fastdot.c' || echo '$(srcdir)/'`../ode/fastdot.c
--
--fastdot.obj: ../ode/fastdot.c
-- at AMDEP_TRUE@ source='../ode/fastdot.c' object='fastdot.obj' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ depfile='$(DEPDIR)/fastdot.Po' tmpdepfile='$(DEPDIR)/fastdot.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o fastdot.obj `cygpath -w ../ode/fastdot.c`
--
--fastldlt.o: ../ode/fastldlt.c
-- at AMDEP_TRUE@ source='../ode/fastldlt.c' object='fastldlt.o' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ depfile='$(DEPDIR)/fastldlt.Po' tmpdepfile='$(DEPDIR)/fastldlt.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o fastldlt.o `test -f '../ode/fastldlt.c' || echo '$(srcdir)/'`../ode/fastldlt.c
--
--fastldlt.obj: ../ode/fastldlt.c
-- at AMDEP_TRUE@ source='../ode/fastldlt.c' object='fastldlt.obj' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ depfile='$(DEPDIR)/fastldlt.Po' tmpdepfile='$(DEPDIR)/fastldlt.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o fastldlt.obj `cygpath -w ../ode/fastldlt.c`
--
--fastlsolve.o: ../ode/fastlsolve.c
-- at AMDEP_TRUE@ source='../ode/fastlsolve.c' object='fastlsolve.o' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ depfile='$(DEPDIR)/fastlsolve.Po' tmpdepfile='$(DEPDIR)/fastlsolve.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o fastlsolve.o `test -f '../ode/fastlsolve.c' || echo '$(srcdir)/'`../ode/fastlsolve.c
--
--fastlsolve.obj: ../ode/fastlsolve.c
-- at AMDEP_TRUE@ source='../ode/fastlsolve.c' object='fastlsolve.obj' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ depfile='$(DEPDIR)/fastlsolve.Po' tmpdepfile='$(DEPDIR)/fastlsolve.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o fastlsolve.obj `cygpath -w ../ode/fastlsolve.c`
--
--fastltsolve.o: ../ode/fastltsolve.c
-- at AMDEP_TRUE@ source='../ode/fastltsolve.c' object='fastltsolve.o' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ depfile='$(DEPDIR)/fastltsolve.Po' tmpdepfile='$(DEPDIR)/fastltsolve.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o fastltsolve.o `test -f '../ode/fastltsolve.c' || echo '$(srcdir)/'`../ode/fastltsolve.c
--
--fastltsolve.obj: ../ode/fastltsolve.c
-- at AMDEP_TRUE@ source='../ode/fastltsolve.c' object='fastltsolve.obj' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ depfile='$(DEPDIR)/fastltsolve.Po' tmpdepfile='$(DEPDIR)/fastltsolve.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o fastltsolve.obj `cygpath -w ../ode/fastltsolve.c`
--
--adler32.o: ../zlib/adler32.c
-- at AMDEP_TRUE@ source='../zlib/adler32.c' object='adler32.o' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ depfile='$(DEPDIR)/adler32.Po' tmpdepfile='$(DEPDIR)/adler32.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o adler32.o `test -f '../zlib/adler32.c' || echo '$(srcdir)/'`../zlib/adler32.c
--
--adler32.obj: ../zlib/adler32.c
-- at AMDEP_TRUE@ source='../zlib/adler32.c' object='adler32.obj' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ depfile='$(DEPDIR)/adler32.Po' tmpdepfile='$(DEPDIR)/adler32.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o adler32.obj `cygpath -w ../zlib/adler32.c`
--
--compress.o: ../zlib/compress.c
-- at AMDEP_TRUE@ source='../zlib/compress.c' object='compress.o' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ depfile='$(DEPDIR)/compress.Po' tmpdepfile='$(DEPDIR)/compress.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o compress.o `test -f '../zlib/compress.c' || echo '$(srcdir)/'`../zlib/compress.c
--
--compress.obj: ../zlib/compress.c
-- at AMDEP_TRUE@ source='../zlib/compress.c' object='compress.obj' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ depfile='$(DEPDIR)/compress.Po' tmpdepfile='$(DEPDIR)/compress.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o compress.obj `cygpath -w ../zlib/compress.c`
--
--crc32.o: ../zlib/crc32.c
-- at AMDEP_TRUE@ source='../zlib/crc32.c' object='crc32.o' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ depfile='$(DEPDIR)/crc32.Po' tmpdepfile='$(DEPDIR)/crc32.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o crc32.o `test -f '../zlib/crc32.c' || echo '$(srcdir)/'`../zlib/crc32.c
--
--crc32.obj: ../zlib/crc32.c
-- at AMDEP_TRUE@ source='../zlib/crc32.c' object='crc32.obj' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ depfile='$(DEPDIR)/crc32.Po' tmpdepfile='$(DEPDIR)/crc32.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o crc32.obj `cygpath -w ../zlib/crc32.c`
--
--deflate.o: ../zlib/deflate.c
-- at AMDEP_TRUE@ source='../zlib/deflate.c' object='deflate.o' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ depfile='$(DEPDIR)/deflate.Po' tmpdepfile='$(DEPDIR)/deflate.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o deflate.o `test -f '../zlib/deflate.c' || echo '$(srcdir)/'`../zlib/deflate.c
--
--deflate.obj: ../zlib/deflate.c
-- at AMDEP_TRUE@ source='../zlib/deflate.c' object='deflate.obj' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ depfile='$(DEPDIR)/deflate.Po' tmpdepfile='$(DEPDIR)/deflate.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o deflate.obj `cygpath -w ../zlib/deflate.c`
--
--gzio.o: ../zlib/gzio.c
-- at AMDEP_TRUE@ source='../zlib/gzio.c' object='gzio.o' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ depfile='$(DEPDIR)/gzio.Po' tmpdepfile='$(DEPDIR)/gzio.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gzio.o `test -f '../zlib/gzio.c' || echo '$(srcdir)/'`../zlib/gzio.c
--
--gzio.obj: ../zlib/gzio.c
-- at AMDEP_TRUE@ source='../zlib/gzio.c' object='gzio.obj' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ depfile='$(DEPDIR)/gzio.Po' tmpdepfile='$(DEPDIR)/gzio.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gzio.obj `cygpath -w ../zlib/gzio.c`
--
--infblock.o: ../zlib/infblock.c
-- at AMDEP_TRUE@ source='../zlib/infblock.c' object='infblock.o' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ depfile='$(DEPDIR)/infblock.Po' tmpdepfile='$(DEPDIR)/infblock.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o infblock.o `test -f '../zlib/infblock.c' || echo '$(srcdir)/'`../zlib/infblock.c
--
--infblock.obj: ../zlib/infblock.c
-- at AMDEP_TRUE@ source='../zlib/infblock.c' object='infblock.obj' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ depfile='$(DEPDIR)/infblock.Po' tmpdepfile='$(DEPDIR)/infblock.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o infblock.obj `cygpath -w ../zlib/infblock.c`
--
--infcodes.o: ../zlib/infcodes.c
-- at AMDEP_TRUE@ source='../zlib/infcodes.c' object='infcodes.o' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ depfile='$(DEPDIR)/infcodes.Po' tmpdepfile='$(DEPDIR)/infcodes.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o infcodes.o `test -f '../zlib/infcodes.c' || echo '$(srcdir)/'`../zlib/infcodes.c
--
--infcodes.obj: ../zlib/infcodes.c
-- at AMDEP_TRUE@ source='../zlib/infcodes.c' object='infcodes.obj' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ depfile='$(DEPDIR)/infcodes.Po' tmpdepfile='$(DEPDIR)/infcodes.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o infcodes.obj `cygpath -w ../zlib/infcodes.c`
--
--inffast.o: ../zlib/inffast.c
-- at AMDEP_TRUE@ source='../zlib/inffast.c' object='inffast.o' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ depfile='$(DEPDIR)/inffast.Po' tmpdepfile='$(DEPDIR)/inffast.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o inffast.o `test -f '../zlib/inffast.c' || echo '$(srcdir)/'`../zlib/inffast.c
--
--inffast.obj: ../zlib/inffast.c
-- at AMDEP_TRUE@ source='../zlib/inffast.c' object='inffast.obj' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ depfile='$(DEPDIR)/inffast.Po' tmpdepfile='$(DEPDIR)/inffast.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o inffast.obj `cygpath -w ../zlib/inffast.c`
--
--inflate.o: ../zlib/inflate.c
-- at AMDEP_TRUE@ source='../zlib/inflate.c' object='inflate.o' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ depfile='$(DEPDIR)/inflate.Po' tmpdepfile='$(DEPDIR)/inflate.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o inflate.o `test -f '../zlib/inflate.c' || echo '$(srcdir)/'`../zlib/inflate.c
--
--inflate.obj: ../zlib/inflate.c
-- at AMDEP_TRUE@ source='../zlib/inflate.c' object='inflate.obj' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ depfile='$(DEPDIR)/inflate.Po' tmpdepfile='$(DEPDIR)/inflate.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o inflate.obj `cygpath -w ../zlib/inflate.c`
--
--inftrees.o: ../zlib/inftrees.c
-- at AMDEP_TRUE@ source='../zlib/inftrees.c' object='inftrees.o' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ depfile='$(DEPDIR)/inftrees.Po' tmpdepfile='$(DEPDIR)/inftrees.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o inftrees.o `test -f '../zlib/inftrees.c' || echo '$(srcdir)/'`../zlib/inftrees.c
--
--inftrees.obj: ../zlib/inftrees.c
-- at AMDEP_TRUE@ source='../zlib/inftrees.c' object='inftrees.obj' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ depfile='$(DEPDIR)/inftrees.Po' tmpdepfile='$(DEPDIR)/inftrees.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o inftrees.obj `cygpath -w ../zlib/inftrees.c`
--
--infutil.o: ../zlib/infutil.c
-- at AMDEP_TRUE@ source='../zlib/infutil.c' object='infutil.o' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ depfile='$(DEPDIR)/infutil.Po' tmpdepfile='$(DEPDIR)/infutil.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o infutil.o `test -f '../zlib/infutil.c' || echo '$(srcdir)/'`../zlib/infutil.c
--
--infutil.obj: ../zlib/infutil.c
-- at AMDEP_TRUE@ source='../zlib/infutil.c' object='infutil.obj' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ depfile='$(DEPDIR)/infutil.Po' tmpdepfile='$(DEPDIR)/infutil.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o infutil.obj `cygpath -w ../zlib/infutil.c`
--
--trees.o: ../zlib/trees.c
-- at AMDEP_TRUE@ source='../zlib/trees.c' object='trees.o' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ depfile='$(DEPDIR)/trees.Po' tmpdepfile='$(DEPDIR)/trees.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o trees.o `test -f '../zlib/trees.c' || echo '$(srcdir)/'`../zlib/trees.c
--
--trees.obj: ../zlib/trees.c
-- at AMDEP_TRUE@ source='../zlib/trees.c' object='trees.obj' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ depfile='$(DEPDIR)/trees.Po' tmpdepfile='$(DEPDIR)/trees.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o trees.obj `cygpath -w ../zlib/trees.c`
--
--uncompr.o: ../zlib/uncompr.c
-- at AMDEP_TRUE@ source='../zlib/uncompr.c' object='uncompr.o' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ depfile='$(DEPDIR)/uncompr.Po' tmpdepfile='$(DEPDIR)/uncompr.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o uncompr.o `test -f '../zlib/uncompr.c' || echo '$(srcdir)/'`../zlib/uncompr.c
--
--uncompr.obj: ../zlib/uncompr.c
-- at AMDEP_TRUE@ source='../zlib/uncompr.c' object='uncompr.obj' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ depfile='$(DEPDIR)/uncompr.Po' tmpdepfile='$(DEPDIR)/uncompr.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o uncompr.obj `cygpath -w ../zlib/uncompr.c`
--
--zutil.o: ../zlib/zutil.c
-- at AMDEP_TRUE@ source='../zlib/zutil.c' object='zutil.o' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ depfile='$(DEPDIR)/zutil.Po' tmpdepfile='$(DEPDIR)/zutil.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o zutil.o `test -f '../zlib/zutil.c' || echo '$(srcdir)/'`../zlib/zutil.c
--
--zutil.obj: ../zlib/zutil.c
-- at AMDEP_TRUE@ source='../zlib/zutil.c' object='zutil.obj' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ depfile='$(DEPDIR)/zutil.Po' tmpdepfile='$(DEPDIR)/zutil.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o zutil.obj `cygpath -w ../zlib/zutil.c`
+- at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT snprintf.obj -MD -MP -MF $(DEPDIR)/snprintf.Tpo -c -o snprintf.obj `if test -f '../common/snprintf.c'; then $(CYGPATH_W) '../common/snprintf.c'; else $(CYGPATH_W) '$(srcdir)/../common/snprintf.c'; fi`
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/snprintf.Tpo $(DEPDIR)/snprintf.Po
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../common/snprintf.c' object='snprintf.obj' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o snprintf.obj `if test -f '../common/snprintf.c'; then $(CYGPATH_W) '../common/snprintf.c'; else $(CYGPATH_W) '$(srcdir)/../common/snprintf.c'; fi`
-
-xmlparse.o: ../XML/xmlparse.c
-- at AMDEP_TRUE@ source='../XML/xmlparse.c' object='xmlparse.o' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ depfile='$(DEPDIR)/xmlparse.Po' tmpdepfile='$(DEPDIR)/xmlparse.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xmlparse.o `test -f '../XML/xmlparse.c' || echo '$(srcdir)/'`../XML/xmlparse.c
+- at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xmlparse.o -MD -MP -MF $(DEPDIR)/xmlparse.Tpo -c -o xmlparse.o `test -f '../XML/xmlparse.c' || echo '$(srcdir)/'`../XML/xmlparse.c
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/xmlparse.Tpo $(DEPDIR)/xmlparse.Po
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../XML/xmlparse.c' object='xmlparse.o' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xmlparse.o `test -f '../XML/xmlparse.c' || echo '$(srcdir)/'`../XML/xmlparse.c
-
-xmlparse.obj: ../XML/xmlparse.c
-- at AMDEP_TRUE@ source='../XML/xmlparse.c' object='xmlparse.obj' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ depfile='$(DEPDIR)/xmlparse.Po' tmpdepfile='$(DEPDIR)/xmlparse.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xmlparse.obj `cygpath -w ../XML/xmlparse.c`
+- at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xmlparse.obj -MD -MP -MF $(DEPDIR)/xmlparse.Tpo -c -o xmlparse.obj `if test -f '../XML/xmlparse.c'; then $(CYGPATH_W) '../XML/xmlparse.c'; else $(CYGPATH_W) '$(srcdir)/../XML/xmlparse.c'; fi`
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/xmlparse.Tpo $(DEPDIR)/xmlparse.Po
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../XML/xmlparse.c' object='xmlparse.obj' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xmlparse.obj `if test -f '../XML/xmlparse.c'; then $(CYGPATH_W) '../XML/xmlparse.c'; else $(CYGPATH_W) '$(srcdir)/../XML/xmlparse.c'; fi`
-
-xmlrole.o: ../XML/xmlrole.c
-- at AMDEP_TRUE@ source='../XML/xmlrole.c' object='xmlrole.o' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ depfile='$(DEPDIR)/xmlrole.Po' tmpdepfile='$(DEPDIR)/xmlrole.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xmlrole.o `test -f '../XML/xmlrole.c' || echo '$(srcdir)/'`../XML/xmlrole.c
+- at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xmlrole.o -MD -MP -MF $(DEPDIR)/xmlrole.Tpo -c -o xmlrole.o `test -f '../XML/xmlrole.c' || echo '$(srcdir)/'`../XML/xmlrole.c
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/xmlrole.Tpo $(DEPDIR)/xmlrole.Po
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../XML/xmlrole.c' object='xmlrole.o' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xmlrole.o `test -f '../XML/xmlrole.c' || echo '$(srcdir)/'`../XML/xmlrole.c
-
-xmlrole.obj: ../XML/xmlrole.c
-- at AMDEP_TRUE@ source='../XML/xmlrole.c' object='xmlrole.obj' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ depfile='$(DEPDIR)/xmlrole.Po' tmpdepfile='$(DEPDIR)/xmlrole.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xmlrole.obj `cygpath -w ../XML/xmlrole.c`
+- at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xmlrole.obj -MD -MP -MF $(DEPDIR)/xmlrole.Tpo -c -o xmlrole.obj `if test -f '../XML/xmlrole.c'; then $(CYGPATH_W) '../XML/xmlrole.c'; else $(CYGPATH_W) '$(srcdir)/../XML/xmlrole.c'; fi`
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/xmlrole.Tpo $(DEPDIR)/xmlrole.Po
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../XML/xmlrole.c' object='xmlrole.obj' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xmlrole.obj `if test -f '../XML/xmlrole.c'; then $(CYGPATH_W) '../XML/xmlrole.c'; else $(CYGPATH_W) '$(srcdir)/../XML/xmlrole.c'; fi`
-
-xmltok.o: ../XML/xmltok.c
-- at AMDEP_TRUE@ source='../XML/xmltok.c' object='xmltok.o' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ depfile='$(DEPDIR)/xmltok.Po' tmpdepfile='$(DEPDIR)/xmltok.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xmltok.o `test -f '../XML/xmltok.c' || echo '$(srcdir)/'`../XML/xmltok.c
+- at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xmltok.o -MD -MP -MF $(DEPDIR)/xmltok.Tpo -c -o xmltok.o `test -f '../XML/xmltok.c' || echo '$(srcdir)/'`../XML/xmltok.c
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/xmltok.Tpo $(DEPDIR)/xmltok.Po
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../XML/xmltok.c' object='xmltok.o' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xmltok.o `test -f '../XML/xmltok.c' || echo '$(srcdir)/'`../XML/xmltok.c
-
-xmltok.obj: ../XML/xmltok.c
-- at AMDEP_TRUE@ source='../XML/xmltok.c' object='xmltok.obj' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ depfile='$(DEPDIR)/xmltok.Po' tmpdepfile='$(DEPDIR)/xmltok.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xmltok.obj `cygpath -w ../XML/xmltok.c`
- CCDEPMODE = @CCDEPMODE@
-
+- at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xmltok.obj -MD -MP -MF $(DEPDIR)/xmltok.Tpo -c -o xmltok.obj `if test -f '../XML/xmltok.c'; then $(CYGPATH_W) '../XML/xmltok.c'; else $(CYGPATH_W) '$(srcdir)/../XML/xmltok.c'; fi`
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/xmltok.Tpo $(DEPDIR)/xmltok.Po
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../XML/xmltok.c' object='xmltok.obj' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xmltok.obj `if test -f '../XML/xmltok.c'; then $(CYGPATH_W) '../XML/xmltok.c'; else $(CYGPATH_W) '$(srcdir)/../XML/xmltok.c'; fi`
+-
+-glew.o: ../GLEXT/glew.c
+- at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT glew.o -MD -MP -MF $(DEPDIR)/glew.Tpo -c -o glew.o `test -f '../GLEXT/glew.c' || echo '$(srcdir)/'`../GLEXT/glew.c
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/glew.Tpo $(DEPDIR)/glew.Po
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../GLEXT/glew.c' object='glew.o' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o glew.o `test -f '../GLEXT/glew.c' || echo '$(srcdir)/'`../GLEXT/glew.c
+-
+-glew.obj: ../GLEXT/glew.c
+- at am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT glew.obj -MD -MP -MF $(DEPDIR)/glew.Tpo -c -o glew.obj `if test -f '../GLEXT/glew.c'; then $(CYGPATH_W) '../GLEXT/glew.c'; else $(CYGPATH_W) '$(srcdir)/../GLEXT/glew.c'; fi`
+- at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/glew.Tpo $(DEPDIR)/glew.Po
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='../GLEXT/glew.c' object='glew.obj' libtool=no @AMDEPBACKSLASH@
+- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+- at am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o glew.obj `if test -f '../GLEXT/glew.c'; then $(CYGPATH_W) '../GLEXT/glew.c'; else $(CYGPATH_W) '$(srcdir)/../GLEXT/glew.c'; fi`
+-
.cpp.o:
-@@ -7717,318 +7216,6 @@
- @AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o WeaponVelocity.obj `cygpath -w ../weapons/WeaponVelocity.cpp`
-
--array.o: ../ode/array.cpp
-- at AMDEP_TRUE@ source='../ode/array.cpp' object='array.o' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ depfile='$(DEPDIR)/array.Po' tmpdepfile='$(DEPDIR)/array.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o array.o `test -f '../ode/array.cpp' || echo '$(srcdir)/'`../ode/array.cpp
--
--array.obj: ../ode/array.cpp
-- at AMDEP_TRUE@ source='../ode/array.cpp' object='array.obj' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ depfile='$(DEPDIR)/array.Po' tmpdepfile='$(DEPDIR)/array.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o array.obj `cygpath -w ../ode/array.cpp`
--
--collision_kernel.o: ../ode/collision_kernel.cpp
-- at AMDEP_TRUE@ source='../ode/collision_kernel.cpp' object='collision_kernel.o' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ depfile='$(DEPDIR)/collision_kernel.Po' tmpdepfile='$(DEPDIR)/collision_kernel.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o collision_kernel.o `test -f '../ode/collision_kernel.cpp' || echo '$(srcdir)/'`../ode/collision_kernel.cpp
--
--collision_kernel.obj: ../ode/collision_kernel.cpp
-- at AMDEP_TRUE@ source='../ode/collision_kernel.cpp' object='collision_kernel.obj' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ depfile='$(DEPDIR)/collision_kernel.Po' tmpdepfile='$(DEPDIR)/collision_kernel.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o collision_kernel.obj `cygpath -w ../ode/collision_kernel.cpp`
--
--collision_quadtreespace.o: ../ode/collision_quadtreespace.cpp
-- at AMDEP_TRUE@ source='../ode/collision_quadtreespace.cpp' object='collision_quadtreespace.o' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ depfile='$(DEPDIR)/collision_quadtreespace.Po' tmpdepfile='$(DEPDIR)/collision_quadtreespace.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o collision_quadtreespace.o `test -f '../ode/collision_quadtreespace.cpp' || echo '$(srcdir)/'`../ode/collision_quadtreespace.cpp
--
--collision_quadtreespace.obj: ../ode/collision_quadtreespace.cpp
-- at AMDEP_TRUE@ source='../ode/collision_quadtreespace.cpp' object='collision_quadtreespace.obj' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ depfile='$(DEPDIR)/collision_quadtreespace.Po' tmpdepfile='$(DEPDIR)/collision_quadtreespace.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o collision_quadtreespace.obj `cygpath -w ../ode/collision_quadtreespace.cpp`
--
--collision_space.o: ../ode/collision_space.cpp
-- at AMDEP_TRUE@ source='../ode/collision_space.cpp' object='collision_space.o' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ depfile='$(DEPDIR)/collision_space.Po' tmpdepfile='$(DEPDIR)/collision_space.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o collision_space.o `test -f '../ode/collision_space.cpp' || echo '$(srcdir)/'`../ode/collision_space.cpp
--
--collision_space.obj: ../ode/collision_space.cpp
-- at AMDEP_TRUE@ source='../ode/collision_space.cpp' object='collision_space.obj' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ depfile='$(DEPDIR)/collision_space.Po' tmpdepfile='$(DEPDIR)/collision_space.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o collision_space.obj `cygpath -w ../ode/collision_space.cpp`
--
--collision_std.o: ../ode/collision_std.cpp
-- at AMDEP_TRUE@ source='../ode/collision_std.cpp' object='collision_std.o' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ depfile='$(DEPDIR)/collision_std.Po' tmpdepfile='$(DEPDIR)/collision_std.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o collision_std.o `test -f '../ode/collision_std.cpp' || echo '$(srcdir)/'`../ode/collision_std.cpp
--
--collision_std.obj: ../ode/collision_std.cpp
-- at AMDEP_TRUE@ source='../ode/collision_std.cpp' object='collision_std.obj' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ depfile='$(DEPDIR)/collision_std.Po' tmpdepfile='$(DEPDIR)/collision_std.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o collision_std.obj `cygpath -w ../ode/collision_std.cpp`
--
--collision_transform.o: ../ode/collision_transform.cpp
-- at AMDEP_TRUE@ source='../ode/collision_transform.cpp' object='collision_transform.o' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ depfile='$(DEPDIR)/collision_transform.Po' tmpdepfile='$(DEPDIR)/collision_transform.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o collision_transform.o `test -f '../ode/collision_transform.cpp' || echo '$(srcdir)/'`../ode/collision_transform.cpp
--
--collision_transform.obj: ../ode/collision_transform.cpp
-- at AMDEP_TRUE@ source='../ode/collision_transform.cpp' object='collision_transform.obj' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ depfile='$(DEPDIR)/collision_transform.Po' tmpdepfile='$(DEPDIR)/collision_transform.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o collision_transform.obj `cygpath -w ../ode/collision_transform.cpp`
--
--collision_util.o: ../ode/collision_util.cpp
-- at AMDEP_TRUE@ source='../ode/collision_util.cpp' object='collision_util.o' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ depfile='$(DEPDIR)/collision_util.Po' tmpdepfile='$(DEPDIR)/collision_util.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o collision_util.o `test -f '../ode/collision_util.cpp' || echo '$(srcdir)/'`../ode/collision_util.cpp
--
--collision_util.obj: ../ode/collision_util.cpp
-- at AMDEP_TRUE@ source='../ode/collision_util.cpp' object='collision_util.obj' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ depfile='$(DEPDIR)/collision_util.Po' tmpdepfile='$(DEPDIR)/collision_util.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o collision_util.obj `cygpath -w ../ode/collision_util.cpp`
--
--error.o: ../ode/error.cpp
-- at AMDEP_TRUE@ source='../ode/error.cpp' object='error.o' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ depfile='$(DEPDIR)/error.Po' tmpdepfile='$(DEPDIR)/error.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o error.o `test -f '../ode/error.cpp' || echo '$(srcdir)/'`../ode/error.cpp
--
--error.obj: ../ode/error.cpp
-- at AMDEP_TRUE@ source='../ode/error.cpp' object='error.obj' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ depfile='$(DEPDIR)/error.Po' tmpdepfile='$(DEPDIR)/error.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o error.obj `cygpath -w ../ode/error.cpp`
--
--export-dif.o: ../ode/export-dif.cpp
-- at AMDEP_TRUE@ source='../ode/export-dif.cpp' object='export-dif.o' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ depfile='$(DEPDIR)/export-dif.Po' tmpdepfile='$(DEPDIR)/export-dif.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o export-dif.o `test -f '../ode/export-dif.cpp' || echo '$(srcdir)/'`../ode/export-dif.cpp
--
--export-dif.obj: ../ode/export-dif.cpp
-- at AMDEP_TRUE@ source='../ode/export-dif.cpp' object='export-dif.obj' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ depfile='$(DEPDIR)/export-dif.Po' tmpdepfile='$(DEPDIR)/export-dif.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o export-dif.obj `cygpath -w ../ode/export-dif.cpp`
--
--joint.o: ../ode/joint.cpp
-- at AMDEP_TRUE@ source='../ode/joint.cpp' object='joint.o' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ depfile='$(DEPDIR)/joint.Po' tmpdepfile='$(DEPDIR)/joint.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o joint.o `test -f '../ode/joint.cpp' || echo '$(srcdir)/'`../ode/joint.cpp
--
--joint.obj: ../ode/joint.cpp
-- at AMDEP_TRUE@ source='../ode/joint.cpp' object='joint.obj' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ depfile='$(DEPDIR)/joint.Po' tmpdepfile='$(DEPDIR)/joint.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o joint.obj `cygpath -w ../ode/joint.cpp`
--
--lcp.o: ../ode/lcp.cpp
-- at AMDEP_TRUE@ source='../ode/lcp.cpp' object='lcp.o' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ depfile='$(DEPDIR)/lcp.Po' tmpdepfile='$(DEPDIR)/lcp.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lcp.o `test -f '../ode/lcp.cpp' || echo '$(srcdir)/'`../ode/lcp.cpp
--
--lcp.obj: ../ode/lcp.cpp
-- at AMDEP_TRUE@ source='../ode/lcp.cpp' object='lcp.obj' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ depfile='$(DEPDIR)/lcp.Po' tmpdepfile='$(DEPDIR)/lcp.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o lcp.obj `cygpath -w ../ode/lcp.cpp`
--
--mass.o: ../ode/mass.cpp
-- at AMDEP_TRUE@ source='../ode/mass.cpp' object='mass.o' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ depfile='$(DEPDIR)/mass.Po' tmpdepfile='$(DEPDIR)/mass.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o mass.o `test -f '../ode/mass.cpp' || echo '$(srcdir)/'`../ode/mass.cpp
--
--mass.obj: ../ode/mass.cpp
-- at AMDEP_TRUE@ source='../ode/mass.cpp' object='mass.obj' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ depfile='$(DEPDIR)/mass.Po' tmpdepfile='$(DEPDIR)/mass.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o mass.obj `cygpath -w ../ode/mass.cpp`
--
--mat.o: ../ode/mat.cpp
-- at AMDEP_TRUE@ source='../ode/mat.cpp' object='mat.o' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ depfile='$(DEPDIR)/mat.Po' tmpdepfile='$(DEPDIR)/mat.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o mat.o `test -f '../ode/mat.cpp' || echo '$(srcdir)/'`../ode/mat.cpp
--
--mat.obj: ../ode/mat.cpp
-- at AMDEP_TRUE@ source='../ode/mat.cpp' object='mat.obj' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ depfile='$(DEPDIR)/mat.Po' tmpdepfile='$(DEPDIR)/mat.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o mat.obj `cygpath -w ../ode/mat.cpp`
--
--matrix.o: ../ode/matrix.cpp
-- at AMDEP_TRUE@ source='../ode/matrix.cpp' object='matrix.o' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ depfile='$(DEPDIR)/matrix.Po' tmpdepfile='$(DEPDIR)/matrix.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o matrix.o `test -f '../ode/matrix.cpp' || echo '$(srcdir)/'`../ode/matrix.cpp
--
--matrix.obj: ../ode/matrix.cpp
-- at AMDEP_TRUE@ source='../ode/matrix.cpp' object='matrix.obj' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ depfile='$(DEPDIR)/matrix.Po' tmpdepfile='$(DEPDIR)/matrix.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o matrix.obj `cygpath -w ../ode/matrix.cpp`
--
--memory.o: ../ode/memory.cpp
-- at AMDEP_TRUE@ source='../ode/memory.cpp' object='memory.o' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ depfile='$(DEPDIR)/memory.Po' tmpdepfile='$(DEPDIR)/memory.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o memory.o `test -f '../ode/memory.cpp' || echo '$(srcdir)/'`../ode/memory.cpp
--
--memory.obj: ../ode/memory.cpp
-- at AMDEP_TRUE@ source='../ode/memory.cpp' object='memory.obj' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ depfile='$(DEPDIR)/memory.Po' tmpdepfile='$(DEPDIR)/memory.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o memory.obj `cygpath -w ../ode/memory.cpp`
--
--misc.o: ../ode/misc.cpp
-- at AMDEP_TRUE@ source='../ode/misc.cpp' object='misc.o' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ depfile='$(DEPDIR)/misc.Po' tmpdepfile='$(DEPDIR)/misc.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o misc.o `test -f '../ode/misc.cpp' || echo '$(srcdir)/'`../ode/misc.cpp
--
--misc.obj: ../ode/misc.cpp
-- at AMDEP_TRUE@ source='../ode/misc.cpp' object='misc.obj' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ depfile='$(DEPDIR)/misc.Po' tmpdepfile='$(DEPDIR)/misc.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o misc.obj `cygpath -w ../ode/misc.cpp`
--
--obstack.o: ../ode/obstack.cpp
-- at AMDEP_TRUE@ source='../ode/obstack.cpp' object='obstack.o' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ depfile='$(DEPDIR)/obstack.Po' tmpdepfile='$(DEPDIR)/obstack.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o obstack.o `test -f '../ode/obstack.cpp' || echo '$(srcdir)/'`../ode/obstack.cpp
--
--obstack.obj: ../ode/obstack.cpp
-- at AMDEP_TRUE@ source='../ode/obstack.cpp' object='obstack.obj' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ depfile='$(DEPDIR)/obstack.Po' tmpdepfile='$(DEPDIR)/obstack.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o obstack.obj `cygpath -w ../ode/obstack.cpp`
--
--ode.o: ../ode/ode.cpp
-- at AMDEP_TRUE@ source='../ode/ode.cpp' object='ode.o' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ depfile='$(DEPDIR)/ode.Po' tmpdepfile='$(DEPDIR)/ode.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ode.o `test -f '../ode/ode.cpp' || echo '$(srcdir)/'`../ode/ode.cpp
--
--ode.obj: ../ode/ode.cpp
-- at AMDEP_TRUE@ source='../ode/ode.cpp' object='ode.obj' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ depfile='$(DEPDIR)/ode.Po' tmpdepfile='$(DEPDIR)/ode.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ode.obj `cygpath -w ../ode/ode.cpp`
--
--odemath.o: ../ode/odemath.cpp
-- at AMDEP_TRUE@ source='../ode/odemath.cpp' object='odemath.o' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ depfile='$(DEPDIR)/odemath.Po' tmpdepfile='$(DEPDIR)/odemath.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o odemath.o `test -f '../ode/odemath.cpp' || echo '$(srcdir)/'`../ode/odemath.cpp
--
--odemath.obj: ../ode/odemath.cpp
-- at AMDEP_TRUE@ source='../ode/odemath.cpp' object='odemath.obj' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ depfile='$(DEPDIR)/odemath.Po' tmpdepfile='$(DEPDIR)/odemath.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o odemath.obj `cygpath -w ../ode/odemath.cpp`
--
--quickstep.o: ../ode/quickstep.cpp
-- at AMDEP_TRUE@ source='../ode/quickstep.cpp' object='quickstep.o' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ depfile='$(DEPDIR)/quickstep.Po' tmpdepfile='$(DEPDIR)/quickstep.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o quickstep.o `test -f '../ode/quickstep.cpp' || echo '$(srcdir)/'`../ode/quickstep.cpp
--
--quickstep.obj: ../ode/quickstep.cpp
-- at AMDEP_TRUE@ source='../ode/quickstep.cpp' object='quickstep.obj' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ depfile='$(DEPDIR)/quickstep.Po' tmpdepfile='$(DEPDIR)/quickstep.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o quickstep.obj `cygpath -w ../ode/quickstep.cpp`
--
--rotation.o: ../ode/rotation.cpp
-- at AMDEP_TRUE@ source='../ode/rotation.cpp' object='rotation.o' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ depfile='$(DEPDIR)/rotation.Po' tmpdepfile='$(DEPDIR)/rotation.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o rotation.o `test -f '../ode/rotation.cpp' || echo '$(srcdir)/'`../ode/rotation.cpp
--
--rotation.obj: ../ode/rotation.cpp
-- at AMDEP_TRUE@ source='../ode/rotation.cpp' object='rotation.obj' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ depfile='$(DEPDIR)/rotation.Po' tmpdepfile='$(DEPDIR)/rotation.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o rotation.obj `cygpath -w ../ode/rotation.cpp`
--
--step.o: ../ode/step.cpp
-- at AMDEP_TRUE@ source='../ode/step.cpp' object='step.o' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ depfile='$(DEPDIR)/step.Po' tmpdepfile='$(DEPDIR)/step.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o step.o `test -f '../ode/step.cpp' || echo '$(srcdir)/'`../ode/step.cpp
--
--step.obj: ../ode/step.cpp
-- at AMDEP_TRUE@ source='../ode/step.cpp' object='step.obj' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ depfile='$(DEPDIR)/step.Po' tmpdepfile='$(DEPDIR)/step.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o step.obj `cygpath -w ../ode/step.cpp`
--
--stepfast.o: ../ode/stepfast.cpp
-- at AMDEP_TRUE@ source='../ode/stepfast.cpp' object='stepfast.o' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ depfile='$(DEPDIR)/stepfast.Po' tmpdepfile='$(DEPDIR)/stepfast.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o stepfast.o `test -f '../ode/stepfast.cpp' || echo '$(srcdir)/'`../ode/stepfast.cpp
--
--stepfast.obj: ../ode/stepfast.cpp
-- at AMDEP_TRUE@ source='../ode/stepfast.cpp' object='stepfast.obj' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ depfile='$(DEPDIR)/stepfast.Po' tmpdepfile='$(DEPDIR)/stepfast.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o stepfast.obj `cygpath -w ../ode/stepfast.cpp`
--
--testing.o: ../ode/testing.cpp
-- at AMDEP_TRUE@ source='../ode/testing.cpp' object='testing.o' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ depfile='$(DEPDIR)/testing.Po' tmpdepfile='$(DEPDIR)/testing.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o testing.o `test -f '../ode/testing.cpp' || echo '$(srcdir)/'`../ode/testing.cpp
--
--testing.obj: ../ode/testing.cpp
-- at AMDEP_TRUE@ source='../ode/testing.cpp' object='testing.obj' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ depfile='$(DEPDIR)/testing.Po' tmpdepfile='$(DEPDIR)/testing.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o testing.obj `cygpath -w ../ode/testing.cpp`
--
--timer.o: ../ode/timer.cpp
-- at AMDEP_TRUE@ source='../ode/timer.cpp' object='timer.o' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ depfile='$(DEPDIR)/timer.Po' tmpdepfile='$(DEPDIR)/timer.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o timer.o `test -f '../ode/timer.cpp' || echo '$(srcdir)/'`../ode/timer.cpp
--
--timer.obj: ../ode/timer.cpp
-- at AMDEP_TRUE@ source='../ode/timer.cpp' object='timer.obj' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ depfile='$(DEPDIR)/timer.Po' tmpdepfile='$(DEPDIR)/timer.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o timer.obj `cygpath -w ../ode/timer.cpp`
--
--util.o: ../ode/util.cpp
-- at AMDEP_TRUE@ source='../ode/util.cpp' object='util.o' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ depfile='$(DEPDIR)/util.Po' tmpdepfile='$(DEPDIR)/util.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o util.o `test -f '../ode/util.cpp' || echo '$(srcdir)/'`../ode/util.cpp
--
--util.obj: ../ode/util.cpp
-- at AMDEP_TRUE@ source='../ode/util.cpp' object='util.obj' libtool=no @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ depfile='$(DEPDIR)/util.Po' tmpdepfile='$(DEPDIR)/util.TPo' @AMDEPBACKSLASH@
-- at AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o util.obj `cygpath -w ../ode/util.cpp`
--
- AddTarget.o: ../actions/AddTarget.cpp
- @AMDEP_TRUE@ source='../actions/AddTarget.cpp' object='AddTarget.o' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@ depfile='$(DEPDIR)/AddTarget.Po' tmpdepfile='$(DEPDIR)/AddTarget.TPo' @AMDEPBACKSLASH@
---- scorched/src/engine/ModFileEntry.cpp.syslibs 2006-04-13 00:49:26.000000000 +0200
-+++ scorched/src/engine/ModFileEntry.cpp 2006-10-31 20:11:27.000000000 +0100
-@@ -21,7 +21,7 @@
- #include <common/Defines.h>
- #include <engine/ModFileEntry.h>
- #include <engine/ModFiles.h>
--#include <zlib/zlib.h>
-+#include <zlib.h>
- #include <wx/dir.h>
- #include <wx/utils.h>
-
---- scorched/src/tank/TankAvatar.cpp.syslibs 2006-02-13 18:54:27.000000000 +0100
-+++ scorched/src/tank/TankAvatar.cpp 2006-10-31 20:11:27.000000000 +0100
-@@ -22,7 +22,7 @@
- #include <GLEXT/GLTexture.h>
- #include <GLEXT/GLGif.h>
- #include <common/Defines.h>
--#include <zlib/zlib.h>
-+#include <zlib.h>
- #include <stdio.h>
-
- GLTexture *TankAvatar::defaultTexture_ = 0;
---- scorched/src/landscape/HeightMapSender.cpp.syslibs 2005-11-25 11:35:42.000000000 +0100
-+++ scorched/src/landscape/HeightMapSender.cpp 2006-10-31 20:11:27.000000000 +0100
-@@ -20,7 +20,7 @@
-
- #include <landscape/HeightMapSender.h>
- #include <common/Logger.h>
--#include <zlib/zlib.h>
-+#include <zlib.h>
- #include <float.h>
- #include <stdlib.h>
-
---- scorched/src/3dsparse/ModelStore.cpp~ 2007-04-18 15:37:25.000000000 +0200
-+++ scorched/src/3dsparse/ModelStore.cpp 2007-04-18 15:37:25.000000000 +0200
-@@ -90,7 +90,7 @@
- }
-
- // HACK for skin creator
--#ifdef dDOUBLE
-+#if 1
- // Use smaller tank skins for texture size 0
- // Resize the bitmap
- if (OptionsDisplay::instance()->getTexSize() == 0)
---- scorched/configure.ac~ 2007-04-18 15:39:52.000000000 +0200
-+++ scorched/configure.ac 2007-04-18 15:39:52.000000000 +0200
-@@ -352,10 +352,6 @@
- CFLAGS="$CFLAGS -DS3D_DOCDIR=\\\"${docdir}\\\" -DS3D_DATADIR=\\\"${datadir}\\\" -DS3D_BINDIR=\\\"${bindir}\\\""
- CXXFLAGS="$CXXFLAGS -DS3D_DOCDIR=\\\"${docdir}\\\" -DS3D_DATADIR=\\\"${datadir}\\\" -DS3D_BINDIR=\\\"${bindir}\\\""
-
--# extra fixed flags
--CFLAGS="$CFLAGS -DdDOUBLE"
--CXXFLAGS="$CXXFLAGS -DdDOUBLE"
--
- # put here at end because of sdl.m4 not defining
- AC_LANG_CPLUSPLUS
-
---- scorched/configure~ 2007-04-18 15:39:55.000000000 +0200
-+++ scorched/configure 2007-04-18 15:39:55.000000000 +0200
-@@ -6004,10 +6004,6 @@
- CFLAGS="$CFLAGS -DS3D_DOCDIR=\\\"${docdir}\\\" -DS3D_DATADIR=\\\"${datadir}\\\" -DS3D_BINDIR=\\\"${bindir}\\\""
- CXXFLAGS="$CXXFLAGS -DS3D_DOCDIR=\\\"${docdir}\\\" -DS3D_DATADIR=\\\"${datadir}\\\" -DS3D_BINDIR=\\\"${bindir}\\\""
-
--# extra fixed flags
--CFLAGS="$CFLAGS -DdDOUBLE"
--CXXFLAGS="$CXXFLAGS -DdDOUBLE"
--
- # put here at end because of sdl.m4 not defining
- ac_ext=cc
- ac_cpp='$CXXCPP $CPPFLAGS'
+ @am__fastdepCXX_TRUE@ $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+ @am__fastdepCXX_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+diff -up scorched/src/GLEXT/GLState.h.syslibs scorched/src/GLEXT/GLState.h
+--- scorched/src/GLEXT/GLState.h.syslibs 2007-10-20 19:54:40.000000000 +0200
++++ scorched/src/GLEXT/GLState.h 2007-10-31 20:45:00.000000000 +0100
+@@ -24,7 +24,7 @@
+ #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
+ #undef __MACH__
+
+-#include "glew.h"
++#include <GL/glew.h>
+
+ class GLState
+ {
Index: scorched3d.spec
===================================================================
RCS file: /cvs/extras/rpms/scorched3d/devel/scorched3d.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- scorched3d.spec 24 Sep 2007 19:54:08 -0000 1.25
+++ scorched3d.spec 6 Nov 2007 21:31:37 -0000 1.26
@@ -1,20 +1,25 @@
Name: scorched3d
-Version: 40.1d
-Release: 6%{?dist}
+Version: 41.1
+Release: 1%{?dist}
Summary: Game based loosely on the classic DOS game Scorched Earth
Group: Amusements/Games
License: GPLv2+
URL: http://www.scorched3d.co.uk/
-Source0: http://downloads.sourceforge.net/%{name}/Scorched3D-%{version}-src.tar.gz
+# this is
+# http://downloads.sourceforge.net/%{name}/Scorched3D-%{version}-src.tar.gz
+# with the included glew removed as that contains files under the non free
+# SGI Free license B. Instead the system version is used, which has the
+# troublesome glew parts replaced
+Source0: Scorched3D-%{version}-src.tar.gz
Source1: %{name}.desktop
Patch1: %{name}-syslibs.patch
-Patch2: %{name}-wx26.patch
-Patch3: %{name}-openal.patch
-Patch4: %{name}-help.patch
-Patch5: %{name}-wx28.patch
+Patch2: %{name}-help.patch
+# From upstream CVS
+Patch3: %{name}-41.1-64bit.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: wxGTK-devel freealut-devel SDL_net-devel libGLU-devel ode-devel
-BuildRequires: expat-devel libvorbis-devel ImageMagick desktop-file-utils
+BuildRequires: expat-devel libvorbis-devel glew-devel fftw-devel
+BuildRequires: ImageMagick desktop-file-utils
Requires: hicolor-icon-theme opengl-games-utils
# Upstream naming compatibility
Provides: Scorched3D = %{version}-%{release}
@@ -36,13 +41,13 @@
%prep
%setup -q -n scorched
-rm -r `find . -name Makefile`
-rm -r src/zlib src/ode `find src/XML ! -name "X*"`
+rm `find . -name Makefile`
+rm `find src/XML ! -name "X*"`
%patch1 -p1 -z .syslibs
-%patch2 -p1 -z .wx26
-%patch3 -p1 -z .openal
-%patch4 -p1 -z .help
-%patch5 -p1 -z .wx28
+%patch2 -p1 -z .help
+%patch3 -p1 -z .64bit
+iconv -f ISO-8859-1 -t UTF8 AUTHORS > AUTHORS.tmp
+mv AUTHORS.tmp AUTHORS
# make rpmlint happy with debuginfo package
chmod -x src/GLEXT/*
# stop autoxxx from running
@@ -94,7 +99,7 @@
%files
%defattr(-,root,root,-)
-%doc AUTHORS COPYING TODO html
+%doc AUTHORS COPYING TODO
%{_bindir}/%{name}*
%{_datadir}/%{name}
%{_datadir}/applications/fedora-%{name}.desktop
@@ -102,6 +107,9 @@
%changelog
+* Tue Nov 6 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 41.1-1
+- New upstream release 41.1
+
* Mon Sep 24 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 40.1d-6
- Use opengl-games-utils wrapper to show error dialog when DRI is missing
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scorched3d/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 22 Nov 2006 22:14:14 -0000 1.6
+++ sources 6 Nov 2007 21:31:37 -0000 1.7
@@ -1 +1 @@
-263d2c1be168860d783426c4d6c7060c Scorched3D-40.1d-src.tar.gz
+5fc57f040f932985b3cdaab4461b9076 Scorched3D-41.1-src.tar.gz
--- scorched3d-openal.patch DELETED ---
--- scorched3d-wx26.patch DELETED ---
--- scorched3d-wx28.patch DELETED ---
More information about the fedora-extras-commits
mailing list