rpms/scorched3d/FC-5 scorched3d-wx26.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 scorched3d-64bit.patch, 1.5, 1.6 scorched3d-help.patch, 1.2, 1.3 scorched3d-openal.patch, 1.1, 1.2 scorched3d-syslibs.patch, 1.2, 1.3 scorched3d.spec, 1.14, 1.15 sources, 1.3, 1.4 scorched3d-HTML-injection.patch, 1.1, NONE scorched3d-XML-injection.patch, 1.1, NONE scorched3d-aclocal18.patch, 1.1, NONE scorched3d-apoc-3.1-bins.tgz, 1.1, NONE scorched3d-apoc-3.1.patch, 1.1, NONE scorched3d-cvs-20050929.patch, 1.2, NONE scorched3d-formatstring.patch, 1.1, NONE scorched3d-gcc41.patch, 1.1, NONE scorched3d-negint.patch, 1.1, NONE scorched3d-opengl-without-context.patch, 1.1, NONE scorched3d-pgsql.patch, 1.1, NONE scorched3d-sprintf.patch, 1.1, NONE scorched3d-strxxx.patch, 1.1, NONE
Hans de Goede (jwrdegoede)
fedora-extras-commits at redhat.com
Sun Jul 16 20:05:42 UTC 2006
- Previous message (by thread): rpms/scorched3d/devel .cvsignore,1.3,1.4
- Next message (by thread): rpms/scorched3d/FC-4 scorched3d-wx26.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 scorched3d-64bit.patch, 1.1, 1.2 scorched3d-help.patch, 1.1, 1.2 scorched3d-openal.patch, 1.1, 1.2 scorched3d-syslibs.patch, 1.2, 1.3 scorched3d.spec, 1.7, 1.8 sources, 1.3, 1.4 scorched3d-HTML-injection.patch, 1.1, NONE scorched3d-XML-injection.patch, 1.1, NONE scorched3d-aclocal18.patch, 1.1, NONE scorched3d-apoc-3.1-bins.tgz, 1.1, NONE scorched3d-apoc-3.1.patch, 1.1, NONE scorched3d-cvs-20050929.patch, 1.1, NONE scorched3d-formatstring.patch, 1.1, NONE scorched3d-gcc41.patch, 1.1, NONE scorched3d-negint.patch, 1.1, NONE scorched3d-opengl-without-context.patch, 1.1, NONE scorched3d-pgsql.patch, 1.1, NONE scorched3d-sprintf.patch, 1.1, NONE scorched3d-strxxx.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: jwrdegoede
Update of /cvs/extras/rpms/scorched3d/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31359
Modified Files:
.cvsignore scorched3d-64bit.patch scorched3d-help.patch
scorched3d-openal.patch scorched3d-syslibs.patch
scorched3d.spec sources
Added Files:
scorched3d-wx26.patch
Removed Files:
scorched3d-HTML-injection.patch scorched3d-XML-injection.patch
scorched3d-aclocal18.patch scorched3d-apoc-3.1-bins.tgz
scorched3d-apoc-3.1.patch scorched3d-cvs-20050929.patch
scorched3d-formatstring.patch scorched3d-gcc41.patch
scorched3d-negint.patch
scorched3d-opengl-without-context.patch scorched3d-pgsql.patch
scorched3d-sprintf.patch scorched3d-strxxx.patch
Log Message:
* Sun Jul 15 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 40-1
- New upstream release 40
- Drop many upstreamed patches
- Use system ode library instead of included one
scorched3d-wx26.patch:
--- NEW FILE scorched3d-wx26.patch ---
--- scorched/src/scorched/NetLan.cpp~ 2006-07-16 12:50:44.000000000 +0200
+++ scorched/src/scorched/NetLan.cpp 2006-07-16 12:50:44.000000000 +0200
@@ -96,9 +96,9 @@
// Radio Buttons
wxFlexGridSizer *radioSizer = new wxFlexGridSizer(1, 8, 5, 5);
IDC_RADIO_NET_CTRL = new wxRadioButton(parent, IDC_RADIO_NET,
- "Internet", wxDefaultPosition, wxDefaultSize, wxRB_GROUP);
+ wxT("Internet"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP);
IDC_RADIO_LAN_CTRL = new wxRadioButton(parent, IDC_RADIO_LAN,
- "LAN", wxDefaultPosition, wxDefaultSize, 0);
+ wxT("LAN"), wxDefaultPosition, wxDefaultSize, 0);
radioSizer->Add(IDC_RADIO_NET_CTRL, 0, wxRIGHT, 10);
radioSizer->Add(IDC_RADIO_LAN_CTRL, 0, wxRIGHT, 0);
sizer->Add(radioSizer, 0, wxALIGN_CENTER | wxALL, 5);
--- scorched/src/scorched/OptionEntrySetter.cpp~ 2006-07-16 13:04:56.000000000 +0200
+++ scorched/src/scorched/OptionEntrySetter.cpp 2006-07-16 13:04:56.000000000 +0200
@@ -122,7 +122,7 @@
{
sizer->Add(control =
new wxCheckBox(parent, -1,
- "",
+ wxT(""),
wxDefaultPosition, wxDefaultSize),
0, wxALIGN_LEFT);
control->SetToolTip(
--- scorched/src/scorched/NetLan.cpp~ 2006-07-16 20:36:19.000000000 +0200
+++ scorched/src/scorched/NetLan.cpp 2006-07-16 20:36:19.000000000 +0200
@@ -71,17 +71,11 @@
new wxTextCtrl(parent, IDC_EDIT_PASSWORD,
wxT(""), wxDefaultPosition, wxSize(285, -1), wxTE_PASSWORD);
IDC_CLEAR_CTRL =
- new wxButton(parent, IDC_CLEAR,
- wxT("Clear"),
- wxDefaultPosition, wxSize(-1, 20));
+ new wxButton(parent, IDC_CLEAR, wxT("Clear"));
IDC_CLEAR_NAME_CTRL =
- new wxButton(parent, IDC_CLEAR_NAME,
- wxT("Clear"),
- wxDefaultPosition, wxSize(-1, 20));
+ new wxButton(parent, IDC_CLEAR_NAME, wxT("Clear"));
IDC_CLEAR_PASSWORD_CTRL =
- new wxButton(parent, IDC_CLEAR_PASSWORD,
- wxT("Clear"),
- wxDefaultPosition, wxSize(-1, 20));
+ new wxButton(parent, IDC_CLEAR_PASSWORD, wxT("Clear"));
nameSizer->Add(nameText, 0, wxALIGN_CENTER_VERTICAL);
nameSizer->Add(IDC_EDIT_SERVER_CTRL, 0, 0);
nameSizer->Add(IDC_CLEAR_CTRL, 0, 0);
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scorched3d/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 11 Oct 2005 19:19:39 -0000 1.3
+++ .cvsignore 16 Jul 2006 20:05:42 -0000 1.4
@@ -1 +1 @@
-Scorched3D-39.1-src.tar.gz
+Scorched3D-40-src.tar.gz
scorched3d-64bit.patch:
Index: scorched3d-64bit.patch
===================================================================
RCS file: /cvs/extras/rpms/scorched3d/FC-5/scorched3d-64bit.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- scorched3d-64bit.patch 12 Feb 2006 11:16:24 -0000 1.5
+++ scorched3d-64bit.patch 16 Jul 2006 20:05:42 -0000 1.6
@@ -1,7 +1,7 @@
diff -ur scorched.orig/src/client/ClientConnectionAcceptHandler.cpp scorched/src/client/ClientConnectionAcceptHandler.cpp
---- scorched.orig/src/client/ClientConnectionAcceptHandler.cpp 2006-02-09 14:52:14.000000000 +0100
-+++ scorched/src/client/ClientConnectionAcceptHandler.cpp 2006-02-09 14:47:28.000000000 +0100
-@@ -66,7 +66,9 @@
+--- scorched.orig/src/client/ClientConnectionAcceptHandler.cpp 2006-02-13 18:54:26.000000000 +0100
++++ scorched/src/client/ClientConnectionAcceptHandler.cpp 2006-07-16 10:26:01.000000000 +0200
+@@ -68,7 +68,9 @@
if (OptionsParam::instance()->getConnectedToServer())
{
@@ -12,22 +12,24 @@
if (!ConnectDialog::instance()->getIdStore().saveUniqueId(
ip, message.getUniqueId(), message.getPublishAddress()))
{
+Only in scorched/src/client: ClientConnectionAcceptHandler.cpp.orig
diff -ur scorched.orig/src/client/ServerBrowser.cpp scorched/src/client/ServerBrowser.cpp
---- scorched.orig/src/client/ServerBrowser.cpp 2006-02-09 14:52:14.000000000 +0100
-+++ scorched/src/client/ServerBrowser.cpp 2006-02-09 14:47:28.000000000 +0100
-@@ -50,7 +50,7 @@
+--- scorched.orig/src/client/ServerBrowser.cpp 2006-07-05 19:16:14.000000000 +0200
++++ scorched/src/client/ServerBrowser.cpp 2006-07-16 10:26:01.000000000 +0200
+@@ -79,7 +79,7 @@
int ServerBrowser::threadFunc(void *var)
{
- bool lan = (bool) (int(var)==1);
+ bool lan = (bool) (long(var)==1);
bool result = false;
- if (lan) result = instance_->serverList_.fetchLANList();
- else result = instance_->serverList_.fetchServerList();
+ if (lan) result = instance_->serverCollector_.fetchLANList();
+ else result = instance_->serverCollector_.fetchServerList();
+Only in scorched/src/client: ServerBrowser.cpp.orig
diff -ur scorched.orig/src/coms/NetServer.cpp scorched/src/coms/NetServer.cpp
---- scorched.orig/src/coms/NetServer.cpp 2006-02-09 14:52:14.000000000 +0100
-+++ scorched/src/coms/NetServer.cpp 2006-02-09 16:48:09.000000000 +0100
-@@ -33,6 +33,7 @@
+--- scorched.orig/src/coms/NetServer.cpp 2006-02-13 18:54:26.000000000 +0100
++++ scorched/src/coms/NetServer.cpp 2006-07-16 10:54:20.000000000 +0200
+@@ -32,6 +32,7 @@
{
sockSet_ = SDLNet_AllocSocketSet(1);
setMutex_ = SDL_CreateMutex();
@@ -35,7 +37,7 @@
SDL_CreateThread(NetServer::threadFunc, (void *) this);
}
-@@ -66,7 +67,8 @@
+@@ -65,7 +66,8 @@
{
NetMessage *message = (delayedMessages_.front()).second;
delayedMessages_.pop_front();
@@ -45,7 +47,7 @@
}
}
-@@ -184,27 +185,25 @@
+@@ -184,27 +186,25 @@
bool NetServer::pollDeleted()
{
SDL_LockMutex(setMutex_);
@@ -78,7 +80,7 @@
}
SDL_UnlockMutex(setMutex_);
return true;
-@@ -212,13 +211,25 @@
+@@ -212,13 +212,24 @@
void NetServer::addClient(TCPsocket client)
{
@@ -96,10 +98,9 @@
+
// Create the thread to read this socket
- NetServerRead *serverRead = new NetServerRead(
-- client, protocol_, &messageHandler_, &checkDeleted_, sentNotification_);
+- client, protocol_, &messageHandler_, &checkDeleted_);
+ NetServerRead *serverRead = new NetServerRead(client, lastId_,
-+ protocol_, &messageHandler_, &checkDeleted_,
-+ sentNotification_);
++ protocol_, &messageHandler_, &checkDeleted_);
// Add this to the collection of sockets (connections)
- SDL_LockMutex(setMutex_);
@@ -108,7 +109,7 @@
firstDestination_ = (*connections_.begin()).first;
SDL_UnlockMutex(setMutex_);
-@@ -228,27 +238,23 @@
+@@ -228,27 +239,23 @@
void NetServer::disconnectAllClients()
{
@@ -140,7 +141,7 @@
if (delayed)
{
-@@ -258,26 +264,22 @@
+@@ -258,26 +265,22 @@
else
{
// Add the message to the list of out going
@@ -172,7 +173,7 @@
// Add message to new buffer
message->getBuffer().allocate(buffer.getBufferUsed());
-@@ -286,28 +288,37 @@
+@@ -286,28 +289,38 @@
message->getBuffer().setBufferUsed(buffer.getBufferUsed());
// Send Mesage
@@ -197,8 +198,8 @@
else
- {
NetMessagePool::instance()->addToPool(message);
-- Logger::log( "Unknown sendMessage destination %i",
-- (int) client);
+- Logger::log(formatString("Unknown sendMessage destination %i",
+- (int) client));
+}
+
+NetServerRead *NetServer::getServerRead(unsigned int dest)
@@ -213,7 +214,8 @@
+ if (itor != connections_.end())
+ serverRead = (*itor).second;
+ else
-+ Logger::log( "Unknown destination %u", dest);
++ Logger::log(formatString("Unknown destination %u",
++ dest));
+ SDL_UnlockMutex(setMutex_);
}
- SDL_UnlockMutex(setMutex_);
@@ -222,7 +224,7 @@
}
unsigned int NetServer::getIpAddress(TCPsocket destination)
-@@ -324,3 +335,14 @@
+@@ -324,3 +336,14 @@
return addr;
}
@@ -237,12 +239,15 @@
+{
+ return getIpAddress(getServerRead(destination));
+}
+Only in scorched/src/coms: NetServer.cpp.orig
+Only in scorched/src/coms: NetServer.cpp.rej
+Only in scorched/src/coms: NetServer.cpp~
diff -ur scorched.orig/src/coms/NetServer.h scorched/src/coms/NetServer.h
---- scorched.orig/src/coms/NetServer.h 2006-02-09 14:52:14.000000000 +0100
-+++ scorched/src/coms/NetServer.h 2006-02-09 16:48:14.000000000 +0100
-@@ -47,28 +47,32 @@
+--- scorched.orig/src/coms/NetServer.h 2005-10-24 22:58:29.000000000 +0200
++++ scorched/src/coms/NetServer.h 2006-07-16 10:32:48.000000000 +0200
+@@ -46,26 +46,30 @@
+ virtual void sendMessage(NetBuffer &buffer);
virtual void sendMessage(NetBuffer &buffer, unsigned int destination);
- void setSentNotification() { sentNotification_ = true; }
+ unsigned int getIpAddress(unsigned int destination);
static unsigned int getIpAddress(TCPsocket destination);
@@ -260,7 +265,6 @@
SDL_mutex *setMutex_;
NetMessageHandler messageHandler_;
bool checkDeleted_;
- bool sentNotification_;
+ unsigned int lastId_;
static int threadFunc(void *);
@@ -269,18 +273,18 @@
bool pollDeleted();
void addClient(TCPsocket client);
- void sendMessage(TCPsocket client, NetMessage *message);
--
+ void sendMessage(NetServerRead *serverRead, NetMessage *message);
+ NetServerRead *getServerRead(unsigned int dest);
+ unsigned int getIpAddress(NetServerRead *serverRead);
-+
+
private:
- NetServer(const NetServer &);
+Only in scorched/src/coms: NetServer.h.orig
+Only in scorched/src/coms: NetServer.h.rej
Only in scorched/src/coms: NetServer.h~
diff -ur scorched.orig/src/coms/NetServerProtocol.cpp scorched/src/coms/NetServerProtocol.cpp
---- scorched.orig/src/coms/NetServerProtocol.cpp 2006-02-09 14:52:14.000000000 +0100
-+++ scorched/src/coms/NetServerProtocol.cpp 2006-02-09 14:47:28.000000000 +0100
+--- scorched.orig/src/coms/NetServerProtocol.cpp 2006-07-16 10:49:53.000000000 +0200
++++ scorched/src/coms/NetServerProtocol.cpp 2006-07-16 10:26:01.000000000 +0200
@@ -40,7 +40,8 @@
{
}
@@ -411,8 +415,8 @@
// get the string buffer over the socket
diff -ur scorched.orig/src/coms/NetServerProtocol.h scorched/src/coms/NetServerProtocol.h
---- scorched.orig/src/coms/NetServerProtocol.h 2006-02-09 14:52:14.000000000 +0100
-+++ scorched/src/coms/NetServerProtocol.h 2006-02-09 14:47:28.000000000 +0100
+--- scorched.orig/src/coms/NetServerProtocol.h 2005-06-08 19:29:38.000000000 +0200
++++ scorched/src/coms/NetServerProtocol.h 2006-07-16 10:26:01.000000000 +0200
@@ -29,8 +29,10 @@
NetServerProtocol();
virtual ~NetServerProtocol();
@@ -479,23 +483,22 @@
#endif
diff -ur scorched.orig/src/coms/NetServerRead.cpp scorched/src/coms/NetServerRead.cpp
---- scorched.orig/src/coms/NetServerRead.cpp 2006-02-09 14:52:14.000000000 +0100
-+++ scorched/src/coms/NetServerRead.cpp 2006-02-09 14:47:28.000000000 +0100
-@@ -26,11 +26,12 @@
+--- scorched.orig/src/coms/NetServerRead.cpp 2006-02-13 18:54:26.000000000 +0100
++++ scorched/src/coms/NetServerRead.cpp 2006-07-16 10:37:25.000000000 +0200
+@@ -26,10 +26,11 @@
#include <common/Defines.h>
NetServerRead::NetServerRead(TCPsocket socket,
+ unsigned int socketId,
NetServerProtocol *protocol,
NetMessageHandler *messageHandler,
- bool *checkDeleted,
- bool sentNotification) :
+ bool *checkDeleted) :
- socket_(socket), sockSet_(0), protocol_(protocol),
+ socket_(socket), socketId_(socketId), sockSet_(0), protocol_(protocol),
outgoingMessagesMutex_(0), checkDeleted_(checkDeleted),
disconnect_(false), messageHandler_(messageHandler),
sentDisconnect_(false), startCount_(0),
-@@ -64,8 +65,7 @@
+@@ -62,8 +63,7 @@
// Send the player connected notification
NetMessage *message = NetMessagePool::instance()->
getFromPool(NetMessage::ConnectMessage,
@@ -505,7 +508,7 @@
messageHandler_->addMessage(message);
recvThread_ = SDL_CreateThread(
-@@ -96,8 +96,7 @@
+@@ -94,8 +94,7 @@
sentDisconnect_ = true;
NetMessage *message = NetMessagePool::instance()->
getFromPool(NetMessage::DisconnectMessage,
@@ -515,19 +518,19 @@
messageHandler_->addMessage(message);
}
SDL_UnlockMutex(outgoingMessagesMutex_);
-@@ -189,9 +188,9 @@
+@@ -187,9 +186,9 @@
if (timeDiff > 15.0f)
{
- Logger::log(
+ Logger::log(formatString(
- "Warning: %s net loop took %.2f seconds, client %i",
+ "Warning: %s net loop took %.2f seconds, client %u",
(send?"Send":"Recv"),
-- timeDiff, (unsigned int) socket_);
-+ timeDiff, socketId_);
+- timeDiff, (unsigned int) socket_));
++ timeDiff, socketId_));
}
}
-@@ -201,8 +200,7 @@
+@@ -199,8 +198,7 @@
sentDisconnect_ = true;
NetMessage *message = NetMessagePool::instance()->
getFromPool(NetMessage::DisconnectMessage,
@@ -537,7 +540,7 @@
messageHandler_->addMessage(message);
}
SDL_UnlockMutex(outgoingMessagesMutex_);
-@@ -220,7 +218,8 @@
+@@ -218,7 +216,8 @@
if(SDLNet_SocketReady(socket_))
{
@@ -547,7 +550,7 @@
if (!message)
{
Logger::log( "Client socket has been closed.");
-@@ -263,7 +262,8 @@
+@@ -261,7 +260,8 @@
}
else
{
@@ -557,18 +560,12 @@
{
Logger::log( "Failed to send message to client");
result = false;
-@@ -276,7 +276,7 @@
- {
- NetMessage *notification = NetMessagePool::instance()->
- getFromPool(NetMessage::SentMessage,
-- (unsigned int) socket_,
-+ socketId_,
- NetServer::getIpAddress(socket_));
- messageHandler_->addMessage(notification);
- }
+Only in scorched/src/coms: NetServerRead.cpp.orig
+Only in scorched/src/coms: NetServerRead.cpp.rej
+Only in scorched/src/coms: NetServerRead.cpp~
diff -ur scorched.orig/src/coms/NetServerRead.h scorched/src/coms/NetServerRead.h
---- scorched.orig/src/coms/NetServerRead.h 2006-02-09 14:52:14.000000000 +0100
-+++ scorched/src/coms/NetServerRead.h 2006-02-09 14:47:28.000000000 +0100
+--- scorched.orig/src/coms/NetServerRead.h 2005-10-24 22:58:29.000000000 +0200
++++ scorched/src/coms/NetServerRead.h 2006-07-16 10:29:58.000000000 +0200
@@ -28,6 +28,7 @@
{
public:
@@ -576,8 +573,8 @@
+ unsigned int socketId,
NetServerProtocol *protocol,
NetMessageHandler *messageHandler,
- bool *checkDeleted,
-@@ -37,12 +38,14 @@
+ bool *checkDeleted);
+@@ -36,11 +37,13 @@
void start();
bool getDisconnect();
void addMessage(NetMessage *message);
@@ -586,28 +583,33 @@
protected:
bool *checkDeleted_;
bool disconnect_, sentDisconnect_;
- bool sentNotification_;
TCPsocket socket_;
+ unsigned int socketId_;
SDLNet_SocketSet sockSet_;
NetServerProtocol *protocol_;
NetMessageHandler *messageHandler_;
+Only in scorched/src/coms: NetServerRead.h.orig
+Only in scorched/src/coms: NetServerRead.h.rej
+Only in scorched/src/coms: NetServerRead.h~
diff -ur scorched.orig/src/dialogs/HelpButtonDialog.cpp scorched/src/dialogs/HelpButtonDialog.cpp
---- scorched.orig/src/dialogs/HelpButtonDialog.cpp 2006-02-09 14:52:14.000000000 +0100
-+++ scorched/src/dialogs/HelpButtonDialog.cpp 2006-02-09 14:47:28.000000000 +0100
-@@ -160,7 +160,7 @@
-
- void HelpButtonDialog::itemSelected(GLWSelectorEntry *entry, int position)
+--- scorched.orig/src/dialogs/HelpButtonDialog.cpp 2006-04-30 13:56:33.000000000 +0200
++++ scorched/src/dialogs/HelpButtonDialog.cpp 2006-07-16 10:49:15.000000000 +0200
+@@ -127,7 +127,7 @@
+ void HelpButtonDialog::VolumeMenu::menuSelection(const char* menuName,
+ const int position, GLMenuItem &item)
{
-- int data = (int) entry->getUserData();
-+ long data = (long) entry->getUserData();
+- int data = (int) item.getUserData();
++ long data = (long) item.getUserData();
if (data != -1)
{
int volume = int(float(data) * 12.8f);
+Only in scorched/src/dialogs: HelpButtonDialog.cpp.orig
+Only in scorched/src/dialogs: HelpButtonDialog.cpp.rej
+Only in scorched/src/dialogs: HelpButtonDialog.cpp~
diff -ur scorched.orig/src/engine/ScorchedCollisionHandler.cpp scorched/src/engine/ScorchedCollisionHandler.cpp
---- scorched.orig/src/engine/ScorchedCollisionHandler.cpp 2006-02-09 14:52:14.000000000 +0100
-+++ scorched/src/engine/ScorchedCollisionHandler.cpp 2006-02-09 14:47:28.000000000 +0100
-@@ -93,7 +93,7 @@
+--- scorched.orig/src/engine/ScorchedCollisionHandler.cpp 2006-04-07 01:08:28.000000000 +0200
++++ scorched/src/engine/ScorchedCollisionHandler.cpp 2006-07-16 10:26:01.000000000 +0200
+@@ -136,7 +136,7 @@
}
ShotBounce *particle = (ShotBounce *) bounceInfo->data;
@@ -616,7 +618,7 @@
// only collide with the ground, walls or landscape,
// or iteself
-@@ -217,7 +217,7 @@
+@@ -257,7 +257,7 @@
otherInfo = (ScorchedCollisionInfo *) dGeomGetData(o1);
}
@@ -625,93 +627,13 @@
ShotProjectile *shot = (ShotProjectile *) particleInfo->data;
shot->incLandedCounter();
Vector particlePositionV(
-diff -ur scorched.orig/src/ode/config.h scorched/src/ode/config.h
---- scorched.orig/src/ode/config.h 2006-02-09 14:52:14.000000000 +0100
-+++ scorched/src/ode/config.h 2006-02-09 14:47:28.000000000 +0100
-@@ -81,7 +81,7 @@
- /* an integer type that we can safely cast a pointer to and from without
- * loss of bits.
- */
--typedef unsigned int intP;
-+typedef unsigned long intP;
-
-
- /* if we're compiling on a pentium, we may need to know the clock rate so
-diff -ur scorched.orig/src/scorched/SettingsDialog.cpp scorched/src/scorched/SettingsDialog.cpp
---- scorched.orig/src/scorched/SettingsDialog.cpp 2006-02-09 14:52:14.000000000 +0100
-+++ scorched/src/scorched/SettingsDialog.cpp 2006-02-09 14:47:28.000000000 +0100
-@@ -748,44 +748,44 @@
-
- // Env
- {
-- context_.setWindForce((OptionsGame::WindForce) (int)
-+ context_.setWindForce((OptionsGame::WindForce) (long)
- SettingsEnv::IDC_COMBO_FORCE_CTRL->GetClientData(
- SettingsEnv::IDC_COMBO_FORCE_CTRL->GetSelection()));
-
-- context_.setWindType((OptionsGame::WindType) (int)
-+ context_.setWindType((OptionsGame::WindType) (long)
- SettingsEnv::IDC_COMBO_WINDCHANGES_CTRL->GetClientData(
- SettingsEnv::IDC_COMBO_WINDCHANGES_CTRL->GetSelection()));
-
-- context_.setWallType((OptionsGame::WallType) (int)
-+ context_.setWallType((OptionsGame::WallType) (long)
- SettingsEnv::IDC_COMBO_WALLTYPE_CTRL->GetClientData(
- SettingsEnv::IDC_COMBO_WALLTYPE_CTRL->GetSelection()));
-
-- context_.setWeapScale((OptionsGame::WeapScale) (int)
-+ context_.setWeapScale((OptionsGame::WeapScale) (long)
- SettingsEnv::IDC_COMBO_WEAPONSCALE_CTRL->GetClientData(
- SettingsEnv::IDC_COMBO_WEAPONSCALE_CTRL->GetSelection()));
-
-- context_.setStartArmsLevel((int)
-+ context_.setStartArmsLevel((long)
- SettingsEnv::IDC_COMBO_STARTARMSLEVEL_CTRL->GetClientData(
- SettingsEnv::IDC_COMBO_STARTARMSLEVEL_CTRL->GetSelection()));
-
-- context_.setEndArmsLevel((int)
-+ context_.setEndArmsLevel((long)
- SettingsEnv::IDC_COMBO_ENDARMSLEVEL_CTRL->GetClientData(
- SettingsEnv::IDC_COMBO_ENDARMSLEVEL_CTRL->GetSelection()));
-- context_.setMinFallingDistance((int)
-+ context_.setMinFallingDistance((long)
- SettingsEnv::IDC_COMBO_FALLINGDISTANCE_CTRL->GetClientData(
- SettingsEnv::IDC_COMBO_FALLINGDISTANCE_CTRL->GetSelection()));
-- context_.setMaxClimbingDistance((int)
-+ context_.setMaxClimbingDistance((long)
- SettingsEnv::IDC_COMBO_CLIMBINGDISTANCE_CTRL->GetClientData(
- SettingsEnv::IDC_COMBO_CLIMBINGDISTANCE_CTRL->GetSelection()));
-
- context_.setGiveAllWeapons(
- SettingsEnv::IDC_GIVEALLWEAPONS_CTRL->GetValue());
-
-- context_.setResignMode((OptionsGame::ResignType) (int)
-+ context_.setResignMode((OptionsGame::ResignType) (long)
- SettingsEnv::IDC_RESIGNENDROUND_CTRL->GetClientData(
- SettingsEnv::IDC_RESIGNENDROUND_CTRL->GetSelection()));
-
-- context_.setMovementRestriction((OptionsGame::MovementRestrictionType) (int)
-+ context_.setMovementRestriction((OptionsGame::MovementRestrictionType) (long)
- SettingsEnv::IDC_MOVEMENTRESTRICTION_CTRL->GetClientData(
- SettingsEnv::IDC_MOVEMENTRESTRICTION_CTRL->GetSelection()));
- }
-@@ -809,10 +809,10 @@
- int downloadSpeed = 0;
- int keepAliveTime = 0;
-
-- context_.setTurnType((OptionsGame::TurnType) (int)
-+ context_.setTurnType((OptionsGame::TurnType) (long)
- SettingsMain::IDC_TYPE_CTRL->GetClientData(
- SettingsMain::IDC_TYPE_CTRL->GetSelection()));
-- context_.setTeamBallance((OptionsGame::TeamBallanceType) (int)
-+ context_.setTeamBallance((OptionsGame::TeamBallanceType) (long)
- SettingsMain::IDC_TEAMBALLANCE_CTRL->GetClientData(
- SettingsMain::IDC_TEAMBALLANCE_CTRL->GetSelection()));
- context_.setTeams((int) SettingsMain::IDC_TEAMS_CTRL->GetSelection() + 1);
+Only in scorched/src/engine: ScorchedCollisionHandler.cpp.orig
+Only in scorched/src/scorched: SettingsDialog.cpp.orig
+Only in scorched/src/scorched: SettingsDialog.cpp.rej
diff -ur scorched.orig/src/server/ServerConnectHandler.cpp scorched/src/server/ServerConnectHandler.cpp
---- scorched.orig/src/server/ServerConnectHandler.cpp 2006-02-09 14:52:14.000000000 +0100
-+++ scorched/src/server/ServerConnectHandler.cpp 2006-02-09 14:47:28.000000000 +0100
-@@ -87,7 +87,9 @@
+--- scorched.orig/src/server/ServerConnectHandler.cpp 2006-07-10 18:48:27.000000000 +0200
++++ scorched/src/server/ServerConnectHandler.cpp 2006-07-16 10:26:52.000000000 +0200
+@@ -88,7 +88,9 @@
}
// Get the ip address
@@ -722,24 +644,41 @@
}
// Decode the connect message
+Only in scorched/src/server: ServerConnectHandler.cpp.orig
diff -ur scorched.orig/src/tankgraph/GLWTankTip.cpp scorched/src/tankgraph/GLWTankTip.cpp
---- scorched.orig/src/tankgraph/GLWTankTip.cpp 2006-02-09 14:52:14.000000000 +0100
-+++ scorched/src/tankgraph/GLWTankTip.cpp 2006-02-09 14:47:28.000000000 +0100
-@@ -66,7 +66,7 @@
+--- scorched.orig/src/tankgraph/GLWTankTip.cpp 2006-07-11 03:36:06.000000000 +0200
++++ scorched/src/tankgraph/GLWTankTip.cpp 2006-07-16 10:48:01.000000000 +0200
+@@ -68,7 +68,7 @@
void TankUndoMenu::itemSelected(GLWSelectorEntry *entry, int position)
{
-- tank_->getPhysics().revertSettings((unsigned int) entry->getUserData());
-+ tank_->getPhysics().revertSettings((unsigned long) entry->getUserData());
+- tank_->getPosition().revertSettings((unsigned int) entry->getUserData());
++ tank_->getPosition().revertSettings((unsigned long) entry->getUserData());
}
TankFuelTip::TankFuelTip(Tank *tank) :
-@@ -170,7 +170,7 @@
+@@ -236,7 +236,7 @@
void TankBatteryTip::itemSelected(GLWSelectorEntry *entry, int position)
{
TankAIHuman *tankAI = (TankAIHuman *) tank_->getTankAI();
- for (int i=1; i<=(int) entry->getUserData(); i++)
+ for (int i=1; i<=(long) entry->getUserData(); i++)
{
- if (tank_->getState().getLife() < 100.0f)
- {
+ if (tank_->getLife().getLife() <
+ tank_->getLife().getMaxLife())
+Only in scorched/src/tankgraph: GLWTankTip.cpp.orig
+Only in scorched/src/tankgraph: GLWTankTip.cpp.rej
+Only in scorched/src/tankgraph: GLWTankTip.cpp~
+--- scorched/src/engine/ScorchedCollisionHandler.cpp~ 2006-07-16 11:48:56.000000000 +0200
++++ scorched/src/engine/ScorchedCollisionHandler.cpp 2006-07-16 11:48:56.000000000 +0200
+@@ -90,8 +90,8 @@
+ ScorchedCollisionInfo *info1, ScorchedCollisionInfo *info2,
+ dContactGeom *contacts, int noContacts)
+ {
+- unsigned int playerId1 = (unsigned int) info1->data;
+- unsigned int playerId2 = (unsigned int) info2->data;
++ unsigned int playerId1 = (unsigned long) info1->data;
++ unsigned int playerId2 = (unsigned long) info2->data;
+ Target *target1 = context_->targetContainer->getTargetById(playerId1);
+ Target *target2 = context_->targetContainer->getTargetById(playerId2);
+ if (!target1 || !target2) return;
scorched3d-help.patch:
Index: scorched3d-help.patch
===================================================================
RCS file: /cvs/extras/rpms/scorched3d/FC-5/scorched3d-help.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- scorched3d-help.patch 9 Feb 2006 21:57:31 -0000 1.2
+++ scorched3d-help.patch 16 Jul 2006 20:05:42 -0000 1.3
@@ -1,18 +1,6 @@
---- scorched/src/scorched/MainDialog.cpp.help 2006-02-06 12:24:58.000000000 +0100
-+++ scorched/src/scorched/MainDialog.cpp 2006-02-06 12:25:42.000000000 +0100
-@@ -131,8 +131,8 @@
- #ifdef __DARWIN__
- system(formatString("open %s", url));
- #else
-- system(formatString("mozilla %s", url));
-- dialogMessage("Web site location", "%s", url);
-+ system(formatString("htmlview %s&", url));
-+ // dialogMessage("Web site location", "%s", url);
- #endif // __DARWIN__
- #endif // _WIN32
- }
---- scorched/src/scorched/HtmlHelpDialog.cpp.help 2006-02-09 19:14:11.000000000 +0100
-+++ scorched/src/scorched/HtmlHelpDialog.cpp 2006-02-09 19:14:49.000000000 +0100
+diff -ur scorched.orig/src/scorched/HtmlHelpDialog.cpp scorched/src/scorched/HtmlHelpDialog.cpp
+--- scorched.orig/src/scorched/HtmlHelpDialog.cpp 2006-02-17 18:48:54.000000000 +0100
++++ scorched/src/scorched/HtmlHelpDialog.cpp 2006-07-16 11:03:57.000000000 +0200
@@ -137,13 +137,13 @@
void HelpFrame::onHome(wxCommandEvent &event)
{
@@ -24,8 +12,28 @@
void showHtmlHelpDialog()
{
// For the moment just show the documentation in the default web browser
-- showURL(getDocFile("documentation/html/index.html"));
-+ showURL(getDocFile("html/index.html"));
+- showURL(formatString("file://%s", getDocFile("documentation/html/index.html")));
++ showURL(formatString("file://%s", getDocFile("html/index.html")));
//HelpFrame *frame = new HelpFrame();
//frame->Show();
+Only in scorched/src/scorched: HtmlHelpDialog.cpp.orig
+Only in scorched/src/scorched: HtmlHelpDialog.cpp.rej
+Only in scorched/src/scorched: HtmlHelpDialog.cpp~
+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 @@
+ #ifdef __DARWIN__
+ system(formatString("open %s", url));
+ #else
+- system(formatString("mozilla %s", url));
+- dialogMessage("Web site location", formatString("%s", url));
++ system(formatString("htmlview %s&", url));
++// dialogMessage("Web site location", formatString("%s", url));
+ #endif // __DARWIN__
+ #endif // _WIN32
+ }
+Only in scorched/src/scorched: MainDialog.cpp.orig
+Only in scorched/src/scorched: MainDialog.cpp.rej
+Only in scorched/src/scorched: MainDialog.cpp~
scorched3d-openal.patch:
Index: scorched3d-openal.patch
===================================================================
RCS file: /cvs/extras/rpms/scorched3d/FC-5/scorched3d-openal.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- scorched3d-openal.patch 6 Feb 2006 15:01:40 -0000 1.1
+++ scorched3d-openal.patch 16 Jul 2006 20:05:42 -0000 1.2
@@ -1,5 +1,18 @@
---- scorched/configure.ac.openal 2006-02-06 10:55:19.000000000 +0100
-+++ scorched/configure.ac 2006-02-06 10:55:31.000000000 +0100
+diff -ur scorched.orig/configure scorched/configure
+--- scorched.orig/configure 2006-07-15 17:15:30.000000000 +0200
++++ scorched/configure 2006-07-16 11:00:26.000000000 +0200
+@@ -3946,7 +3946,7 @@
+ if test x"$use_static_openal" = x"yes"; then
+ LIBS="$LIBS /usr/local/lib/libopenal.a"
+ else
+- LIBS="$LIBS `$OPENAL_CONFIG --libs`"
++ LIBS="$LIBS `$OPENAL_CONFIG --libs` -lalut"
+ fi
+
+ CFLAGS="$CFLAGS `$OPENAL_CONFIG --cflags`"
+diff -ur scorched.orig/configure.ac scorched/configure.ac
+--- scorched.orig/configure.ac 2006-07-15 14:01:30.000000000 +0200
++++ scorched/configure.ac 2006-07-16 10:59:21.000000000 +0200
@@ -114,7 +114,7 @@
if test x"$use_static_openal" = x"yes"; then
LIBS="$LIBS /usr/local/lib/libopenal.a"
@@ -9,3 +22,4 @@
fi
CFLAGS="$CFLAGS `$OPENAL_CONFIG --cflags`"
+Only in scorched: configure~
scorched3d-syslibs.patch:
Index: scorched3d-syslibs.patch
===================================================================
RCS file: /cvs/extras/rpms/scorched3d/FC-5/scorched3d-syslibs.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- scorched3d-syslibs.patch 11 Oct 2005 19:19:39 -0000 1.2
+++ scorched3d-syslibs.patch 16 Jul 2006 20:05:42 -0000 1.3
@@ -1,28 +1,143 @@
---- scorched/src/engine/ModFileEntry.cpp~ 2005-06-06 00:54:01.000000000 +0300
-+++ scorched/src/engine/ModFileEntry.cpp 2005-10-08 02:14:29.000000000 +0300
-@@ -20,7 +20,7 @@
-
- #include <engine/ModFileEntry.h>
- #include <engine/ModFiles.h>
+--- scorched/src/coms/NetServerProtocol.cpp.syslibs 2006-02-13 18:54:26.000000000 +0100
++++ scorched/src/coms/NetServerProtocol.cpp 2006-07-16 11:36:19.000000000 +0200
+@@ -22,7 +22,7 @@
+ #include <coms/NetMessagePool.h>
+ #include <coms/NetServer.h>
+ #include <common/Logger.h>
-#include <zlib/zlib.h>
+#include <zlib.h>
- #include <wx/dir.h>
- #include <wx/utils.h>
---- scorched/src/landscape/LandscapeMaps.cpp~ 2005-08-10 15:39:31.000000000 +0300
-+++ scorched/src/landscape/LandscapeMaps.cpp 2005-10-08 02:14:45.000000000 +0300
-@@ -31,7 +31,7 @@
- #include <common/RandomGenerator.h>
- #include <common/Defines.h>
- #include <common/Logger.h>
+ NetServerProtocol::NetServerProtocol()
+ {
+--- scorched/src/coms/ComsMessageSender.cpp.syslibs 2006-02-13 18:54:26.000000000 +0100
++++ scorched/src/coms/ComsMessageSender.cpp 2006-07-16 11:36:19.000000000 +0200
+@@ -27,7 +27,7 @@
+ #include <tank/TankContainer.h>
+ #include <client/ScorchedClient.h>
+ #include <server/ScorchedServer.h>
-#include <zlib/zlib.h>
+#include <zlib.h>
- #include <float.h>
- #include <stdlib.h>
+ #include <set>
---- scorched/src/scorched/Makefile.am~ 2005-08-30 21:04:22.000000000 +0300
-+++ scorched/src/scorched/Makefile.am 2005-10-08 02:15:02.000000000 +0300
-@@ -690,39 +690,6 @@
+ bool ComsMessageSender::sendToServer(ComsMessage &message)
+--- scorched/src/XML/XMLParser.h.syslibs 2006-05-01 01:42:52.000000000 +0200
++++ scorched/src/XML/XMLParser.h 2006-07-16 11:36:19.000000000 +0200
+@@ -21,7 +21,7 @@
+ #if !defined(__INCLUDE_XMLParserh_INCLUDE__)
+ #define __INCLUDE_XMLParserh_INCLUDE__
+
+-#include <XML/expat.h>
++#include <expat.h>
+ #include <XML/XMLNode.h>
+
+ class XMLParser
+--- scorched/src/scorched/Makefile.am.syslibs 2006-07-15 17:14:50.000000000 +0200
++++ scorched/src/scorched/Makefile.am 2006-07-16 11:36:47.000000000 +0200
+@@ -260,7 +260,6 @@
+ ../common/Vector.h \
+ ../common/VectorLib.cpp \
+ ../common/VectorLib.h \
+- ../common/snprintf.c \
+ ../3dsparse/ASEModelFactory.cpp \
+ ../3dsparse/ASEModelFactory.h \
+ ../3dsparse/Bone.cpp \
+@@ -602,95 +601,6 @@
+ ../weapons/WeaponTranslate.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_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 \
+@@ -1100,14 +1010,6 @@
../XML/XMLParser.h \
../XML/XMLStringBuffer.cpp \
../XML/XMLStringBuffer.h \
@@ -34,6 +149,87 @@
- ../XML/xmlrole.h \
- ../XML/xmltok.c \
- ../XML/xmltok.h \
+ ../target/Target.cpp \
+ ../target/Target.h \
+ ../target/TargetContainer.cpp \
+--- scorched/src/scorched/Makefile.in.syslibs 2006-07-15 17:15:28.000000000 +0200
++++ scorched/src/scorched/Makefile.in 2006-07-16 11:37:23.000000000 +0200
+@@ -360,7 +360,6 @@
+ ../common/Vector.h \
+ ../common/VectorLib.cpp \
+ ../common/VectorLib.h \
+- ../common/snprintf.c \
+ ../3dsparse/ASEModelFactory.cpp \
+ ../3dsparse/ASEModelFactory.h \
+ ../3dsparse/Bone.cpp \
+@@ -702,95 +701,6 @@
+ ../weapons/WeaponTranslate.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_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 \
@@ -59,33 +255,818 @@
- ../zlib/zlib.h \
- ../zlib/zutil.c \
- ../zlib/zutil.h \
- ../actions/ActionVector.cpp \
- ../actions/ActionVector.h \
+ ../actions/AddTarget.cpp \
+ ../actions/AddTarget.h \
../actions/Animation.cpp \
---- scorched/src/coms/NetServerProtocol.cpp~ 2005-06-13 20:31:06.000000000 +0300
-+++ scorched/src/coms/NetServerProtocol.cpp 2005-10-08 02:14:04.000000000 +0300
-@@ -22,7 +22,7 @@
- #include <coms/NetMessagePool.h>
- #include <coms/NetServer.h>
- #include <common/Logger.h>
--#include <zlib/zlib.h>
-+#include <zlib.h>
+@@ -1200,14 +1110,6 @@
+ ../XML/XMLParser.h \
+ ../XML/XMLStringBuffer.cpp \
+ ../XML/XMLStringBuffer.h \
+- ../XML/expat.h \
+- ../XML/expat_config.h \
+- ../XML/winconfig.h \
+- ../XML/xmlparse.c \
+- ../XML/xmlrole.c \
+- ../XML/xmlrole.h \
+- ../XML/xmltok.c \
+- ../XML/xmltok.h \
+ ../target/Target.cpp \
+ ../target/Target.h \
+ ../target/TargetContainer.cpp \
+@@ -1426,7 +1328,7 @@
+ SplineCurve.$(OBJEXT) SplinePath.$(OBJEXT) \
+ StatsLogger.$(OBJEXT) StatsLoggerFile.$(OBJEXT) \
+ StatsLoggerMySQL.$(OBJEXT) Triangle.$(OBJEXT) Vector.$(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) \
+@@ -1506,21 +1408,6 @@
+ WeaponScatterPosition.$(OBJEXT) WeaponSkyFlash.$(OBJEXT) \
+ WeaponSound.$(OBJEXT) WeaponTeleport.$(OBJEXT) \
+ WeaponTranslate.$(OBJEXT) WeaponVelocity.$(OBJEXT) \
+- array.$(OBJEXT) collision_kernel.$(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) \
+ AddTarget.$(OBJEXT) Animation.$(OBJEXT) \
+ CallbackWeapon.$(OBJEXT) CameraPositionAction.$(OBJEXT) \
+ Explosion.$(OBJEXT) Laser.$(OBJEXT) Lightning.$(OBJEXT) \
+@@ -1625,8 +1512,8 @@
+ TankAIStore.$(OBJEXT) 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) \
++ XMLStringBuffer.$(OBJEXT) \
++ Target.$(OBJEXT) TargetContainer.$(OBJEXT) \
+ TargetDamageCalc.$(OBJEXT) TargetDefinition.$(OBJEXT) \
+ TargetLife.$(OBJEXT) TargetParachute.$(OBJEXT) \
+ TargetRenderer.$(OBJEXT) TargetShield.$(OBJEXT) \
+@@ -2178,35 +2065,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_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)
+@@ -2386,7 +2247,6 @@
+ Triangle.$(OBJEXT): ../common/Triangle.cpp
+ Vector.$(OBJEXT): ../common/Vector.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
+@@ -2563,49 +2423,6 @@
+ WeaponTeleport.$(OBJEXT): ../weapons/WeaponTeleport.cpp
+ WeaponTranslate.$(OBJEXT): ../weapons/WeaponTranslate.cpp
+ WeaponVelocity.$(OBJEXT): ../weapons/WeaponVelocity.cpp
+-array.$(OBJEXT): ../ode/array.cpp
+-collision_kernel.$(OBJEXT): ../ode/collision_kernel.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
+@@ -2807,9 +2624,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
+@@ -3476,56 +3290,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@
+ @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)/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_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)/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@
+- 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@
- NetServerProtocol::NetServerProtocol()
- {
---- scorched/src/coms/ComsMessageSender.cpp~ 2005-07-20 00:45:36.000000000 +0300
-+++ scorched/src/coms/ComsMessageSender.cpp 2005-10-08 02:13:38.000000000 +0300
-@@ -27,7 +27,7 @@
- #include <tank/TankContainer.h>
- #include <client/ScorchedClient.h>
- #include <server/ScorchedServer.h>
+ distclean-depend:
+ -rm -rf ./$(DEPDIR)
+@@ -3542,269 +3309,6 @@
+ @AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+ $(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
+-
+-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`
+-
+-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
+-
+-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`
+-
+-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
+-
+-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`
+-
+-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
+-
+-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@
+
+ .cpp.o:
+@@ -7395,306 +6897,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_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-07-16 11:36:19.000000000 +0200
+@@ -21,7 +21,7 @@
+ #include <common/Defines.h>
+ #include <engine/ModFileEntry.h>
+ #include <engine/ModFiles.h>
-#include <zlib/zlib.h>
+#include <zlib.h>
- #include <set>
+ #include <wx/dir.h>
+ #include <wx/utils.h>
- bool ComsMessageSender::sendToServer(ComsMessage &message)
---- scorched/src/tank/TankAvatar.cpp~ 2005-03-22 19:45:49.000000000 +0200
-+++ scorched/src/tank/TankAvatar.cpp 2005-10-08 02:15:15.000000000 +0300
+--- scorched/src/tank/TankAvatar.cpp.syslibs 2006-02-13 18:54:27.000000000 +0100
++++ scorched/src/tank/TankAvatar.cpp 2006-07-16 11:36:19.000000000 +0200
@@ -22,7 +22,7 @@
#include <GLEXT/GLTexture.h>
#include <GLEXT/GLGif.h>
@@ -95,14 +1076,14 @@
#include <stdio.h>
GLTexture *TankAvatar::defaultTexture_ = 0;
---- scorched/src/XML/XMLParser.h~ 2005-06-11 19:53:41.000000000 +0300
-+++ scorched/src/XML/XMLParser.h 2005-10-08 02:15:26.000000000 +0300
-@@ -23,7 +23,7 @@
+--- scorched/src/landscape/HeightMapSender.cpp~ 2006-07-16 11:55:01.000000000 +0200
++++ scorched/src/landscape/HeightMapSender.cpp 2006-07-16 11:55:01.000000000 +0200
+@@ -20,7 +20,7 @@
- #include <string>
- #include <list>
--#include <XML/expat.h>
-+#include <expat.h>
- #include <common/FileLines.h>
- #include <common/Vector.h>
+ #include <landscape/HeightMapSender.h>
+ #include <common/Logger.h>
+-#include <zlib/zlib.h>
++#include <zlib.h>
+ #include <float.h>
+ #include <stdlib.h>
Index: scorched3d.spec
===================================================================
RCS file: /cvs/extras/rpms/scorched3d/FC-5/scorched3d.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- scorched3d.spec 23 Feb 2006 22:01:30 -0000 1.14
+++ scorched3d.spec 16 Jul 2006 20:05:42 -0000 1.15
@@ -1,31 +1,18 @@
Name: scorched3d
-Version: 39.1
-Release: 5%{?dist}
+Version: 40
+Release: 1%{?dist}
Summary: Game based loosely on the classic DOS game Scorched Earth
-
Group: Amusements/Games
License: GPL
URL: http://www.scorched3d.co.uk/
Source0: http://dl.sf.net/scorched3d/Scorched3D-%{version}-src.tar.gz
Source1: %{name}.desktop
-Source2: %{name}-apoc-3.1-bins.tgz
-Patch0: %{name}-cvs-20050929.patch
Patch1: %{name}-syslibs.patch
-Patch2: %{name}-aclocal18.patch
-Patch3: %{name}-gcc41.patch
+Patch2: %{name}-wx26.patch
Patch4: %{name}-64bit.patch
Patch5: %{name}-openal.patch
Patch6: %{name}-help.patch
-Patch7: %{name}-sprintf.patch
-Patch8: %{name}-formatstring.patch
-Patch9: %{name}-strxxx.patch
-Patch10: %{name}-negint.patch
-Patch11: %{name}-XML-injection.patch
-Patch12: %{name}-HTML-injection.patch
-Patch13: %{name}-opengl-without-context.patch
-Patch14: %{name}-apoc-3.1.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
BuildRequires: wxGTK-devel
BuildRequires: openal-devel
BuildRequires: freealut-devel
@@ -34,8 +21,7 @@
BuildRequires: libGLU-devel
BuildRequires: desktop-file-utils
BuildRequires: expat-devel
-BuildRequires: autoconf
-BuildRequires: automake
+BuildRequires: ode-devel
# Upstream naming compatibility
Provides: Scorched3D = %{version}-%{release}
@@ -56,35 +42,15 @@
%prep
%setup -q -n scorched
-find . -type d -name CVS | xargs rm -r
rm -r autom4te.cache `find . -name Makefile`
-rm -r src/zlib `find src/XML ! -name "X*"`
-# Update apoc mod bins to the 3.1 version as distributed by apocHQ. Patch14
-# updates the txt/xml files. This fixes joining apoc-mod using netgames.
-rmdir data/acessories data/tanks/CannonTower data/tanks/sonicring
-pushd data/globalmods/apoc/data/accessories
-rmdir 50cal boulders brownboulders bullet cactus church1 cityoffice common deer
-rmdir factory1 farm1 fusionbarrel gasstation1 grenade house1 logcabin1 shotgun
-rmdir m7a3grenade napalm office3 officeplaza1 redhornet remorcebomblet store1
-rmdir shockbomblet shockrocket skyscraper1 smalloak trailorhouse1
-popd
-tar xfz %{SOURCE2}
-%patch0 -p1
+rm -r src/zlib src/ode `find src/XML ! -name "X*"`
%patch1 -p1
-%patch2 -p0
-%patch3 -p1
+%patch2 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
-. autogen.sh
+# make rpmlint happy with debuginfo package
+chmod -x src/GLEXT/*
%build
@@ -92,7 +58,8 @@
--disable-dependency-tracking \
--datadir=%{_datadir}/games/%{name} \
--with-docdir=$RPM_DOC_DIR/%{name}-%{version}
-make %{?_smp_mflags}
+# LDFLAGS=-lode for use of system ode
+make %{?_smp_mflags} LDFLAGS=-lode
convert data/windows/tank2.ico tank2.png
@@ -133,6 +100,11 @@
%changelog
+* Sun Jul 15 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 40-1
+- New upstream release 40
+- Drop many upstreamed patches
+- Use system ode library instead of included one
+
* Thu Feb 23 2006 Hans de Goede <j.w.r.degoede at hhs.nl> - 39.1-5
- Patch included apoc mod version 3.1 to the 3.1 version as distributed by
the ApocHQ servers for a smooth (no download required) experience joining
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scorched3d/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 11 Oct 2005 19:19:39 -0000 1.3
+++ sources 16 Jul 2006 20:05:42 -0000 1.4
@@ -1 +1 @@
-b5d4600ff77e8e1ba2848ef400ae76eb Scorched3D-39.1-src.tar.gz
+76b60b9f73d2c971d86bfac761989cf4 Scorched3D-40-src.tar.gz
--- scorched3d-HTML-injection.patch DELETED ---
--- scorched3d-XML-injection.patch DELETED ---
--- scorched3d-aclocal18.patch DELETED ---
--- scorched3d-apoc-3.1-bins.tgz DELETED ---
--- scorched3d-apoc-3.1.patch DELETED ---
--- scorched3d-cvs-20050929.patch DELETED ---
--- scorched3d-formatstring.patch DELETED ---
--- scorched3d-gcc41.patch DELETED ---
--- scorched3d-negint.patch DELETED ---
--- scorched3d-opengl-without-context.patch DELETED ---
--- scorched3d-pgsql.patch DELETED ---
--- scorched3d-sprintf.patch DELETED ---
--- scorched3d-strxxx.patch DELETED ---
- Previous message (by thread): rpms/scorched3d/devel .cvsignore,1.3,1.4
- Next message (by thread): rpms/scorched3d/FC-4 scorched3d-wx26.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 scorched3d-64bit.patch, 1.1, 1.2 scorched3d-help.patch, 1.1, 1.2 scorched3d-openal.patch, 1.1, 1.2 scorched3d-syslibs.patch, 1.2, 1.3 scorched3d.spec, 1.7, 1.8 sources, 1.3, 1.4 scorched3d-HTML-injection.patch, 1.1, NONE scorched3d-XML-injection.patch, 1.1, NONE scorched3d-aclocal18.patch, 1.1, NONE scorched3d-apoc-3.1-bins.tgz, 1.1, NONE scorched3d-apoc-3.1.patch, 1.1, NONE scorched3d-cvs-20050929.patch, 1.1, NONE scorched3d-formatstring.patch, 1.1, NONE scorched3d-gcc41.patch, 1.1, NONE scorched3d-negint.patch, 1.1, NONE scorched3d-opengl-without-context.patch, 1.1, NONE scorched3d-pgsql.patch, 1.1, NONE scorched3d-sprintf.patch, 1.1, NONE scorched3d-strxxx.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list