diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/apps/bootstrap/Jamfile cel-1.4/apps/bootstrap/Jamfile
--- cel-1.9+svn3615/apps/bootstrap/Jamfile 2006-10-20 16:15:54.000000000 +0100
+++ cel-1.4/apps/bootstrap/Jamfile 2009-11-28 16:46:05.000000000 +0000
@@ -4,6 +4,7 @@
CFlags bootstrap : "-DLIBDIR='\"$(INSTALLDIR.PLUGIN)/\"'" ;
LinkWith bootstrap : celtool ;
ExternalLibs bootstrap : CRYSTAL ;
+FileListEntryApplications bootstrap : app-demo ;
if $(HAVE_STATIC_PLUGINS) = "yes"
{
@@ -16,6 +17,7 @@
CFlags bootstrap_static : [ FDefines CS_STATIC_LINKED ] ;
MsvcDefine bootstrap_static : CS_STATIC_LINKED ;
LinkWith bootstrap_static : cel_staticplugins celtool ;
+ FileListEntryApplications bootstrap_static : app-demo-static ;
#
# The plugins that we need
@@ -132,6 +134,7 @@
pfmesh
pfmove
pfmover
+ pfnewcamera
pfportal
pfquest
pfsound
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/apps/celstart/Jamfile /tmp/IB0bHXT4Oc/cel-1.4/apps/celstart/Jamfile
--- cel-1.9+svn3615/apps/celstart/Jamfile 2008-08-06 20:21:30.000000000 +0100
+++ cel-1.4/apps/celstart/Jamfile 2009-11-28 16:46:05.000000000 +0000
@@ -11,6 +11,7 @@
LinkWith celstart : celtool ;
ExternalLibs celstart : CRYSTAL ;
Win32Resource celstart : [ ConcatDirs $(SUBDIR) celstart.rc ] ;
+FileListEntryApplications celstart : app-celstart ;
if $(HAVE_STATIC_PLUGINS) = "yes"
{
@@ -25,6 +26,7 @@
MsvcDefine celstart_static : CS_STATIC_LINKED ;
LinkWith celstart_static : cel_staticplugins celtool ;
Win32Resource celstart_static : [ ConcatDirs $(SUBDIR) celstart.rc ] ;
+ FileListEntryApplications celstart_static : app-celstart-static ;
#
# The plugins that we need
@@ -66,6 +68,8 @@
glshader_fixed
gmeshldr
gmeshskelanim2
+ haze
+ hazeldr
lghtng
null2d
null3d
@@ -112,13 +116,11 @@
#
STATIC.OPTIONALPLUGINLIST =
bullet
+ cscegui
cspython
glshader_cg
glshader_ps1
odedynam
- rm_rlcompat
- rm_shadow_pssm
- rm_unshadowed
sndmanager
sndsysopenal
sndsyssoft
@@ -158,7 +160,6 @@
mgr_quests
mgr_billboard
pfactormove
- pfanalogmotion
pfbillboard
pfdamage
pfdefcam
@@ -166,7 +167,6 @@
pfengine
pfinput
pfinv
- pfjump
pflight
pfmechanics
pfmeshdeform
@@ -175,6 +175,7 @@
pfmeshdeform
pfmove
pfmover
+ pfnewcamera
pfpathfinder
pfportal
pfquest
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/apps/celtest/celtest.cpp /tmp/IB0bHXT4Oc/cel-1.4/apps/celtest/celtest.cpp
--- cel-1.9+svn3615/apps/celtest/celtest.cpp 2008-08-07 01:22:43.000000000 +0100
+++ cel-1.4/apps/celtest/celtest.cpp 2009-11-28 16:46:05.000000000 +0000
@@ -24,7 +24,6 @@
#include "iutil/object.h"
#include "iutil/cmdline.h"
#include "csutil/cscolor.h"
-#include "csutil/csobject.h"
#include "cstool/csview.h"
#include "cstool/initapp.h"
#include "csutil/event.h"
@@ -43,7 +42,7 @@
#include "iengine/mesh.h"
#include "iengine/movable.h"
#include "iengine/material.h"
-#include "iengine/collection.h"
+#include "iengine/region.h"
#include "imesh/thing.h"
#include "imesh/sprite3d.h"
#include "imesh/object.h"
@@ -77,7 +76,6 @@
#include "propclass/mesh.h"
#include "propclass/meshsel.h"
#include "propclass/inv.h"
-#include "propclass/jump.h"
#include "propclass/chars.h"
#include "propclass/move.h"
#include "propclass/tooltip.h"
@@ -87,7 +85,7 @@
#include "propclass/region.h"
#include "propclass/input.h"
#include "propclass/linmove.h"
-#include "propclass/analogmotion.h"
+#include "propclass/actoranalog.h"
#include "propclass/quest.h"
#include "propclass/trigger.h"
#include "propclass/zone.h"
@@ -185,17 +183,14 @@
// The Real Camera
csRef entity_cam = pl->CreateEntity (name, bltest, "actor",
"pcinput.standard",
- "pcmove.analogmotion",
- "pcmove.jump",
- "pcmove.grab",
+ "pcmove.actor.analog",
"pccamera.delegate",
"pccamera.mode.tracking",
"pcobject.mesh",
"pcobject.mesh.select",
"pcmove.linear",
- //"pc2d.tooltip",
+ "pc2d.tooltip",
"pctools.inventory",
- "pctools.timer",
"pcsound.listener",
CEL_PROPCLASS_END);
if (!entity_cam) return 0;
@@ -207,7 +202,6 @@
pcinp->Bind ("JoystickButton2", "resetcam");
pcinp->Bind ("JoystickAxis0", "joyaxis0");
pcinp->Bind ("JoystickAxis1", "joyaxis1");
- pcinp->Bind ("MouseAxis0_centered", "mouseaxis0");
pcinp->Bind ("z", "ready");
pcinp->Bind ("x", "lockon");
@@ -216,27 +210,16 @@
pcinp->Bind ("right", "right");
pcinp->Bind ("up", "up");
pcinp->Bind ("down", "down");
- pcinp->Bind ("space", "jump");
- pcinp->Bind ("m", "freeze");
- pcinp->Bind ("shift", "roll");
- pcinp->Bind ("`", "showstates");
pcinp->Bind ("[", "camleft");
pcinp->Bind ("]", "camright");
pcinp->Bind ("pageup", "camup");
pcinp->Bind ("pagedown", "camdown");
- csRef actor = celQueryPropertyClassEntity (entity_cam);
- //actor->SetMinimumTurningSpeed (5.0f);
+ csRef actor = celQueryPropertyClassEntity (entity_cam);
+ actor->SetTurningSpeed (15.0f);
//actor->SetMovementSpeed (1.5f);
- csRef jump = celQueryPropertyClassEntity (entity_cam);
- jump->SetBoostJump (false);
- jump->SetJumpHeight (1.0f);
- //jump->SetDoubleJumpSpeed (7.0f);
-
csRef trackcam = celQueryPropertyClassEntity (entity_cam);
- trackcam->SetPanSpeed (8);
- trackcam->SetTiltSpeed (2.5);
csRef delegcam = celQueryPropertyClassEntity (entity_cam);
//delegcam->SetCurrentMode (trackcam);
@@ -246,9 +229,6 @@
newcamera->AttachCameraMode(iPcNewCamera::CCM_THIRD_PERSON);
newcamera->SetCurrentCameraMode (0);*/
- //csRef timer = celQueryPropertyClassEntity (entity_cam);
- //timer->WakeUpFrame (0);
-
csRef pcmesh = CEL_QUERY_PROPCLASS_ENT (entity_cam, iPcMesh);
bool hascal3d = true;
pcmesh->SetPath ("/cellib/objects");
@@ -274,7 +254,6 @@
return csPtr (entity_cam);
}
-
bool CelTest::CreateRoom ()
{
csRef entity_room;
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/apps/celtest/Jamfile /tmp/IB0bHXT4Oc/cel-1.4/apps/celtest/Jamfile
--- cel-1.9+svn3615/apps/celtest/Jamfile 2006-11-21 21:48:14.000000000 +0000
+++ cel-1.4/apps/celtest/Jamfile 2009-11-28 16:46:05.000000000 +0000
@@ -4,6 +4,7 @@
CFlags celtst : "-DLIBDIR='\"$(INSTALLDIR.PLUGIN)/\"'" ;
LinkWith celtst : celtool ;
ExternalLibs celtst : CRYSTAL ;
+FileListEntryApplications celtst : app-demo ;
if $(HAVE_STATIC_PLUGINS) = "yes"
{
@@ -13,6 +14,7 @@
CFlags celtst_static : [ FDefines CS_STATIC_LINKED ] ;
MsvcDefine celtst_static : CS_STATIC_LINKED ;
LinkWith celtst_static : cel_staticplugins celtool ;
+ FileListEntryApplications celtst_static : app-demo-static ;
LinkStaticPlugins celtst_static :
addon_celentity
addon_celentitytpl
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/apps/evolvecraft/behave.cpp /tmp/IB0bHXT4Oc/cel-1.4/apps/evolvecraft/behave.cpp
--- cel-1.9+svn3615/apps/evolvecraft/behave.cpp 2007-07-17 12:52:51.000000000 +0100
+++ cel-1.4/apps/evolvecraft/behave.cpp 2009-11-28 16:46:06.000000000 +0000
@@ -37,7 +37,7 @@
iCelPlLayer* pl) :
scfImplementationType (this),
bl (bl), entity (entity), evolving (false),
- bestFitness (0), targetFitness (100000000.0)
+ bestFitness (0), targetFitness (100000000.0), doCallFitnessCB (false)
{
parid_currentticks = pl->FetchStringID("cel.parameter.currentticks");
parid_maxfitness = pl->FetchStringID("cel.parameter.max_fitness");
@@ -72,6 +72,13 @@
GetMesh ();
GetCamera ();
+ // (vk) Fitness callback call on collision is moved here
+ if (evolving && doCallFitnessCB)
+ {
+ pcevolve->FitnessCallback(deferedFitness);
+ doCallFitnessCB = false;
+ }
+
currentTime = params->GetParameter(parid_currentticks)->value.l;
// here we produce the inputs; these are speed, and distance to obstacle
@@ -189,7 +196,11 @@
csVector3 currentPosition (pcmechobj->GetBody()->GetPosition());
float distanceTravelled = (currentPosition - initPosition).Norm();
float fitness = distanceTravelled * timeTaken;
- pcevolve->FitnessCallback(fitness);
+
+ // (vk) Defer this call, otherwise we get crash with recent ODE versions
+ //pcevolve->FitnessCallback(fitness);
+ doCallFitnessCB = true;
+ deferedFitness = fitness;
}
return true;
}
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/apps/evolvecraft/behave.h /tmp/IB0bHXT4Oc/cel-1.4/apps/evolvecraft/behave.h
--- cel-1.9+svn3615/apps/evolvecraft/behave.h 2007-07-17 12:52:51.000000000 +0100
+++ cel-1.4/apps/evolvecraft/behave.h 2009-11-28 16:46:06.000000000 +0000
@@ -67,6 +67,9 @@
csVector3 initPosition, pollPosition;
csMatrix3 initOrientation;
+ bool doCallFitnessCB;
+ float deferedFitness;
+
public:
htBehaviourActor(iCelBlLayer *bl, iCelEntity *entity, iCelPlLayer *pl);
virtual ~htBehaviourActor();
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/apps/evolvecraft/evolvecraft.cpp /tmp/IB0bHXT4Oc/cel-1.4/apps/evolvecraft/evolvecraft.cpp
--- cel-1.9+svn3615/apps/evolvecraft/evolvecraft.cpp 2008-06-18 23:34:12.000000000 +0100
+++ cel-1.4/apps/evolvecraft/evolvecraft.cpp 2009-11-28 16:46:06.000000000 +0000
@@ -42,7 +42,7 @@
#include "iengine/mesh.h"
#include "iengine/movable.h"
#include "iengine/material.h"
-#include "iengine/collection.h"
+#include "iengine/region.h"
#include "imesh/thing.h"
#include "imesh/sprite3d.h"
#include "imesh/object.h"
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/apps/evolvecraft/Jamfile /tmp/IB0bHXT4Oc/cel-1.4/apps/evolvecraft/Jamfile
--- cel-1.9+svn3615/apps/evolvecraft/Jamfile 2007-05-16 01:01:25.000000000 +0100
+++ cel-1.4/apps/evolvecraft/Jamfile 2009-11-28 16:46:06.000000000 +0000
@@ -4,4 +4,5 @@
CFlags evolvecraft : "-DLIBDIR='\"$(INSTALLDIR.PLUGIN)/\"'" ;
LinkWith evolvecraft : celtool ;
ExternalLibs evolvecraft : CRYSTAL ;
+FileListEntryApplications evolvecraft : app-demo ;
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/apps/hovertest/hovertest.cpp /tmp/IB0bHXT4Oc/cel-1.4/apps/hovertest/hovertest.cpp
--- cel-1.9+svn3615/apps/hovertest/hovertest.cpp 2008-06-18 23:34:12.000000000 +0100
+++ cel-1.4/apps/hovertest/hovertest.cpp 2009-11-28 16:46:06.000000000 +0000
@@ -42,7 +42,7 @@
#include "iengine/mesh.h"
#include "iengine/movable.h"
#include "iengine/material.h"
-#include "iengine/collection.h"
+#include "iengine/region.h"
#include "imesh/thing.h"
#include "imesh/sprite3d.h"
#include "imesh/object.h"
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/apps/hovertest/Jamfile /tmp/IB0bHXT4Oc/cel-1.4/apps/hovertest/Jamfile
--- cel-1.9+svn3615/apps/hovertest/Jamfile 2006-02-07 16:47:52.000000000 +0000
+++ cel-1.4/apps/hovertest/Jamfile 2009-11-28 16:46:06.000000000 +0000
@@ -4,4 +4,5 @@
CFlags hovertest : "-DLIBDIR='\"$(INSTALLDIR.PLUGIN)/\"'" ;
LinkWith hovertest : celtool ;
ExternalLibs hovertest : CRYSTAL ;
+FileListEntryApplications hovertest : app-demo ;
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/apps/nettest/Jamfile /tmp/IB0bHXT4Oc/cel-1.4/apps/nettest/Jamfile
--- cel-1.9+svn3615/apps/nettest/Jamfile 2006-10-20 16:15:54.000000000 +0100
+++ cel-1.4/apps/nettest/Jamfile 2009-11-28 16:46:06.000000000 +0000
@@ -4,6 +4,7 @@
CFlags nettest : "-DLIBDIR='\"$(INSTALLDIR.PLUGIN)/\"'" ;
LinkWith nettest : celtool ;
ExternalLibs nettest : CRYSTAL ;
+FileListEntryApplications nettest : app-demo ;
if $(HAVE_STATIC_PLUGINS) = "yes"
{
@@ -13,6 +14,7 @@
CFlags nettest_static : [ FDefines CS_STATIC_LINKED ] ;
LFlags nettest_static : -lcrystalspace_staticplugins ;
LinkWith nettest_static : cel_staticplugins celtool ;
+ FileListEntryApplications nettest_static : app-demo-static ;
LinkStaticPlugins nettest_static :
addon_celentity
addon_celentitytpl
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/apps/nettest/nettest.cpp /tmp/IB0bHXT4Oc/cel-1.4/apps/nettest/nettest.cpp
--- cel-1.9+svn3615/apps/nettest/nettest.cpp 2008-06-18 23:34:12.000000000 +0100
+++ cel-1.4/apps/nettest/nettest.cpp 2009-11-28 16:46:06.000000000 +0000
@@ -44,7 +44,7 @@
#include "iengine/mesh.h"
#include "iengine/movable.h"
#include "iengine/material.h"
-#include "iengine/collection.h"
+#include "iengine/region.h"
#include "imesh/thing.h"
#include "imesh/sprite3d.h"
#include "imesh/object.h"
@@ -281,15 +281,16 @@
const char* /*factname*/, const csVector3& /*pos*/)
{
// The Real Camera
- csRef entity_cam = pl->CreateEntity (name, bltest, "actor",
- "pccommandinput",
- "pcdefaultcamera",
- "pcactormove",
- "pcmesh",
- "pcmeshselect",
- "pclinearmovement",
- "pctooltip",
- "pcinventory",
+ csRef entity_cam = pl->CreateEntity (name, bltest,
+ "actorcameraold", // behaviour name
+ "pcinput.standard",
+ "pccamera.old",
+ "pcmove.actor.standard",
+ "pcobject.mesh",
+ "pcobject.mesh.select",
+ "pcmove.linear",
+ "pc2d.tooltip",
+ "pctools.inventory",
CEL_PROPCLASS_END);
if (!entity_cam) return 0;
@@ -382,10 +383,11 @@
csPtr NetTest::CreateActorNPC (const char* name,
const char* /*factname*/, const csVector3& /*pos*/)
{
- csRef entity_cam = pl->CreateEntity (name, bltest, "actor",
- "pcactormove",
- "pcmesh",
- "pclinearmovement",
+ csRef entity_cam = pl->CreateEntity (name, bltest,
+ "actorcameraold", // behaviour name
+ "pcmove.actor.standard",
+ "pcobject.mesh",
+ "pcmove.linear",
CEL_PROPCLASS_END);
if (!entity_cam) return 0;
@@ -612,45 +614,45 @@
game_factory->SetProtocolVersion ("v0.1");
// XXX: This should be in a config file...
- if (!pl->LoadPropertyClassFactory ("cel.pcfactory.test"))
+ if (!pl->LoadPropertyClassFactory ("cel.pcfactory.misc.test"))
return false;
- if (!pl->LoadPropertyClassFactory ("cel.pcfactory.linmove"))
+ if (!pl->LoadPropertyClassFactory ("cel.pcfactory.move.linear"))
return false;
- if (!pl->LoadPropertyClassFactory ("cel.pcfactory.actormove"))
+ if (!pl->LoadPropertyClassFactory ("cel.pcfactory.move.actor.standard"))
return false;
- if (!pl->LoadPropertyClassFactory ("cel.pcfactory.solid"))
+ if (!pl->LoadPropertyClassFactory ("cel.pcfactory.move.solid"))
return false;
- if (!pl->LoadPropertyClassFactory ("cel.pcfactory.colldet"))
+ if (!pl->LoadPropertyClassFactory ("cel.pcfactory.object.mesh.collisiondetection"))
return false;
- if (!pl->LoadPropertyClassFactory ("cel.pcfactory.region"))
+ if (!pl->LoadPropertyClassFactory ("cel.pcfactory.world.region"))
return false;
- if (!pl->LoadPropertyClassFactory ("cel.pcfactory.zonemanager"))
+ if (!pl->LoadPropertyClassFactory ("cel.pcfactory.world.zonemanager"))
return false;
- if (!pl->LoadPropertyClassFactory ("cel.pcfactory.defaultcamera"))
+ if (!pl->LoadPropertyClassFactory ("cel.pcfactory.camera.old"))
return false;
- if (!pl->LoadPropertyClassFactory ("cel.pcfactory.tooltip"))
+ if (!pl->LoadPropertyClassFactory ("cel.pcfactory.2d.tooltip"))
return false;
- if (!pl->LoadPropertyClassFactory ("cel.pcfactory.timer"))
+ if (!pl->LoadPropertyClassFactory ("cel.pcfactory.tools.timer"))
return false;
- if (!pl->LoadPropertyClassFactory ("cel.pcfactory.inventory"))
+ if (!pl->LoadPropertyClassFactory ("cel.pcfactory.tools.inventory"))
return false;
- if (!pl->LoadPropertyClassFactory ("cel.pcfactory.characteristics"))
+ if (!pl->LoadPropertyClassFactory ("cel.pcfactory.tools.inventory.characteristics"))
return false;
- if (!pl->LoadPropertyClassFactory ("cel.pcfactory.mesh"))
+ if (!pl->LoadPropertyClassFactory ("cel.pcfactory.object.mesh"))
return false;
- if (!pl->LoadPropertyClassFactory ("cel.pcfactory.light"))
+ if (!pl->LoadPropertyClassFactory ("cel.pcfactory.object.light"))
return false;
- if (!pl->LoadPropertyClassFactory ("cel.pcfactory.meshselect"))
+ if (!pl->LoadPropertyClassFactory ("cel.pcfactory.object.mesh.select"))
return false;
- if (!pl->LoadPropertyClassFactory ("cel.pcfactory.pccommandinput"))
+ if (!pl->LoadPropertyClassFactory ("cel.pcfactory.input.standard"))
return false;
- if (!pl->LoadPropertyClassFactory ("cel.pcfactory.quest"))
+ if (!pl->LoadPropertyClassFactory ("cel.pcfactory.logic.quest"))
return false;
- if (!pl->LoadPropertyClassFactory ("cel.pcfactory.properties"))
+ if (!pl->LoadPropertyClassFactory ("cel.pcfactory.tools.properties"))
return false;
- if (!pl->LoadPropertyClassFactory ("cel.pcfactory.trigger"))
+ if (!pl->LoadPropertyClassFactory ("cel.pcfactory.logic.trigger"))
return false;
- if (!pl->LoadPropertyClassFactory ("cel.pcfactory.billboard"))
+ if (!pl->LoadPropertyClassFactory ("cel.pcfactory.2d.billboard"))
return false;
// analyse command line arguments
@@ -757,7 +759,7 @@
return true;
}
-void NetTest::WriteShadow (int align,int x,int y,int fg,char *str,...)
+void NetTest::WriteShadow (int align,int x,int y,int fg,const char *str,...)
{
char buf[256];
@@ -770,7 +772,7 @@
Write (align, x, y, fg, -1, buf);
}
-void NetTest::Write(int align,int x,int y,int fg,int bg,char *str,...)
+void NetTest::Write(int align,int x,int y,int fg,int bg,const char *str,...)
{
va_list arg;
char b[256], *buf = b;
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/apps/nettest/nettest.h /tmp/IB0bHXT4Oc/cel-1.4/apps/nettest/nettest.h
--- cel-1.9+svn3615/apps/nettest/nettest.h 2006-01-05 18:52:58.000000000 +0000
+++ cel-1.4/apps/nettest/nettest.h 2009-11-28 16:46:06.000000000 +0000
@@ -73,8 +73,8 @@
GameFactoryManager* gfm;
celNetworkServerStats stats;
- void WriteShadow (int align,int x,int y,int fg,char *str,...);
- void Write(int align,int x,int y,int fg,int bg,char *str,...);
+ void WriteShadow (int align,int x,int y,int fg,const char *str,...);
+ void Write(int align,int x,int y,int fg,int bg,const char *str,...);
public:
/**
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/apps/tutorial/graph/behave.cpp /tmp/IB0bHXT4Oc/cel-1.4/apps/tutorial/graph/behave.cpp
--- cel-1.9+svn3615/apps/tutorial/graph/behave.cpp 2008-05-29 18:11:36.000000000 +0100
+++ cel-1.4/apps/tutorial/graph/behave.cpp 2009-11-28 16:46:07.000000000 +0000
@@ -153,7 +153,7 @@
for (i = 0 ; i < count ; i++)
{
iCelEntity* child = pcinventory->GetEntity (i);
- printf (" child %d is '%s'\n", i, child->GetName ());
+ printf (" child %zu is '%s'\n", i, child->GetName ());
}
}
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/apps/tutorial/graph/Jamfile /tmp/IB0bHXT4Oc/cel-1.4/apps/tutorial/graph/Jamfile
--- cel-1.9+svn3615/apps/tutorial/graph/Jamfile 2007-09-12 11:48:57.000000000 +0100
+++ cel-1.4/apps/tutorial/graph/Jamfile 2009-11-28 16:46:07.000000000 +0000
@@ -4,4 +4,5 @@
CFlags graph : "-DLIBDIR='\"$(INSTALLDIR.PLUGIN)/\"'" ;
LinkWith graph : celtool ;
ExternalLibs graph : CRYSTAL ;
+FileListEntryApplications graph : app-demo ;
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/apps/tutorial/steering/behave.cpp /tmp/IB0bHXT4Oc/cel-1.4/apps/tutorial/steering/behave.cpp
--- cel-1.9+svn3615/apps/tutorial/steering/behave.cpp 2008-05-29 18:11:36.000000000 +0100
+++ cel-1.4/apps/tutorial/steering/behave.cpp 2009-11-28 16:46:07.000000000 +0000
@@ -150,7 +150,7 @@
for (i = 0 ; i < count ; i++)
{
iCelEntity* child = pcinventory->GetEntity (i);
- printf (" child %d is '%s'\n", i, child->GetName ());
+ printf (" child %zu is '%s'\n", i, child->GetName ());
}
}
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/apps/tutorial/steering/Jamfile /tmp/IB0bHXT4Oc/cel-1.4/apps/tutorial/steering/Jamfile
--- cel-1.9+svn3615/apps/tutorial/steering/Jamfile 2007-09-12 11:48:57.000000000 +0100
+++ cel-1.4/apps/tutorial/steering/Jamfile 2009-11-28 16:46:06.000000000 +0000
@@ -4,4 +4,5 @@
CFlags steering : "-DLIBDIR='\"$(INSTALLDIR.PLUGIN)/\"'" ;
LinkWith steering : celtool ;
ExternalLibs steering : CRYSTAL ;
+FileListEntryApplications steering : app-demo ;
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/apps/tutorial/walktut/behave.cpp /tmp/IB0bHXT4Oc/cel-1.4/apps/tutorial/walktut/behave.cpp
--- cel-1.9+svn3615/apps/tutorial/walktut/behave.cpp 2007-06-01 13:52:02.000000000 +0100
+++ cel-1.4/apps/tutorial/walktut/behave.cpp 2009-11-28 16:46:06.000000000 +0000
@@ -139,7 +139,7 @@
for (i = 0 ; i < count ; i++)
{
iCelEntity* child = pcinventory->GetEntity (i);
- printf (" child %d is '%s'\n", i, child->GetName ());
+ printf (" child %zu is '%s'\n", i, child->GetName ());
}
}
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/apps/tutorial/walktut/Jamfile /tmp/IB0bHXT4Oc/cel-1.4/apps/tutorial/walktut/Jamfile
--- cel-1.9+svn3615/apps/tutorial/walktut/Jamfile 2006-02-05 10:04:35.000000000 +0000
+++ cel-1.4/apps/tutorial/walktut/Jamfile 2009-11-28 16:46:06.000000000 +0000
@@ -4,4 +4,5 @@
CFlags walktut : "-DLIBDIR='\"$(INSTALLDIR.PLUGIN)/\"'" ;
LinkWith walktut : celtool ;
ExternalLibs walktut : CRYSTAL ;
+FileListEntryApplications walktut: app-demo ;
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/apps/wheeledtest/Jamfile /tmp/IB0bHXT4Oc/cel-1.4/apps/wheeledtest/Jamfile
--- cel-1.9+svn3615/apps/wheeledtest/Jamfile 2006-06-23 16:08:52.000000000 +0100
+++ cel-1.4/apps/wheeledtest/Jamfile 2009-11-28 16:46:07.000000000 +0000
@@ -4,4 +4,5 @@
CFlags wheeledtest : "-DLIBDIR='\"$(INSTALLDIR.PLUGIN)/\"'" ;
LinkWith wheeledtest : celtool ;
ExternalLibs wheeledtest : CRYSTAL ;
+FileListEntryApplications wheeledtest : app-demo ;
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/apps/wheeledtest/wheeledtest.cpp /tmp/IB0bHXT4Oc/cel-1.4/apps/wheeledtest/wheeledtest.cpp
--- cel-1.9+svn3615/apps/wheeledtest/wheeledtest.cpp 2008-06-18 23:34:12.000000000 +0100
+++ cel-1.4/apps/wheeledtest/wheeledtest.cpp 2009-11-28 16:46:07.000000000 +0000
@@ -43,7 +43,7 @@
#include "iengine/mesh.h"
#include "iengine/movable.h"
#include "iengine/material.h"
-#include "iengine/collection.h"
+#include "iengine/region.h"
#include "imesh/thing.h"
#include "imesh/sprite3d.h"
#include "imesh/object.h"
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/autogen.sh /tmp/IB0bHXT4Oc/cel-1.4/autogen.sh
--- cel-1.9+svn3615/autogen.sh 2004-05-05 11:36:23.000000000 +0100
+++ cel-1.4/autogen.sh 2009-11-28 16:46:41.000000000 +0000
@@ -18,4 +18,10 @@
rm -f $MACROFILE
+# Work around for ^M character emited by autoconf 2.63-
+# which causes line-ending problem for SVN.
+cr=`echo X | tr X '\\015'`
+sed "s/^ac_cr='$cr'$/ac_cr=\`echo X | tr X '\\\015'\`/" < configure > configure.tmp
+mv configure.tmp configure
+
exit $rc
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/bin/cs-genwix-msm.py /tmp/IB0bHXT4Oc/cel-1.4/bin/cs-genwix-msm.py
--- cel-1.9+svn3615/bin/cs-genwix-msm.py 1970-01-01 01:00:00.000000000 +0100
+++ cel-1.4/bin/cs-genwix-msm.py 2009-11-28 16:46:07.000000000 +0000
@@ -0,0 +1,67 @@
+#!python
+from wixlib import *
+from optparse import OptionParser
+
+import time
+import datetime
+
+from guidregistry import guid_registry as gr
+
+options = OptionParser(usage="usage: %prog [options] list1 list2")
+options.add_option("-o", "--out", dest="outfile",
+ help="Output file name", metavar="FILE")
+options.add_option("--id", dest="msmid",
+ help="Merge module ID (used to look up GUID)", metavar="ID")
+options.add_option("--subdirmap", dest="subdirmap",
+ help="Subdirectory map to place files in. (Multiple allowed)",
+ action="append", metavar="LIST:DIR")
+options.add_option("--version", dest="version",
+ help="Package version", metavar="VERSION")
+
+(parsed_options, args) = options.parse_args()
+
+if not parsed_options.outfile:
+ options.error("missing --out")
+if not parsed_options.msmid:
+ options.error("missing --id")
+
+subdirmap = {}
+if parsed_options.subdirmap:
+ for s in parsed_options.subdirmap:
+ (list, subdirs) = s.split (':', 1)
+ subdirmap[list] = subdirs
+
+(base, merge, dir) = generate_merge_module(id = parsed_options.msmid,
+ path = [('TARGETDIR', 'SourceDir', None),
+ (parsed_options.msmid + '_dir', None, None)],
+ filename = parsed_options.outfile,
+ manufacturer = "The Crystal Space Project",
+ guid = gr[parsed_options.msmid],
+ version = parsed_options.version)
+
+f = Fragment(
+ parent = base,
+ id = parsed_options.msmid)
+
+dirref = DirectoryRef(
+ parent = f,
+ id = parsed_options.msmid + '_dir')
+
+for list in args:
+ listid = os.path.splitext(os.path.basename(list))[0]
+ thisdir = dirref
+ if subdirmap.has_key(listid):
+ dirid = parsed_options.msmid
+ list_subdir = subdirmap[listid]
+ for subdir in list_subdir.split('/'):
+ dirid = dirid + '.' + subdir
+ thisdir = Directory(
+ parent = thisdir,
+ id = dirid + '_d',
+ name = subdir)
+ generate_from_file_list_txt (list,
+ parent = merge,
+ prefix = parsed_options.msmid + '.' + listid,
+ dir = thisdir)
+
+base.save()
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/bin/guidregistry.py /tmp/IB0bHXT4Oc/cel-1.4/bin/guidregistry.py
--- cel-1.9+svn3615/bin/guidregistry.py 1970-01-01 01:00:00.000000000 +0100
+++ cel-1.4/bin/guidregistry.py 2009-11-28 16:46:07.000000000 +0000
@@ -0,0 +1,4 @@
+guid_registry = {
+ #We compute some uuids out of a base and a unique id (mostly component guids)
+ "base": '6c754815-632d-4e1c-92f6-4ae951a76b18',
+ }
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/bin/wixlib.py /tmp/IB0bHXT4Oc/cel-1.4/bin/wixlib.py
--- cel-1.9+svn3615/bin/wixlib.py 1970-01-01 01:00:00.000000000 +0100
+++ cel-1.4/bin/wixlib.py 2009-11-28 16:46:07.000000000 +0000
@@ -0,0 +1,581 @@
+#!/usr/bin/python
+from guidregistry import guid_registry as gr
+import uuid
+import os
+import sha
+import md5
+import re
+import sys
+
+from lxml import etree
+
+
+class Empty(object):
+ """Marker class"""
+ pass
+
+
+class InitializeOnDef(type):
+ """
+ Ok. Now this is black magic. Makes every class have its own stack of
+ static_kw, map_kw etc. and simplifies defining them through not having
+ to use super().
+ """
+ def __init__(cls, name, bases, classdict):
+ cls._class_name = name
+ cls.init()
+
+class WixBase(object):
+ __metaclass__ = InitializeOnDef
+
+ @classmethod
+ def setup(cls):
+ cls.kw_map['id'] = 'Id'
+
+ @classmethod
+ def init(cls):
+ cls.kw_static = getattr(cls, 'kw_static', {}).copy() #Statically set parameters
+ cls.kw_map = getattr(cls, 'kw_map', {}).copy() #Rename
+ cls.kw_allowed = getattr(cls, 'kw_allowed', {}).copy() #Additionally allowed parameters
+ cls.kw_default = getattr(cls, 'kw_default', {}).copy() #Default values of parameters
+ cls.kw_default_call = getattr(cls, 'kw_default_call', {}).copy()#Default values of parameters as function
+ cls.kw_convert = getattr(cls, 'kw_convert', {}).copy()
+ cls.highersetup = None
+ cls.setup()
+
+ def __init__(self, **kw):
+ self.param = kw.copy()
+ super(WixBase, self).__init__()
+
+ self.childs = []
+ if "parent" in kw.keys():
+ kw["parent"].add(self)
+ kw.pop("parent")
+ self.kw = kw
+
+ def toXML(self, contain):
+ param = self.kw.copy()
+
+ #Validate we got only valid keys
+ for i in self.kw.keys():
+ if i not in self.kw_map.keys() + self.kw_allowed.keys():
+ raise TypeError('Unknown parameter ' + i)
+
+ for i in self.kw_default:
+ if i not in param.keys():
+ param[i] = self.kw_default[i]
+
+ for i in self.kw_default_call:
+ if i not in param.keys():
+ param[i] = self.kw_default_call[i](self)
+
+ param.update(self.kw_static)
+
+ for i in param:
+ if i in self.kw_convert.keys():
+ param[i] = self.kw_convert[i](self, param.pop(i))
+
+ for i in param:
+ if i in self.kw_map.keys():
+ #print i,self.kw_map[i], param[i]
+ param[self.kw_map[i]] = param.pop(i)
+ elem = etree.SubElement(contain,
+ getattr(self, "element_name", self._class_name),
+ **param)
+ for child in self.childs:
+ child.toXML(elem)
+ return contain
+
+ def add(self, child):
+ self.childs.append(child)
+
+def call(a):
+ import pdb
+ pdb.set_trace()
+
+
+
+class RefBase(WixBase):
+ pass
+ #@classmethod
+ #def setup(cls):
+ # import pdb
+ # pdb.set_trace()
+ # cls.kw_map['id'] = 'Id'
+
+
+class InstallExecuteSequence(WixBase):
+ @classmethod
+ def setup(cls):
+ pass
+
+class RemoveExistingProducts(WixBase):
+ @classmethod
+ def setup(cls):
+ cls.kw_static['After'] = "InstallFinalize"
+
+
+
+class Base(WixBase):
+ def __init__(self, *arg, **kw):
+ self.filename = kw.pop('filename')
+ super(Base, self).__init__(*arg, **kw)
+
+ def save(self):
+ fh = open(self.filename, 'w')
+ fh.write(etree.tostring(self.toXML(), pretty_print=True))
+ fh.write('\n')
+ fh.close()
+
+ def toXML(self, contain = Empty):
+ elem = etree.Element('Wix', xmlns = 'http://schemas.microsoft.com/wix/2006/wi')
+ for child in self.childs:
+ child.toXML(elem)
+ return elem
+
+class Product(WixBase):
+ @classmethod
+ def setup(cls):
+ cls.kw_map['name'] = 'Name'
+ cls.kw_map['version'] = 'Version'
+ cls.kw_map['language'] = 'Language'
+ cls.kw_map['upgrade_code'] = 'UpgradeCode'
+ cls.kw_map['manufacturer'] = 'Manufacturer'
+ #cls.kw_map['id'] = 'Id'
+
+ cls.kw_default['id'] = '*'
+ cls.kw_default['language'] = '1033'
+
+
+class Package(WixBase):
+ @classmethod
+ def setup(cls):
+ cls.kw_static['InstallerVersion'] = '200'
+ cls.kw_map['compressed'] = 'Compressed'
+ cls.kw_map['manufacturer'] = 'Manufacturer'
+ #cls.kw_static['Description'] = "Whatever"
+
+class Module(WixBase):
+ @classmethod
+ def setup(cls):
+ cls.kw_map['version'] = 'Version'
+ cls.kw_map['language'] = 'Language'
+
+class Fragment(WixBase):
+ pass
+
+class UIRef(WixBase):
+ @classmethod
+ def setup(cls):
+ cls.kw_static['Id'] = "WixUI_FeatureTree"
+
+class Media(WixBase):
+ @classmethod
+ def setup(cls):
+ cls.kw_static['Id'] = '1'
+ cls.kw_static['Cabinet'] = 'cs1.cab'
+ cls.kw_static['EmbedCab'] = 'yes'
+
+
+class Directory(WixBase):
+ @classmethod
+ def setup(cls):
+ cls.kw_map['source_dir'] = 'FileSource'
+ cls.kw_map['id'] = 'Id'
+ cls.kw_map['name'] = 'Name'
+
+class Feature(WixBase):
+ @classmethod
+ def setup(cls):
+ cls.kw_map['id'] = 'Id'
+ cls.kw_map['configurable_directory'] = 'ConfigurableDirectory'
+ cls.kw_map['title'] = 'Title'
+ cls.kw_map['level'] = 'Level'
+
+ cls.kw_default['level'] = "1"
+ cls.kw_default['title'] = ""
+
+ cls.kw_convert['configurable_directory'] = lambda self, val: val.param['id']
+
+class FeatureRef(RefBase):
+ pass
+
+class DirectoryRef(RefBase):
+ pass
+
+class Component(WixBase):
+ component_genbase = uuid.UUID(gr['base'])
+ @classmethod
+ def setup(cls):
+ cls.kw_map['id'] = 'Id'
+ cls.kw_map['guid'] = 'Guid'
+ cls.kw_map['directory'] = 'Directory'
+
+ cls.kw_default_call['guid'] = lambda self: str(uuid.uuid3(self.component_genbase, self.param['id']))
+
+class ComponentRef(RefBase):
+ pass
+
+class Property(RefBase):
+ @classmethod
+ def setup(cls):
+ cls.kw_map['value'] = 'Value'
+ cls.kw_map['secure'] = 'Secure'
+ cls.kw_map['admin'] = 'Admin'
+
+class Upgrade(WixBase):
+ @classmethod
+ def setup(cls):
+ cls.kw_map['upgrade_code'] = 'Id'
+
+
+class UpgradeVersion(WixBase):
+ @classmethod
+ def setup(cls):
+ cls.kw_static['Property'] = 'PATCHFOUND'
+ cls.kw_static['IncludeMinimum'] = 'yes'
+ cls.kw_static['IncludeMaximum'] = 'yes'
+
+ cls.kw_map['min_version'] = "Minimum"
+ cls.kw_map['max_version'] = "Maximum"
+
+ cls.kw_convert['keep_old'] = lambda self: 'yes'
+
+
+class File(WixBase):
+ @classmethod
+ def setup(cls):
+ cls.kw_map['id'] = 'Id'
+ cls.kw_map['name'] = 'Name'
+ cls.kw_map['source'] = 'Source'
+ #cls.kw_static['Vital'] = 'yes'
+
+class WixVariable(WixBase):
+ @classmethod
+ def setup(cls):
+ cls.kw_map['id'] = 'Id'
+ cls.kw_map['value'] = 'Value'
+
+class RegistryValue(WixBase):
+ @classmethod
+ def setup(cls):
+ cls.kw_map['id'] = 'Id'
+ cls.kw_map['name'] = 'Name'
+ cls.kw_map['key'] = 'Key'
+ cls.kw_map['value'] = 'Value'
+ cls.kw_map['action'] = 'Action'
+ cls.kw_map['root'] = 'Root'
+ cls.kw_map['type'] = 'Type'
+
+ cls.kw_default['root'] = "HKLM"
+ cls.kw_default['type'] = "string"
+ cls.kw_default['action'] = "write"
+
+class RegistrySearch(WixBase):
+ @classmethod
+ def setup(cls):
+ cls.kw_map['id'] = 'Id'
+ cls.kw_map['name'] = 'Name'
+ cls.kw_map['key'] = 'Key'
+ cls.kw_map['root'] = 'Root'
+ cls.kw_map['type'] = 'Type'
+
+ cls.kw_default['root'] = "HKLM"
+ cls.kw_default['type'] = "directory"
+
+class DirectorySearch(WixBase):
+ @classmethod
+ def setup(cls):
+ cls.kw_map['id'] = 'Id'
+ cls.kw_map['depth'] = 'Depth'
+ cls.kw_map['path'] = 'Path'
+
+class Merge(WixBase):
+ @classmethod
+ def setup(cls):
+ cls.kw_map['id'] = 'Id'
+ cls.kw_map['source_file'] = 'SourceFile'
+ cls.kw_map['disk_id'] = 'DiskId'
+ cls.kw_map['language'] = "Language"
+ cls.kw_map['compressed'] = 'FileCompression'
+
+ cls.kw_default['language'] = "1033"
+ cls.kw_default['compressed'] = "yes"
+
+
+class MergeRef(WixBase):
+ pass
+
+
+
+class Environment(WixBase):
+ @classmethod
+ def setup(cls):
+ cls.kw_map['id'] = 'Id'
+ cls.kw_map['action'] = 'Action'
+ cls.kw_map['name'] = 'Name'
+ cls.kw_map['part'] = 'Part'
+ cls.kw_map['seperator'] = 'Seperator'
+ cls.kw_map['value'] = 'Value'
+
+ cls.kw_default['action'] = 'set'
+ cls.kw_default['part'] = 'last'
+
+
+def extract_version_information(directory):
+ fh = open(directory + "/configure")
+ package = 'PACKAGE_VERSION='
+ len_proj = len(package)
+ for line in fh.readlines():
+ if len(line) > len_proj and line[:len_proj] == package:
+ break
+ return line[len_proj+1:-2]
+
+def generate_directory_tree(directory, parent = Empty, prefix = Empty, create_dir = False, current = Empty, file_filter = Empty, directory_filter = Empty):
+ """
+ Recurses through a directory structure and subsequently adds every file and
+ directory which is not negatively filtered to parent.
+
+ parent =
+ prefix = A prefix making generated ids unique
+ current = Do we have a current directory, or do we need to generate it?
+ directory_filter = Which directories should we visit. Argument needs to be
+ a function which signals true/false after getting passed cur directry, to
+ be visited directory as arguments
+ file_filter = Which files should get included. Argument needs to be a
+ function which signals true/false after getting passed cur directry,
+ filename as arguments
+ """
+ if Empty in [parent, current, prefix]:
+ raise TypeError('Missing paremeter')
+
+ curdir = None
+ if create_dir:
+ prefix = prefix + '.' + os.path.basename(directory)
+ curdir = Directory(parent = current, source_dir = directory, name = os.path.basename(directory), id = gen_wix_id_repeatable(prefix))
+ else:
+ curdir = Directory(parent = current, source_dir = directory, id = gen_wix_id_repeatable(prefix))
+ #comp = Component(id = prefix + '.component')
+
+ #entrycount = 0
+ for entry in os.listdir(directory):
+ if os.path.isfile(os.path.join(directory, entry)) and (file_filter == Empty or file_filter(directory, entry)):
+ #c_id = prefix + "_" + os.path.join(directory, entry)
+ comp = Component(parent = curdir, id = gen_wix_id_repeatable(prefix + '.' + entry))
+ File(parent = comp, name = entry, id = gen_wix_id_repeatable(prefix + '.' + entry))
+ ComponentRef(parent = parent,
+ id = gen_wix_id_repeatable(prefix + '.' + entry))
+
+ #entrycount += 1
+ elif os.path.isdir(os.path.join(directory, entry)) and (directory_filter == Empty or directory_filter(directory, entry)):
+ generate_directory_tree(os.path.join(directory, entry),
+ current = curdir,
+ create_dir = True,
+ parent = parent,
+ prefix = prefix,
+ file_filter = file_filter,
+ directory_filter = directory_filter)
+
+ #if entrycount:
+ # curdir.add(comp)
+ # ComponentRef(parent = parent,
+ # id = prefix + '.component')
+
+ return curdir
+
+class DirectoryHelper:
+ def __init__(self, parent, prefix, rootDir):
+ self.parent = parent
+ self.prefix = prefix
+ self.rootDir = rootDir
+ if not '_dirHelper_knownDirs' in parent.__dict__:
+ parent.__dict__['_dirHelper_knownDirs'] = {}
+
+ def GetDirectory(self, dir):
+ if dir == None:
+ return self.rootDir
+ if dir in self.parent._dirHelper_knownDirs:
+ return self.parent._dirHelper_knownDirs[dir]
+ dirSplit = dir.rsplit ('/', 1)
+ if len(dirSplit) == 1:
+ pObj = self.rootDir
+ name = dirSplit[0]
+ realPrefix = self.prefix
+ else:
+ pObj = self.GetDirectory (dirSplit[0])
+ name = dirSplit[1]
+ realPrefix = self.prefix + '.' + dirSplit[0].replace('/', '.')
+ newDir = Directory (parent = pObj,
+ name = name,
+ id = gen_wix_id_repeatable(realPrefix + '.' + name))
+ self.parent._dirHelper_knownDirs[dir] = newDir
+ return newDir
+
+def generate_from_file_list(filelist, parent, prefix, dir):
+ """
+ Goes through a file list (as generated by CS' `jam filelists` command) and
+ adds each file (and containing directory) to parent.
+
+ filelist = List of files. Must be iterable, with the iterated items being
+ lines as in a filelist file.
+ parent =
+ prefix = A prefix making generated ids unique
+ """
+
+ dirs = DirectoryHelper(parent, prefix, dir)
+
+ for file in filelist:
+ (sourcePath, destPath) = file.split(':', 1)
+ destSplit = destPath.rsplit ('/', 1)
+ if len(destSplit) == 1:
+ destFN = destSplit[0].strip()
+ destDir = None
+ realPrefix = prefix
+ else:
+ destDir = destSplit[0].strip()
+ destFN = destSplit[1].strip()
+ realPrefix = prefix + '.' + destDir.replace('/', '.')
+ dirObj = dirs.GetDirectory (destDir)
+ if destFN == "":
+ # No file name part - create empty dir
+ continue
+ if os.path.isfile(sourcePath):
+ wixID = gen_wix_id_repeatable(realPrefix + '.' + destFN)
+ comp = Component(parent = dirObj, id = wixID)
+ File(parent = comp, name = destFN, id = wixID, source = sourcePath)
+ ComponentRef(parent = parent, id = wixID)
+ elif os.path.isdir(sourcePath):
+ # Source is actually a directory, add recursively
+ generate_directory_tree(sourcePath,
+ current = dirObj,
+ create_dir = True,
+ parent = parent,
+ prefix = realPrefix)
+ else:
+ print "File list entry %s not found, packages may be incomplete" % sourcePath
+
+def generate_from_file_list_txt(filelist_name, parent, prefix, dir):
+ try:
+ list = file(filelist_name, "r")
+ except:
+ list = None
+ print "Could not open %s, packages may be incomplete" % filelist_name
+ if list:
+ generate_from_file_list(list,
+ parent = parent,
+ prefix = prefix,
+ dir = dir)
+
+def wixify_string(s):
+ return s.replace('-', '_').replace(' ', '_').replace(',', '_')
+
+def wixify_string_and_shorten(s, cur):
+ """
+ This is quite ugly and ad hoc.
+ Compress the filenames to fit into the stupid `Id` length requirement.
+ A nicer solution is needed, but in most cases we now dont need to calculate
+ an sha based id.
+ """
+ return md5.md5(s).hexdigest()
+ curlen = len(cur) + 1
+ s = wixify_string(s)
+ if len(s) + curlen >= 72:
+ #s = re.sub('(.*)_([0-9a-f]{32})(\.[a-z]*)', r'\1.\3', s)
+ s = s.replace('graph', 'gr')
+ s = s.replace('source', 'sr')
+ s = s.replace('struct', 'st')
+ s = s.replace('class', 'c')
+ s = s.replace('const', 'c')
+ s = s.replace('char', 'c')
+ s = s.replace('inherit', 'i')
+ s = s.replace('members', 'm')
+ s = s.replace('.html', '.h')
+ s = s.replace('crystalspace', 'cs')
+ s = s.replace('lightmap', 'lm')
+ s = s.replace('crystalspace', 'cs')
+ s = s.replace('Plugin', 'plg')
+ s = s.replace('Common', 'cmn')
+ s = s.replace('Shader', 'shd')
+ s = s.replace('Comparator', 'cmp')
+ s = s.replace('Default', 'def')
+ s = s.replace('Scanline', 'scl')
+ s = s.replace('Render', 'rn')
+ s = s.replace('Implementation', 'impl')
+ s = s.replace('System', 'sys')
+ s = s.replace('Stream', 'str')
+ s = s.replace('Notification', 'notif')
+ s = s.replace('Interpolate', 'intrp')
+ s = s.replace('Utility', 'util')
+ s = s.replace('Container', 'cont')
+ s = s.replace('Upcase', 'uc')
+ s = s.replace('Downcase', 'lc')
+ if len(s) + curlen > 72:
+ olds = s
+ s = md5.md5(s).hexdigest()
+ sys.stderr.write('shortening filename because it trips the limit: \n'+
+ '\t' + olds + "\n"
+ '\twith a len of ' + str(curlen + len(olds)) + "\n" +
+ '\treplacing with ' + s + "\n"
+ '\ttill now id is ' + cur + "\n")
+ #s = s.replace('__', '_')
+ #s = s[:20]
+ return s
+
+def gen_wix_id_repeatable(s):
+ """
+ Generates a Id which fits to WIX's requirements for ids. It
+ creates the same id for the same input.
+ """
+ #return '_' + sha.sha(str(s)).hexdigest()
+ return '_' + md5.md5(s).hexdigest()[:-1]
+
+def default_directory_filter(directory, entry):
+ #print entry
+ if entry in [".svn", 'CVS']:
+ return False
+ return True
+
+def generate_merge_module(path = [], out = '.', id = Empty, manufacturer = "", Language = 1033, guid = Empty, version = Empty, language = '1033', filename = None):
+ if Empty in [id, guid, version]:
+ raise TypeError('Missing parameter')
+ if not filename:
+ filename = out + os.path.sep + id + '.wxs'
+ base = Base(filename = filename)
+ module = Module(
+ parent = base,
+ version = version,
+ language = language,
+ id = id
+ )
+ package = Package(
+ parent = module,
+ id = guid,
+ manufacturer = manufacturer
+ )
+
+ p = module
+ for i in path:
+ (c_id, c_name, c_source) = i
+ param = {"parent": p,
+ "id": c_id}
+ if c_source:
+ param['source_dir'] = c_source
+ if c_name:
+ param['name'] = c_name
+
+ p = Directory(
+ **param)
+
+ return (base, module, p)
+
+def merge_merge_module(id = Empty, source_file = Empty, feature = Empty, directory = Empty, media = '1', guid = Empty):
+ if Empty in [source_file, feature, directory, id, guid]:
+ raise TypeError('Missing parameter')
+ comb_id = id + '.' + guid
+ Merge(parent = directory,
+ id = comb_id,
+ source_file = source_file,
+ disk_id = media)
+ MergeRef(
+ parent = feature,
+ id = comb_id)
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/cel-config /tmp/IB0bHXT4Oc/cel-1.4/cel-config
--- cel-1.9+svn3615/cel-config 2009-12-09 03:12:10.000000000 +0000
+++ cel-1.4/cel-config 1970-01-01 01:00:00.000000000 +0100
@@ -1,43 +0,0 @@
-#!/bin/sh
-
-if [ "x$MSYSTEM" = "xmsys" ] ; then
- PATH_SEPARATOR=";"
-else
- PATH_SEPARATOR=":"
-fi
-
-BASE_DIR=`dirname $0`
-TEMP_PREFIX=/tmp/cel-config$$
-
-# Collect executables starting with 'cel-config-' from $CEL and $PATH
-# @@@ FIXME: What about $CEL_x_y env vars?
-OLD_IFS="$IFS"
-IFS=$PATH_SEPARATOR
-for p in $CEL$PATH_SEPARATOR$CEL/bin$PATH_SEPARATOR$BASE_DIR$PATH_SEPARATOR$PATH ; do
- if [ -d "$p" ] ; then
- for s in "$p"/cel-config-* ; do
- if [ -x "$s" ] ; then
- echo "$s" >> ${TEMP_PREFIX}_find
- fi
- done
- fi
-done
-IFS="$OLD_IFS"
-
-if [ ! -e ${TEMP_PREFIX}_find ] ; then
- echo No cel-config-* scripts found
- exit -1
-fi
-
-# Reorder for sorting
-cat ${TEMP_PREFIX}_find | sed 's!\(.*\)/cel-config-\(.*\)\.\(.*\)!\2:\3:\1!g' >> ${TEMP_PREFIX}_split
-# Sort by version number
-cat ${TEMP_PREFIX}_split | sort -u -t : -k 1,1nr -k 2,2nr >> ${TEMP_PREFIX}_sorted
-# Extract first entry (highest version)
-command=`cat ${TEMP_PREFIX}_sorted | head -n 1 | sed 's!\(.*\):\(.*\):\(.*\)!\3/cel-config-\1\.\2!'`
-# cleanup
-rm ${TEMP_PREFIX}*
-# ...and execute.
-$command $@
-
-
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/configure /tmp/IB0bHXT4Oc/cel-1.4/configure
--- cel-1.9+svn3615/configure 2008-07-10 13:28:45.000000000 +0100
+++ cel-1.4/configure 2009-11-28 16:46:41.000000000 +0000
@@ -1,11 +1,11 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for cel 1.9.
+# Generated by GNU Autoconf 2.63 for cel 1.4.0.
#
# Report bugs to .
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
# This configure script is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
## --------------------- ##
@@ -17,7 +17,7 @@
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
@@ -39,17 +39,45 @@
as_cr_digits='0123456789'
as_cr_alnum=$as_cr_Letters$as_cr_digits
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
- echo "#! /bin/sh" >conf$$.sh
- echo "exit 0" >>conf$$.sh
- chmod +x conf$$.sh
- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
- PATH_SEPARATOR=';'
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+ as_echo='printf %s\n'
+ as_echo_n='printf %s'
+else
+ if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+ as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+ as_echo_n='/usr/ucb/echo -n'
else
- PATH_SEPARATOR=:
+ as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+ as_echo_n_body='eval
+ arg=$1;
+ case $arg in
+ *"$as_nl"*)
+ expr "X$arg" : "X\\(.*\\)$as_nl";
+ arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+ esac;
+ expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+ '
+ export as_echo_n_body
+ as_echo_n='sh -c $as_echo_n_body as_echo'
fi
- rm -f conf$$.sh
+ export as_echo_body
+ as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+ PATH_SEPARATOR=:
+ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+ PATH_SEPARATOR=';'
+ }
fi
# Support unset when possible.
@@ -65,8 +93,6 @@
# there to prevent editors from complaining about space-tab.
# (If _AS_PATH_WALK were called with IFS unset, it would disable word
# splitting by setting IFS to empty value.)
-as_nl='
-'
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
@@ -89,7 +115,7 @@
as_myself=$0
fi
if test ! -f "$as_myself"; then
- echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
{ (exit 1); exit 1; }
fi
@@ -102,17 +128,10 @@
PS4='+ '
# NLS nuisances.
-for as_var in \
- LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
- LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
- LC_TELEPHONE LC_TIME
-do
- if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
- eval $as_var=C; export $as_var
- else
- ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
- fi
-done
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
# Required to use basename.
if expr a : '\(a\)' >/dev/null 2>&1 &&
@@ -134,7 +153,7 @@
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
+$as_echo X/"$0" |
sed '/^.*\/\([^/][^/]*\)\/*$/{
s//\1/
q
@@ -160,7 +179,7 @@
as_have_required=no
fi
- if test $as_have_required = yes && (eval ":
+ if test $as_have_required = yes && (eval ":
(as_func_return () {
(exit \$1)
}
@@ -242,7 +261,7 @@
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
@@ -263,7 +282,7 @@
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
@@ -343,10 +362,10 @@
if test "x$CONFIG_SHELL" != x; then
for as_var in BASH_ENV ENV
- do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
- done
- export CONFIG_SHELL
- exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+ do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
+ done
+ export CONFIG_SHELL
+ exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
fi
@@ -415,9 +434,10 @@
test \$exitcode = 0") || {
echo No shell found that supports shell functions.
- echo Please tell autoconf@gnu.org about your system,
- echo including any error possibly output before this
- echo message
+ echo Please tell bug-autoconf@gnu.org about your system,
+ echo including any error possibly output before this message.
+ echo This can help us improve future autoconf versions.
+ echo Configuration will now proceed without shell functions.
}
@@ -453,7 +473,7 @@
s/-\n.*//
' >$as_me.lineno &&
chmod +x "$as_me.lineno" ||
- { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+ { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
{ (exit 1); exit 1; }; }
# Don't try to exec as it changes $[0], causing all sort of problems
@@ -481,7 +501,6 @@
*)
ECHO_N='-n';;
esac
-
if expr a : '\(a\)' >/dev/null 2>&1 &&
test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
@@ -494,19 +513,22 @@
rm -f conf$$.dir/conf$$.file
else
rm -f conf$$.dir
- mkdir conf$$.dir
+ mkdir conf$$.dir 2>/dev/null
fi
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
- as_ln_s='ln -s'
- # ... but there are two gotchas:
- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
- # In both cases, we have to default to `cp -p'.
- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+if (echo >conf$$.file) 2>/dev/null; then
+ if ln -s conf$$.file conf$$ 2>/dev/null; then
+ as_ln_s='ln -s'
+ # ... but there are two gotchas:
+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+ # In both cases, we have to default to `cp -p'.
+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+ as_ln_s='cp -p'
+ elif ln conf$$.file conf$$ 2>/dev/null; then
+ as_ln_s=ln
+ else
as_ln_s='cp -p'
-elif ln conf$$.file conf$$ 2>/dev/null; then
- as_ln_s=ln
+ fi
else
as_ln_s='cp -p'
fi
@@ -533,10 +555,10 @@
as_test_x='
eval sh -c '\''
if test -d "$1"; then
- test -d "$1/.";
+ test -d "$1/.";
else
case $1 in
- -*)set "./$1";;
+ -*)set "./$1";;
esac;
case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
???[sx]*):;;*)false;;esac;fi
@@ -576,8 +598,8 @@
# Identity of this package.
PACKAGE_NAME='cel'
PACKAGE_TARNAME='cel'
-PACKAGE_VERSION='1.9'
-PACKAGE_STRING='cel 1.9'
+PACKAGE_VERSION='1.4.0'
+PACKAGE_STRING='cel 1.4.0'
PACKAGE_BUGREPORT='cel-main@lists.sourceforge.net'
ac_unique_file="mk/jam/build.jam"
@@ -617,119 +639,140 @@
# include
#endif"
-ac_subst_vars='SHELL
-PATH_SEPARATOR
-PACKAGE_NAME
-PACKAGE_TARNAME
-PACKAGE_VERSION
-PACKAGE_STRING
-PACKAGE_BUGREPORT
-exec_prefix
-prefix
-program_transform_name
-bindir
-sbindir
-libexecdir
-datarootdir
-datadir
-sysconfdir
-sharedstatedir
-localstatedir
-includedir
-oldincludedir
-docdir
-infodir
-htmldir
-dvidir
-pdfdir
-psdir
-libdir
-localedir
-mandir
-DEFS
-ECHO_C
-ECHO_N
-ECHO_T
-LIBS
-build_alias
-host_alias
-target_alias
-build
-build_cpu
-build_vendor
-build_os
-host
-host_cpu
-host_vendor
-host_os
-CC
-CFLAGS
-LDFLAGS
-CPPFLAGS
-ac_ct_CC
-EXEEXT
-OBJEXT
-CXX
-CXXFLAGS
-ac_ct_CXX
-LD
-ac_ct_LD
-RANLIB
-DLLTOOL
-ac_ct_DLLTOOL
-DLLWRAP
-ac_ct_DLLWRAP
-WINDRES
-ac_ct_WINDRES
-STRINGS
-ac_ct_STRINGS
-OBJCOPY
-ac_ct_OBJCOPY
-LIBTOOL_TEST
-ac_ct_LIBTOOL_TEST
-LIBTOOL_PATH
-LIBTOOL
-ac_ct_LIBTOOL
-CS_LT_APPLE
-APPLE_LIBTOOL
-MKDIR
-MKDIRS
-INSTALL
-LN_S
-TEXI2DVI
-TEXI2PDF
-DVIPS
-DVIPDF
-MAKEINFO
-DOXYGEN
-DOT
-ac_ct_DOT
-RSVG
-ICOTOOL
-CONVERT
-PERL
-TTREE
-SWIG
-CSLIBS_CONFIG
-ac_ct_CSLIBS_CONFIG
-PYTHON
-ac_ct_PYTHON
-PKG_CONFIG
-ac_ct_PKG_CONFIG
-CONFIG_CPPUNIT
-ac_ct_CONFIG_CPPUNIT
-CONFIG_NL
-ac_ct_CONFIG_NL
-CRYSTAL
-CRYSTAL_CONFIG_TOOL
-CPP
-GREP
-EGREP
-CONFIG_BFD
-ac_ct_CONFIG_BFD
+ac_subst_vars='LTLIBOBJS
LIBOBJS
-LTLIBOBJS'
+CONFIG_BFD
+EGREP
+GREP
+CPP
+RELAYTOOL
+CRYSTAL_CONFIG_TOOL
+CRYSTAL
+CONFIG_NL
+CONFIG_CPPUNIT
+ac_ct_PKG_CONFIG
+PKG_CONFIG
+ac_ct_PYTHON
+PYTHON
+ac_ct_CSLIBS_CONFIG
+CSLIBS_CONFIG
+SWIG
+TTREE
+PERL
+CONVERT
+ICOTOOL
+RSVG
+ac_ct_DOT
+DOT
+DOXYGEN
+MAKEINFO
+DVIPDF
+DVIPS
+TEXI2PDF
+TEXI2DVI
+LN_S
+INSTALL
+MKDIRS
+MKDIR
+APPLE_LIBTOOL
+CS_LT_APPLE
+ac_ct_LIBTOOL
+LIBTOOL
+LIBTOOL_PATH
+ac_ct_LIBTOOL_TEST
+LIBTOOL_TEST
+ac_ct_OBJCOPY
+OBJCOPY
+ac_ct_STRINGS
+STRINGS
+ac_ct_WINDRES
+WINDRES
+ac_ct_DLLWRAP
+DLLWRAP
+ac_ct_DLLTOOL
+DLLTOOL
+RANLIB
+ac_ct_LD
+LD
+ac_ct_CXX
+CXXFLAGS
+CXX
+OBJEXT
+EXEEXT
+ac_ct_CC
+CPPFLAGS
+LDFLAGS
+CFLAGS
+CC
+CS_TOP_BUILDDIR
+CS_TOP_SRCDIR
+host_os
+host_vendor
+host_cpu
+host
+build_os
+build_vendor
+build_cpu
+build
+target_alias
+host_alias
+build_alias
+LIBS
+ECHO_T
+ECHO_N
+ECHO_C
+DEFS
+mandir
+localedir
+libdir
+psdir
+pdfdir
+dvidir
+htmldir
+infodir
+docdir
+oldincludedir
+includedir
+localstatedir
+sharedstatedir
+sysconfdir
+datadir
+datarootdir
+libexecdir
+sbindir
+bindir
+program_transform_name
+prefix
+exec_prefix
+PACKAGE_BUGREPORT
+PACKAGE_STRING
+PACKAGE_VERSION
+PACKAGE_TARNAME
+PACKAGE_NAME
+PATH_SEPARATOR
+SHELL
+CRYSTAL_TOOLS_PREFIX'
ac_subst_files=''
+ac_user_opts='
+enable_option_checking
+enable_mno_cygwin
+enable_as_needed
+enable_gc_sections
+enable_universal_binary
+enable_separate_debug_info
+enable_optimize_mode_debug_info
+with_python
+with_cppunit
+with_NL
+with_cs
+with_cs_prefix
+enable_cstest
+enable_relaytool
+enable_meta_info_embedding
+with_bfd
+enable_shared
+enable_debug
+'
ac_precious_vars='build_alias
host_alias
target_alias
@@ -748,6 +791,8 @@
# Initialize some variables set by options.
ac_init_help=
ac_init_version=false
+ac_unrecognized_opts=
+ac_unrecognized_sep=
# The variables have the same names as the options, with
# dashes changed to underlines.
cache_file=/dev/null
@@ -846,13 +891,21 @@
datarootdir=$ac_optarg ;;
-disable-* | --disable-*)
- ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+ ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
# Reject names that are not valid shell variable names.
- expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
- { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+ { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
{ (exit 1); exit 1; }; }
- ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
- eval enable_$ac_feature=no ;;
+ ac_useropt_orig=$ac_useropt
+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+ case $ac_user_opts in
+ *"
+"enable_$ac_useropt"
+"*) ;;
+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
+ ac_unrecognized_sep=', ';;
+ esac
+ eval enable_$ac_useropt=no ;;
-docdir | --docdir | --docdi | --doc | --do)
ac_prev=docdir ;;
@@ -865,13 +918,21 @@
dvidir=$ac_optarg ;;
-enable-* | --enable-*)
- ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+ ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
# Reject names that are not valid shell variable names.
- expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
- { echo "$as_me: error: invalid feature name: $ac_feature" >&2
+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+ { $as_echo "$as_me: error: invalid feature name: $ac_useropt" >&2
{ (exit 1); exit 1; }; }
- ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
- eval enable_$ac_feature=\$ac_optarg ;;
+ ac_useropt_orig=$ac_useropt
+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+ case $ac_user_opts in
+ *"
+"enable_$ac_useropt"
+"*) ;;
+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
+ ac_unrecognized_sep=', ';;
+ esac
+ eval enable_$ac_useropt=\$ac_optarg ;;
-exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
| --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
@@ -1062,22 +1123,38 @@
ac_init_version=: ;;
-with-* | --with-*)
- ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+ ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
# Reject names that are not valid shell variable names.
- expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
- { echo "$as_me: error: invalid package name: $ac_package" >&2
+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+ { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
{ (exit 1); exit 1; }; }
- ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
- eval with_$ac_package=\$ac_optarg ;;
+ ac_useropt_orig=$ac_useropt
+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+ case $ac_user_opts in
+ *"
+"with_$ac_useropt"
+"*) ;;
+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
+ ac_unrecognized_sep=', ';;
+ esac
+ eval with_$ac_useropt=\$ac_optarg ;;
-without-* | --without-*)
- ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+ ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
# Reject names that are not valid shell variable names.
- expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
- { echo "$as_me: error: invalid package name: $ac_package" >&2
+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+ { $as_echo "$as_me: error: invalid package name: $ac_useropt" >&2
{ (exit 1); exit 1; }; }
- ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
- eval with_$ac_package=no ;;
+ ac_useropt_orig=$ac_useropt
+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+ case $ac_user_opts in
+ *"
+"with_$ac_useropt"
+"*) ;;
+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
+ ac_unrecognized_sep=', ';;
+ esac
+ eval with_$ac_useropt=no ;;
--x)
# Obsolete; use --with-x.
@@ -1097,7 +1174,7 @@
| --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
x_libraries=$ac_optarg ;;
- -*) { echo "$as_me: error: unrecognized option: $ac_option
+ -*) { $as_echo "$as_me: error: unrecognized option: $ac_option
Try \`$0 --help' for more information." >&2
{ (exit 1); exit 1; }; }
;;
@@ -1106,16 +1183,16 @@
ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
# Reject names that are not valid shell variable names.
expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
- { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
+ { $as_echo "$as_me: error: invalid variable name: $ac_envvar" >&2
{ (exit 1); exit 1; }; }
eval $ac_envvar=\$ac_optarg
export $ac_envvar ;;
*)
# FIXME: should be removed in autoconf 3.0.
- echo "$as_me: WARNING: you should use --build, --host, --target" >&2
+ $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
- echo "$as_me: WARNING: invalid host type: $ac_option" >&2
+ $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
: ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
;;
@@ -1124,22 +1201,38 @@
if test -n "$ac_prev"; then
ac_option=--`echo $ac_prev | sed 's/_/-/g'`
- { echo "$as_me: error: missing argument to $ac_option" >&2
+ { $as_echo "$as_me: error: missing argument to $ac_option" >&2
{ (exit 1); exit 1; }; }
fi
-# Be sure to have absolute directory names.
+if test -n "$ac_unrecognized_opts"; then
+ case $enable_option_checking in
+ no) ;;
+ fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2
+ { (exit 1); exit 1; }; } ;;
+ *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+ esac
+fi
+
+# Check all directory arguments for consistency.
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
datadir sysconfdir sharedstatedir localstatedir includedir \
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
libdir localedir mandir
do
eval ac_val=\$$ac_var
+ # Remove trailing slashes.
+ case $ac_val in
+ */ )
+ ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'`
+ eval $ac_var=\$ac_val;;
+ esac
+ # Be sure to have absolute directory names.
case $ac_val in
[\\/$]* | ?:[\\/]* ) continue;;
NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
esac
- { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
+ { $as_echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
{ (exit 1); exit 1; }; }
done
@@ -1154,7 +1247,7 @@
if test "x$host_alias" != x; then
if test "x$build_alias" = x; then
cross_compiling=maybe
- echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+ $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
If a cross compiler is detected then cross compile mode will be used." >&2
elif test "x$build_alias" != "x$host_alias"; then
cross_compiling=yes
@@ -1170,10 +1263,10 @@
ac_pwd=`pwd` && test -n "$ac_pwd" &&
ac_ls_di=`ls -di .` &&
ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
- { echo "$as_me: error: Working directory cannot be determined" >&2
+ { $as_echo "$as_me: error: working directory cannot be determined" >&2
{ (exit 1); exit 1; }; }
test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
- { echo "$as_me: error: pwd does not report name of working directory" >&2
+ { $as_echo "$as_me: error: pwd does not report name of working directory" >&2
{ (exit 1); exit 1; }; }
@@ -1181,12 +1274,12 @@
if test -z "$srcdir"; then
ac_srcdir_defaulted=yes
# Try the directory containing this script, then the parent directory.
- ac_confdir=`$as_dirname -- "$0" ||
-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$0" : 'X\(//\)[^/]' \| \
- X"$0" : 'X\(//\)$' \| \
- X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$0" |
+ ac_confdir=`$as_dirname -- "$as_myself" ||
+$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$as_myself" : 'X\(//\)[^/]' \| \
+ X"$as_myself" : 'X\(//\)$' \| \
+ X"$as_myself" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_myself" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
@@ -1213,12 +1306,12 @@
fi
if test ! -r "$srcdir/$ac_unique_file"; then
test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
+ { $as_echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
{ (exit 1); exit 1; }; }
fi
ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
ac_abs_confdir=`(
- cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2
+ cd "$srcdir" && test -r "./$ac_unique_file" || { $as_echo "$as_me: error: $ac_msg" >&2
{ (exit 1); exit 1; }; }
pwd)`
# When building in place, set srcdir=.
@@ -1245,7 +1338,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures cel 1.9 to adapt to many kinds of systems.
+\`configure' configures cel 1.4.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1267,9 +1360,9 @@
Installation directories:
--prefix=PREFIX install architecture-independent files in PREFIX
- [$ac_default_prefix]
+ [$ac_default_prefix]
--exec-prefix=EPREFIX install architecture-dependent files in EPREFIX
- [PREFIX]
+ [PREFIX]
By default, \`make install' will install all the files in
\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify
@@ -1279,25 +1372,25 @@
For better control, use the options below.
Fine tuning of the installation directories:
- --bindir=DIR user executables [EPREFIX/bin]
- --sbindir=DIR system admin executables [EPREFIX/sbin]
- --libexecdir=DIR program executables [EPREFIX/libexec]
- --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
- --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
- --localstatedir=DIR modifiable single-machine data [PREFIX/var]
- --libdir=DIR object code libraries [EPREFIX/lib]
- --includedir=DIR C header files [PREFIX/include]
- --oldincludedir=DIR C header files for non-gcc [/usr/include]
- --datarootdir=DIR read-only arch.-independent data root [PREFIX/share]
- --datadir=DIR read-only architecture-independent data [DATAROOTDIR]
- --infodir=DIR info documentation [DATAROOTDIR/info]
- --localedir=DIR locale-dependent data [DATAROOTDIR/locale]
- --mandir=DIR man documentation [DATAROOTDIR/man]
- --docdir=DIR documentation root [DATAROOTDIR/doc/cel]
- --htmldir=DIR html documentation [DOCDIR]
- --dvidir=DIR dvi documentation [DOCDIR]
- --pdfdir=DIR pdf documentation [DOCDIR]
- --psdir=DIR ps documentation [DOCDIR]
+ --bindir=DIR user executables [EPREFIX/bin]
+ --sbindir=DIR system admin executables [EPREFIX/sbin]
+ --libexecdir=DIR program executables [EPREFIX/libexec]
+ --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
+ --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
+ --localstatedir=DIR modifiable single-machine data [PREFIX/var]
+ --libdir=DIR object code libraries [EPREFIX/lib]
+ --includedir=DIR C header files [PREFIX/include]
+ --oldincludedir=DIR C header files for non-gcc [/usr/include]
+ --datarootdir=DIR read-only arch.-independent data root [PREFIX/share]
+ --datadir=DIR read-only architecture-independent data [DATAROOTDIR]
+ --infodir=DIR info documentation [DATAROOTDIR/info]
+ --localedir=DIR locale-dependent data [DATAROOTDIR/locale]
+ --mandir=DIR man documentation [DATAROOTDIR/man]
+ --docdir=DIR documentation root [DATAROOTDIR/doc/cel]
+ --htmldir=DIR html documentation [DOCDIR]
+ --dvidir=DIR dvi documentation [DOCDIR]
+ --pdfdir=DIR pdf documentation [DOCDIR]
+ --psdir=DIR ps documentation [DOCDIR]
_ACEOF
cat <<\_ACEOF
@@ -1310,11 +1403,12 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of cel 1.9:";;
+ short | recursive ) echo "Configuration of cel 1.4.0:";;
esac
cat <<\_ACEOF
Optional Features:
+ --disable-option-checking ignore unrecognized --enable/--with options
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
--enable-mno-cygwin Compile with the -mno-cygwin option. (default YES)
@@ -1323,6 +1417,9 @@
enough to support it properly (default YES)
--enable-gc-sections Utilize --gc-sections linker flag for some targets
(default YES)
+ --enable-universal-binary
+ build Mac OS X universal binaries (default YES on
+ Mac OS X with universal SDK installed, else NO)
--enable-separate-debug-info
split debug information into separate files.
(default YES if binutils >= 2.16 detected and not on
@@ -1333,6 +1430,8 @@
is enabled, otherwise default NO)
--enable-cstest verify that the Crystal Space SDK is actually usable
(default YES)
+ --enable-relaytool enable use of relaytool for some libraries (default
+ YES)
--enable-meta-info-embedding
store plugin meta-information directly inside plugin
modules if supported by platform; if disabled,
@@ -1397,15 +1496,17 @@
if test "$ac_init_help" = "recursive"; then
# If there are subdirs, report their specific --help.
for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
- test -d "$ac_dir" || continue
+ test -d "$ac_dir" ||
+ { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } ||
+ continue
ac_builddir=.
case "$ac_dir" in
.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
*)
- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+ ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
# A ".." for each directory in $ac_dir_suffix.
- ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+ ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
case $ac_top_builddir_sub in
"") ac_top_builddir_sub=. ac_top_build_prefix= ;;
*) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -1441,7 +1542,7 @@
echo &&
$SHELL "$ac_srcdir/configure" --help=recursive
else
- echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
+ $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
fi || ac_status=$?
cd "$ac_pwd" || { ac_status=$?; break; }
done
@@ -1450,11 +1551,11 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-cel configure 1.9
-generated by GNU Autoconf 2.61
+cel configure 1.4.0
+generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.
_ACEOF
@@ -1464,8 +1565,8 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by cel $as_me 1.9, which was
-generated by GNU Autoconf 2.61. Invocation command line was
+It was created by cel $as_me 1.4.0, which was
+generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
@@ -1501,7 +1602,7 @@
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
- echo "PATH: $as_dir"
+ $as_echo "PATH: $as_dir"
done
IFS=$as_save_IFS
@@ -1536,7 +1637,7 @@
| -silent | --silent | --silen | --sile | --sil)
continue ;;
*\'*)
- ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
+ ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
esac
case $ac_pass in
1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
@@ -1588,11 +1689,12 @@
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
- *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+ *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
esac
case $ac_var in #(
_ | IFS | as_nl) ;; #(
+ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
*) $as_unset $ac_var ;;
esac ;;
esac
@@ -1622,9 +1724,9 @@
do
eval ac_val=\$$ac_var
case $ac_val in
- *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
esac
- echo "$ac_var='\''$ac_val'\''"
+ $as_echo "$ac_var='\''$ac_val'\''"
done | sort
echo
@@ -1639,9 +1741,9 @@
do
eval ac_val=\$$ac_var
case $ac_val in
- *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
+ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
esac
- echo "$ac_var='\''$ac_val'\''"
+ $as_echo "$ac_var='\''$ac_val'\''"
done | sort
echo
fi
@@ -1657,8 +1759,8 @@
echo
fi
test "$ac_signal" != 0 &&
- echo "$as_me: caught signal $ac_signal"
- echo "$as_me: exit $exit_status"
+ $as_echo "$as_me: caught signal $ac_signal"
+ $as_echo "$as_me: exit $exit_status"
} >&5
rm -f core *.core core.conftest.* &&
rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
@@ -1700,21 +1802,24 @@
# Let the site file select an alternate cache file if it wants to.
-# Prefer explicitly selected file to automatically selected ones.
+# Prefer an explicitly selected file to automatically selected ones.
+ac_site_file1=NONE
+ac_site_file2=NONE
if test -n "$CONFIG_SITE"; then
- set x "$CONFIG_SITE"
+ ac_site_file1=$CONFIG_SITE
elif test "x$prefix" != xNONE; then
- set x "$prefix/share/config.site" "$prefix/etc/config.site"
+ ac_site_file1=$prefix/share/config.site
+ ac_site_file2=$prefix/etc/config.site
else
- set x "$ac_default_prefix/share/config.site" \
- "$ac_default_prefix/etc/config.site"
+ ac_site_file1=$ac_default_prefix/share/config.site
+ ac_site_file2=$ac_default_prefix/etc/config.site
fi
-shift
-for ac_site_file
+for ac_site_file in "$ac_site_file1" "$ac_site_file2"
do
+ test "x$ac_site_file" = xNONE && continue
if test -r "$ac_site_file"; then
- { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-echo "$as_me: loading site script $ac_site_file" >&6;}
+ { $as_echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
+$as_echo "$as_me: loading site script $ac_site_file" >&6;}
sed 's/^/| /' "$ac_site_file" >&5
. "$ac_site_file"
fi
@@ -1724,16 +1829,16 @@
# Some versions of bash will fail to source /dev/null (special
# files actually), so we avoid doing that.
if test -f "$cache_file"; then
- { echo "$as_me:$LINENO: loading cache $cache_file" >&5
-echo "$as_me: loading cache $cache_file" >&6;}
+ { $as_echo "$as_me:$LINENO: loading cache $cache_file" >&5
+$as_echo "$as_me: loading cache $cache_file" >&6;}
case $cache_file in
[\\/]* | ?:[\\/]* ) . "$cache_file";;
*) . "./$cache_file";;
esac
fi
else
- { echo "$as_me:$LINENO: creating cache $cache_file" >&5
-echo "$as_me: creating cache $cache_file" >&6;}
+ { $as_echo "$as_me:$LINENO: creating cache $cache_file" >&5
+$as_echo "$as_me: creating cache $cache_file" >&6;}
>$cache_file
fi
@@ -1747,29 +1852,38 @@
eval ac_new_val=\$ac_env_${ac_var}_value
case $ac_old_set,$ac_new_set in
set,)
- { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
+ { $as_echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
ac_cache_corrupted=: ;;
,set)
- { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
+ { $as_echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
+$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
ac_cache_corrupted=: ;;
,);;
*)
if test "x$ac_old_val" != "x$ac_new_val"; then
- { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
- { echo "$as_me:$LINENO: former value: $ac_old_val" >&5
-echo "$as_me: former value: $ac_old_val" >&2;}
- { echo "$as_me:$LINENO: current value: $ac_new_val" >&5
-echo "$as_me: current value: $ac_new_val" >&2;}
- ac_cache_corrupted=:
+ # differences in whitespace do not lead to failure.
+ ac_old_val_w=`echo x $ac_old_val`
+ ac_new_val_w=`echo x $ac_new_val`
+ if test "$ac_old_val_w" != "$ac_new_val_w"; then
+ { $as_echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
+$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
+ ac_cache_corrupted=:
+ else
+ { $as_echo "$as_me:$LINENO: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
+$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
+ eval $ac_var=\$ac_old_val
+ fi
+ { $as_echo "$as_me:$LINENO: former value: \`$ac_old_val'" >&5
+$as_echo "$as_me: former value: \`$ac_old_val'" >&2;}
+ { $as_echo "$as_me:$LINENO: current value: \`$ac_new_val'" >&5
+$as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
fi;;
esac
# Pass precious variables to config.status.
if test "$ac_new_set" = set; then
case $ac_new_val in
- *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
+ *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
*) ac_arg=$ac_var=$ac_new_val ;;
esac
case " $ac_configure_args " in
@@ -1779,10 +1893,12 @@
fi
done
if $ac_cache_corrupted; then
- { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
-echo "$as_me: error: changes in the environment can compromise the build" >&2;}
- { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
+ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+ { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
+$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+ { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+$as_echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -1839,8 +1955,8 @@
fi
done
if test -z "$ac_aux_dir"; then
- { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in mk/autoconf \"$srcdir\"/mk/autoconf" >&5
-echo "$as_me: error: cannot find install-sh or install.sh in mk/autoconf \"$srcdir\"/mk/autoconf" >&2;}
+ { { $as_echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in mk/autoconf \"$srcdir\"/mk/autoconf" >&5
+$as_echo "$as_me: error: cannot find install-sh or install.sh in mk/autoconf \"$srcdir\"/mk/autoconf" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -1855,34 +1971,34 @@
# Make sure we can run config.sub.
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
- { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
-echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
+ { { $as_echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5
+$as_echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;}
{ (exit 1); exit 1; }; }
-{ echo "$as_me:$LINENO: checking build system type" >&5
-echo $ECHO_N "checking build system type... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking build system type" >&5
+$as_echo_n "checking build system type... " >&6; }
if test "${ac_cv_build+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
ac_build_alias=$build_alias
test "x$ac_build_alias" = x &&
ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
test "x$ac_build_alias" = x &&
- { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
-echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
+ { { $as_echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
+$as_echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
{ (exit 1); exit 1; }; }
ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
- { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
+ { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5
+$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;}
{ (exit 1); exit 1; }; }
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-echo "${ECHO_T}$ac_cv_build" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_build" >&5
+$as_echo "$ac_cv_build" >&6; }
case $ac_cv_build in
*-*-*) ;;
-*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
-echo "$as_me: error: invalid value of canonical build" >&2;}
+*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical build" >&5
+$as_echo "$as_me: error: invalid value of canonical build" >&2;}
{ (exit 1); exit 1; }; };;
esac
build=$ac_cv_build
@@ -1899,27 +2015,27 @@
case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
-{ echo "$as_me:$LINENO: checking host system type" >&5
-echo $ECHO_N "checking host system type... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking host system type" >&5
+$as_echo_n "checking host system type... " >&6; }
if test "${ac_cv_host+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test "x$host_alias" = x; then
ac_cv_host=$ac_cv_build
else
ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
- { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
-echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
+ { { $as_echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5
+$as_echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;}
{ (exit 1); exit 1; }; }
fi
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-echo "${ECHO_T}$ac_cv_host" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_host" >&5
+$as_echo "$ac_cv_host" >&6; }
case $ac_cv_host in
*-*-*) ;;
-*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
-echo "$as_me: error: invalid value of canonical host" >&2;}
+*) { { $as_echo "$as_me:$LINENO: error: invalid value of canonical host" >&5
+$as_echo "$as_me: error: invalid value of canonical host" >&2;}
{ (exit 1); exit 1; }; };;
esac
host=$ac_cv_host
@@ -1936,9 +2052,52 @@
case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
+CS_TOP_SRCDIR=$(
+ cs_indir=`echo "x$srcdir" | tr '\\\\' '/' | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+ ac_dir="$cs_indir"
+ pwd -W >/dev/null 2>&1 && ac_pwd_w="pwd -W" || ac_pwd_w=pwd
+ until ac_val=`exec 2>/dev/null; cd "$ac_dir" && $ac_pwd_w`
+ do
+ ac_dir=`$as_dirname -- "$ac_dir" ||
+$as_expr X"$ac_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$ac_dir" : 'X\(//\)[^/]' \| \
+ X"$ac_dir" : 'X\(//\)$' \| \
+ X"$ac_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$ac_dir" |
+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)[^/].*/{
+ s//\1/
+ q
+ }
+ /^X\(\/\/\)$/{
+ s//\1/
+ q
+ }
+ /^X\(\/\).*/{
+ s//\1/
+ q
+ }
+ s/.*/./; q'`
+ done
+ ac_dir=`echo "$ac_dir" | sed 's?^[./]*??'`
+ ac_val=`echo "$ac_val" | sed 's?/*$??'`
+ cs_outdir=`echo "$cs_indir" | sed "s?^[./]*$ac_dir/*?$ac_val/?"';s?/*$??'`
+ echo $cs_outdir
+ )
+
+ CS_TOP_BUILDDIR=.
+
+
+
+#----------------------------------------------------------------------------
+# Check for tools.
+#----------------------------------------------------------------------------
- { echo "$as_me:$LINENO: checking whether to enable -mno-cygwin" >&5
-echo $ECHO_N "checking whether to enable -mno-cygwin... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking whether to enable -mno-cygwin" >&5
+$as_echo_n "checking whether to enable -mno-cygwin... " >&6; }
# Check whether --enable-mno-cygwin was given.
if test "${enable_mno_cygwin+set}" = set; then
enableval=$enable_mno_cygwin; enable_m_no_cygwin=$enableval
@@ -1974,18 +2133,14 @@
cs_mno_cygwin=no
fi
- { echo "$as_me:$LINENO: result: $cs_mno_cygwin" >&5
-echo "${ECHO_T}$cs_mno_cygwin" >&6; }
-
-
+ { $as_echo "$as_me:$LINENO: result: $cs_mno_cygwin" >&5
+$as_echo "$cs_mno_cygwin" >&6; }
-#----------------------------------------------------------------------------
-# Check for tools.
-#----------------------------------------------------------------------------
CFLAGS="$CFLAGS" # Filter undesired flags
- ac_ext=c
+
+ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -1993,10 +2148,10 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
set dummy ${ac_tool_prefix}gcc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2009,7 +2164,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="${ac_tool_prefix}gcc"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -2020,11 +2175,11 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -2033,10 +2188,10 @@
ac_ct_CC=$CC
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
@@ -2049,7 +2204,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_CC="gcc"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -2060,11 +2215,11 @@
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
- { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
if test "x$ac_ct_CC" = x; then
@@ -2072,12 +2227,8 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
CC=$ac_ct_CC
@@ -2090,10 +2241,10 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2106,7 +2257,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="${ac_tool_prefix}cc"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -2117,11 +2268,11 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -2130,10 +2281,10 @@
if test -z "$CC"; then
# Extract the first word of "cc", so it can be a program name with args.
set dummy cc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2151,7 +2302,7 @@
continue
fi
ac_cv_prog_CC="cc"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -2174,11 +2325,11 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -2189,10 +2340,10 @@
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$CC"; then
ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2205,7 +2356,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -2216,11 +2367,11 @@
fi
CC=$ac_cv_prog_CC
if test -n "$CC"; then
- { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $CC" >&5
+$as_echo "$CC" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -2233,10 +2384,10 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CC"; then
ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
@@ -2249,7 +2400,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_CC="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -2260,11 +2411,11 @@
fi
ac_ct_CC=$ac_cv_prog_ac_ct_CC
if test -n "$ac_ct_CC"; then
- { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+$as_echo "$ac_ct_CC" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -2276,12 +2427,8 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
CC=$ac_ct_CC
@@ -2291,44 +2438,50 @@
fi
-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
+test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
See \`config.log' for more details." >&5
-echo "$as_me: error: no acceptable C compiler found in \$PATH
+$as_echo "$as_me: error: no acceptable C compiler found in \$PATH
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+ { (exit 1); exit 1; }; }; }
# Provide some information about the compiler.
-echo "$as_me:$LINENO: checking for C compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
+$as_echo "$as_me:$LINENO: checking for C compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
{ (ac_try="$ac_compiler --version >&5"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_compiler --version >&5") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
{ (ac_try="$ac_compiler -v >&5"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_compiler -v >&5") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
{ (ac_try="$ac_compiler -V >&5"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_compiler -V >&5") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
cat >conftest.$ac_ext <<_ACEOF
@@ -2347,27 +2500,22 @@
}
_ACEOF
ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.exe b.out"
+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
# Try to create an executable without -o first, disregard a.out.
# It will help us diagnose broken compilers, and finding out an intuition
# of exeext.
-{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
-ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-#
-# List of possible output files, starting from the most likely.
-# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
-# only as a last resort. b.out is created by i960 compilers.
-ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
-#
-# The IRIX 6 linker writes into existing files which may not be
-# executable, retaining their permissions. Remove them first so a
-# subsequent execution test works.
+{ $as_echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
+$as_echo_n "checking for C compiler default output file name... " >&6; }
+ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
+
+# The possible output files:
+ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
+
ac_rmfiles=
for ac_file in $ac_files
do
case $ac_file in
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
* ) ac_rmfiles="$ac_rmfiles $ac_file";;
esac
done
@@ -2378,10 +2526,11 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_link_default") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
# Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
@@ -2392,7 +2541,7 @@
do
test -f "$ac_file" || continue
case $ac_file in
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj )
;;
[ab].out )
# We found the default executable, but exeext='' is most
@@ -2419,25 +2568,27 @@
ac_file=''
fi
-{ echo "$as_me:$LINENO: result: $ac_file" >&5
-echo "${ECHO_T}$ac_file" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_file" >&5
+$as_echo "$ac_file" >&6; }
if test -z "$ac_file"; then
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
+{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables
See \`config.log' for more details." >&5
-echo "$as_me: error: C compiler cannot create executables
+$as_echo "$as_me: error: C compiler cannot create executables
See \`config.log' for more details." >&2;}
- { (exit 77); exit 77; }; }
+ { (exit 77); exit 77; }; }; }
fi
ac_exeext=$ac_cv_exeext
# Check that the compiler produces executables we can run. If not, either
# the compiler is broken, or we cross compile.
-{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether the C compiler works" >&5
+$as_echo_n "checking whether the C compiler works... " >&6; }
# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
# If not cross compiling, check that we can run a simple program.
if test "$cross_compiling" != yes; then
@@ -2446,49 +2597,53 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_try") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cross_compiling=no
else
if test "$cross_compiling" = maybe; then
cross_compiling=yes
else
- { { echo "$as_me:$LINENO: error: cannot run C compiled programs.
+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs.
If you meant to cross compile, use \`--host'.
See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run C compiled programs.
+$as_echo "$as_me: error: cannot run C compiled programs.
If you meant to cross compile, use \`--host'.
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+ { (exit 1); exit 1; }; }; }
fi
fi
fi
-{ echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+{ $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
-rm -f a.out a.exe conftest$ac_cv_exeext b.out
+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
ac_clean_files=$ac_clean_files_save
# Check that the compiler produces executables we can run. If not, either
# the compiler is broken, or we cross compile.
-{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
-{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
-echo "${ECHO_T}$cross_compiling" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
+$as_echo_n "checking whether we are cross compiling... " >&6; }
+{ $as_echo "$as_me:$LINENO: result: $cross_compiling" >&5
+$as_echo "$cross_compiling" >&6; }
-{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for suffix of executables" >&5
+$as_echo_n "checking for suffix of executables... " >&6; }
if { (ac_try="$ac_link"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
# If both `conftest.exe' and `conftest' are `present' (well, observable)
# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
@@ -2497,31 +2652,33 @@
for ac_file in conftest.exe conftest conftest.*; do
test -f "$ac_file" || continue
case $ac_file in
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;;
*.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
break;;
* ) break;;
esac
done
else
- { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
+$as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+ { (exit 1); exit 1; }; }; }
fi
rm -f conftest$ac_cv_exeext
-{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-echo "${ECHO_T}$ac_cv_exeext" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
+$as_echo "$ac_cv_exeext" >&6; }
rm -f conftest.$ac_ext
EXEEXT=$ac_cv_exeext
ac_exeext=$EXEEXT
-{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for suffix of object files" >&5
+$as_echo_n "checking for suffix of object files... " >&6; }
if test "${ac_cv_objext+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -2544,40 +2701,43 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_compile") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
for ac_file in conftest.o conftest.obj conftest.*; do
test -f "$ac_file" || continue;
case $ac_file in
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;;
*) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
break;;
esac
done
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
+{ { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of object files: cannot compile
+$as_echo "$as_me: error: cannot compute suffix of object files: cannot compile
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+ { (exit 1); exit 1; }; }; }
fi
rm -f conftest.$ac_cv_objext conftest.$ac_ext
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-echo "${ECHO_T}$ac_cv_objext" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
+$as_echo "$ac_cv_objext" >&6; }
OBJEXT=$ac_cv_objext
ac_objext=$OBJEXT
-{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
if test "${ac_cv_c_compiler_gnu+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -2603,20 +2763,21 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_compiler_gnu=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_compiler_gnu=no
@@ -2626,15 +2787,19 @@
ac_cv_c_compiler_gnu=$ac_compiler_gnu
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
-GCC=`test $ac_compiler_gnu = yes && echo yes`
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+ GCC=yes
+else
+ GCC=
+fi
ac_test_CFLAGS=${CFLAGS+set}
ac_save_CFLAGS=$CFLAGS
-{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
+$as_echo_n "checking whether $CC accepts -g... " >&6; }
if test "${ac_cv_prog_cc_g+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
ac_save_c_werror_flag=$ac_c_werror_flag
ac_c_werror_flag=yes
@@ -2661,20 +2826,21 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_cv_prog_cc_g=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
CFLAGS=""
@@ -2699,20 +2865,21 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
:
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_c_werror_flag=$ac_save_c_werror_flag
@@ -2738,20 +2905,21 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_cv_prog_cc_g=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -2766,8 +2934,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_c_werror_flag=$ac_save_c_werror_flag
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
+$as_echo "$ac_cv_prog_cc_g" >&6; }
if test "$ac_test_CFLAGS" = set; then
CFLAGS=$ac_save_CFLAGS
elif test $ac_cv_prog_cc_g = yes; then
@@ -2783,10 +2951,10 @@
CFLAGS=
fi
fi
-{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
-echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
if test "${ac_cv_prog_cc_c89+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
ac_cv_prog_cc_c89=no
ac_save_CC=$CC
@@ -2833,121 +3001,306 @@
#define FOO(x) 'x'
int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-int argc;
-char **argv;
+int test (int i, double x);
+struct s1 {int (*f) (int a);};
+struct s2 {int (*f) (double a);};
+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
+int argc;
+char **argv;
+int
+main ()
+{
+return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
+ ;
+ return 0;
+}
+_ACEOF
+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
+ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+do
+ CC="$ac_save_CC $ac_arg"
+ rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_prog_cc_c89=$ac_arg
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext
+ test "x$ac_cv_prog_cc_c89" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC
+
+fi
+# AC_CACHE_VAL
+case "x$ac_cv_prog_cc_c89" in
+ x)
+ { $as_echo "$as_me:$LINENO: result: none needed" >&5
+$as_echo "none needed" >&6; } ;;
+ xno)
+ { $as_echo "$as_me:$LINENO: result: unsupported" >&5
+$as_echo "unsupported" >&6; } ;;
+ *)
+ CC="$CC $ac_cv_prog_cc_c89"
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
+esac
+
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+
+
+
+ if test -n "$CC"; then
+
+ cs_build_prop_val="$CC"
+ cs_build_prop_val=`echo x$cs_build_prop_val | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+ if test -n "$cs_build_prop_val"; then
+ cs_jamconfig_text="${cs_jamconfig_text}CMD.CC ?= $cs_build_prop_val ;
+"
+fi
+
+ cs_build_prop_val="$CPPFLAGS $CFLAGS"
+ cs_build_prop_val=`echo x$cs_build_prop_val | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+ if test -n "$cs_build_prop_val"; then
+ cs_jamconfig_text="${cs_jamconfig_text}COMPILER.CFLAGS += $cs_build_prop_val ;
+"
+fi
+
+ if test "$ac_compiler_gnu" = yes; then
+ cs_compiler_name_c=GCC
+else
+ cs_compiler_name_c=`$as_echo "$CC" | $as_tr_cpp`
+fi
+
+ cs_build_prop_val="$cs_compiler_name_c"
+ cs_build_prop_val=`echo x$cs_build_prop_val | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+ if test -n "$cs_build_prop_val"; then
+ cs_jamconfig_text="${cs_jamconfig_text}COMPILER.C.TYPE ?= $cs_build_prop_val ;
+"
+fi
+
+ cs_build_prop_val="$cs_compiler_name_c"
+ cs_build_prop_val=`echo x$cs_build_prop_val | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+ if test -n "$cs_build_prop_val"; then
+ cs_jamconfig_text="${cs_jamconfig_text}COMPILER.TYPE = $cs_build_prop_val ;
+"
+fi
+
+
+ # Check if compiler recognizes -pipe directive.
+ { $as_echo "$as_me:$LINENO: checking if $CC accepts -pipe" >&5
+$as_echo_n "checking if $CC accepts -pipe... " >&6; }
+if test "${cs_cv_prog_cc_pipe_ok+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ if test -n "`echo @-pipe@@ | sed 'y% %#%'`"; then
+ ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+ cs_cflags_save="$CFLAGS"
+ cs_lflags_save="$LDFLAGS"
+ cs_libs_save="$LIBS"
+ cs_build_ok=no
+
+
+ for cs_build_item in `echo @-pipe@@ | sed 'y% %#%'`
+ do
+
+ set filler `echo "$cs_build_item" | awk 'BEGIN { FS="@" }
+ { for (i=1; i <= NF; ++i)
+ { if ($i == "") print "filler"; else print $i } }'`
+ shift
+ if test $# -eq 0; then
+ cs_dummy=''
+else
+ if test "$1" = filler; then
+ cs_dummy=''
+else
+ cs_dummy=$1
+fi
+
+ shift
+fi
+
+if test $# -eq 0; then
+ cs_cflags_test=''
+else
+ if test "$1" = filler; then
+ cs_cflags_test=''
+else
+ cs_cflags_test=$1
+fi
+
+ shift
+fi
+
+if test $# -eq 0; then
+ cs_lflags_test=''
+else
+ if test "$1" = filler; then
+ cs_lflags_test=''
+else
+ cs_lflags_test=$1
+fi
+
+ shift
+fi
+
+if test $# -eq 0; then
+ cs_libs_test=''
+else
+ if test "$1" = filler; then
+ cs_libs_test=''
+else
+ cs_libs_test=$1
+fi
+
+ shift
+fi
+
+
+ cs_cflags_test=`echo $cs_cflags_test | sed 'y%#% %'`
+ cs_lflags_test=`echo $cs_lflags_test | sed 'y%#% %'`
+ cs_libs_test=`echo $cs_libs_test | sed 'y%#% %'`
+
+ CFLAGS="$cs_cflags_test $cs_cflags_save"
+ LDFLAGS="$cs_lflags_test $cs_lflags_save"
+ LIBS="$cs_libs_test $cs_libs_save"
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
int
main ()
{
-return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
+
;
return 0;
}
_ACEOF
-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
- -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-do
- CC="$ac_save_CC $ac_arg"
- rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest.$ac_objext; then
- ac_cv_prog_cc_c89=$ac_arg
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ cs_build_ok=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
fi
-rm -f core conftest.err conftest.$ac_objext
- test "x$ac_cv_prog_cc_c89" != "xno" && break
-done
-rm -f conftest.$ac_ext
-CC=$ac_save_CC
-
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+ if test $cs_build_ok = yes; then
+ break
fi
-# AC_CACHE_VAL
-case "x$ac_cv_prog_cc_c89" in
- x)
- { echo "$as_me:$LINENO: result: none needed" >&5
-echo "${ECHO_T}none needed" >&6; } ;;
- xno)
- { echo "$as_me:$LINENO: result: unsupported" >&5
-echo "${ECHO_T}unsupported" >&6; } ;;
- *)
- CC="$CC $ac_cv_prog_cc_c89"
- { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
-esac
+ done
-ac_ext=c
+
+ CFLAGS=$cs_cflags_save
+ LDFLAGS=$cs_lflags_save
+ LIBS=$cs_libs_save
+ ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
- if test -n "$CC"; then
-
- cs_build_prop_val="$CC"
- cs_build_prop_val=`echo x$cs_build_prop_val | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
- if test -n "$cs_build_prop_val"; then
- cs_jamconfig_text="${cs_jamconfig_text}CMD.CC ?= $cs_build_prop_val ;
-"
-fi
- cs_build_prop_val="$CPPFLAGS $CFLAGS"
- cs_build_prop_val=`echo x$cs_build_prop_val | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
- if test -n "$cs_build_prop_val"; then
- cs_jamconfig_text="${cs_jamconfig_text}COMPILER.CFLAGS += $cs_build_prop_val ;
-"
+ if test $cs_build_ok = yes; then
+ cs_build_cflags=`echo x$cs_cflags_test | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+ cs_build_lflags=`echo x$cs_lflags_test | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+ cs_build_libs=`echo x$cs_libs_test | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+ cs_cv_prog_cc_pipe=`echo x$cs_build_cflags $cs_build_lflags $cs_build_libs | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+ cs_cv_prog_cc_pipe_ok="$cs_cv_prog_cc_pipe"
+else
+ cs_cv_prog_cc_pipe=''
+ cs_cv_prog_cc_pipe_ok=no
fi
- if test "$ac_compiler_gnu" = yes; then
- cs_compiler_name_c=GCC
else
- cs_compiler_name_c=`echo "$CC" | $as_tr_cpp`
+ cs_cv_prog_cc_pipe=''
+ cs_cv_prog_cc_pipe_ok=no
fi
- cs_build_prop_val="$cs_compiler_name_c"
+fi
+{ $as_echo "$as_me:$LINENO: result: $cs_cv_prog_cc_pipe_ok" >&5
+$as_echo "$cs_cv_prog_cc_pipe_ok" >&6; }
+ if test "$cs_cv_prog_cc_pipe_ok" != no; then
+ cs_build_prop_val="$cs_cv_prog_cc_pipe"
cs_build_prop_val=`echo x$cs_build_prop_val | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
if test -n "$cs_build_prop_val"; then
- cs_jamconfig_text="${cs_jamconfig_text}COMPILER.C.TYPE ?= $cs_build_prop_val ;
+ cs_jamconfig_text="${cs_jamconfig_text}COMPILER.CFLAGS += $cs_build_prop_val ;
"
fi
- cs_build_prop_val="$cs_compiler_name_c"
- cs_build_prop_val=`echo x$cs_build_prop_val | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
- if test -n "$cs_build_prop_val"; then
- cs_jamconfig_text="${cs_jamconfig_text}COMPILER.TYPE = $cs_build_prop_val ;
-"
+
fi
- # Check if compiler recognizes -pipe directive.
- { echo "$as_me:$LINENO: checking if $CC accepts -pipe" >&5
-echo $ECHO_N "checking if $CC accepts -pipe... $ECHO_C" >&6; }
-if test "${cs_cv_prog_cc_pipe_ok+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ # Check if compiler recognizes Sparc v9 CPU. Ugly to pollute
+ # project-agnostic C compiler check, but it is needed by assembly code
+ # implementing Sparc atomic threading operations, and it should not
+ # hurt if the option is not recognized.
+ { $as_echo "$as_me:$LINENO: checking if $CC handles Sparc v9" >&5
+$as_echo_n "checking if $CC handles Sparc v9... " >&6; }
+if test "${cs_cv_prog_cc_sparc_v9_ok+set}" = set; then
+ $as_echo_n "(cached) " >&6
else
- if test -n "`echo @-pipe@@ | sed 'y% %#%'`"; then
+ if test -n "`echo @-mcpu=v9@@ | sed 'y% %#%'`"; then
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -2960,7 +3313,7 @@
cs_build_ok=no
- for cs_build_item in `echo @-pipe@@ | sed 'y% %#%'`
+ for cs_build_item in `echo @-mcpu=v9@@ | sed 'y% %#%'`
do
set filler `echo "$cs_build_item" | awk 'BEGIN { FS="@" }
@@ -2978,6 +3331,7 @@
shift
fi
+
if test $# -eq 0; then
cs_cflags_test=''
else
@@ -2989,6 +3343,7 @@
shift
fi
+
if test $# -eq 0; then
cs_lflags_test=''
else
@@ -3000,6 +3355,7 @@
shift
fi
+
if test $# -eq 0; then
cs_libs_test=''
else
@@ -3012,6 +3368,7 @@
shift
fi
+
cs_cflags_test=`echo $cs_cflags_test | sed 'y%#% %'`
cs_lflags_test=`echo $cs_lflags_test | sed 'y%#% %'`
cs_libs_test=`echo $cs_libs_test | sed 'y%#% %'`
@@ -3040,26 +3397,30 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
cs_build_ok=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
fi
+rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test $cs_build_ok = yes; then
@@ -3083,23 +3444,23 @@
cs_build_cflags=`echo x$cs_cflags_test | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
cs_build_lflags=`echo x$cs_lflags_test | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
cs_build_libs=`echo x$cs_libs_test | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
- cs_cv_prog_cc_pipe=`echo x$cs_build_cflags $cs_build_lflags $cs_build_libs | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
- cs_cv_prog_cc_pipe_ok="$cs_cv_prog_cc_pipe"
+ cs_cv_prog_cc_sparc_v9=`echo x$cs_build_cflags $cs_build_lflags $cs_build_libs | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+ cs_cv_prog_cc_sparc_v9_ok="$cs_cv_prog_cc_sparc_v9"
else
- cs_cv_prog_cc_pipe=''
- cs_cv_prog_cc_pipe_ok=no
+ cs_cv_prog_cc_sparc_v9=''
+ cs_cv_prog_cc_sparc_v9_ok=no
fi
else
- cs_cv_prog_cc_pipe=''
- cs_cv_prog_cc_pipe_ok=no
+ cs_cv_prog_cc_sparc_v9=''
+ cs_cv_prog_cc_sparc_v9_ok=no
fi
fi
-{ echo "$as_me:$LINENO: result: $cs_cv_prog_cc_pipe_ok" >&5
-echo "${ECHO_T}$cs_cv_prog_cc_pipe_ok" >&6; }
- if test "$cs_cv_prog_cc_pipe_ok" != no; then
- cs_build_prop_val="$cs_cv_prog_cc_pipe"
+{ $as_echo "$as_me:$LINENO: result: $cs_cv_prog_cc_sparc_v9_ok" >&5
+$as_echo "$cs_cv_prog_cc_sparc_v9_ok" >&6; }
+ if test "$cs_cv_prog_cc_sparc_v9_ok" != no; then
+ cs_build_prop_val="$cs_cv_prog_cc_sparc_v9"
cs_build_prop_val=`echo x$cs_build_prop_val | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
if test -n "$cs_build_prop_val"; then
cs_jamconfig_text="${cs_jamconfig_text}COMPILER.CFLAGS += $cs_build_prop_val ;
@@ -3114,9 +3475,9 @@
-
CXXFLAGS="$CXXFLAGS" # Filter undesired flags
- ac_ext=cpp
+
+ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
@@ -3130,10 +3491,10 @@
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_CXX+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$CXX"; then
ac_cv_prog_CXX="$CXX" # Let the user override the test.
@@ -3146,7 +3507,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -3157,11 +3518,11 @@
fi
CXX=$ac_cv_prog_CXX
if test -n "$CXX"; then
- { echo "$as_me:$LINENO: result: $CXX" >&5
-echo "${ECHO_T}$CXX" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $CXX" >&5
+$as_echo "$CXX" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -3174,10 +3535,10 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CXX"; then
ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
@@ -3190,7 +3551,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_CXX="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -3201,11 +3562,11 @@
fi
ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
if test -n "$ac_ct_CXX"; then
- { echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
-echo "${ECHO_T}$ac_ct_CXX" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
+$as_echo "$ac_ct_CXX" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -3217,12 +3578,8 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
CXX=$ac_ct_CXX
@@ -3232,43 +3589,47 @@
fi
fi
# Provide some information about the compiler.
-echo "$as_me:$LINENO: checking for C++ compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
+$as_echo "$as_me:$LINENO: checking for C++ compiler version" >&5
+set X $ac_compile
+ac_compiler=$2
{ (ac_try="$ac_compiler --version >&5"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_compiler --version >&5") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
{ (ac_try="$ac_compiler -v >&5"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_compiler -v >&5") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
{ (ac_try="$ac_compiler -V >&5"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_compiler -V >&5") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }
-{ echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
+$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -3294,20 +3655,21 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_compiler_gnu=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_compiler_gnu=no
@@ -3317,15 +3679,19 @@
ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6; }
-GXX=`test $ac_compiler_gnu = yes && echo yes`
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
+$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
+if test $ac_compiler_gnu = yes; then
+ GXX=yes
+else
+ GXX=
+fi
ac_test_CXXFLAGS=${CXXFLAGS+set}
ac_save_CXXFLAGS=$CXXFLAGS
-{ echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
-echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
+$as_echo_n "checking whether $CXX accepts -g... " >&6; }
if test "${ac_cv_prog_cxx_g+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
ac_save_cxx_werror_flag=$ac_cxx_werror_flag
ac_cxx_werror_flag=yes
@@ -3352,20 +3718,21 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_cv_prog_cxx_g=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
CXXFLAGS=""
@@ -3390,20 +3757,21 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
:
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cxx_werror_flag=$ac_save_cxx_werror_flag
@@ -3429,20 +3797,21 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_cv_prog_cxx_g=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -3457,8 +3826,8 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
ac_cxx_werror_flag=$ac_save_cxx_werror_flag
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
+$as_echo "$ac_cv_prog_cxx_g" >&6; }
if test "$ac_test_CXXFLAGS" = set; then
CXXFLAGS=$ac_save_CXXFLAGS
elif test $ac_cv_prog_cxx_g = yes; then
@@ -3480,6 +3849,10 @@
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+
+
if test -n "$CXX"; then
cs_build_prop_val="$CXX"
@@ -3499,7 +3872,7 @@
if test "$ac_compiler_gnu" = yes; then
cs_compiler_name_cxx=GCC
else
- cs_compiler_name_cxx=`echo "$CXX" | $as_tr_cpp`
+ cs_compiler_name_cxx=`$as_echo "$CXX" | $as_tr_cpp`
fi
cs_build_prop_val="$cs_compiler_name_cxx"
@@ -3520,10 +3893,10 @@
# Check if compiler can be instructed to produce position-independent-code
# (PIC). This feature is required by some platforms when building plugin
# modules and shared libraries.
- { echo "$as_me:$LINENO: checking how to treat C++ warnings as errors" >&5
-echo $ECHO_N "checking how to treat C++ warnings as errors... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking how to treat C++ warnings as errors" >&5
+$as_echo_n "checking how to treat C++ warnings as errors... " >&6; }
if test "${cs_cv_prog_cxx_pic_werror_ok+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "`echo @-Werror@@ | sed 'y% %#%'`"; then
ac_ext=cpp
@@ -3556,6 +3929,7 @@
shift
fi
+
if test $# -eq 0; then
cs_cflags_test=''
else
@@ -3567,6 +3941,7 @@
shift
fi
+
if test $# -eq 0; then
cs_lflags_test=''
else
@@ -3578,6 +3953,7 @@
shift
fi
+
if test $# -eq 0; then
cs_libs_test=''
else
@@ -3590,6 +3966,7 @@
shift
fi
+
cs_cflags_test=`echo $cs_cflags_test | sed 'y%#% %'`
cs_lflags_test=`echo $cs_lflags_test | sed 'y%#% %'`
cs_libs_test=`echo $cs_libs_test | sed 'y%#% %'`
@@ -3618,26 +3995,30 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
cs_build_ok=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
fi
+rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test $cs_build_ok = yes; then
@@ -3674,13 +4055,13 @@
fi
fi
-{ echo "$as_me:$LINENO: result: $cs_cv_prog_cxx_pic_werror_ok" >&5
-echo "${ECHO_T}$cs_cv_prog_cxx_pic_werror_ok" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $cs_cv_prog_cxx_pic_werror_ok" >&5
+$as_echo "$cs_cv_prog_cxx_pic_werror_ok" >&6; }
- { echo "$as_me:$LINENO: checking how to enable C++ PIC generation" >&5
-echo $ECHO_N "checking how to enable C++ PIC generation... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking how to enable C++ PIC generation" >&5
+$as_echo_n "checking how to enable C++ PIC generation... " >&6; }
if test "${cs_cv_prog_cxx_pic_ok+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "`echo @-fPIC@@ | sed 'y% %#%'`"; then
ac_ext=cpp
@@ -3713,6 +4094,7 @@
shift
fi
+
if test $# -eq 0; then
cs_cflags_test=''
else
@@ -3724,6 +4106,7 @@
shift
fi
+
if test $# -eq 0; then
cs_lflags_test=''
else
@@ -3735,6 +4118,7 @@
shift
fi
+
if test $# -eq 0; then
cs_libs_test=''
else
@@ -3747,6 +4131,7 @@
shift
fi
+
cs_cflags_test=`echo $cs_cflags_test | sed 'y%#% %'`
cs_lflags_test=`echo $cs_lflags_test | sed 'y%#% %'`
cs_libs_test=`echo $cs_libs_test | sed 'y%#% %'`
@@ -3775,23 +4160,26 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
if { ac_try='grep "fPIC" conftest.err >/dev/null 2>&1'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cs_build_ok=no
else
@@ -3799,12 +4187,13 @@
fi
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
fi
+rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test $cs_build_ok = yes; then
@@ -3841,8 +4230,8 @@
fi
fi
-{ echo "$as_me:$LINENO: result: $cs_cv_prog_cxx_pic_ok" >&5
-echo "${ECHO_T}$cs_cv_prog_cxx_pic_ok" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $cs_cv_prog_cxx_pic_ok" >&5
+$as_echo "$cs_cv_prog_cxx_pic_ok" >&6; }
if test "$cs_cv_prog_cxx_pic_ok" != no; then
cs_build_prop_val="$cs_cv_prog_cxx_pic"
cs_build_prop_val=`echo x$cs_build_prop_val | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
@@ -3869,10 +4258,10 @@
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_LD+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$LD"; then
ac_cv_prog_LD="$LD" # Let the user override the test.
@@ -3885,7 +4274,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_LD="$ac_tool_prefix$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -3896,11 +4285,11 @@
fi
LD=$ac_cv_prog_LD
if test -n "$LD"; then
- { echo "$as_me:$LINENO: result: $LD" >&5
-echo "${ECHO_T}$LD" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $LD" >&5
+$as_echo "$LD" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -3913,10 +4302,10 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_ac_ct_LD+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_LD"; then
ac_cv_prog_ac_ct_LD="$ac_ct_LD" # Let the user override the test.
@@ -3929,7 +4318,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_LD="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -3940,11 +4329,11 @@
fi
ac_ct_LD=$ac_cv_prog_ac_ct_LD
if test -n "$ac_ct_LD"; then
- { echo "$as_me:$LINENO: result: $ac_ct_LD" >&5
-echo "${ECHO_T}$ac_ct_LD" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_ct_LD" >&5
+$as_echo "$ac_ct_LD" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -3956,12 +4345,8 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
LD=$ac_ct_LD
@@ -3973,10 +4358,10 @@
# to stderr rather than stdout. Handle these anomalies.
if echo `ld -v 2>&1` | grep GNU 2>&1 > /dev/null; then
# binutils versions come in the flavors X.Y as well as X.Y.Z
- { echo "$as_me:$LINENO: checking if binutils version >= 2.17" >&5
-echo $ECHO_N "checking if binutils version >= 2.17... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking if binutils version >= 2.17" >&5
+$as_echo_n "checking if binutils version >= 2.17... " >&6; }
if test "${cs_cv_prog_binutils_version_2_17_ok_annotated+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
cs_prog_binutils_is_version=
cs_prog_binutils_min_version=
@@ -3990,18 +4375,21 @@
-test -z $cs_prog_binutils_is_version && cs_prog_binutils_is_version=`$LD -v | sed '/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*/\1/;q'`
+
+test -z $cs_prog_binutils_is_version && cs_prog_binutils_is_version=`$LD -v | sed '/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*/\1/;q'`
test -n "$cs_prog_binutils_is_version" && test -z $cs_prog_binutils_is_suffix_done && { cs_prog_binutils_is_suffix_done=yes ; cs_prog_binutils_is_suffix= ; }
-test -z $cs_prog_binutils_is_version && cs_prog_binutils_is_version=`$LD -v | sed '/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*/\1/;q'`
+test -z $cs_prog_binutils_is_version && cs_prog_binutils_is_version=`$LD -v | sed '/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*/\1/;q'`
test -n "$cs_prog_binutils_is_version" && test -z $cs_prog_binutils_is_suffix_done && { cs_prog_binutils_is_suffix_done=yes ; cs_prog_binutils_is_suffix=.0 ; }
-test -z $cs_prog_binutils_is_version && cs_prog_binutils_is_version=`$LD -v | sed '/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*/\1/;q'`
+test -z $cs_prog_binutils_is_version && cs_prog_binutils_is_version=`$LD -v | sed '/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*/\1/;q'`
test -n "$cs_prog_binutils_is_version" && test -z $cs_prog_binutils_is_suffix_done && { cs_prog_binutils_is_suffix_done=yes ; cs_prog_binutils_is_suffix=.0.0 ; }
-test -z $cs_prog_binutils_is_version && cs_prog_binutils_is_version=`$LD -v | sed '/[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\.[0-9][0-9]*\).*/\1/;q'`
+test -z $cs_prog_binutils_is_version && cs_prog_binutils_is_version=`$LD -v | sed '/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*/\1/;q'`
test -n "$cs_prog_binutils_is_version" && test -z $cs_prog_binutils_is_suffix_done && { cs_prog_binutils_is_suffix_done=yes ; cs_prog_binutils_is_suffix=.0.0.0 ; }
+test -z $cs_prog_binutils_is_version && cs_prog_binutils_is_version=`$LD -v | sed '/[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\.[0-9][0-9]*\).*/\1/;q'`
+test -n "$cs_prog_binutils_is_version" && test -z $cs_prog_binutils_is_suffix_done && { cs_prog_binutils_is_suffix_done=yes ; cs_prog_binutils_is_suffix=.0.0.0.0 ; }
@@ -4009,30 +4397,37 @@
-test -z $cs_prog_binutils_min_version && cs_prog_binutils_min_version=`echo 2.17 | sed '/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*/\1/;q'`
+
+
+test -z $cs_prog_binutils_min_version && cs_prog_binutils_min_version=`echo 2.17 | sed '/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*/\1/;q'`
test -n "$cs_prog_binutils_min_version" && test -z $cs_prog_binutils_min_suffix_done && { cs_prog_binutils_min_suffix_done=yes ; cs_prog_binutils_min_suffix= ; }
-test -z $cs_prog_binutils_min_version && cs_prog_binutils_min_version=`echo 2.17 | sed '/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*/\1/;q'`
+test -z $cs_prog_binutils_min_version && cs_prog_binutils_min_version=`echo 2.17 | sed '/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*/\1/;q'`
test -n "$cs_prog_binutils_min_version" && test -z $cs_prog_binutils_min_suffix_done && { cs_prog_binutils_min_suffix_done=yes ; cs_prog_binutils_min_suffix=.0 ; }
-test -z $cs_prog_binutils_min_version && cs_prog_binutils_min_version=`echo 2.17 | sed '/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*/\1/;q'`
+test -z $cs_prog_binutils_min_version && cs_prog_binutils_min_version=`echo 2.17 | sed '/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*/\1/;q'`
test -n "$cs_prog_binutils_min_version" && test -z $cs_prog_binutils_min_suffix_done && { cs_prog_binutils_min_suffix_done=yes ; cs_prog_binutils_min_suffix=.0.0 ; }
-test -z $cs_prog_binutils_min_version && cs_prog_binutils_min_version=`echo 2.17 | sed '/[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\.[0-9][0-9]*\).*/\1/;q'`
+test -z $cs_prog_binutils_min_version && cs_prog_binutils_min_version=`echo 2.17 | sed '/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*/\1/;q'`
test -n "$cs_prog_binutils_min_version" && test -z $cs_prog_binutils_min_suffix_done && { cs_prog_binutils_min_suffix_done=yes ; cs_prog_binutils_min_suffix=.0.0.0 ; }
+test -z $cs_prog_binutils_min_version && cs_prog_binutils_min_version=`echo 2.17 | sed '/[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\.[0-9][0-9]*\).*/\1/;q'`
+test -n "$cs_prog_binutils_min_version" && test -z $cs_prog_binutils_min_suffix_done && { cs_prog_binutils_min_suffix_done=yes ; cs_prog_binutils_min_suffix=.0.0.0.0 ; }
-cs_prog_binutils_is_ver_1=`echo ${cs_prog_binutils_is_version}${cs_prog_binutils_is_suffix} | sed '/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*/\1/'`
-cs_prog_binutils_is_ver_2=`echo ${cs_prog_binutils_is_version}${cs_prog_binutils_is_suffix} | sed '/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*/\2/'`
-cs_prog_binutils_is_ver_3=`echo ${cs_prog_binutils_is_version}${cs_prog_binutils_is_suffix} | sed '/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*/\3/'`
-cs_prog_binutils_is_ver_4=`echo ${cs_prog_binutils_is_version}${cs_prog_binutils_is_suffix} | sed '/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*/\4/'`
-cs_prog_binutils_is_ver_5=`echo ${cs_prog_binutils_is_version}${cs_prog_binutils_is_suffix} | sed '/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*/\5/'`
-cs_prog_binutils_min_ver_1=`echo $cs_prog_binutils_min_version${cs_prog_binutils_min_suffix} | sed '/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*/\1/'`
-cs_prog_binutils_min_ver_2=`echo $cs_prog_binutils_min_version${cs_prog_binutils_min_suffix} | sed '/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*/\2/'`
-cs_prog_binutils_min_ver_3=`echo $cs_prog_binutils_min_version${cs_prog_binutils_min_suffix} | sed '/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*/\3/'`
-cs_prog_binutils_min_ver_4=`echo $cs_prog_binutils_min_version${cs_prog_binutils_min_suffix} | sed '/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*/\4/'`
-cs_prog_binutils_min_ver_5=`echo $cs_prog_binutils_min_version${cs_prog_binutils_min_suffix} | sed '/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*/\5/'`
+cs_prog_binutils_is_ver_1=`echo ${cs_prog_binutils_is_version}${cs_prog_binutils_is_suffix} | sed '/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*/\1/'`
+cs_prog_binutils_is_ver_2=`echo ${cs_prog_binutils_is_version}${cs_prog_binutils_is_suffix} | sed '/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*/\2/'`
+cs_prog_binutils_is_ver_3=`echo ${cs_prog_binutils_is_version}${cs_prog_binutils_is_suffix} | sed '/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*/\3/'`
+cs_prog_binutils_is_ver_4=`echo ${cs_prog_binutils_is_version}${cs_prog_binutils_is_suffix} | sed '/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*/\4/'`
+cs_prog_binutils_is_ver_5=`echo ${cs_prog_binutils_is_version}${cs_prog_binutils_is_suffix} | sed '/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*/\5/'`
+cs_prog_binutils_is_ver_6=`echo ${cs_prog_binutils_is_version}${cs_prog_binutils_is_suffix} | sed '/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*/\6/'`
+
+cs_prog_binutils_min_ver_1=`echo $cs_prog_binutils_min_version${cs_prog_binutils_min_suffix} | sed '/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*/\1/'`
+cs_prog_binutils_min_ver_2=`echo $cs_prog_binutils_min_version${cs_prog_binutils_min_suffix} | sed '/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*/\2/'`
+cs_prog_binutils_min_ver_3=`echo $cs_prog_binutils_min_version${cs_prog_binutils_min_suffix} | sed '/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*/\3/'`
+cs_prog_binutils_min_ver_4=`echo $cs_prog_binutils_min_version${cs_prog_binutils_min_suffix} | sed '/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*/\4/'`
+cs_prog_binutils_min_ver_5=`echo $cs_prog_binutils_min_version${cs_prog_binutils_min_suffix} | sed '/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*/\5/'`
+cs_prog_binutils_min_ver_6=`echo $cs_prog_binutils_min_version${cs_prog_binutils_min_suffix} | sed '/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*/\6/'`
cs_cv_prog_binutils_version_2_17_ok=''
test -z "$cs_cv_prog_binutils_version_2_17_ok" \
@@ -4065,6 +4460,12 @@
test -z "$cs_cv_prog_binutils_version_2_17_ok" \
&& { expr "$cs_prog_binutils_min_ver_5" ">=" "$cs_prog_binutils_is_ver_5" >/dev/null \
|| cs_cv_prog_binutils_version_2_17_ok=yes ; }
+test -z "$cs_cv_prog_binutils_version_2_17_ok" \
+ && { expr "$cs_prog_binutils_is_ver_6" ">=" "$cs_prog_binutils_min_ver_6" >/dev/null \
+ || cs_cv_prog_binutils_version_2_17_ok=no ; }
+test -z "$cs_cv_prog_binutils_version_2_17_ok" \
+ && { expr "$cs_prog_binutils_min_ver_6" ">=" "$cs_prog_binutils_is_ver_6" >/dev/null \
+ || cs_cv_prog_binutils_version_2_17_ok=yes ; }
if test -z "$cs_cv_prog_binutils_version_2_17_ok"; then
cs_cv_prog_binutils_version_2_17_ok=yes
@@ -4086,8 +4487,8 @@
fi
-{ echo "$as_me:$LINENO: result: $cs_cv_prog_binutils_version_2_17_ok_annotated" >&5
-echo "${ECHO_T}$cs_cv_prog_binutils_version_2_17_ok_annotated" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $cs_cv_prog_binutils_version_2_17_ok_annotated" >&5
+$as_echo "$cs_cv_prog_binutils_version_2_17_ok_annotated" >&6; }
if test "$cs_cv_prog_binutils_version_2_17_ok" = yes; then
cs_cv_binutils_true_2_17=yes
else
@@ -4099,10 +4500,10 @@
fi
if test -z "$cs_cv_binutils_2_17"; then
- { echo "$as_me:$LINENO: checking if binutils version >= 2.16.91" >&5
-echo $ECHO_N "checking if binutils version >= 2.16.91... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking if binutils version >= 2.16.91" >&5
+$as_echo_n "checking if binutils version >= 2.16.91... " >&6; }
if test "${cs_cv_prog_binutils_version_2_16_91_ok_annotated+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
cs_prog_binutils_is_version=
cs_prog_binutils_min_version=
@@ -4115,42 +4516,52 @@
-test -z $cs_prog_binutils_is_version && cs_prog_binutils_is_version=`$LD -v | sed '/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*/\1/;q'`
+
+test -z $cs_prog_binutils_is_version && cs_prog_binutils_is_version=`$LD -v | sed '/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*/\1/;q'`
test -n "$cs_prog_binutils_is_version" && test -z $cs_prog_binutils_is_suffix_done && { cs_prog_binutils_is_suffix_done=yes ; cs_prog_binutils_is_suffix= ; }
-test -z $cs_prog_binutils_is_version && cs_prog_binutils_is_version=`$LD -v | sed '/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*/\1/;q'`
+test -z $cs_prog_binutils_is_version && cs_prog_binutils_is_version=`$LD -v | sed '/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*/\1/;q'`
test -n "$cs_prog_binutils_is_version" && test -z $cs_prog_binutils_is_suffix_done && { cs_prog_binutils_is_suffix_done=yes ; cs_prog_binutils_is_suffix=.0 ; }
-test -z $cs_prog_binutils_is_version && cs_prog_binutils_is_version=`$LD -v | sed '/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*/\1/;q'`
+test -z $cs_prog_binutils_is_version && cs_prog_binutils_is_version=`$LD -v | sed '/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*/\1/;q'`
test -n "$cs_prog_binutils_is_version" && test -z $cs_prog_binutils_is_suffix_done && { cs_prog_binutils_is_suffix_done=yes ; cs_prog_binutils_is_suffix=.0.0 ; }
+test -z $cs_prog_binutils_is_version && cs_prog_binutils_is_version=`$LD -v | sed '/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*/\1/;q'`
+test -n "$cs_prog_binutils_is_version" && test -z $cs_prog_binutils_is_suffix_done && { cs_prog_binutils_is_suffix_done=yes ; cs_prog_binutils_is_suffix=.0.0.0 ; }
-test -z $cs_prog_binutils_min_version && cs_prog_binutils_min_version=`echo 2.16.91 | sed '/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*/\1/;q'`
+
+
+test -z $cs_prog_binutils_min_version && cs_prog_binutils_min_version=`echo 2.16.91 | sed '/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*/\1/;q'`
test -n "$cs_prog_binutils_min_version" && test -z $cs_prog_binutils_min_suffix_done && { cs_prog_binutils_min_suffix_done=yes ; cs_prog_binutils_min_suffix= ; }
-test -z $cs_prog_binutils_min_version && cs_prog_binutils_min_version=`echo 2.16.91 | sed '/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*/\1/;q'`
+test -z $cs_prog_binutils_min_version && cs_prog_binutils_min_version=`echo 2.16.91 | sed '/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*/\1/;q'`
test -n "$cs_prog_binutils_min_version" && test -z $cs_prog_binutils_min_suffix_done && { cs_prog_binutils_min_suffix_done=yes ; cs_prog_binutils_min_suffix=.0 ; }
-test -z $cs_prog_binutils_min_version && cs_prog_binutils_min_version=`echo 2.16.91 | sed '/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*/\1/;q'`
+test -z $cs_prog_binutils_min_version && cs_prog_binutils_min_version=`echo 2.16.91 | sed '/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*/\1/;q'`
test -n "$cs_prog_binutils_min_version" && test -z $cs_prog_binutils_min_suffix_done && { cs_prog_binutils_min_suffix_done=yes ; cs_prog_binutils_min_suffix=.0.0 ; }
+test -z $cs_prog_binutils_min_version && cs_prog_binutils_min_version=`echo 2.16.91 | sed '/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*/\1/;q'`
+test -n "$cs_prog_binutils_min_version" && test -z $cs_prog_binutils_min_suffix_done && { cs_prog_binutils_min_suffix_done=yes ; cs_prog_binutils_min_suffix=.0.0.0 ; }
-cs_prog_binutils_is_ver_1=`echo ${cs_prog_binutils_is_version}${cs_prog_binutils_is_suffix} | sed '/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*/\1/'`
-cs_prog_binutils_is_ver_2=`echo ${cs_prog_binutils_is_version}${cs_prog_binutils_is_suffix} | sed '/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*/\2/'`
-cs_prog_binutils_is_ver_3=`echo ${cs_prog_binutils_is_version}${cs_prog_binutils_is_suffix} | sed '/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*/\3/'`
-cs_prog_binutils_is_ver_4=`echo ${cs_prog_binutils_is_version}${cs_prog_binutils_is_suffix} | sed '/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*/\4/'`
-cs_prog_binutils_is_ver_5=`echo ${cs_prog_binutils_is_version}${cs_prog_binutils_is_suffix} | sed '/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*/\5/'`
-cs_prog_binutils_min_ver_1=`echo $cs_prog_binutils_min_version${cs_prog_binutils_min_suffix} | sed '/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*/\1/'`
-cs_prog_binutils_min_ver_2=`echo $cs_prog_binutils_min_version${cs_prog_binutils_min_suffix} | sed '/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*/\2/'`
-cs_prog_binutils_min_ver_3=`echo $cs_prog_binutils_min_version${cs_prog_binutils_min_suffix} | sed '/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*/\3/'`
-cs_prog_binutils_min_ver_4=`echo $cs_prog_binutils_min_version${cs_prog_binutils_min_suffix} | sed '/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*/\4/'`
-cs_prog_binutils_min_ver_5=`echo $cs_prog_binutils_min_version${cs_prog_binutils_min_suffix} | sed '/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*/\5/'`
+cs_prog_binutils_is_ver_1=`echo ${cs_prog_binutils_is_version}${cs_prog_binutils_is_suffix} | sed '/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*/\1/'`
+cs_prog_binutils_is_ver_2=`echo ${cs_prog_binutils_is_version}${cs_prog_binutils_is_suffix} | sed '/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*/\2/'`
+cs_prog_binutils_is_ver_3=`echo ${cs_prog_binutils_is_version}${cs_prog_binutils_is_suffix} | sed '/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*/\3/'`
+cs_prog_binutils_is_ver_4=`echo ${cs_prog_binutils_is_version}${cs_prog_binutils_is_suffix} | sed '/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*/\4/'`
+cs_prog_binutils_is_ver_5=`echo ${cs_prog_binutils_is_version}${cs_prog_binutils_is_suffix} | sed '/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*/\5/'`
+cs_prog_binutils_is_ver_6=`echo ${cs_prog_binutils_is_version}${cs_prog_binutils_is_suffix} | sed '/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*/\6/'`
+
+cs_prog_binutils_min_ver_1=`echo $cs_prog_binutils_min_version${cs_prog_binutils_min_suffix} | sed '/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*/\1/'`
+cs_prog_binutils_min_ver_2=`echo $cs_prog_binutils_min_version${cs_prog_binutils_min_suffix} | sed '/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*/\2/'`
+cs_prog_binutils_min_ver_3=`echo $cs_prog_binutils_min_version${cs_prog_binutils_min_suffix} | sed '/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*/\3/'`
+cs_prog_binutils_min_ver_4=`echo $cs_prog_binutils_min_version${cs_prog_binutils_min_suffix} | sed '/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*/\4/'`
+cs_prog_binutils_min_ver_5=`echo $cs_prog_binutils_min_version${cs_prog_binutils_min_suffix} | sed '/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*/\5/'`
+cs_prog_binutils_min_ver_6=`echo $cs_prog_binutils_min_version${cs_prog_binutils_min_suffix} | sed '/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*/\6/'`
cs_cv_prog_binutils_version_2_16_91_ok=''
test -z "$cs_cv_prog_binutils_version_2_16_91_ok" \
@@ -4183,6 +4594,12 @@
test -z "$cs_cv_prog_binutils_version_2_16_91_ok" \
&& { expr "$cs_prog_binutils_min_ver_5" ">=" "$cs_prog_binutils_is_ver_5" >/dev/null \
|| cs_cv_prog_binutils_version_2_16_91_ok=yes ; }
+test -z "$cs_cv_prog_binutils_version_2_16_91_ok" \
+ && { expr "$cs_prog_binutils_is_ver_6" ">=" "$cs_prog_binutils_min_ver_6" >/dev/null \
+ || cs_cv_prog_binutils_version_2_16_91_ok=no ; }
+test -z "$cs_cv_prog_binutils_version_2_16_91_ok" \
+ && { expr "$cs_prog_binutils_min_ver_6" ">=" "$cs_prog_binutils_is_ver_6" >/dev/null \
+ || cs_cv_prog_binutils_version_2_16_91_ok=yes ; }
if test -z "$cs_cv_prog_binutils_version_2_16_91_ok"; then
cs_cv_prog_binutils_version_2_16_91_ok=yes
@@ -4204,8 +4621,8 @@
fi
-{ echo "$as_me:$LINENO: result: $cs_cv_prog_binutils_version_2_16_91_ok_annotated" >&5
-echo "${ECHO_T}$cs_cv_prog_binutils_version_2_16_91_ok_annotated" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $cs_cv_prog_binutils_version_2_16_91_ok_annotated" >&5
+$as_echo "$cs_cv_prog_binutils_version_2_16_91_ok_annotated" >&6; }
if test "$cs_cv_prog_binutils_version_2_16_91_ok" = yes; then
cs_cv_binutils_2_17=yes
fi
@@ -4253,10 +4670,10 @@
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_LD+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$LD"; then
ac_cv_prog_LD="$LD" # Let the user override the test.
@@ -4269,7 +4686,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_LD="$ac_tool_prefix$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -4280,11 +4697,11 @@
fi
LD=$ac_cv_prog_LD
if test -n "$LD"; then
- { echo "$as_me:$LINENO: result: $LD" >&5
-echo "${ECHO_T}$LD" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $LD" >&5
+$as_echo "$LD" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -4297,10 +4714,10 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_ac_ct_LD+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_LD"; then
ac_cv_prog_ac_ct_LD="$ac_ct_LD" # Let the user override the test.
@@ -4313,7 +4730,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_LD="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -4324,11 +4741,11 @@
fi
ac_ct_LD=$ac_cv_prog_ac_ct_LD
if test -n "$ac_ct_LD"; then
- { echo "$as_me:$LINENO: result: $ac_ct_LD" >&5
-echo "${ECHO_T}$ac_ct_LD" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_ct_LD" >&5
+$as_echo "$ac_ct_LD" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -4340,12 +4757,8 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
LD=$ac_ct_LD
@@ -4375,10 +4788,10 @@
# the warning "unrecognized option `-shared'". Worse, even -Werror fails to
# promote the warning to an error, so we must instead scan the compiler's
# output for an appropriate diagnostic.
- { echo "$as_me:$LINENO: checking if -shared is accepted" >&5
-echo $ECHO_N "checking if -shared is accepted... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking if -shared is accepted" >&5
+$as_echo_n "checking if -shared is accepted... " >&6; }
if test "${cs_cv_prog_link_shared_ok+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "`echo @-shared $cs_cv_prog_cxx_pic@@ | sed 'y% %#%'`"; then
ac_ext=cpp
@@ -4411,6 +4824,7 @@
shift
fi
+
if test $# -eq 0; then
cs_cflags_test=''
else
@@ -4422,6 +4836,7 @@
shift
fi
+
if test $# -eq 0; then
cs_lflags_test=''
else
@@ -4433,6 +4848,7 @@
shift
fi
+
if test $# -eq 0; then
cs_libs_test=''
else
@@ -4445,6 +4861,7 @@
shift
fi
+
cs_cflags_test=`echo $cs_cflags_test | sed 'y%#% %'`
cs_lflags_test=`echo $cs_lflags_test | sed 'y%#% %'`
cs_libs_test=`echo $cs_libs_test | sed 'y%#% %'`
@@ -4473,23 +4890,26 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
if { ac_try='grep "shared" conftest.err >/dev/null 2>&1'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cs_build_ok=no
else
@@ -4497,12 +4917,13 @@
fi
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
fi
+rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test $cs_build_ok = yes; then
@@ -4539,8 +4960,8 @@
fi
fi
-{ echo "$as_me:$LINENO: result: $cs_cv_prog_link_shared_ok" >&5
-echo "${ECHO_T}$cs_cv_prog_link_shared_ok" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $cs_cv_prog_link_shared_ok" >&5
+$as_echo "$cs_cv_prog_link_shared_ok" >&6; }
if test "$cs_cv_prog_link_shared_ok" != no; then
cs_build_prop_val="-shared"
cs_build_prop_val=`echo x$cs_build_prop_val | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
@@ -4555,10 +4976,10 @@
# Check if linker recognizes -soname which is used to assign a name internally
# to plugin modules.
if test "" != yes; then
- { echo "$as_me:$LINENO: checking if -soname is accepted" >&5
-echo $ECHO_N "checking if -soname is accepted... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking if -soname is accepted" >&5
+$as_echo_n "checking if -soname is accepted... " >&6; }
if test "${cs_cv_prog_link_soname+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
@@ -4590,6 +5011,7 @@
shift
fi
+
if test $# -eq 0; then
cs_cflags_test=''
else
@@ -4601,6 +5023,7 @@
shift
fi
+
if test $# -eq 0; then
cs_lflags_test=''
else
@@ -4612,6 +5035,7 @@
shift
fi
+
if test $# -eq 0; then
cs_libs_test=''
else
@@ -4624,6 +5048,7 @@
shift
fi
+
cs_cflags_test=`echo $cs_cflags_test | sed 'y%#% %'`
cs_lflags_test=`echo $cs_lflags_test | sed 'y%#% %'`
cs_libs_test=`echo $cs_libs_test | sed 'y%#% %'`
@@ -4652,26 +5077,30 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
cs_build_ok=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
fi
+rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test $cs_build_ok = yes; then
@@ -4704,11 +5133,11 @@
fi
fi
-{ echo "$as_me:$LINENO: result: $cs_cv_prog_link_soname" >&5
-echo "${ECHO_T}$cs_cv_prog_link_soname" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $cs_cv_prog_link_soname" >&5
+$as_echo "$cs_cv_prog_link_soname" >&6; }
else
- { echo "$as_me:$LINENO: checking if -soname is accepted" >&5
-echo $ECHO_N "checking if -soname is accepted... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking if -soname is accepted" >&5
+$as_echo_n "checking if -soname is accepted... " >&6; }
ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -4739,6 +5168,7 @@
shift
fi
+
if test $# -eq 0; then
cs_cflags_test=''
else
@@ -4750,6 +5180,7 @@
shift
fi
+
if test $# -eq 0; then
cs_lflags_test=''
else
@@ -4761,6 +5192,7 @@
shift
fi
+
if test $# -eq 0; then
cs_libs_test=''
else
@@ -4773,6 +5205,7 @@
shift
fi
+
cs_cflags_test=`echo $cs_cflags_test | sed 'y%#% %'`
cs_lflags_test=`echo $cs_lflags_test | sed 'y%#% %'`
cs_libs_test=`echo $cs_libs_test | sed 'y%#% %'`
@@ -4801,26 +5234,30 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
cs_build_ok=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
fi
+rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test $cs_build_ok = yes; then
@@ -4852,8 +5289,8 @@
cs_cv_prog_link_soname=no
fi
- { echo "$as_me:$LINENO: result: $cs_cv_prog_link_soname" >&5
-echo "${ECHO_T}$cs_cv_prog_link_soname" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $cs_cv_prog_link_soname" >&5
+$as_echo "$cs_cv_prog_link_soname" >&6; }
fi
if test $cs_cv_prog_link_soname = yes; then
@@ -4875,10 +5312,10 @@
# Check if binutils support response files
rm -f conf$$.resp
echo "" > conf$$.resp
- { echo "$as_me:$LINENO: checking if response files are accepted" >&5
-echo $ECHO_N "checking if response files are accepted... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking if response files are accepted" >&5
+$as_echo_n "checking if response files are accepted... " >&6; }
if test "${cs_cv_prog_link_respfile+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
@@ -4909,26 +5346,30 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
cs_cv_prog_link_respfile=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
cs_cv_prog_link_respfile=no
fi
+rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LDFLAGS=$cs_lflags_save
@@ -4939,8 +5380,8 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
fi
-{ echo "$as_me:$LINENO: result: $cs_cv_prog_link_respfile" >&5
-echo "${ECHO_T}$cs_cv_prog_link_respfile" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $cs_cv_prog_link_respfile" >&5
+$as_echo "$cs_cv_prog_link_respfile" >&6; }
if test $cs_cv_prog_link_respfile = yes; then
cs_build_prop_val="yes"
cs_build_prop_val=`echo x$cs_build_prop_val | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
@@ -4966,10 +5407,10 @@
if test "$enable_as_needed" != "no"; then
if test "$cs_cv_binutils_2_17" = "yes"; then
- { echo "$as_me:$LINENO: checking if --as-needed is supported" >&5
-echo $ECHO_N "checking if --as-needed is supported... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking if --as-needed is supported" >&5
+$as_echo_n "checking if --as-needed is supported... " >&6; }
if test "${cs_cv_prog_link_as_needed_ok+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "`echo @-Wl,--as-needed@@ | sed 'y% %#%'`"; then
ac_ext=cpp
@@ -5002,6 +5443,7 @@
shift
fi
+
if test $# -eq 0; then
cs_cflags_test=''
else
@@ -5013,6 +5455,7 @@
shift
fi
+
if test $# -eq 0; then
cs_lflags_test=''
else
@@ -5024,6 +5467,7 @@
shift
fi
+
if test $# -eq 0; then
cs_libs_test=''
else
@@ -5036,6 +5480,7 @@
shift
fi
+
cs_cflags_test=`echo $cs_cflags_test | sed 'y%#% %'`
cs_lflags_test=`echo $cs_lflags_test | sed 'y%#% %'`
cs_libs_test=`echo $cs_libs_test | sed 'y%#% %'`
@@ -5064,26 +5509,30 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
cs_build_ok=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
fi
+rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test $cs_build_ok = yes; then
@@ -5120,8 +5569,8 @@
fi
fi
-{ echo "$as_me:$LINENO: result: $cs_cv_prog_link_as_needed_ok" >&5
-echo "${ECHO_T}$cs_cv_prog_link_as_needed_ok" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $cs_cv_prog_link_as_needed_ok" >&5
+$as_echo "$cs_cv_prog_link_as_needed_ok" >&6; }
if test "$cs_cv_prog_link_as_needed_ok" != no; then
cs_build_prop_val="$cs_cv_prog_link_as_needed"
cs_build_prop_val=`echo x$cs_build_prop_val | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
@@ -5133,10 +5582,10 @@
fi
- { echo "$as_me:$LINENO: checking if --no-as-needed is supported" >&5
-echo $ECHO_N "checking if --no-as-needed is supported... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking if --no-as-needed is supported" >&5
+$as_echo_n "checking if --no-as-needed is supported... " >&6; }
if test "${cs_cv_prog_link_no_as_needed_ok+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "`echo @-Wl,--no-as-needed@@ | sed 'y% %#%'`"; then
ac_ext=cpp
@@ -5169,6 +5618,7 @@
shift
fi
+
if test $# -eq 0; then
cs_cflags_test=''
else
@@ -5180,6 +5630,7 @@
shift
fi
+
if test $# -eq 0; then
cs_lflags_test=''
else
@@ -5191,6 +5642,7 @@
shift
fi
+
if test $# -eq 0; then
cs_libs_test=''
else
@@ -5203,6 +5655,7 @@
shift
fi
+
cs_cflags_test=`echo $cs_cflags_test | sed 'y%#% %'`
cs_lflags_test=`echo $cs_lflags_test | sed 'y%#% %'`
cs_libs_test=`echo $cs_libs_test | sed 'y%#% %'`
@@ -5231,26 +5684,30 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
cs_build_ok=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
fi
+rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test $cs_build_ok = yes; then
@@ -5287,8 +5744,8 @@
fi
fi
-{ echo "$as_me:$LINENO: result: $cs_cv_prog_link_no_as_needed_ok" >&5
-echo "${ECHO_T}$cs_cv_prog_link_no_as_needed_ok" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $cs_cv_prog_link_no_as_needed_ok" >&5
+$as_echo "$cs_cv_prog_link_no_as_needed_ok" >&6; }
fi
@@ -5306,10 +5763,10 @@
fi
if test "$enable_gc_sections" != "no"; then
- { echo "$as_me:$LINENO: checking if --gc-sections is supported" >&5
-echo $ECHO_N "checking if --gc-sections is supported... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking if --gc-sections is supported" >&5
+$as_echo_n "checking if --gc-sections is supported... " >&6; }
if test "${cs_cv_prog_link_gc_sections_ok+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "`echo @-Wl,--gc-sections@@ | sed 'y% %#%'`"; then
ac_ext=cpp
@@ -5342,6 +5799,7 @@
shift
fi
+
if test $# -eq 0; then
cs_cflags_test=''
else
@@ -5353,6 +5811,7 @@
shift
fi
+
if test $# -eq 0; then
cs_lflags_test=''
else
@@ -5364,6 +5823,7 @@
shift
fi
+
if test $# -eq 0; then
cs_libs_test=''
else
@@ -5376,6 +5836,7 @@
shift
fi
+
cs_cflags_test=`echo $cs_cflags_test | sed 'y%#% %'`
cs_lflags_test=`echo $cs_lflags_test | sed 'y%#% %'`
cs_libs_test=`echo $cs_libs_test | sed 'y%#% %'`
@@ -5404,26 +5865,30 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
cs_build_ok=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
fi
+rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test $cs_build_ok = yes; then
@@ -5460,8 +5925,8 @@
fi
fi
-{ echo "$as_me:$LINENO: result: $cs_cv_prog_link_gc_sections_ok" >&5
-echo "${ECHO_T}$cs_cv_prog_link_gc_sections_ok" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $cs_cv_prog_link_gc_sections_ok" >&5
+$as_echo "$cs_cv_prog_link_gc_sections_ok" >&6; }
if test "$cs_cv_prog_link_gc_sections_ok" != no; then
cs_build_prop_val="$cs_cv_prog_link_gc_sections"
cs_build_prop_val=`echo x$cs_build_prop_val | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
@@ -5476,17 +5941,15 @@
-
- # The default RANLIB in Jambase is wrong on some platforms, and is also
- # unsuitable during cross-compilation, so we set the value unconditionally
- # (sixth argument of CS_EMIT_BUILD_PROPERTY).
+# The default RANLIB in Jambase is wrong on some platforms, and is also
+ # unsuitable during cross-compilation, so value is set unconditionally.
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_RANLIB+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$RANLIB"; then
ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
@@ -5499,7 +5962,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -5510,11 +5973,11 @@
fi
RANLIB=$ac_cv_prog_RANLIB
if test -n "$RANLIB"; then
- { echo "$as_me:$LINENO: result: $RANLIB" >&5
-echo "${ECHO_T}$RANLIB" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $RANLIB" >&5
+$as_echo "$RANLIB" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -5523,10 +5986,10 @@
ac_ct_RANLIB=$RANLIB
# Extract the first word of "ranlib", so it can be a program name with args.
set dummy ranlib; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_RANLIB"; then
ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
@@ -5539,7 +6002,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_RANLIB="ranlib"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -5550,11 +6013,11 @@
fi
ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
if test -n "$ac_ct_RANLIB"; then
- { echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-echo "${ECHO_T}$ac_ct_RANLIB" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
+$as_echo "$ac_ct_RANLIB" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
if test "x$ac_ct_RANLIB" = x; then
@@ -5562,12 +6025,8 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
RANLIB=$ac_ct_RANLIB
@@ -5596,10 +6055,10 @@
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_DLLTOOL+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$DLLTOOL"; then
ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
@@ -5612,7 +6071,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_DLLTOOL="$ac_tool_prefix$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -5623,11 +6082,11 @@
fi
DLLTOOL=$ac_cv_prog_DLLTOOL
if test -n "$DLLTOOL"; then
- { echo "$as_me:$LINENO: result: $DLLTOOL" >&5
-echo "${ECHO_T}$DLLTOOL" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $DLLTOOL" >&5
+$as_echo "$DLLTOOL" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -5640,10 +6099,10 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_DLLTOOL"; then
ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
@@ -5656,7 +6115,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_DLLTOOL="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -5667,11 +6126,11 @@
fi
ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
if test -n "$ac_ct_DLLTOOL"; then
- { echo "$as_me:$LINENO: result: $ac_ct_DLLTOOL" >&5
-echo "${ECHO_T}$ac_ct_DLLTOOL" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_ct_DLLTOOL" >&5
+$as_echo "$ac_ct_DLLTOOL" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -5683,12 +6142,8 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
DLLTOOL=$ac_ct_DLLTOOL
@@ -5715,10 +6170,10 @@
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_DLLWRAP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$DLLWRAP"; then
ac_cv_prog_DLLWRAP="$DLLWRAP" # Let the user override the test.
@@ -5731,7 +6186,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_DLLWRAP="$ac_tool_prefix$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -5742,11 +6197,11 @@
fi
DLLWRAP=$ac_cv_prog_DLLWRAP
if test -n "$DLLWRAP"; then
- { echo "$as_me:$LINENO: result: $DLLWRAP" >&5
-echo "${ECHO_T}$DLLWRAP" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $DLLWRAP" >&5
+$as_echo "$DLLWRAP" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -5759,10 +6214,10 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_ac_ct_DLLWRAP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_DLLWRAP"; then
ac_cv_prog_ac_ct_DLLWRAP="$ac_ct_DLLWRAP" # Let the user override the test.
@@ -5775,7 +6230,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_DLLWRAP="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -5786,11 +6241,11 @@
fi
ac_ct_DLLWRAP=$ac_cv_prog_ac_ct_DLLWRAP
if test -n "$ac_ct_DLLWRAP"; then
- { echo "$as_me:$LINENO: result: $ac_ct_DLLWRAP" >&5
-echo "${ECHO_T}$ac_ct_DLLWRAP" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_ct_DLLWRAP" >&5
+$as_echo "$ac_ct_DLLWRAP" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -5802,12 +6257,8 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
DLLWRAP=$ac_ct_DLLWRAP
@@ -5838,10 +6289,10 @@
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_WINDRES+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$WINDRES"; then
ac_cv_prog_WINDRES="$WINDRES" # Let the user override the test.
@@ -5854,7 +6305,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_WINDRES="$ac_tool_prefix$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -5865,11 +6316,11 @@
fi
WINDRES=$ac_cv_prog_WINDRES
if test -n "$WINDRES"; then
- { echo "$as_me:$LINENO: result: $WINDRES" >&5
-echo "${ECHO_T}$WINDRES" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $WINDRES" >&5
+$as_echo "$WINDRES" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -5882,10 +6333,10 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_ac_ct_WINDRES+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_WINDRES"; then
ac_cv_prog_ac_ct_WINDRES="$ac_ct_WINDRES" # Let the user override the test.
@@ -5898,7 +6349,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_WINDRES="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -5909,11 +6360,11 @@
fi
ac_ct_WINDRES=$ac_cv_prog_ac_ct_WINDRES
if test -n "$ac_ct_WINDRES"; then
- { echo "$as_me:$LINENO: result: $ac_ct_WINDRES" >&5
-echo "${ECHO_T}$ac_ct_WINDRES" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_ct_WINDRES" >&5
+$as_echo "$ac_ct_WINDRES" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -5925,12 +6376,8 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
WINDRES=$ac_ct_WINDRES
@@ -5957,10 +6404,10 @@
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_STRINGS+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$STRINGS"; then
ac_cv_prog_STRINGS="$STRINGS" # Let the user override the test.
@@ -5973,7 +6420,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_STRINGS="$ac_tool_prefix$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -5984,11 +6431,11 @@
fi
STRINGS=$ac_cv_prog_STRINGS
if test -n "$STRINGS"; then
- { echo "$as_me:$LINENO: result: $STRINGS" >&5
-echo "${ECHO_T}$STRINGS" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $STRINGS" >&5
+$as_echo "$STRINGS" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -6001,10 +6448,10 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_ac_ct_STRINGS+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_STRINGS"; then
ac_cv_prog_ac_ct_STRINGS="$ac_ct_STRINGS" # Let the user override the test.
@@ -6017,7 +6464,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_STRINGS="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -6028,11 +6475,11 @@
fi
ac_ct_STRINGS=$ac_cv_prog_ac_ct_STRINGS
if test -n "$ac_ct_STRINGS"; then
- { echo "$as_me:$LINENO: result: $ac_ct_STRINGS" >&5
-echo "${ECHO_T}$ac_ct_STRINGS" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_ct_STRINGS" >&5
+$as_echo "$ac_ct_STRINGS" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -6044,12 +6491,8 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
STRINGS=$ac_ct_STRINGS
@@ -6076,10 +6519,10 @@
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_OBJCOPY+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$OBJCOPY"; then
ac_cv_prog_OBJCOPY="$OBJCOPY" # Let the user override the test.
@@ -6092,7 +6535,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_OBJCOPY="$ac_tool_prefix$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -6103,11 +6546,11 @@
fi
OBJCOPY=$ac_cv_prog_OBJCOPY
if test -n "$OBJCOPY"; then
- { echo "$as_me:$LINENO: result: $OBJCOPY" >&5
-echo "${ECHO_T}$OBJCOPY" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $OBJCOPY" >&5
+$as_echo "$OBJCOPY" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -6120,10 +6563,10 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_ac_ct_OBJCOPY+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OBJCOPY"; then
ac_cv_prog_ac_ct_OBJCOPY="$ac_ct_OBJCOPY" # Let the user override the test.
@@ -6136,7 +6579,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_OBJCOPY="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -6147,11 +6590,11 @@
fi
ac_ct_OBJCOPY=$ac_cv_prog_ac_ct_OBJCOPY
if test -n "$ac_ct_OBJCOPY"; then
- { echo "$as_me:$LINENO: result: $ac_ct_OBJCOPY" >&5
-echo "${ECHO_T}$ac_ct_OBJCOPY" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_ct_OBJCOPY" >&5
+$as_echo "$ac_ct_OBJCOPY" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -6163,12 +6606,8 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
OBJCOPY=$ac_ct_OBJCOPY
@@ -6198,10 +6637,10 @@
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_LIBTOOL_TEST+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$LIBTOOL_TEST"; then
ac_cv_prog_LIBTOOL_TEST="$LIBTOOL_TEST" # Let the user override the test.
@@ -6214,7 +6653,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_LIBTOOL_TEST="$ac_tool_prefix$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -6225,11 +6664,11 @@
fi
LIBTOOL_TEST=$ac_cv_prog_LIBTOOL_TEST
if test -n "$LIBTOOL_TEST"; then
- { echo "$as_me:$LINENO: result: $LIBTOOL_TEST" >&5
-echo "${ECHO_T}$LIBTOOL_TEST" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $LIBTOOL_TEST" >&5
+$as_echo "$LIBTOOL_TEST" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -6242,10 +6681,10 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_ac_ct_LIBTOOL_TEST+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_LIBTOOL_TEST"; then
ac_cv_prog_ac_ct_LIBTOOL_TEST="$ac_ct_LIBTOOL_TEST" # Let the user override the test.
@@ -6258,7 +6697,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_LIBTOOL_TEST="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -6269,11 +6708,11 @@
fi
ac_ct_LIBTOOL_TEST=$ac_cv_prog_ac_ct_LIBTOOL_TEST
if test -n "$ac_ct_LIBTOOL_TEST"; then
- { echo "$as_me:$LINENO: result: $ac_ct_LIBTOOL_TEST" >&5
-echo "${ECHO_T}$ac_ct_LIBTOOL_TEST" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_ct_LIBTOOL_TEST" >&5
+$as_echo "$ac_ct_LIBTOOL_TEST" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -6285,12 +6724,8 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
LIBTOOL_TEST=$ac_ct_LIBTOOL_TEST
@@ -6307,10 +6742,10 @@
# Extract the first word of "$LIBTOOL_TEST", so it can be a program name with args.
set dummy $LIBTOOL_TEST; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_path_LIBTOOL_PATH+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
case $LIBTOOL_PATH in
[\\/]* | ?:[\\/]*)
@@ -6325,7 +6760,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_LIBTOOL_PATH="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -6337,28 +6772,28 @@
fi
LIBTOOL_PATH=$ac_cv_path_LIBTOOL_PATH
if test -n "$LIBTOOL_PATH"; then
- { echo "$as_me:$LINENO: result: $LIBTOOL_PATH" >&5
-echo "${ECHO_T}$LIBTOOL_PATH" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $LIBTOOL_PATH" >&5
+$as_echo "$LIBTOOL_PATH" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
if test -n "$LIBTOOL_PATH"; then
- { echo "$as_me:$LINENO: checking classification of $LIBTOOL_PATH" >&5
-echo $ECHO_N "checking classification of $LIBTOOL_PATH... $ECHO_C" >&6; }
- if { (echo "$as_me:$LINENO: \$LIBTOOL_PATH --version 1>&2") >&5
+ { $as_echo "$as_me:$LINENO: checking classification of $LIBTOOL_PATH" >&5
+$as_echo_n "checking classification of $LIBTOOL_PATH... " >&6; }
+ if { ($as_echo "$as_me:$LINENO: \$LIBTOOL_PATH --version 1>&2") >&5
($LIBTOOL_PATH --version 1>&2) 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- { echo "$as_me:$LINENO: result: gnu" >&5
-echo "${ECHO_T}gnu" >&6; }
+ { $as_echo "$as_me:$LINENO: result: gnu" >&5
+$as_echo "gnu" >&6; }
LIBTOOL="$LIBTOOL_PATH"
else
- { echo "$as_me:$LINENO: result: apple" >&5
-echo "${ECHO_T}apple" >&6; }
+ { $as_echo "$as_me:$LINENO: result: apple" >&5
+$as_echo "apple" >&6; }
if test -z "$APPLE_LIBTOOL"; then
APPLE_LIBTOOL="$LIBTOOL_PATH"
fi
@@ -6375,10 +6810,10 @@
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_LIBTOOL+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$LIBTOOL"; then
ac_cv_prog_LIBTOOL="$LIBTOOL" # Let the user override the test.
@@ -6391,7 +6826,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_LIBTOOL="$ac_tool_prefix$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -6402,11 +6837,11 @@
fi
LIBTOOL=$ac_cv_prog_LIBTOOL
if test -n "$LIBTOOL"; then
- { echo "$as_me:$LINENO: result: $LIBTOOL" >&5
-echo "${ECHO_T}$LIBTOOL" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $LIBTOOL" >&5
+$as_echo "$LIBTOOL" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -6419,10 +6854,10 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_ac_ct_LIBTOOL+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_LIBTOOL"; then
ac_cv_prog_ac_ct_LIBTOOL="$ac_ct_LIBTOOL" # Let the user override the test.
@@ -6435,7 +6870,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_LIBTOOL="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -6446,11 +6881,11 @@
fi
ac_ct_LIBTOOL=$ac_cv_prog_ac_ct_LIBTOOL
if test -n "$ac_ct_LIBTOOL"; then
- { echo "$as_me:$LINENO: result: $ac_ct_LIBTOOL" >&5
-echo "${ECHO_T}$ac_ct_LIBTOOL" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_ct_LIBTOOL" >&5
+$as_echo "$ac_ct_LIBTOOL" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -6462,12 +6897,8 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
LIBTOOL=$ac_ct_LIBTOOL
@@ -6496,10 +6927,10 @@
# Extract the first word of "libtool", so it can be a program name with args.
set dummy libtool; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_path_CS_LT_APPLE+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
case $CS_LT_APPLE in
[\\/]* | ?:[\\/]*)
@@ -6514,7 +6945,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_CS_LT_APPLE="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -6526,28 +6957,28 @@
fi
CS_LT_APPLE=$ac_cv_path_CS_LT_APPLE
if test -n "$CS_LT_APPLE"; then
- { echo "$as_me:$LINENO: result: $CS_LT_APPLE" >&5
-echo "${ECHO_T}$CS_LT_APPLE" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $CS_LT_APPLE" >&5
+$as_echo "$CS_LT_APPLE" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
if test -n "$CS_LT_APPLE"; then
- { echo "$as_me:$LINENO: checking classification of $CS_LT_APPLE" >&5
-echo $ECHO_N "checking classification of $CS_LT_APPLE... $ECHO_C" >&6; }
- if { (echo "$as_me:$LINENO: \$CS_LT_APPLE --version 1>&2") >&5
+ { $as_echo "$as_me:$LINENO: checking classification of $CS_LT_APPLE" >&5
+$as_echo_n "checking classification of $CS_LT_APPLE... " >&6; }
+ if { ($as_echo "$as_me:$LINENO: \$CS_LT_APPLE --version 1>&2") >&5
($CS_LT_APPLE --version 1>&2) 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- { echo "$as_me:$LINENO: result: gnu" >&5
-echo "${ECHO_T}gnu" >&6; }
+ { $as_echo "$as_me:$LINENO: result: gnu" >&5
+$as_echo "gnu" >&6; }
else
- { echo "$as_me:$LINENO: result: apple" >&5
-echo "${ECHO_T}apple" >&6; }
+ { $as_echo "$as_me:$LINENO: result: apple" >&5
+$as_echo "apple" >&6; }
APPLE_LIBTOOL="$CS_LT_APPLE"
fi
@@ -6570,23 +7001,22 @@
"
fi
-
-{ echo "$as_me:$LINENO: checking how to create a directory" >&5
-echo $ECHO_N "checking how to create a directory... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking how to create a directory" >&5
+$as_echo_n "checking how to create a directory... " >&6; }
if test "${cs_cv_shell_mkdir+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
cs_cv_shell_mkdir='mkdir'
fi
-{ echo "$as_me:$LINENO: result: $cs_cv_shell_mkdir" >&5
-echo "${ECHO_T}$cs_cv_shell_mkdir" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $cs_cv_shell_mkdir" >&5
+$as_echo "$cs_cv_shell_mkdir" >&6; }
MKDIR=$cs_cv_shell_mkdir
- { echo "$as_me:$LINENO: checking how to create a directory tree" >&5
-echo $ECHO_N "checking how to create a directory tree... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking how to create a directory tree" >&5
+$as_echo_n "checking how to create a directory tree... " >&6; }
if test "${cs_cv_shell_mkdir_p+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if $cs_cv_shell_mkdir -p . 2>/dev/null; then
cs_cv_shell_mkdir_p='mkdir -p'
@@ -6595,8 +7025,8 @@
fi
test -d ./-p && rmdir ./-p
fi
-{ echo "$as_me:$LINENO: result: $cs_cv_shell_mkdir_p" >&5
-echo "${ECHO_T}$cs_cv_shell_mkdir_p" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $cs_cv_shell_mkdir_p" >&5
+$as_echo "$cs_cv_shell_mkdir_p" >&6; }
if test "${cs_cv_shell_mkdir_p+set}" = set; then
MKDIRS=$cs_cv_shell_mkdir_p
@@ -6628,11 +7058,12 @@
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
- *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+ *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
esac
case $ac_var in #(
_ | IFS | as_nl) ;; #(
+ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
*) $as_unset $ac_var ;;
esac ;;
esac
@@ -6665,17 +7096,17 @@
if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
if test -w "$cache_file"; then
test "x$cache_file" != "x/dev/null" &&
- { echo "$as_me:$LINENO: updating cache $cache_file" >&5
-echo "$as_me: updating cache $cache_file" >&6;}
+ { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
+$as_echo "$as_me: updating cache $cache_file" >&6;}
cat confcache >$cache_file
else
- { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
-echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+ { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
fi
fi
rm -f confcache
- { { echo "$as_me:$LINENO: error: do not know how to create a directory tree" >&5
-echo "$as_me: error: do not know how to create a directory tree" >&2;}
+ { { $as_echo "$as_me:$LINENO: error: do not know how to create a directory tree" >&5
+$as_echo "$as_me: error: do not know how to create a directory tree" >&2;}
{ (exit 1); exit 1; }; }
fi
@@ -6705,10 +7136,10 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_INSTALL+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$INSTALL"; then
ac_cv_prog_INSTALL="$INSTALL" # Let the user override the test.
@@ -6721,7 +7152,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_INSTALL="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -6732,11 +7163,11 @@
fi
INSTALL=$ac_cv_prog_INSTALL
if test -n "$INSTALL"; then
- { echo "$as_me:$LINENO: result: $INSTALL" >&5
-echo "${ECHO_T}$INSTALL" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $INSTALL" >&5
+$as_echo "$INSTALL" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -6750,15 +7181,15 @@
"
fi
- { echo "$as_me:$LINENO: checking whether ln -s works" >&5
-echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking whether ln -s works" >&5
+$as_echo_n "checking whether ln -s works... " >&6; }
LN_S=$as_ln_s
if test "$LN_S" = "ln -s"; then
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
else
- { echo "$as_me:$LINENO: result: no, using $LN_S" >&5
-echo "${ECHO_T}no, using $LN_S" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no, using $LN_S" >&5
+$as_echo "no, using $LN_S" >&6; }
fi
cs_build_prop_val="$LN_S"
@@ -6779,10 +7210,10 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_TEXI2DVI+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$TEXI2DVI"; then
ac_cv_prog_TEXI2DVI="$TEXI2DVI" # Let the user override the test.
@@ -6795,7 +7226,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_TEXI2DVI="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -6806,11 +7237,11 @@
fi
TEXI2DVI=$ac_cv_prog_TEXI2DVI
if test -n "$TEXI2DVI"; then
- { echo "$as_me:$LINENO: result: $TEXI2DVI" >&5
-echo "${ECHO_T}$TEXI2DVI" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $TEXI2DVI" >&5
+$as_echo "$TEXI2DVI" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -6836,10 +7267,10 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_TEXI2PDF+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$TEXI2PDF"; then
ac_cv_prog_TEXI2PDF="$TEXI2PDF" # Let the user override the test.
@@ -6852,7 +7283,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_TEXI2PDF="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -6863,11 +7294,11 @@
fi
TEXI2PDF=$ac_cv_prog_TEXI2PDF
if test -n "$TEXI2PDF"; then
- { echo "$as_me:$LINENO: result: $TEXI2PDF" >&5
-echo "${ECHO_T}$TEXI2PDF" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $TEXI2PDF" >&5
+$as_echo "$TEXI2PDF" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -6893,10 +7324,10 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_DVIPS+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$DVIPS"; then
ac_cv_prog_DVIPS="$DVIPS" # Let the user override the test.
@@ -6909,7 +7340,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_DVIPS="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -6920,11 +7351,11 @@
fi
DVIPS=$ac_cv_prog_DVIPS
if test -n "$DVIPS"; then
- { echo "$as_me:$LINENO: result: $DVIPS" >&5
-echo "${ECHO_T}$DVIPS" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $DVIPS" >&5
+$as_echo "$DVIPS" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -6950,10 +7381,10 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_DVIPDF+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$DVIPDF"; then
ac_cv_prog_DVIPDF="$DVIPDF" # Let the user override the test.
@@ -6966,7 +7397,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_DVIPDF="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -6977,11 +7408,11 @@
fi
DVIPDF=$ac_cv_prog_DVIPDF
if test -n "$DVIPDF"; then
- { echo "$as_me:$LINENO: result: $DVIPDF" >&5
-echo "${ECHO_T}$DVIPDF" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $DVIPDF" >&5
+$as_echo "$DVIPDF" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -7007,10 +7438,10 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_MAKEINFO+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$MAKEINFO"; then
ac_cv_prog_MAKEINFO="$MAKEINFO" # Let the user override the test.
@@ -7023,7 +7454,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_MAKEINFO="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -7034,11 +7465,11 @@
fi
MAKEINFO=$ac_cv_prog_MAKEINFO
if test -n "$MAKEINFO"; then
- { echo "$as_me:$LINENO: result: $MAKEINFO" >&5
-echo "${ECHO_T}$MAKEINFO" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $MAKEINFO" >&5
+$as_echo "$MAKEINFO" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -7063,10 +7494,10 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_DOXYGEN+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$DOXYGEN"; then
ac_cv_prog_DOXYGEN="$DOXYGEN" # Let the user override the test.
@@ -7079,7 +7510,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_DOXYGEN="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -7090,11 +7521,11 @@
fi
DOXYGEN=$ac_cv_prog_DOXYGEN
if test -n "$DOXYGEN"; then
- { echo "$as_me:$LINENO: result: $DOXYGEN" >&5
-echo "${ECHO_T}$DOXYGEN" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $DOXYGEN" >&5
+$as_echo "$DOXYGEN" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -7121,10 +7552,10 @@
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_DOT+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$DOT"; then
ac_cv_prog_DOT="$DOT" # Let the user override the test.
@@ -7137,7 +7568,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_DOT="$ac_tool_prefix$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -7148,11 +7579,11 @@
fi
DOT=$ac_cv_prog_DOT
if test -n "$DOT"; then
- { echo "$as_me:$LINENO: result: $DOT" >&5
-echo "${ECHO_T}$DOT" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $DOT" >&5
+$as_echo "$DOT" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -7165,10 +7596,10 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_ac_ct_DOT+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_DOT"; then
ac_cv_prog_ac_ct_DOT="$ac_ct_DOT" # Let the user override the test.
@@ -7181,7 +7612,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_DOT="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -7192,11 +7623,11 @@
fi
ac_ct_DOT=$ac_cv_prog_ac_ct_DOT
if test -n "$ac_ct_DOT"; then
- { echo "$as_me:$LINENO: result: $ac_ct_DOT" >&5
-echo "${ECHO_T}$ac_ct_DOT" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_ct_DOT" >&5
+$as_echo "$ac_ct_DOT" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -7208,12 +7639,8 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
DOT=$ac_ct_DOT
@@ -7239,10 +7666,10 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_RSVG+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$RSVG"; then
ac_cv_prog_RSVG="$RSVG" # Let the user override the test.
@@ -7255,7 +7682,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_RSVG="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -7266,11 +7693,11 @@
fi
RSVG=$ac_cv_prog_RSVG
if test -n "$RSVG"; then
- { echo "$as_me:$LINENO: result: $RSVG" >&5
-echo "${ECHO_T}$RSVG" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $RSVG" >&5
+$as_echo "$RSVG" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -7297,10 +7724,10 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_ICOTOOL+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$ICOTOOL"; then
ac_cv_prog_ICOTOOL="$ICOTOOL" # Let the user override the test.
@@ -7313,7 +7740,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ICOTOOL="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -7324,11 +7751,11 @@
fi
ICOTOOL=$ac_cv_prog_ICOTOOL
if test -n "$ICOTOOL"; then
- { echo "$as_me:$LINENO: result: $ICOTOOL" >&5
-echo "${ECHO_T}$ICOTOOL" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ICOTOOL" >&5
+$as_echo "$ICOTOOL" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -7356,10 +7783,10 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_CONVERT+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$CONVERT"; then
ac_cv_prog_CONVERT="$CONVERT" # Let the user override the test.
@@ -7372,7 +7799,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CONVERT="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -7383,11 +7810,11 @@
fi
CONVERT=$ac_cv_prog_CONVERT
if test -n "$CONVERT"; then
- { echo "$as_me:$LINENO: result: $CONVERT" >&5
-echo "${ECHO_T}$CONVERT" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $CONVERT" >&5
+$as_echo "$CONVERT" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -7413,10 +7840,10 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_PERL+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$PERL"; then
ac_cv_prog_PERL="$PERL" # Let the user override the test.
@@ -7429,7 +7856,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_PERL="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -7440,11 +7867,11 @@
fi
PERL=$ac_cv_prog_PERL
if test -n "$PERL"; then
- { echo "$as_me:$LINENO: result: $PERL" >&5
-echo "${ECHO_T}$PERL" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $PERL" >&5
+$as_echo "$PERL" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -7470,10 +7897,10 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_PERL+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$PERL"; then
ac_cv_prog_PERL="$PERL" # Let the user override the test.
@@ -7486,7 +7913,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_PERL="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -7497,11 +7924,11 @@
fi
PERL=$ac_cv_prog_PERL
if test -n "$PERL"; then
- { echo "$as_me:$LINENO: result: $PERL" >&5
-echo "${ECHO_T}$PERL" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $PERL" >&5
+$as_echo "$PERL" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -7509,15 +7936,15 @@
done
if test -n "$PERL"; then
- { echo "$as_me:$LINENO: checking for TemplateToolkit" >&5
-echo $ECHO_N "checking for TemplateToolkit... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for TemplateToolkit" >&5
+$as_echo_n "checking for TemplateToolkit... " >&6; }
if test "${cs_cv_perl_tt2+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
- if { (echo "$as_me:$LINENO: \$PERL -M'Template 2.11' -MTemplate::Plugin -e 0 1>&2") >&5
+ if { ($as_echo "$as_me:$LINENO: \$PERL -M'Template 2.11' -MTemplate::Plugin -e 0 1>&2") >&5
($PERL -M'Template 2.11' -MTemplate::Plugin -e 0 1>&2) 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
cs_cv_perl_tt2=yes
else
@@ -7525,8 +7952,8 @@
fi
fi
-{ echo "$as_me:$LINENO: result: $cs_cv_perl_tt2" >&5
-echo "${ECHO_T}$cs_cv_perl_tt2" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $cs_cv_perl_tt2" >&5
+$as_echo "$cs_cv_perl_tt2" >&6; }
if test "$cs_prog_path_prepared" != yes; then
cs_prog_path_prepared=yes
@@ -7538,10 +7965,10 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_path_TTREE+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
case $TTREE in
[\\/]* | ?:[\\/]*)
@@ -7556,7 +7983,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_TTREE="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -7568,11 +7995,11 @@
fi
TTREE=$ac_cv_path_TTREE
if test -n "$TTREE"; then
- { echo "$as_me:$LINENO: result: $TTREE" >&5
-echo "${ECHO_T}$TTREE" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $TTREE" >&5
+$as_echo "$TTREE" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -7603,10 +8030,10 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_SWIG+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$SWIG"; then
ac_cv_prog_SWIG="$SWIG" # Let the user override the test.
@@ -7619,7 +8046,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_SWIG="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -7630,11 +8057,11 @@
fi
SWIG=$ac_cv_prog_SWIG
if test -n "$SWIG"; then
- { echo "$as_me:$LINENO: result: $SWIG" >&5
-echo "${ECHO_T}$SWIG" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $SWIG" >&5
+$as_echo "$SWIG" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -7642,10 +8069,10 @@
done
if test -n "$SWIG"; then
- { echo "$as_me:$LINENO: checking if swig version >= 1.3.22" >&5
-echo $ECHO_N "checking if swig version >= 1.3.22... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking if swig version >= 1.3.22" >&5
+$as_echo_n "checking if swig version >= 1.3.22... " >&6; }
if test "${cs_cv_prog_swig_version_1_3_22_ok_annotated+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
cs_prog_swig_is_version=
cs_prog_swig_min_version=
@@ -7723,8 +8150,8 @@
fi
-{ echo "$as_me:$LINENO: result: $cs_cv_prog_swig_version_1_3_22_ok_annotated" >&5
-echo "${ECHO_T}$cs_cv_prog_swig_version_1_3_22_ok_annotated" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $cs_cv_prog_swig_version_1_3_22_ok_annotated" >&5
+$as_echo "$cs_cv_prog_swig_version_1_3_22_ok_annotated" >&6; }
if test "$cs_cv_prog_swig_version_1_3_22_ok" = yes; then
cs_build_prop_val="$SWIG"
cs_build_prop_val=`echo x$cs_build_prop_val | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
@@ -7753,11 +8180,20 @@
case $host_cpu in
[Ii][3-9]86*|[Xx]86*) cs_host_cpu=x86 ;;
+ powerpc*) cs_host_cpu=powerpc ;;
+ sparc*) cs_host_cpu=sparc ;;
+ mips*) cs_host_cpu=mips ;;
+ alpha*) cs_host_cpu=alpha ;;
*) cs_host_cpu=$host_cpu ;;
esac
- cs_host_cpu_normalized="`echo "$cs_host_cpu" | $as_tr_cpp`"
- cs_jamconfig_text="${cs_jamconfig_text}TARGET.PROCESSOR ?= $cs_host_cpu_normalized ;
+ cs_host_cpu_normalized="`$as_echo "$cs_host_cpu" | $as_tr_cpp`"
+ cs_build_prop_val="$cs_host_cpu_normalized"
+ cs_build_prop_val=`echo x$cs_build_prop_val | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+ if test -n "$cs_build_prop_val"; then
+ cs_jamconfig_text="${cs_jamconfig_text}TARGET.PROCESSOR ?= $cs_build_prop_val ;
"
+fi
+
cs_host_os_normalized=''
case $host_os in
@@ -7769,38 +8205,15 @@
- # Both MacOS/X and Darwin are identified via $host_os as "darwin". We need
- # a way to distinguish between the two. If Carbon.h is present, then
- # assume MacOX/S; if not, assume Darwin. If --with-x=yes was invoked, and
- # Carbon.h is present, then assume that user wants to cross-build for
- # Darwin even though build host is MacOS/X.
- # IMPLEMENTATION NOTE *1*
- # The QuickTime 7.0 installer removes , which
- # causes #include to fail unconditionally. Re-installing
- # the QuickTime SDK should restore the header, however not all developers
- # know to do this, so we work around the problem of the missing
- # CarbonSound.h by #defining __CARBONSOUND__ in the test in order to
- # prevent Carbon.h from attempting to #include the missing header.
- # IMPLEMENTATION NOTE *2*
- # At least one MacOS/X user switches between gcc 2.95 and gcc 3.3 with a
- # script which toggles the values of CC, CXX, and CPP. Unfortunately, CPP
- # was being set to run the preprocessor directly ("cpp", for instance)
- # rather than running it via the compiler ("gcc -E", for instance). The
- # problem with running the preprocessor directly is that __APPLE__ and
- # __GNUC__ are not defined, which causes the Carbon.h check to fail. We
- # avoid this problem by supplying a non-empty fourth argument to
- # AC_CHECK_HEADER(), which causes it to test compile the header only (which
- # is a more robust test), rather than also testing it via the preprocessor.
-
cat >>confdefs.h <<\_ACEOF
-#define __CARBONSOUND__
+#define __CARBONSOUND__ /**/
_ACEOF
- { echo "$as_me:$LINENO: checking for Carbon/Carbon.h" >&5
-echo $ECHO_N "checking for Carbon/Carbon.h... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for Carbon/Carbon.h" >&5
+$as_echo_n "checking for Carbon/Carbon.h... " >&6; }
if test "${ac_cv_header_Carbon_Carbon_h+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -7818,20 +8231,21 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_cv_header_Carbon_Carbon_h=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_header_Carbon_Carbon_h=no
@@ -7839,9 +8253,9 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_Carbon_Carbon_h" >&5
-echo "${ECHO_T}$ac_cv_header_Carbon_Carbon_h" >&6; }
-if test $ac_cv_header_Carbon_Carbon_h = yes; then
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_Carbon_Carbon_h" >&5
+$as_echo "$ac_cv_header_Carbon_Carbon_h" >&6; }
+if test "x$ac_cv_header_Carbon_Carbon_h" = x""yes; then
cs_host_macosx=yes
else
cs_host_macosx=no
@@ -7850,15 +8264,15 @@
if test $cs_host_macosx = yes; then
- { echo "$as_me:$LINENO: checking for --with-x" >&5
-echo $ECHO_N "checking for --with-x... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for --with-x" >&5
+$as_echo_n "checking for --with-x... " >&6; }
if test "${with_x+set}" = set && test "$with_x" = "yes"; then
- { echo "$as_me:$LINENO: result: yes (assume Darwin)" >&5
-echo "${ECHO_T}yes (assume Darwin)" >&6; }
+ { $as_echo "$as_me:$LINENO: result: yes (assume Darwin)" >&5
+$as_echo "yes (assume Darwin)" >&6; }
cs_host_macosx=no
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
fi
@@ -7870,35 +8284,98 @@
cs_host_os_normalized='MacOS/X'
cat >>confdefs.h <<\_ACEOF
-#define CS_PLATFORM_MACOSX
+#define CS_PLATFORM_MACOSX /**/
_ACEOF
- { echo "$as_me:$LINENO: checking for Objective-C compiler" >&5
-echo $ECHO_N "checking for Objective-C compiler... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for Objective-C compiler" >&5
+$as_echo_n "checking for Objective-C compiler... " >&6; }
if test "${cs_cv_prog_objc+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
cs_cv_prog_objc="$CC"
fi
-{ echo "$as_me:$LINENO: result: $cs_cv_prog_objc" >&5
-echo "${ECHO_T}$cs_cv_prog_objc" >&6; }
- cs_jamconfig_text="${cs_jamconfig_text}CMD.OBJC ?= $cs_cv_prog_objc ;
+{ $as_echo "$as_me:$LINENO: result: $cs_cv_prog_objc" >&5
+$as_echo "$cs_cv_prog_objc" >&6; }
+ cs_build_prop_val="$cs_cv_prog_objc"
+ cs_build_prop_val=`echo x$cs_build_prop_val | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+ if test -n "$cs_build_prop_val"; then
+ cs_jamconfig_text="${cs_jamconfig_text}CMD.OBJC ?= $cs_build_prop_val ;
+"
+fi
+
+ { $as_echo "$as_me:$LINENO: checking for Objective-C++ compiler" >&5
+$as_echo_n "checking for Objective-C++ compiler... " >&6; }
+if test "${cs_cv_prog_objcxx+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ cs_cv_prog_objcxx="$CXX"
+fi
+{ $as_echo "$as_me:$LINENO: result: $cs_cv_prog_objcxx" >&5
+$as_echo "$cs_cv_prog_objcxx" >&6; }
+ cs_build_prop_val="$cs_cv_prog_objcxx"
+ cs_build_prop_val=`echo x$cs_build_prop_val | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+ if test -n "$cs_build_prop_val"; then
+ cs_jamconfig_text="${cs_jamconfig_text}CMD.OBJC++ ?= $cs_build_prop_val ;
+"
+fi
+
+else
+ cs_host_target=unix
+ cs_host_family=unix
+fi
+
+ if test "$cs_host_target" = macosx &&
+ test "$cross_compiling" != yes &&
+ test -d "/Developer/SDKs/MacOSX10.4u.sdk"; then
+ cs_universal_binary_default=yes
+else
+ cs_universal_binary_default=no
+fi
+
+ { $as_echo "$as_me:$LINENO: checking whether to build universal binaries" >&5
+$as_echo_n "checking whether to build universal binaries... " >&6; }
+ # Check whether --enable-universal-binary was given.
+if test "${enable_universal_binary+set}" = set; then
+ enableval=$enable_universal_binary; cs_universal_binary=$enableval
+else
+ cs_universal_binary=$cs_universal_binary_default
+fi
+
+ { $as_echo "$as_me:$LINENO: result: $cs_universal_binary" >&5
+$as_echo "$cs_universal_binary" >&6; }
+ if test "$cs_universal_binary" = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define CS_UNIVERSAL_BINARY 1
+_ACEOF
+
+ CFLAGS="$CFLAGS -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4 -arch i386 -arch ppc "
+ CXXFLAGS="$CXXFLAGS -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4 -arch i386 -arch ppc "
+ LDFLAGS="$LDFLAGS -Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc "
+ cs_header_text="${cs_header_text}#define CS_UNIVERSAL_BINARY
+"
+ cs_build_prop_val="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4 -arch i386 -arch ppc "
+ cs_build_prop_val=`echo x$cs_build_prop_val | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+ if test -n "$cs_build_prop_val"; then
+ cs_jamconfig_text="${cs_jamconfig_text}COMPILER.CFLAGS += $cs_build_prop_val ;
+"
+fi
+
+ cs_build_prop_val="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4 -arch i386 -arch ppc "
+ cs_build_prop_val=`echo x$cs_build_prop_val | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+ if test -n "$cs_build_prop_val"; then
+ cs_jamconfig_text="${cs_jamconfig_text}COMPILER.C++FLAGS += $cs_build_prop_val ;
"
- { echo "$as_me:$LINENO: checking for Objective-C++ compiler" >&5
-echo $ECHO_N "checking for Objective-C++ compiler... $ECHO_C" >&6; }
-if test "${cs_cv_prog_objcxx+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cs_cv_prog_objcxx="$CXX"
fi
-{ echo "$as_me:$LINENO: result: $cs_cv_prog_objcxx" >&5
-echo "${ECHO_T}$cs_cv_prog_objcxx" >&6; }
- cs_jamconfig_text="${cs_jamconfig_text}CMD.OBJC++ ?= $cs_cv_prog_objcxx ;
+
+ cs_build_prop_val="-Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk -arch i386 -arch ppc "
+ cs_build_prop_val=`echo x$cs_build_prop_val | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+ if test -n "$cs_build_prop_val"; then
+ cs_jamconfig_text="${cs_jamconfig_text}COMPILER.LFLAGS += $cs_build_prop_val ;
"
-else
- cs_host_target=unix
- cs_host_family=unix
+fi
+
fi
;;
@@ -7913,7 +8390,7 @@
windows)
cat >>confdefs.h <<\_ACEOF
-#define CS_PLATFORM_WIN32
+#define CS_PLATFORM_WIN32 /**/
_ACEOF
if test -z "$cs_host_os_normalized"; then
@@ -7924,7 +8401,7 @@
unix)
cat >>confdefs.h <<\_ACEOF
-#define CS_PLATFORM_UNIX
+#define CS_PLATFORM_UNIX /**/
_ACEOF
if test -z "$cs_host_os_normalized"; then
@@ -7934,11 +8411,21 @@
;;
esac
- cs_host_os_normalized_uc="`echo "$cs_host_os_normalized" | $as_tr_cpp`"
- cs_jamconfig_text="${cs_jamconfig_text}TARGET.OS ?= $cs_host_os_normalized_uc ;
+ cs_host_os_normalized_uc="`$as_echo "$cs_host_os_normalized" | $as_tr_cpp`"
+ cs_build_prop_val="$cs_host_os_normalized_uc"
+ cs_build_prop_val=`echo x$cs_build_prop_val | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+ if test -n "$cs_build_prop_val"; then
+ cs_jamconfig_text="${cs_jamconfig_text}TARGET.OS ?= $cs_build_prop_val ;
"
- cs_jamconfig_text="${cs_jamconfig_text}TARGET.OS.NORMALIZED ?= $cs_host_os_normalized ;
+fi
+
+ cs_build_prop_val="$cs_host_os_normalized"
+ cs_build_prop_val=`echo x$cs_build_prop_val | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+ if test -n "$cs_build_prop_val"; then
+ cs_jamconfig_text="${cs_jamconfig_text}TARGET.OS.NORMALIZED ?= $cs_build_prop_val ;
"
+fi
+
@@ -7946,10 +8433,10 @@
# Check how to enable and disable compilation warnings, and how to promote
# diagnostics from warning to error status.
#------------------------------------------------------------------------------
-{ echo "$as_me:$LINENO: checking how to enable C++ compilation warnings" >&5
-echo $ECHO_N "checking how to enable C++ compilation warnings... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking how to enable C++ compilation warnings" >&5
+$as_echo_n "checking how to enable C++ compilation warnings... " >&6; }
if test "${cs_cv_prog_cxx_enable_warnings_ok+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "`echo @-Wmost@@ | sed 'y% %#%'` `echo @-Wall@@ | sed 'y% %#%'`"; then
ac_ext=cpp
@@ -7982,6 +8469,7 @@
shift
fi
+
if test $# -eq 0; then
cs_cflags_test=''
else
@@ -7993,6 +8481,7 @@
shift
fi
+
if test $# -eq 0; then
cs_lflags_test=''
else
@@ -8004,6 +8493,7 @@
shift
fi
+
if test $# -eq 0; then
cs_libs_test=''
else
@@ -8016,6 +8506,7 @@
shift
fi
+
cs_cflags_test=`echo $cs_cflags_test | sed 'y%#% %'`
cs_lflags_test=`echo $cs_lflags_test | sed 'y%#% %'`
cs_libs_test=`echo $cs_libs_test | sed 'y%#% %'`
@@ -8044,26 +8535,30 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
cs_build_ok=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
fi
+rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test $cs_build_ok = yes; then
@@ -8100,8 +8595,8 @@
fi
fi
-{ echo "$as_me:$LINENO: result: $cs_cv_prog_cxx_enable_warnings_ok" >&5
-echo "${ECHO_T}$cs_cv_prog_cxx_enable_warnings_ok" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $cs_cv_prog_cxx_enable_warnings_ok" >&5
+$as_echo "$cs_cv_prog_cxx_enable_warnings_ok" >&6; }
if test "$cs_cv_prog_cxx_enable_warnings_ok" != no; then
cs_build_prop_val="$cs_cv_prog_cxx_enable_warnings"
cs_build_prop_val=`echo x$cs_build_prop_val | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
@@ -8113,10 +8608,10 @@
fi
-{ echo "$as_me:$LINENO: checking how to suppress C++ unused variable warnings" >&5
-echo $ECHO_N "checking how to suppress C++ unused variable warnings... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking how to suppress C++ unused variable warnings" >&5
+$as_echo_n "checking how to suppress C++ unused variable warnings... " >&6; }
if test "${cs_cv_prog_cxx_ignore_unused_ok+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "`echo @-Wno-unused@@ | sed 'y% %#%'`"; then
ac_ext=cpp
@@ -8149,6 +8644,7 @@
shift
fi
+
if test $# -eq 0; then
cs_cflags_test=''
else
@@ -8160,6 +8656,7 @@
shift
fi
+
if test $# -eq 0; then
cs_lflags_test=''
else
@@ -8171,6 +8668,7 @@
shift
fi
+
if test $# -eq 0; then
cs_libs_test=''
else
@@ -8183,6 +8681,7 @@
shift
fi
+
cs_cflags_test=`echo $cs_cflags_test | sed 'y%#% %'`
cs_lflags_test=`echo $cs_lflags_test | sed 'y%#% %'`
cs_libs_test=`echo $cs_libs_test | sed 'y%#% %'`
@@ -8211,26 +8710,30 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
cs_build_ok=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
fi
+rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test $cs_build_ok = yes; then
@@ -8267,8 +8770,8 @@
fi
fi
-{ echo "$as_me:$LINENO: result: $cs_cv_prog_cxx_ignore_unused_ok" >&5
-echo "${ECHO_T}$cs_cv_prog_cxx_ignore_unused_ok" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $cs_cv_prog_cxx_ignore_unused_ok" >&5
+$as_echo "$cs_cv_prog_cxx_ignore_unused_ok" >&6; }
if test "$cs_cv_prog_cxx_ignore_unused_ok" != no; then
cs_build_prop_val="$cs_cv_prog_cxx_ignore_unused"
cs_build_prop_val=`echo x$cs_build_prop_val | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
@@ -8280,10 +8783,10 @@
fi
-{ echo "$as_me:$LINENO: checking how to suppress C++ uninitialized variable warnings" >&5
-echo $ECHO_N "checking how to suppress C++ uninitialized variable warnings... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking how to suppress C++ uninitialized variable warnings" >&5
+$as_echo_n "checking how to suppress C++ uninitialized variable warnings... " >&6; }
if test "${cs_cv_prog_cxx_ignore_uninitialized_ok+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "`echo @-Wno-uninitialized@@ | sed 'y% %#%'`"; then
ac_ext=cpp
@@ -8316,6 +8819,7 @@
shift
fi
+
if test $# -eq 0; then
cs_cflags_test=''
else
@@ -8327,6 +8831,7 @@
shift
fi
+
if test $# -eq 0; then
cs_lflags_test=''
else
@@ -8338,6 +8843,7 @@
shift
fi
+
if test $# -eq 0; then
cs_libs_test=''
else
@@ -8350,6 +8856,7 @@
shift
fi
+
cs_cflags_test=`echo $cs_cflags_test | sed 'y%#% %'`
cs_lflags_test=`echo $cs_lflags_test | sed 'y%#% %'`
cs_libs_test=`echo $cs_libs_test | sed 'y%#% %'`
@@ -8378,26 +8885,30 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
cs_build_ok=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
fi
+rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test $cs_build_ok = yes; then
@@ -8434,8 +8945,8 @@
fi
fi
-{ echo "$as_me:$LINENO: result: $cs_cv_prog_cxx_ignore_uninitialized_ok" >&5
-echo "${ECHO_T}$cs_cv_prog_cxx_ignore_uninitialized_ok" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $cs_cv_prog_cxx_ignore_uninitialized_ok" >&5
+$as_echo "$cs_cv_prog_cxx_ignore_uninitialized_ok" >&6; }
if test "$cs_cv_prog_cxx_ignore_uninitialized_ok" != no; then
cs_build_prop_val="$cs_cv_prog_cxx_ignore_uninitialized"
cs_build_prop_val=`echo x$cs_build_prop_val | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
@@ -8453,10 +8964,10 @@
# optimization levels). This is needed for some code we don't have
# control over (e.g. SWIG-generated code) that breaks strict-aliasing rules.
#------------------------------------------------------------------------------
-{ echo "$as_me:$LINENO: checking for flag to disable string-aliasing" >&5
-echo $ECHO_N "checking for flag to disable string-aliasing... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for flag to disable string-aliasing" >&5
+$as_echo_n "checking for flag to disable string-aliasing... " >&6; }
if test "${cs_cv_prog_cxx_no_strict_aliasing_ok+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "`echo @-fno-strict-aliasing@@ | sed 'y% %#%'`"; then
ac_ext=cpp
@@ -8489,6 +9000,7 @@
shift
fi
+
if test $# -eq 0; then
cs_cflags_test=''
else
@@ -8500,6 +9012,7 @@
shift
fi
+
if test $# -eq 0; then
cs_lflags_test=''
else
@@ -8511,6 +9024,7 @@
shift
fi
+
if test $# -eq 0; then
cs_libs_test=''
else
@@ -8523,6 +9037,7 @@
shift
fi
+
cs_cflags_test=`echo $cs_cflags_test | sed 'y%#% %'`
cs_lflags_test=`echo $cs_lflags_test | sed 'y%#% %'`
cs_libs_test=`echo $cs_libs_test | sed 'y%#% %'`
@@ -8551,26 +9066,30 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
cs_build_ok=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
fi
+rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test $cs_build_ok = yes; then
@@ -8607,8 +9126,8 @@
fi
fi
-{ echo "$as_me:$LINENO: result: $cs_cv_prog_cxx_no_strict_aliasing_ok" >&5
-echo "${ECHO_T}$cs_cv_prog_cxx_no_strict_aliasing_ok" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $cs_cv_prog_cxx_no_strict_aliasing_ok" >&5
+$as_echo "$cs_cv_prog_cxx_no_strict_aliasing_ok" >&6; }
if test $cs_cv_prog_cxx_no_strict_aliasing != no; then
@@ -8628,10 +9147,10 @@
#------------------------------------------------------------------------------
binutils_recent=no
if test -n "$OBJCOPY"; then
- { echo "$as_me:$LINENO: checking if binutils version >= 2.16" >&5
-echo $ECHO_N "checking if binutils version >= 2.16... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking if binutils version >= 2.16" >&5
+$as_echo_n "checking if binutils version >= 2.16... " >&6; }
if test "${cs_cv_prog_binutils_version_2_16_ok_annotated+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
cs_prog_binutils_is_version=
cs_prog_binutils_min_version=
@@ -8741,8 +9260,8 @@
fi
-{ echo "$as_me:$LINENO: result: $cs_cv_prog_binutils_version_2_16_ok_annotated" >&5
-echo "${ECHO_T}$cs_cv_prog_binutils_version_2_16_ok_annotated" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $cs_cv_prog_binutils_version_2_16_ok_annotated" >&5
+$as_echo "$cs_cv_prog_binutils_version_2_16_ok_annotated" >&6; }
if test "$cs_cv_prog_binutils_version_2_16_ok" = yes; then
binutils_recent=yes
fi
@@ -8750,8 +9269,8 @@
fi
-{ echo "$as_me:$LINENO: checking whether to split debug information" >&5
-echo $ECHO_N "checking whether to split debug information... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether to split debug information" >&5
+$as_echo_n "checking whether to split debug information... " >&6; }
# Check whether --enable-separate-debug-info was given.
if test "${enable_separate_debug_info+set}" = set; then
enableval=$enable_separate_debug_info;
@@ -8766,8 +9285,8 @@
fi
-{ echo "$as_me:$LINENO: result: $enable_separate_debug_info" >&5
-echo "${ECHO_T}$enable_separate_debug_info" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $enable_separate_debug_info" >&5
+$as_echo "$enable_separate_debug_info" >&6; }
cs_build_prop_val="$enable_separate_debug_info"
cs_build_prop_val=`echo x$cs_build_prop_val | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
@@ -8777,10 +9296,10 @@
fi
-{ echo "$as_me:$LINENO: checking how to enable debug mode debugging symbols" >&5
-echo $ECHO_N "checking how to enable debug mode debugging symbols... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking how to enable debug mode debugging symbols" >&5
+$as_echo_n "checking how to enable debug mode debugging symbols... " >&6; }
if test "${cs_cv_prog_cxx_debug_symbols_extra_ok+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "`echo @-g3@@ | sed 'y% %#%'` `echo @-g2@@ | sed 'y% %#%'` `echo @-g@@ | sed 'y% %#%'`"; then
ac_ext=cpp
@@ -8813,6 +9332,7 @@
shift
fi
+
if test $# -eq 0; then
cs_cflags_test=''
else
@@ -8824,6 +9344,7 @@
shift
fi
+
if test $# -eq 0; then
cs_lflags_test=''
else
@@ -8835,6 +9356,7 @@
shift
fi
+
if test $# -eq 0; then
cs_libs_test=''
else
@@ -8847,6 +9369,7 @@
shift
fi
+
cs_cflags_test=`echo $cs_cflags_test | sed 'y%#% %'`
cs_lflags_test=`echo $cs_lflags_test | sed 'y%#% %'`
cs_libs_test=`echo $cs_libs_test | sed 'y%#% %'`
@@ -8875,26 +9398,30 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
cs_build_ok=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
fi
+rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test $cs_build_ok = yes; then
@@ -8931,8 +9458,8 @@
fi
fi
-{ echo "$as_me:$LINENO: result: $cs_cv_prog_cxx_debug_symbols_extra_ok" >&5
-echo "${ECHO_T}$cs_cv_prog_cxx_debug_symbols_extra_ok" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $cs_cv_prog_cxx_debug_symbols_extra_ok" >&5
+$as_echo "$cs_cv_prog_cxx_debug_symbols_extra_ok" >&6; }
if test "$cs_cv_prog_cxx_debug_symbols_extra_ok" != no; then
cs_build_prop_val="$cs_cv_prog_cxx_debug_symbols_extra"
cs_build_prop_val=`echo x$cs_build_prop_val | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
@@ -8951,8 +9478,8 @@
fi
-{ echo "$as_me:$LINENO: checking whether to enable debug information in optimize mode" >&5
-echo $ECHO_N "checking whether to enable debug information in optimize mode... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether to enable debug information in optimize mode" >&5
+$as_echo_n "checking whether to enable debug information in optimize mode... " >&6; }
# Check whether --enable-optimize-mode-debug-info was given.
if test "${enable_optimize_mode_debug_info+set}" = set; then
enableval=$enable_optimize_mode_debug_info; enable_optimize_mode_debug_info=$enableval
@@ -8962,13 +9489,13 @@
enable_optimize_mode_debug_info=$enable_separate_debug_info
fi
-{ echo "$as_me:$LINENO: result: $enable_optimize_mode_debug_info" >&5
-echo "${ECHO_T}$enable_optimize_mode_debug_info" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $enable_optimize_mode_debug_info" >&5
+$as_echo "$enable_optimize_mode_debug_info" >&6; }
if test "$enable_optimize_mode_debug_info" != "no"; then
- { echo "$as_me:$LINENO: checking how to enable optimize mode debugging symbols" >&5
-echo $ECHO_N "checking how to enable optimize mode debugging symbols... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking how to enable optimize mode debugging symbols" >&5
+$as_echo_n "checking how to enable optimize mode debugging symbols... " >&6; }
if test "${cs_cv_prog_cxx_debug_symbols_normal_ok+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "`echo @-g2@@ | sed 'y% %#%'` `echo @-g@@ | sed 'y% %#%'`"; then
ac_ext=cpp
@@ -9001,6 +9528,7 @@
shift
fi
+
if test $# -eq 0; then
cs_cflags_test=''
else
@@ -9012,6 +9540,7 @@
shift
fi
+
if test $# -eq 0; then
cs_lflags_test=''
else
@@ -9023,6 +9552,7 @@
shift
fi
+
if test $# -eq 0; then
cs_libs_test=''
else
@@ -9035,6 +9565,7 @@
shift
fi
+
cs_cflags_test=`echo $cs_cflags_test | sed 'y%#% %'`
cs_lflags_test=`echo $cs_lflags_test | sed 'y%#% %'`
cs_libs_test=`echo $cs_libs_test | sed 'y%#% %'`
@@ -9063,26 +9594,30 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
cs_build_ok=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
fi
+rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test $cs_build_ok = yes; then
@@ -9119,8 +9654,8 @@
fi
fi
-{ echo "$as_me:$LINENO: result: $cs_cv_prog_cxx_debug_symbols_normal_ok" >&5
-echo "${ECHO_T}$cs_cv_prog_cxx_debug_symbols_normal_ok" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $cs_cv_prog_cxx_debug_symbols_normal_ok" >&5
+$as_echo "$cs_cv_prog_cxx_debug_symbols_normal_ok" >&6; }
if test "$cs_cv_prog_cxx_debug_symbols_normal_ok" != no; then
cs_build_prop_val="$cs_cv_prog_cxx_debug_symbols_normal"
cs_build_prop_val=`echo x$cs_build_prop_val | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
@@ -9145,10 +9680,10 @@
#------------------------------------------------------------------------------
# Check how to declare symbol visibility.
#------------------------------------------------------------------------------
-{ echo "$as_me:$LINENO: checking how to treat C warnings as errors" >&5
-echo $ECHO_N "checking how to treat C warnings as errors... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking how to treat C warnings as errors" >&5
+$as_echo_n "checking how to treat C warnings as errors... " >&6; }
if test "${cs_cv_prog_c_enable_errors_ok+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "`echo @-Werror@@ | sed 'y% %#%'`"; then
ac_ext=c
@@ -9181,6 +9716,7 @@
shift
fi
+
if test $# -eq 0; then
cs_cflags_test=''
else
@@ -9192,6 +9728,7 @@
shift
fi
+
if test $# -eq 0; then
cs_lflags_test=''
else
@@ -9203,6 +9740,7 @@
shift
fi
+
if test $# -eq 0; then
cs_libs_test=''
else
@@ -9215,6 +9753,7 @@
shift
fi
+
cs_cflags_test=`echo $cs_cflags_test | sed 'y%#% %'`
cs_lflags_test=`echo $cs_lflags_test | sed 'y%#% %'`
cs_libs_test=`echo $cs_libs_test | sed 'y%#% %'`
@@ -9243,26 +9782,30 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
cs_build_ok=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
fi
+rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test $cs_build_ok = yes; then
@@ -9299,13 +9842,13 @@
fi
fi
-{ echo "$as_me:$LINENO: result: $cs_cv_prog_c_enable_errors_ok" >&5
-echo "${ECHO_T}$cs_cv_prog_c_enable_errors_ok" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $cs_cv_prog_c_enable_errors_ok" >&5
+$as_echo "$cs_cv_prog_c_enable_errors_ok" >&6; }
-{ echo "$as_me:$LINENO: checking how to treat C++ warnings as errors" >&5
-echo $ECHO_N "checking how to treat C++ warnings as errors... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking how to treat C++ warnings as errors" >&5
+$as_echo_n "checking how to treat C++ warnings as errors... " >&6; }
if test "${cs_cv_prog_cxx_enable_errors_ok+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "`echo @-Werror@@ | sed 'y% %#%'`"; then
ac_ext=cpp
@@ -9338,6 +9881,7 @@
shift
fi
+
if test $# -eq 0; then
cs_cflags_test=''
else
@@ -9349,6 +9893,7 @@
shift
fi
+
if test $# -eq 0; then
cs_lflags_test=''
else
@@ -9360,6 +9905,7 @@
shift
fi
+
if test $# -eq 0; then
cs_libs_test=''
else
@@ -9372,6 +9918,7 @@
shift
fi
+
cs_cflags_test=`echo $cs_cflags_test | sed 'y%#% %'`
cs_lflags_test=`echo $cs_lflags_test | sed 'y%#% %'`
cs_libs_test=`echo $cs_libs_test | sed 'y%#% %'`
@@ -9400,26 +9947,30 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
cs_build_ok=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
fi
+rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test $cs_build_ok = yes; then
@@ -9456,14 +10007,14 @@
fi
fi
-{ echo "$as_me:$LINENO: result: $cs_cv_prog_cxx_enable_errors_ok" >&5
-echo "${ECHO_T}$cs_cv_prog_cxx_enable_errors_ok" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $cs_cv_prog_cxx_enable_errors_ok" >&5
+$as_echo "$cs_cv_prog_cxx_enable_errors_ok" >&6; }
if test "" != yes; then
- { echo "$as_me:$LINENO: checking for STL" >&5
-echo $ECHO_N "checking for STL... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for STL" >&5
+$as_echo_n "checking for STL... " >&6; }
if test "${cs_cv_libstl+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
@@ -9495,6 +10046,7 @@
shift
fi
+
if test $# -eq 0; then
cs_cflags_test=''
else
@@ -9506,6 +10058,7 @@
shift
fi
+
if test $# -eq 0; then
cs_lflags_test=''
else
@@ -9517,6 +10070,7 @@
shift
fi
+
if test $# -eq 0; then
cs_libs_test=''
else
@@ -9529,6 +10083,7 @@
shift
fi
+
cs_cflags_test=`echo $cs_cflags_test | sed 'y%#% %'`
cs_lflags_test=`echo $cs_lflags_test | sed 'y%#% %'`
cs_libs_test=`echo $cs_libs_test | sed 'y%#% %'`
@@ -9558,26 +10113,30 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
cs_build_ok=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
fi
+rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test $cs_build_ok = yes; then
@@ -9610,11 +10169,11 @@
fi
fi
-{ echo "$as_me:$LINENO: result: $cs_cv_libstl" >&5
-echo "${ECHO_T}$cs_cv_libstl" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $cs_cv_libstl" >&5
+$as_echo "$cs_cv_libstl" >&6; }
else
- { echo "$as_me:$LINENO: checking for STL" >&5
-echo $ECHO_N "checking for STL... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for STL" >&5
+$as_echo_n "checking for STL... " >&6; }
ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -9645,6 +10204,7 @@
shift
fi
+
if test $# -eq 0; then
cs_cflags_test=''
else
@@ -9656,6 +10216,7 @@
shift
fi
+
if test $# -eq 0; then
cs_lflags_test=''
else
@@ -9667,6 +10228,7 @@
shift
fi
+
if test $# -eq 0; then
cs_libs_test=''
else
@@ -9679,6 +10241,7 @@
shift
fi
+
cs_cflags_test=`echo $cs_cflags_test | sed 'y%#% %'`
cs_lflags_test=`echo $cs_lflags_test | sed 'y%#% %'`
cs_libs_test=`echo $cs_libs_test | sed 'y%#% %'`
@@ -9708,26 +10271,30 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
cs_build_ok=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
fi
+rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test $cs_build_ok = yes; then
@@ -9759,8 +10326,8 @@
cs_cv_libstl=no
fi
- { echo "$as_me:$LINENO: result: $cs_cv_libstl" >&5
-echo "${ECHO_T}$cs_cv_libstl" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $cs_cv_libstl" >&5
+$as_echo "$cs_cv_libstl" >&6; }
fi
if test $cs_cv_libstl = yes; then
@@ -9775,10 +10342,10 @@
-{ echo "$as_me:$LINENO: checking how to treat C++ warnings as errors" >&5
-echo $ECHO_N "checking how to treat C++ warnings as errors... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking how to treat C++ warnings as errors" >&5
+$as_echo_n "checking how to treat C++ warnings as errors... " >&6; }
if test "${cs_cv_prog_cxx_pic_werror_ok+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "`echo @-Werror@@ | sed 'y% %#%'`"; then
ac_ext=cpp
@@ -9811,6 +10378,7 @@
shift
fi
+
if test $# -eq 0; then
cs_cflags_test=''
else
@@ -9822,6 +10390,7 @@
shift
fi
+
if test $# -eq 0; then
cs_lflags_test=''
else
@@ -9833,6 +10402,7 @@
shift
fi
+
if test $# -eq 0; then
cs_libs_test=''
else
@@ -9845,6 +10415,7 @@
shift
fi
+
cs_cflags_test=`echo $cs_cflags_test | sed 'y%#% %'`
cs_lflags_test=`echo $cs_lflags_test | sed 'y%#% %'`
cs_libs_test=`echo $cs_libs_test | sed 'y%#% %'`
@@ -9873,26 +10444,30 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
cs_build_ok=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
fi
+rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test $cs_build_ok = yes; then
@@ -9929,13 +10504,13 @@
fi
fi
-{ echo "$as_me:$LINENO: result: $cs_cv_prog_cxx_pic_werror_ok" >&5
-echo "${ECHO_T}$cs_cv_prog_cxx_pic_werror_ok" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $cs_cv_prog_cxx_pic_werror_ok" >&5
+$as_echo "$cs_cv_prog_cxx_pic_werror_ok" >&6; }
- { echo "$as_me:$LINENO: checking how to enable C++ PIC generation" >&5
-echo $ECHO_N "checking how to enable C++ PIC generation... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking how to enable C++ PIC generation" >&5
+$as_echo_n "checking how to enable C++ PIC generation... " >&6; }
if test "${cs_cv_prog_cxx_pic_ok+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "`echo @-fPIC@@ | sed 'y% %#%'`"; then
ac_ext=cpp
@@ -9968,6 +10543,7 @@
shift
fi
+
if test $# -eq 0; then
cs_cflags_test=''
else
@@ -9979,6 +10555,7 @@
shift
fi
+
if test $# -eq 0; then
cs_lflags_test=''
else
@@ -9990,6 +10567,7 @@
shift
fi
+
if test $# -eq 0; then
cs_libs_test=''
else
@@ -10002,6 +10580,7 @@
shift
fi
+
cs_cflags_test=`echo $cs_cflags_test | sed 'y%#% %'`
cs_lflags_test=`echo $cs_lflags_test | sed 'y%#% %'`
cs_libs_test=`echo $cs_libs_test | sed 'y%#% %'`
@@ -10030,23 +10609,26 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
if { ac_try='grep "fPIC" conftest.err >/dev/null 2>&1'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
cs_build_ok=no
else
@@ -10054,12 +10636,13 @@
fi
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
fi
+rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test $cs_build_ok = yes; then
@@ -10096,15 +10679,15 @@
fi
fi
-{ echo "$as_me:$LINENO: result: $cs_cv_prog_cxx_pic_ok" >&5
-echo "${ECHO_T}$cs_cv_prog_cxx_pic_ok" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $cs_cv_prog_cxx_pic_ok" >&5
+$as_echo "$cs_cv_prog_cxx_pic_ok" >&6; }
# Check if compiler recognizes an option to set inline visibility to hidden.
-{ echo "$as_me:$LINENO: checking for inline visibility flag" >&5
-echo $ECHO_N "checking for inline visibility flag... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for inline visibility flag" >&5
+$as_echo_n "checking for inline visibility flag... " >&6; }
if test "${cs_cv_prog_cxx_visibility_inlines_hidden_ok+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "`echo @-fvisibility-inlines-hidden@@ | sed 'y% %#%'`"; then
ac_ext=cpp
@@ -10137,6 +10720,7 @@
shift
fi
+
if test $# -eq 0; then
cs_cflags_test=''
else
@@ -10148,6 +10732,7 @@
shift
fi
+
if test $# -eq 0; then
cs_lflags_test=''
else
@@ -10159,6 +10744,7 @@
shift
fi
+
if test $# -eq 0; then
cs_libs_test=''
else
@@ -10171,6 +10757,7 @@
shift
fi
+
cs_cflags_test=`echo $cs_cflags_test | sed 'y%#% %'`
cs_lflags_test=`echo $cs_lflags_test | sed 'y%#% %'`
cs_libs_test=`echo $cs_libs_test | sed 'y%#% %'`
@@ -10199,26 +10786,30 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
cs_build_ok=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
fi
+rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test $cs_build_ok = yes; then
@@ -10255,8 +10846,8 @@
fi
fi
-{ echo "$as_me:$LINENO: result: $cs_cv_prog_cxx_visibility_inlines_hidden_ok" >&5
-echo "${ECHO_T}$cs_cv_prog_cxx_visibility_inlines_hidden_ok" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $cs_cv_prog_cxx_visibility_inlines_hidden_ok" >&5
+$as_echo "$cs_cv_prog_cxx_visibility_inlines_hidden_ok" >&6; }
cs_prog_cxx_visibility_inlines_hidden=$cs_cv_prog_cxx_visibility_inlines_hidden
@@ -10264,10 +10855,10 @@
# "visibility attribute is not supported in this configuration".
if test -n "$cs_prog_cxx_visibility_inlines_hidden"; then
if test "" != yes; then
- { echo "$as_me:$LINENO: checking if configuration supports $cs_prog_cxx_visibility_inlines_hidden" >&5
-echo $ECHO_N "checking if configuration supports $cs_prog_cxx_visibility_inlines_hidden... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking if configuration supports $cs_prog_cxx_visibility_inlines_hidden" >&5
+$as_echo_n "checking if configuration supports $cs_prog_cxx_visibility_inlines_hidden... " >&6; }
if test "${cs_cv_prog_cxx_visibility_inlines_hidden_supported+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
@@ -10299,6 +10890,7 @@
shift
fi
+
if test $# -eq 0; then
cs_cflags_test=''
else
@@ -10310,6 +10902,7 @@
shift
fi
+
if test $# -eq 0; then
cs_lflags_test=''
else
@@ -10321,6 +10914,7 @@
shift
fi
+
if test $# -eq 0; then
cs_libs_test=''
else
@@ -10333,6 +10927,7 @@
shift
fi
+
cs_cflags_test=`echo $cs_cflags_test | sed 'y%#% %'`
cs_lflags_test=`echo $cs_lflags_test | sed 'y%#% %'`
cs_libs_test=`echo $cs_libs_test | sed 'y%#% %'`
@@ -10362,26 +10957,30 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
cs_build_ok=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
fi
+rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test $cs_build_ok = yes; then
@@ -10415,11 +11014,11 @@
fi
fi
-{ echo "$as_me:$LINENO: result: $cs_cv_prog_cxx_visibility_inlines_hidden_supported" >&5
-echo "${ECHO_T}$cs_cv_prog_cxx_visibility_inlines_hidden_supported" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $cs_cv_prog_cxx_visibility_inlines_hidden_supported" >&5
+$as_echo "$cs_cv_prog_cxx_visibility_inlines_hidden_supported" >&6; }
else
- { echo "$as_me:$LINENO: checking if configuration supports $cs_prog_cxx_visibility_inlines_hidden" >&5
-echo $ECHO_N "checking if configuration supports $cs_prog_cxx_visibility_inlines_hidden... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking if configuration supports $cs_prog_cxx_visibility_inlines_hidden" >&5
+$as_echo_n "checking if configuration supports $cs_prog_cxx_visibility_inlines_hidden... " >&6; }
ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -10450,6 +11049,7 @@
shift
fi
+
if test $# -eq 0; then
cs_cflags_test=''
else
@@ -10461,6 +11061,7 @@
shift
fi
+
if test $# -eq 0; then
cs_lflags_test=''
else
@@ -10472,6 +11073,7 @@
shift
fi
+
if test $# -eq 0; then
cs_libs_test=''
else
@@ -10484,6 +11086,7 @@
shift
fi
+
cs_cflags_test=`echo $cs_cflags_test | sed 'y%#% %'`
cs_lflags_test=`echo $cs_lflags_test | sed 'y%#% %'`
cs_libs_test=`echo $cs_libs_test | sed 'y%#% %'`
@@ -10513,26 +11116,30 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
cs_build_ok=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
fi
+rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test $cs_build_ok = yes; then
@@ -10565,8 +11172,8 @@
cs_cv_prog_cxx_visibility_inlines_hidden_supported=no
fi
- { echo "$as_me:$LINENO: result: $cs_cv_prog_cxx_visibility_inlines_hidden_supported" >&5
-echo "${ECHO_T}$cs_cv_prog_cxx_visibility_inlines_hidden_supported" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $cs_cv_prog_cxx_visibility_inlines_hidden_supported" >&5
+$as_echo "$cs_cv_prog_cxx_visibility_inlines_hidden_supported" >&6; }
fi
if test $cs_cv_prog_cxx_visibility_inlines_hidden_supported = yes; then
@@ -10587,10 +11194,10 @@
# Check if hidden visibility handling is buggy.
if test -n "$cs_prog_cxx_visibility_inlines_hidden"; then
- { echo "$as_me:$LINENO: checking if $cs_prog_cxx_visibility_inlines_hidden is buggy" >&5
-echo $ECHO_N "checking if $cs_prog_cxx_visibility_inlines_hidden is buggy... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking if $cs_prog_cxx_visibility_inlines_hidden is buggy" >&5
+$as_echo_n "checking if $cs_prog_cxx_visibility_inlines_hidden is buggy... " >&6; }
if test "${cs_cv_prog_cxx_visibility_inlines_hidden_buggy+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test $ac_compiler_gnu = yes && test $cs_cv_libstl = yes; then
if test $cs_host_target = macosx; then
@@ -10627,6 +11234,7 @@
shift
fi
+
if test $# -eq 0; then
cs_cflags_test=''
else
@@ -10638,6 +11246,7 @@
shift
fi
+
if test $# -eq 0; then
cs_lflags_test=''
else
@@ -10649,6 +11258,7 @@
shift
fi
+
if test $# -eq 0; then
cs_libs_test=''
else
@@ -10661,6 +11271,7 @@
shift
fi
+
cs_cflags_test=`echo $cs_cflags_test | sed 'y%#% %'`
cs_lflags_test=`echo $cs_lflags_test | sed 'y%#% %'`
cs_libs_test=`echo $cs_libs_test | sed 'y%#% %'`
@@ -10689,26 +11300,30 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
cs_build_ok=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
fi
+rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test $cs_build_ok = yes; then
@@ -10744,8 +11359,8 @@
fi
fi
-{ echo "$as_me:$LINENO: result: $cs_cv_prog_cxx_visibility_inlines_hidden_buggy" >&5
-echo "${ECHO_T}$cs_cv_prog_cxx_visibility_inlines_hidden_buggy" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $cs_cv_prog_cxx_visibility_inlines_hidden_buggy" >&5
+$as_echo "$cs_cv_prog_cxx_visibility_inlines_hidden_buggy" >&6; }
if test $cs_cv_prog_cxx_visibility_inlines_hidden_buggy = yes; then
cs_prog_cxx_visibility_inlines_hidden=''
fi
@@ -10765,10 +11380,10 @@
-{ echo "$as_me:$LINENO: checking for hidden symbol visibility flag" >&5
-echo $ECHO_N "checking for hidden symbol visibility flag... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for hidden symbol visibility flag" >&5
+$as_echo_n "checking for hidden symbol visibility flag... " >&6; }
if test "${cs_cv_prog_c_visibility_hidden_ok+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "`echo @-fvisibility=hidden@@ | sed 'y% %#%'`"; then
ac_ext=c
@@ -10801,6 +11416,7 @@
shift
fi
+
if test $# -eq 0; then
cs_cflags_test=''
else
@@ -10812,6 +11428,7 @@
shift
fi
+
if test $# -eq 0; then
cs_lflags_test=''
else
@@ -10823,6 +11440,7 @@
shift
fi
+
if test $# -eq 0; then
cs_libs_test=''
else
@@ -10835,6 +11453,7 @@
shift
fi
+
cs_cflags_test=`echo $cs_cflags_test | sed 'y%#% %'`
cs_lflags_test=`echo $cs_lflags_test | sed 'y%#% %'`
cs_libs_test=`echo $cs_libs_test | sed 'y%#% %'`
@@ -10863,26 +11482,30 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
cs_build_ok=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
fi
+rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test $cs_build_ok = yes; then
@@ -10919,8 +11542,8 @@
fi
fi
-{ echo "$as_me:$LINENO: result: $cs_cv_prog_c_visibility_hidden_ok" >&5
-echo "${ECHO_T}$cs_cv_prog_c_visibility_hidden_ok" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $cs_cv_prog_c_visibility_hidden_ok" >&5
+$as_echo "$cs_cv_prog_c_visibility_hidden_ok" >&6; }
if test "$cs_cv_prog_c_visibility_hidden_ok" != no; then
cs_build_prop_val="$cs_cv_prog_c_visibility_hidden"
cs_build_prop_val=`echo x$cs_build_prop_val | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
@@ -10958,10 +11581,10 @@
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_CSLIBS_CONFIG+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$CSLIBS_CONFIG"; then
ac_cv_prog_CSLIBS_CONFIG="$CSLIBS_CONFIG" # Let the user override the test.
@@ -10974,7 +11597,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CSLIBS_CONFIG="$ac_tool_prefix$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -10985,11 +11608,11 @@
fi
CSLIBS_CONFIG=$ac_cv_prog_CSLIBS_CONFIG
if test -n "$CSLIBS_CONFIG"; then
- { echo "$as_me:$LINENO: result: $CSLIBS_CONFIG" >&5
-echo "${ECHO_T}$CSLIBS_CONFIG" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $CSLIBS_CONFIG" >&5
+$as_echo "$CSLIBS_CONFIG" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -11002,10 +11625,10 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_ac_ct_CSLIBS_CONFIG+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_CSLIBS_CONFIG"; then
ac_cv_prog_ac_ct_CSLIBS_CONFIG="$ac_ct_CSLIBS_CONFIG" # Let the user override the test.
@@ -11018,7 +11641,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_CSLIBS_CONFIG="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -11029,11 +11652,11 @@
fi
ac_ct_CSLIBS_CONFIG=$ac_cv_prog_ac_ct_CSLIBS_CONFIG
if test -n "$ac_ct_CSLIBS_CONFIG"; then
- { echo "$as_me:$LINENO: result: $ac_ct_CSLIBS_CONFIG" >&5
-echo "${ECHO_T}$ac_ct_CSLIBS_CONFIG" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_ct_CSLIBS_CONFIG" >&5
+$as_echo "$ac_ct_CSLIBS_CONFIG" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -11045,12 +11668,8 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
CSLIBS_CONFIG=$ac_ct_CSLIBS_CONFIG
@@ -11062,10 +11681,10 @@
sed 's/\([0-9]\?\)\.\([0-9]\?\)\.[0-9]\?/\1.\2/'`"
fi
- { echo "$as_me:$LINENO: checking for cslibs package" >&5
-echo $ECHO_N "checking for cslibs package... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for cslibs package" >&5
+$as_echo_n "checking for cslibs package... " >&6; }
if test "${cs_cv_cslibs+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$CSLIBS_CONFIG"; then
cs_cv_cslibs=yes
@@ -11076,37 +11695,37 @@
fi
- cs_cv_cslibs_cflags=`{ (echo "$as_me:$LINENO: \$CSLIBS_CONFIG --cflags \$cs_cv_cslibs_compiler") >&5
+ cs_cv_cslibs_cflags=`{ ($as_echo "$as_me:$LINENO: \$CSLIBS_CONFIG --cflags \$cs_cv_cslibs_compiler") >&5
($CSLIBS_CONFIG --cflags $cs_cv_cslibs_compiler) 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } | tr '\\\\' '/' | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
- cs_cv_cslibs_lflags=`{ (echo "$as_me:$LINENO: \$CSLIBS_CONFIG --lflags \$cs_cv_cslibs_compiler") >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } | tr '\\\\' '/' | sed 's/ */ /g;s/^ //;s/ $//'`
+ cs_cv_cslibs_lflags=`{ ($as_echo "$as_me:$LINENO: \$CSLIBS_CONFIG --lflags \$cs_cv_cslibs_compiler") >&5
($CSLIBS_CONFIG --lflags $cs_cv_cslibs_compiler) 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } | tr '\\\\' '/' | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
- cs_cv_cslibs_binpath=`{ (echo "$as_me:$LINENO: \$CSLIBS_CONFIG --binpath \$cs_cv_cslibs_compiler") >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } | tr '\\\\' '/' | sed 's/ */ /g;s/^ //;s/ $//'`
+ cs_cv_cslibs_binpath=`{ ($as_echo "$as_me:$LINENO: \$CSLIBS_CONFIG --binpath \$cs_cv_cslibs_compiler") >&5
($CSLIBS_CONFIG --binpath $cs_cv_cslibs_compiler) 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } | tr '\\\\' '/' | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } | tr '\\\\' '/' | sed 's/ */ /g;s/^ //;s/ $//'`
if $CSLIBS_CONFIG --incpath >/dev/null 2>&1; then
- cs_cv_cslibs_incpath=`{ (echo "$as_me:$LINENO: \$CSLIBS_CONFIG --incpath \$cs_cv_cslibs_compiler") >&5
+ cs_cv_cslibs_incpath=`{ ($as_echo "$as_me:$LINENO: \$CSLIBS_CONFIG --incpath \$cs_cv_cslibs_compiler") >&5
($CSLIBS_CONFIG --incpath $cs_cv_cslibs_compiler) 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } | tr '\\\\' '/' | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } | tr '\\\\' '/' | sed 's/ */ /g;s/^ //;s/ $//'`
else
cs_cv_cslibs_incpath=''
fi
if $CSLIBS_CONFIG --pcpath >/dev/null 2>&1; then
- cs_cv_cslibs_pcpath=`{ (echo "$as_me:$LINENO: \$CSLIBS_CONFIG --pcpath \$cs_cv_cslibs_compiler") >&5
+ cs_cv_cslibs_pcpath=`{ ($as_echo "$as_me:$LINENO: \$CSLIBS_CONFIG --pcpath \$cs_cv_cslibs_compiler") >&5
($CSLIBS_CONFIG --pcpath $cs_cv_cslibs_compiler) 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } | tr '\\\\' '/' | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } | tr '\\\\' '/' | sed 's/ */ /g;s/^ //;s/ $//'`
else
cs_cv_cslibs_pcpath=''
fi
@@ -11116,8 +11735,8 @@
fi
fi
-{ echo "$as_me:$LINENO: result: $cs_cv_cslibs" >&5
-echo "${ECHO_T}$cs_cv_cslibs" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $cs_cv_cslibs" >&5
+$as_echo "$cs_cv_cslibs" >&6; }
if test $cs_cv_cslibs = yes; then
CFLAGS="$CFLAGS $cs_cv_cslibs_cflags"
CPPFLAGS="$CPPFLAGS $cs_cv_cslibs_cflags"
@@ -11137,10 +11756,10 @@
*)
if test "" != yes; then
- { echo "$as_me:$LINENO: checking for pthread" >&5
-echo $ECHO_N "checking for pthread... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for pthread" >&5
+$as_echo_n "checking for pthread... " >&6; }
if test "${cs_cv_sys_pthread+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
@@ -11177,6 +11796,7 @@
shift
fi
+
if test $# -eq 0; then
cs_cflags_test=''
else
@@ -11188,6 +11808,7 @@
shift
fi
+
if test $# -eq 0; then
cs_lflags_test=''
else
@@ -11199,6 +11820,7 @@
shift
fi
+
if test $# -eq 0; then
cs_libs_test=''
else
@@ -11211,6 +11833,7 @@
shift
fi
+
cs_cflags_test=`echo $cs_cflags_test | sed 'y%#% %'`
cs_lflags_test=`echo $cs_lflags_test | sed 'y%#% %'`
cs_libs_test=`echo $cs_libs_test | sed 'y%#% %'`
@@ -11245,26 +11868,30 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
cs_build_ok=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
fi
+rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test $cs_build_ok = yes; then
@@ -11297,11 +11924,11 @@
fi
fi
-{ echo "$as_me:$LINENO: result: $cs_cv_sys_pthread" >&5
-echo "${ECHO_T}$cs_cv_sys_pthread" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $cs_cv_sys_pthread" >&5
+$as_echo "$cs_cv_sys_pthread" >&6; }
else
- { echo "$as_me:$LINENO: checking for pthread" >&5
-echo $ECHO_N "checking for pthread... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for pthread" >&5
+$as_echo_n "checking for pthread... " >&6; }
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -11337,6 +11964,7 @@
shift
fi
+
if test $# -eq 0; then
cs_cflags_test=''
else
@@ -11348,6 +11976,7 @@
shift
fi
+
if test $# -eq 0; then
cs_lflags_test=''
else
@@ -11359,6 +11988,7 @@
shift
fi
+
if test $# -eq 0; then
cs_libs_test=''
else
@@ -11371,6 +12001,7 @@
shift
fi
+
cs_cflags_test=`echo $cs_cflags_test | sed 'y%#% %'`
cs_lflags_test=`echo $cs_lflags_test | sed 'y%#% %'`
cs_libs_test=`echo $cs_libs_test | sed 'y%#% %'`
@@ -11405,26 +12036,30 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
cs_build_ok=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
fi
+rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test $cs_build_ok = yes; then
@@ -11456,8 +12091,8 @@
cs_cv_sys_pthread=no
fi
- { echo "$as_me:$LINENO: result: $cs_cv_sys_pthread" >&5
-echo "${ECHO_T}$cs_cv_sys_pthread" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $cs_cv_sys_pthread" >&5
+$as_echo "$cs_cv_sys_pthread" >&6; }
fi
if test $cs_cv_sys_pthread = yes; then
@@ -11472,10 +12107,10 @@
;;
esac
if test $cs_cv_sys_pthread = yes; then
- { echo "$as_me:$LINENO: checking for pthread recursive mutexes" >&5
-echo $ECHO_N "checking for pthread recursive mutexes... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for pthread recursive mutexes" >&5
+$as_echo_n "checking for pthread recursive mutexes... " >&6; }
if test "${cs_cv_sys_pthread_mutex_recursive+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
@@ -11508,6 +12143,7 @@
shift
fi
+
if test $# -eq 0; then
cs_cflags_test=''
else
@@ -11519,6 +12155,7 @@
shift
fi
+
if test $# -eq 0; then
cs_lflags_test=''
else
@@ -11530,6 +12167,7 @@
shift
fi
+
if test $# -eq 0; then
cs_libs_test=''
else
@@ -11542,6 +12180,7 @@
shift
fi
+
cs_cflags_test=`echo $cs_cflags_test | sed 'y%#% %'`
cs_lflags_test=`echo $cs_lflags_test | sed 'y%#% %'`
cs_libs_test=`echo $cs_libs_test | sed 'y%#% %'`
@@ -11571,26 +12210,30 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
cs_build_ok=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
fi
+rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test $cs_build_ok = yes; then
@@ -11620,8 +12263,8 @@
fi
fi
-{ echo "$as_me:$LINENO: result: $cs_cv_sys_pthread_mutex_recursive" >&5
-echo "${ECHO_T}$cs_cv_sys_pthread_mutex_recursive" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $cs_cv_sys_pthread_mutex_recursive" >&5
+$as_echo "$cs_cv_sys_pthread_mutex_recursive" >&6; }
else
cs_cv_sys_pthread_mutex_recursive=no
fi
@@ -11634,10 +12277,10 @@
cs_ignore_long_double_tuples=''
fi
- { echo "$as_me:$LINENO: checking how to suppress C++ \`long double' warnings" >&5
-echo $ECHO_N "checking how to suppress C++ \`long double' warnings... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking how to suppress C++ \`long double' warnings" >&5
+$as_echo_n "checking how to suppress C++ \`long double' warnings... " >&6; }
if test "${cs_cv_prog_cxx_ignore_long_double_ok+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$cs_ignore_long_double_tuples"; then
ac_ext=cpp
@@ -11670,6 +12313,7 @@
shift
fi
+
if test $# -eq 0; then
cs_cflags_test=''
else
@@ -11681,6 +12325,7 @@
shift
fi
+
if test $# -eq 0; then
cs_lflags_test=''
else
@@ -11692,6 +12337,7 @@
shift
fi
+
if test $# -eq 0; then
cs_libs_test=''
else
@@ -11704,6 +12350,7 @@
shift
fi
+
cs_cflags_test=`echo $cs_cflags_test | sed 'y%#% %'`
cs_lflags_test=`echo $cs_lflags_test | sed 'y%#% %'`
cs_libs_test=`echo $cs_libs_test | sed 'y%#% %'`
@@ -11732,26 +12379,30 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
cs_build_ok=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
fi
+rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test $cs_build_ok = yes; then
@@ -11788,8 +12439,8 @@
fi
fi
-{ echo "$as_me:$LINENO: result: $cs_cv_prog_cxx_ignore_long_double_ok" >&5
-echo "${ECHO_T}$cs_cv_prog_cxx_ignore_long_double_ok" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $cs_cv_prog_cxx_ignore_long_double_ok" >&5
+$as_echo "$cs_cv_prog_cxx_ignore_long_double_ok" >&6; }
@@ -11815,10 +12466,10 @@
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_PYTHON+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$PYTHON"; then
ac_cv_prog_PYTHON="$PYTHON" # Let the user override the test.
@@ -11831,7 +12482,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_PYTHON="$ac_tool_prefix$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -11842,11 +12493,11 @@
fi
PYTHON=$ac_cv_prog_PYTHON
if test -n "$PYTHON"; then
- { echo "$as_me:$LINENO: result: $PYTHON" >&5
-echo "${ECHO_T}$PYTHON" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $PYTHON" >&5
+$as_echo "$PYTHON" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -11859,10 +12510,10 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_ac_ct_PYTHON+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_PYTHON"; then
ac_cv_prog_ac_ct_PYTHON="$ac_ct_PYTHON" # Let the user override the test.
@@ -11875,7 +12526,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_PYTHON="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -11886,11 +12537,11 @@
fi
ac_ct_PYTHON=$ac_cv_prog_ac_ct_PYTHON
if test -n "$ac_ct_PYTHON"; then
- { echo "$as_me:$LINENO: result: $ac_ct_PYTHON" >&5
-echo "${ECHO_T}$ac_ct_PYTHON" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_ct_PYTHON" >&5
+$as_echo "$ac_ct_PYTHON" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -11902,12 +12553,8 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
PYTHON=$ac_ct_PYTHON
@@ -11924,17 +12571,17 @@
if test -n "$PYTHON" && test "$with_python" != no; then
- { echo "$as_me:$LINENO: checking for python SDK" >&5
-echo $ECHO_N "checking for python SDK... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for python SDK" >&5
+$as_echo_n "checking for python SDK... " >&6; }
if test "${cs_cv_python_sdk+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
- cs_pyver=`{ (echo "$as_me:$LINENO: \$PYTHON -c 'import sys, string; \\
+ cs_pyver=`{ ($as_echo "$as_me:$LINENO: \$PYTHON -c 'import sys, string; \\
print string.join(map(str,sys.version_info[:2]),\".\")'") >&5
($PYTHON -c 'import sys, string; \
print string.join(map(str,sys.version_info[:2]),".")') 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }`
cs_cv_pybase="python${cs_pyver}"
@@ -11946,37 +12593,37 @@
fi
- cs_cv_pybase_cflags=`{ (echo "$as_me:$LINENO: \$PYTHON -c \\
+ cs_cv_pybase_cflags=`{ ($as_echo "$as_me:$LINENO: \$PYTHON -c \\
'import distutils.sysconfig; \\
print \"-I\" + distutils.sysconfig.get_python_inc()'") >&5
($PYTHON -c \
'import distutils.sysconfig; \
print "-I" + distutils.sysconfig.get_python_inc()') 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } | tr '\\\\' '/' | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } | tr '\\\\' '/' | sed 's/ */ /g;s/^ //;s/ $//'`
cs_cv_pybase_cflags="$cs_cv_pybase_cflags \
$cs_cv_prog_cxx_ignore_long_double"
# Depending upon platform and installation, link library might
# reside in "get_python_lib()", "get_python_lib()/config",
# "${prefix}/lib" (Unix), or "${prefix}/libs" (Windows).
- cs_cv_pybase_syslib=`{ (echo "$as_me:$LINENO: \$PYTHON -c \\
+ cs_cv_pybase_syslib=`{ ($as_echo "$as_me:$LINENO: \$PYTHON -c \\
'import distutils.sysconfig; \\
print distutils.sysconfig.get_python_lib(0,1)'") >&5
($PYTHON -c \
'import distutils.sysconfig; \
print distutils.sysconfig.get_python_lib(0,1)') 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } | tr '\\\\' '/' | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
- cs_cv_pybase_sysprefix=`{ (echo "$as_me:$LINENO: \$PYTHON -c \\
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } | tr '\\\\' '/' | sed 's/ */ /g;s/^ //;s/ $//'`
+ cs_cv_pybase_sysprefix=`{ ($as_echo "$as_me:$LINENO: \$PYTHON -c \\
'import sys; print sys.prefix'") >&5
($PYTHON -c \
'import sys; print sys.prefix') 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } | tr '\\\\' '/' | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } | tr '\\\\' '/' | sed 's/ */ /g;s/^ //;s/ $//'`
cs_cv_pybase_lflags_base=''
if test -d "$cs_cv_pybase_syslib"; then
cs_cv_pybase_lflags_base="$cs_cv_pybase_lflags_base -L$cs_cv_pybase_syslib"
@@ -11996,7 +12643,7 @@
fi
- cs_cv_pybase_libs=`{ (echo "$as_me:$LINENO: \$PYTHON -c \\
+ cs_cv_pybase_libs=`{ ($as_echo "$as_me:$LINENO: \$PYTHON -c \\
'import distutils.sysconfig; \\
print (distutils.sysconfig.get_config_var(\"LIBS\") or \"\")+\" \"+ \\
(distutils.sysconfig.get_config_var(\"SYSLIBS\") or \"\")'") >&5
@@ -12005,17 +12652,17 @@
print (distutils.sysconfig.get_config_var("LIBS") or "")+" "+ \
(distutils.sysconfig.get_config_var("SYSLIBS") or "")') 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } | tr '\\\\' '/' | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } | tr '\\\\' '/' | sed 's/ */ /g;s/^ //;s/ $//'`
- cs_cv_python_ext=`{ (echo "$as_me:$LINENO: \$PYTHON -c \\
+ cs_cv_python_ext=`{ ($as_echo "$as_me:$LINENO: \$PYTHON -c \\
'import distutils.sysconfig; \\
print (distutils.sysconfig.get_config_var(\"SO\") or \"\")'") >&5
($PYTHON -c \
'import distutils.sysconfig; \
print (distutils.sysconfig.get_config_var("SO") or "")') 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }`
if test -n "$cs_pyver" &&
@@ -12027,8 +12674,8 @@
fi
fi
-{ echo "$as_me:$LINENO: result: $cs_cv_python_sdk" >&5
-echo "${ECHO_T}$cs_cv_python_sdk" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $cs_cv_python_sdk" >&5
+$as_echo "$cs_cv_python_sdk" >&6; }
# Check if Python SDK is usable. The most common library name is the
# basename with a few decorations (for example, libpython2.2.a),
@@ -12069,10 +12716,10 @@
cs_pyflags="$cs_pyflags `echo @@-bundle -flat_namespace -undefined suppress@$cs_cv_pybase_lflags_ext | sed 'y% %#%'`"
if test "" != yes; then
- { echo "$as_me:$LINENO: checking if python SDK is usable" >&5
-echo $ECHO_N "checking if python SDK is usable... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking if python SDK is usable" >&5
+$as_echo_n "checking if python SDK is usable... " >&6; }
if test "${cs_cv_python+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
@@ -12104,6 +12751,7 @@
shift
fi
+
if test $# -eq 0; then
cs_cflags_test=''
else
@@ -12115,6 +12763,7 @@
shift
fi
+
if test $# -eq 0; then
cs_lflags_test=''
else
@@ -12126,6 +12775,7 @@
shift
fi
+
if test $# -eq 0; then
cs_libs_test=''
else
@@ -12138,6 +12788,7 @@
shift
fi
+
cs_cflags_test=`echo $cs_cflags_test | sed 'y%#% %'`
cs_lflags_test=`echo $cs_lflags_test | sed 'y%#% %'`
cs_libs_test=`echo $cs_libs_test | sed 'y%#% %'`
@@ -12166,26 +12817,30 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
cs_build_ok=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
fi
+rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test $cs_build_ok = yes; then
@@ -12218,11 +12873,11 @@
fi
fi
-{ echo "$as_me:$LINENO: result: $cs_cv_python" >&5
-echo "${ECHO_T}$cs_cv_python" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $cs_cv_python" >&5
+$as_echo "$cs_cv_python" >&6; }
else
- { echo "$as_me:$LINENO: checking if python SDK is usable" >&5
-echo $ECHO_N "checking if python SDK is usable... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking if python SDK is usable" >&5
+$as_echo_n "checking if python SDK is usable... " >&6; }
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -12253,6 +12908,7 @@
shift
fi
+
if test $# -eq 0; then
cs_cflags_test=''
else
@@ -12264,6 +12920,7 @@
shift
fi
+
if test $# -eq 0; then
cs_lflags_test=''
else
@@ -12275,6 +12932,7 @@
shift
fi
+
if test $# -eq 0; then
cs_libs_test=''
else
@@ -12287,6 +12945,7 @@
shift
fi
+
cs_cflags_test=`echo $cs_cflags_test | sed 'y%#% %'`
cs_lflags_test=`echo $cs_lflags_test | sed 'y%#% %'`
cs_libs_test=`echo $cs_libs_test | sed 'y%#% %'`
@@ -12315,26 +12974,30 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
cs_build_ok=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
fi
+rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test $cs_build_ok = yes; then
@@ -12366,8 +13029,8 @@
cs_cv_python=no
fi
- { echo "$as_me:$LINENO: result: $cs_cv_python" >&5
-echo "${ECHO_T}$cs_cv_python" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $cs_cv_python" >&5
+$as_echo "$cs_cv_python" >&6; }
fi
if test $cs_cv_python = yes; then
@@ -12464,10 +13127,10 @@
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_PKG_CONFIG+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$PKG_CONFIG"; then
ac_cv_prog_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test.
@@ -12480,7 +13143,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_PKG_CONFIG="$ac_tool_prefix$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -12491,11 +13154,11 @@
fi
PKG_CONFIG=$ac_cv_prog_PKG_CONFIG
if test -n "$PKG_CONFIG"; then
- { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -12508,10 +13171,10 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_ac_ct_PKG_CONFIG+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_PKG_CONFIG"; then
ac_cv_prog_ac_ct_PKG_CONFIG="$ac_ct_PKG_CONFIG" # Let the user override the test.
@@ -12524,7 +13187,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_PKG_CONFIG="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -12535,11 +13198,11 @@
fi
ac_ct_PKG_CONFIG=$ac_cv_prog_ac_ct_PKG_CONFIG
if test -n "$ac_ct_PKG_CONFIG"; then
- { echo "$as_me:$LINENO: result: $ac_ct_PKG_CONFIG" >&5
-echo "${ECHO_T}$ac_ct_PKG_CONFIG" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_ct_PKG_CONFIG" >&5
+$as_echo "$ac_ct_PKG_CONFIG" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -12551,12 +13214,8 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
PKG_CONFIG=$ac_ct_PKG_CONFIG
@@ -12581,10 +13240,10 @@
fi
if test $cs_cv_prog_pkg_config_ok = yes; then
- { echo "$as_me:$LINENO: checking if $PKG_CONFIG recognizes cppunit" >&5
-echo $ECHO_N "checking if $PKG_CONFIG recognizes cppunit... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking if $PKG_CONFIG recognizes cppunit" >&5
+$as_echo_n "checking if $PKG_CONFIG recognizes cppunit... " >&6; }
if test "${cs_cv_prog_pkg_config_cppunit+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if $PKG_CONFIG --exists cppunit; then
cs_cv_prog_pkg_config_cppunit=yes
@@ -12593,21 +13252,21 @@
fi
fi
-{ echo "$as_me:$LINENO: result: $cs_cv_prog_pkg_config_cppunit" >&5
-echo "${ECHO_T}$cs_cv_prog_pkg_config_cppunit" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $cs_cv_prog_pkg_config_cppunit" >&5
+$as_echo "$cs_cv_prog_pkg_config_cppunit" >&6; }
if test $cs_cv_prog_pkg_config_cppunit = yes; then
if test -z "$cs_cv_prog_pkg_config_cppunit_flags"; then
- cs_check_lib_cflag=`{ (echo "$as_me:$LINENO: \$PKG_CONFIG --cflags cppunit") >&5
+ cs_check_lib_cflag=`{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --cflags cppunit") >&5
($PKG_CONFIG --cflags cppunit) 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } | tr '\\\\' '/' | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } | tr '\\\\' '/' | sed 's/ */ /g;s/^ //;s/ $//'`
cs_check_lib_lflag=''
- cs_check_lib_libs=`{ (echo "$as_me:$LINENO: \$PKG_CONFIG --libs cppunit") >&5
+ cs_check_lib_libs=`{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --libs cppunit") >&5
($PKG_CONFIG --libs cppunit) 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } | tr '\\\\' '/' | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } | tr '\\\\' '/' | sed 's/ */ /g;s/^ //;s/ $//'`
cs_cv_prog_pkg_config_cppunit_flags=`echo @$cs_check_lib_cflag@$cs_check_lib_lflag@$cs_check_lib_libs | sed 'y% %#%'`
fi
@@ -12624,107 +13283,101 @@
fi
if test -n "$ac_tool_prefix"; then
- for ac_prog in cppunit-config
- do
- # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_CONFIG_CPPUNIT+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$CONFIG_CPPUNIT"; then
- ac_cv_prog_CONFIG_CPPUNIT="$CONFIG_CPPUNIT" # Let the user override the test.
+ # Extract the first word of "${ac_tool_prefix}cppunit-config", so it can be a program name with args.
+set dummy ${ac_tool_prefix}cppunit-config; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_CONFIG_CPPUNIT+set}" = set; then
+ $as_echo_n "(cached) " >&6
else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ case $CONFIG_CPPUNIT in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_CONFIG_CPPUNIT="$CONFIG_CPPUNIT" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_CONFIG_CPPUNIT="$ac_tool_prefix$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ ac_cv_path_CONFIG_CPPUNIT="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
IFS=$as_save_IFS
+ ;;
+esac
fi
-fi
-CONFIG_CPPUNIT=$ac_cv_prog_CONFIG_CPPUNIT
+CONFIG_CPPUNIT=$ac_cv_path_CONFIG_CPPUNIT
if test -n "$CONFIG_CPPUNIT"; then
- { echo "$as_me:$LINENO: result: $CONFIG_CPPUNIT" >&5
-echo "${ECHO_T}$CONFIG_CPPUNIT" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $CONFIG_CPPUNIT" >&5
+$as_echo "$CONFIG_CPPUNIT" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
- test -n "$CONFIG_CPPUNIT" && break
- done
fi
-if test -z "$CONFIG_CPPUNIT"; then
- ac_ct_CONFIG_CPPUNIT=$CONFIG_CPPUNIT
- for ac_prog in cppunit-config
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_CONFIG_CPPUNIT+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+if test -z "$ac_cv_path_CONFIG_CPPUNIT"; then
+ ac_pt_CONFIG_CPPUNIT=$CONFIG_CPPUNIT
+ # Extract the first word of "cppunit-config", so it can be a program name with args.
+set dummy cppunit-config; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_ac_pt_CONFIG_CPPUNIT+set}" = set; then
+ $as_echo_n "(cached) " >&6
else
- if test -n "$ac_ct_CONFIG_CPPUNIT"; then
- ac_cv_prog_ac_ct_CONFIG_CPPUNIT="$ac_ct_CONFIG_CPPUNIT" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ case $ac_pt_CONFIG_CPPUNIT in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_ac_pt_CONFIG_CPPUNIT="$ac_pt_CONFIG_CPPUNIT" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_CONFIG_CPPUNIT="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ ac_cv_path_ac_pt_CONFIG_CPPUNIT="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
IFS=$as_save_IFS
+ ;;
+esac
fi
-fi
-ac_ct_CONFIG_CPPUNIT=$ac_cv_prog_ac_ct_CONFIG_CPPUNIT
-if test -n "$ac_ct_CONFIG_CPPUNIT"; then
- { echo "$as_me:$LINENO: result: $ac_ct_CONFIG_CPPUNIT" >&5
-echo "${ECHO_T}$ac_ct_CONFIG_CPPUNIT" >&6; }
+ac_pt_CONFIG_CPPUNIT=$ac_cv_path_ac_pt_CONFIG_CPPUNIT
+if test -n "$ac_pt_CONFIG_CPPUNIT"; then
+ { $as_echo "$as_me:$LINENO: result: $ac_pt_CONFIG_CPPUNIT" >&5
+$as_echo "$ac_pt_CONFIG_CPPUNIT" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
-
- test -n "$ac_ct_CONFIG_CPPUNIT" && break
-done
-
- if test "x$ac_ct_CONFIG_CPPUNIT" = x; then
+ if test "x$ac_pt_CONFIG_CPPUNIT" = x; then
CONFIG_CPPUNIT=""
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
- CONFIG_CPPUNIT=$ac_ct_CONFIG_CPPUNIT
+ CONFIG_CPPUNIT=$ac_pt_CONFIG_CPPUNIT
fi
+else
+ CONFIG_CPPUNIT="$ac_cv_path_CONFIG_CPPUNIT"
fi
if test -n "$CONFIG_CPPUNIT"; then
@@ -12739,17 +13392,17 @@
if test $cs_cv_prog_config_cppunit_ok = yes; then
if test -z "$cs_cv_prog_config_cppunit_flags"; then
- cs_check_lib_cflag=`{ (echo "$as_me:$LINENO: \$CONFIG_CPPUNIT --cflags ") >&5
+ cs_check_lib_cflag=`{ ($as_echo "$as_me:$LINENO: \$CONFIG_CPPUNIT --cflags ") >&5
($CONFIG_CPPUNIT --cflags ) 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } | tr '\\\\' '/' | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } | tr '\\\\' '/' | sed 's/ */ /g;s/^ //;s/ $//'`
cs_check_lib_lflag=''
- cs_check_lib_libs=`{ (echo "$as_me:$LINENO: \$CONFIG_CPPUNIT --libs ") >&5
+ cs_check_lib_libs=`{ ($as_echo "$as_me:$LINENO: \$CONFIG_CPPUNIT --libs ") >&5
($CONFIG_CPPUNIT --libs ) 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } | tr '\\\\' '/' | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } | tr '\\\\' '/' | sed 's/ */ /g;s/^ //;s/ $//'`
cs_cv_prog_config_cppunit_flags=`echo @$cs_check_lib_cflag@$cs_check_lib_lflag@$cs_check_lib_libs | sed 'y% %#%'`
fi
@@ -12788,6 +13441,7 @@
shift
fi
+
if test $# -eq 0; then
cs_check_libdir=''
else
@@ -12800,6 +13454,7 @@
shift
fi
+
if test -n "$cs_check_incdir"; then
cs_check_lib_cflag="-I$cs_check_incdir"
else
@@ -12876,10 +13531,10 @@
if test "$cs_ignore_cache" != yes; then
- { echo "$as_me:$LINENO: checking for libcppunit" >&5
-echo $ECHO_N "checking for libcppunit... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for libcppunit" >&5
+$as_echo_n "checking for libcppunit... " >&6; }
if test "${cs_cv_libcppunit+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
@@ -12911,6 +13566,7 @@
shift
fi
+
if test $# -eq 0; then
cs_cflags_test=''
else
@@ -12922,6 +13578,7 @@
shift
fi
+
if test $# -eq 0; then
cs_lflags_test=''
else
@@ -12933,6 +13590,7 @@
shift
fi
+
if test $# -eq 0; then
cs_libs_test=''
else
@@ -12945,6 +13603,7 @@
shift
fi
+
cs_cflags_test=`echo $cs_cflags_test | sed 'y%#% %'`
cs_lflags_test=`echo $cs_lflags_test | sed 'y%#% %'`
cs_libs_test=`echo $cs_libs_test | sed 'y%#% %'`
@@ -12973,26 +13632,30 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
cs_build_ok=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
fi
+rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test $cs_build_ok = yes; then
@@ -13025,11 +13688,11 @@
fi
fi
-{ echo "$as_me:$LINENO: result: $cs_cv_libcppunit" >&5
-echo "${ECHO_T}$cs_cv_libcppunit" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $cs_cv_libcppunit" >&5
+$as_echo "$cs_cv_libcppunit" >&6; }
else
- { echo "$as_me:$LINENO: checking for libcppunit" >&5
-echo $ECHO_N "checking for libcppunit... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for libcppunit" >&5
+$as_echo_n "checking for libcppunit... " >&6; }
ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -13060,6 +13723,7 @@
shift
fi
+
if test $# -eq 0; then
cs_cflags_test=''
else
@@ -13071,6 +13735,7 @@
shift
fi
+
if test $# -eq 0; then
cs_lflags_test=''
else
@@ -13082,6 +13747,7 @@
shift
fi
+
if test $# -eq 0; then
cs_libs_test=''
else
@@ -13094,6 +13760,7 @@
shift
fi
+
cs_cflags_test=`echo $cs_cflags_test | sed 'y%#% %'`
cs_lflags_test=`echo $cs_lflags_test | sed 'y%#% %'`
cs_libs_test=`echo $cs_libs_test | sed 'y%#% %'`
@@ -13122,26 +13789,30 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
cs_build_ok=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
fi
+rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test $cs_build_ok = yes; then
@@ -13173,8 +13844,8 @@
cs_cv_libcppunit=no
fi
- { echo "$as_me:$LINENO: result: $cs_cv_libcppunit" >&5
-echo "${ECHO_T}$cs_cv_libcppunit" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $cs_cv_libcppunit" >&5
+$as_echo "$cs_cv_libcppunit" >&6; }
fi
if test $cs_cv_libcppunit = yes; then
@@ -13204,10 +13875,10 @@
if test $cs_cv_libcppunit = yes; then
if test "" != yes; then
- { echo "$as_me:$LINENO: checking if cppunit is sufficiently recent" >&5
-echo $ECHO_N "checking if cppunit is sufficiently recent... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking if cppunit is sufficiently recent" >&5
+$as_echo_n "checking if cppunit is sufficiently recent... " >&6; }
if test "${cs_cv_libcppunit_recent+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
@@ -13239,6 +13910,7 @@
shift
fi
+
if test $# -eq 0; then
cs_cflags_test=''
else
@@ -13250,6 +13922,7 @@
shift
fi
+
if test $# -eq 0; then
cs_lflags_test=''
else
@@ -13261,6 +13934,7 @@
shift
fi
+
if test $# -eq 0; then
cs_libs_test=''
else
@@ -13273,6 +13947,7 @@
shift
fi
+
cs_cflags_test=`echo $cs_cflags_test | sed 'y%#% %'`
cs_lflags_test=`echo $cs_lflags_test | sed 'y%#% %'`
cs_libs_test=`echo $cs_libs_test | sed 'y%#% %'`
@@ -13301,26 +13976,30 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
cs_build_ok=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
fi
+rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test $cs_build_ok = yes; then
@@ -13353,11 +14032,11 @@
fi
fi
-{ echo "$as_me:$LINENO: result: $cs_cv_libcppunit_recent" >&5
-echo "${ECHO_T}$cs_cv_libcppunit_recent" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $cs_cv_libcppunit_recent" >&5
+$as_echo "$cs_cv_libcppunit_recent" >&6; }
else
- { echo "$as_me:$LINENO: checking if cppunit is sufficiently recent" >&5
-echo $ECHO_N "checking if cppunit is sufficiently recent... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking if cppunit is sufficiently recent" >&5
+$as_echo_n "checking if cppunit is sufficiently recent... " >&6; }
ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -13388,6 +14067,7 @@
shift
fi
+
if test $# -eq 0; then
cs_cflags_test=''
else
@@ -13399,6 +14079,7 @@
shift
fi
+
if test $# -eq 0; then
cs_lflags_test=''
else
@@ -13410,6 +14091,7 @@
shift
fi
+
if test $# -eq 0; then
cs_libs_test=''
else
@@ -13422,6 +14104,7 @@
shift
fi
+
cs_cflags_test=`echo $cs_cflags_test | sed 'y%#% %'`
cs_lflags_test=`echo $cs_lflags_test | sed 'y%#% %'`
cs_libs_test=`echo $cs_libs_test | sed 'y%#% %'`
@@ -13450,26 +14133,30 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
cs_build_ok=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
fi
+rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test $cs_build_ok = yes; then
@@ -13501,8 +14188,8 @@
cs_cv_libcppunit_recent=no
fi
- { echo "$as_me:$LINENO: result: $cs_cv_libcppunit_recent" >&5
-echo "${ECHO_T}$cs_cv_libcppunit_recent" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $cs_cv_libcppunit_recent" >&5
+$as_echo "$cs_cv_libcppunit_recent" >&6; }
fi
if test $cs_cv_libcppunit_recent = yes; then
@@ -13547,10 +14234,10 @@
*)
if test "" != yes; then
- { echo "$as_me:$LINENO: checking for pthread" >&5
-echo $ECHO_N "checking for pthread... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for pthread" >&5
+$as_echo_n "checking for pthread... " >&6; }
if test "${cs_cv_sys_pthread+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
@@ -13587,6 +14274,7 @@
shift
fi
+
if test $# -eq 0; then
cs_cflags_test=''
else
@@ -13598,6 +14286,7 @@
shift
fi
+
if test $# -eq 0; then
cs_lflags_test=''
else
@@ -13609,6 +14298,7 @@
shift
fi
+
if test $# -eq 0; then
cs_libs_test=''
else
@@ -13621,6 +14311,7 @@
shift
fi
+
cs_cflags_test=`echo $cs_cflags_test | sed 'y%#% %'`
cs_lflags_test=`echo $cs_lflags_test | sed 'y%#% %'`
cs_libs_test=`echo $cs_libs_test | sed 'y%#% %'`
@@ -13655,26 +14346,30 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
cs_build_ok=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
fi
+rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test $cs_build_ok = yes; then
@@ -13707,11 +14402,11 @@
fi
fi
-{ echo "$as_me:$LINENO: result: $cs_cv_sys_pthread" >&5
-echo "${ECHO_T}$cs_cv_sys_pthread" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $cs_cv_sys_pthread" >&5
+$as_echo "$cs_cv_sys_pthread" >&6; }
else
- { echo "$as_me:$LINENO: checking for pthread" >&5
-echo $ECHO_N "checking for pthread... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for pthread" >&5
+$as_echo_n "checking for pthread... " >&6; }
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -13747,6 +14442,7 @@
shift
fi
+
if test $# -eq 0; then
cs_cflags_test=''
else
@@ -13758,6 +14454,7 @@
shift
fi
+
if test $# -eq 0; then
cs_lflags_test=''
else
@@ -13769,6 +14466,7 @@
shift
fi
+
if test $# -eq 0; then
cs_libs_test=''
else
@@ -13781,6 +14479,7 @@
shift
fi
+
cs_cflags_test=`echo $cs_cflags_test | sed 'y%#% %'`
cs_lflags_test=`echo $cs_lflags_test | sed 'y%#% %'`
cs_libs_test=`echo $cs_libs_test | sed 'y%#% %'`
@@ -13815,26 +14514,30 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
cs_build_ok=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
fi
+rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test $cs_build_ok = yes; then
@@ -13866,8 +14569,8 @@
cs_cv_sys_pthread=no
fi
- { echo "$as_me:$LINENO: result: $cs_cv_sys_pthread" >&5
-echo "${ECHO_T}$cs_cv_sys_pthread" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $cs_cv_sys_pthread" >&5
+$as_echo "$cs_cv_sys_pthread" >&6; }
fi
if test $cs_cv_sys_pthread = yes; then
@@ -13882,10 +14585,10 @@
;;
esac
if test $cs_cv_sys_pthread = yes; then
- { echo "$as_me:$LINENO: checking for pthread recursive mutexes" >&5
-echo $ECHO_N "checking for pthread recursive mutexes... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for pthread recursive mutexes" >&5
+$as_echo_n "checking for pthread recursive mutexes... " >&6; }
if test "${cs_cv_sys_pthread_mutex_recursive+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
@@ -13918,6 +14621,7 @@
shift
fi
+
if test $# -eq 0; then
cs_cflags_test=''
else
@@ -13929,6 +14633,7 @@
shift
fi
+
if test $# -eq 0; then
cs_lflags_test=''
else
@@ -13940,6 +14645,7 @@
shift
fi
+
if test $# -eq 0; then
cs_libs_test=''
else
@@ -13952,6 +14658,7 @@
shift
fi
+
cs_cflags_test=`echo $cs_cflags_test | sed 'y%#% %'`
cs_lflags_test=`echo $cs_lflags_test | sed 'y%#% %'`
cs_libs_test=`echo $cs_libs_test | sed 'y%#% %'`
@@ -13981,26 +14688,30 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
cs_build_ok=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
fi
+rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test $cs_build_ok = yes; then
@@ -14030,8 +14741,8 @@
fi
fi
-{ echo "$as_me:$LINENO: result: $cs_cv_sys_pthread_mutex_recursive" >&5
-echo "${ECHO_T}$cs_cv_sys_pthread_mutex_recursive" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $cs_cv_sys_pthread_mutex_recursive" >&5
+$as_echo "$cs_cv_sys_pthread_mutex_recursive" >&6; }
else
cs_cv_sys_pthread_mutex_recursive=no
fi
@@ -14091,10 +14802,10 @@
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_PKG_CONFIG+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$PKG_CONFIG"; then
ac_cv_prog_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test.
@@ -14107,7 +14818,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_PKG_CONFIG="$ac_tool_prefix$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -14118,11 +14829,11 @@
fi
PKG_CONFIG=$ac_cv_prog_PKG_CONFIG
if test -n "$PKG_CONFIG"; then
- { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -14135,10 +14846,10 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_ac_ct_PKG_CONFIG+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_PKG_CONFIG"; then
ac_cv_prog_ac_ct_PKG_CONFIG="$ac_ct_PKG_CONFIG" # Let the user override the test.
@@ -14151,7 +14862,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_PKG_CONFIG="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -14162,11 +14873,11 @@
fi
ac_ct_PKG_CONFIG=$ac_cv_prog_ac_ct_PKG_CONFIG
if test -n "$ac_ct_PKG_CONFIG"; then
- { echo "$as_me:$LINENO: result: $ac_ct_PKG_CONFIG" >&5
-echo "${ECHO_T}$ac_ct_PKG_CONFIG" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_ct_PKG_CONFIG" >&5
+$as_echo "$ac_ct_PKG_CONFIG" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -14178,12 +14889,8 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
PKG_CONFIG=$ac_ct_PKG_CONFIG
@@ -14208,10 +14915,10 @@
fi
if test $cs_cv_prog_pkg_config_ok = yes; then
- { echo "$as_me:$LINENO: checking if $PKG_CONFIG recognizes NL" >&5
-echo $ECHO_N "checking if $PKG_CONFIG recognizes NL... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking if $PKG_CONFIG recognizes NL" >&5
+$as_echo_n "checking if $PKG_CONFIG recognizes NL... " >&6; }
if test "${cs_cv_prog_pkg_config_NL+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if $PKG_CONFIG --exists NL; then
cs_cv_prog_pkg_config_NL=yes
@@ -14220,21 +14927,21 @@
fi
fi
-{ echo "$as_me:$LINENO: result: $cs_cv_prog_pkg_config_NL" >&5
-echo "${ECHO_T}$cs_cv_prog_pkg_config_NL" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $cs_cv_prog_pkg_config_NL" >&5
+$as_echo "$cs_cv_prog_pkg_config_NL" >&6; }
if test $cs_cv_prog_pkg_config_NL = yes; then
if test -z "$cs_cv_prog_pkg_config_NL_flags"; then
- cs_check_lib_cflag=`{ (echo "$as_me:$LINENO: \$PKG_CONFIG --cflags NL") >&5
+ cs_check_lib_cflag=`{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --cflags NL") >&5
($PKG_CONFIG --cflags NL) 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } | tr '\\\\' '/' | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } | tr '\\\\' '/' | sed 's/ */ /g;s/^ //;s/ $//'`
cs_check_lib_lflag=''
- cs_check_lib_libs=`{ (echo "$as_me:$LINENO: \$PKG_CONFIG --libs NL") >&5
+ cs_check_lib_libs=`{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --libs NL") >&5
($PKG_CONFIG --libs NL) 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } | tr '\\\\' '/' | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } | tr '\\\\' '/' | sed 's/ */ /g;s/^ //;s/ $//'`
cs_cv_prog_pkg_config_NL_flags=`echo @$cs_check_lib_cflag@$cs_check_lib_lflag@$cs_check_lib_libs | sed 'y% %#%'`
fi
@@ -14251,107 +14958,101 @@
fi
if test -n "$ac_tool_prefix"; then
- for ac_prog in NL-config
- do
- # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_CONFIG_NL+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$CONFIG_NL"; then
- ac_cv_prog_CONFIG_NL="$CONFIG_NL" # Let the user override the test.
+ # Extract the first word of "${ac_tool_prefix}NL-config", so it can be a program name with args.
+set dummy ${ac_tool_prefix}NL-config; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_CONFIG_NL+set}" = set; then
+ $as_echo_n "(cached) " >&6
else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ case $CONFIG_NL in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_CONFIG_NL="$CONFIG_NL" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_CONFIG_NL="$ac_tool_prefix$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ ac_cv_path_CONFIG_NL="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
IFS=$as_save_IFS
+ ;;
+esac
fi
-fi
-CONFIG_NL=$ac_cv_prog_CONFIG_NL
+CONFIG_NL=$ac_cv_path_CONFIG_NL
if test -n "$CONFIG_NL"; then
- { echo "$as_me:$LINENO: result: $CONFIG_NL" >&5
-echo "${ECHO_T}$CONFIG_NL" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $CONFIG_NL" >&5
+$as_echo "$CONFIG_NL" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
- test -n "$CONFIG_NL" && break
- done
fi
-if test -z "$CONFIG_NL"; then
- ac_ct_CONFIG_NL=$CONFIG_NL
- for ac_prog in NL-config
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_CONFIG_NL+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+if test -z "$ac_cv_path_CONFIG_NL"; then
+ ac_pt_CONFIG_NL=$CONFIG_NL
+ # Extract the first word of "NL-config", so it can be a program name with args.
+set dummy NL-config; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_ac_pt_CONFIG_NL+set}" = set; then
+ $as_echo_n "(cached) " >&6
else
- if test -n "$ac_ct_CONFIG_NL"; then
- ac_cv_prog_ac_ct_CONFIG_NL="$ac_ct_CONFIG_NL" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ case $ac_pt_CONFIG_NL in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_ac_pt_CONFIG_NL="$ac_pt_CONFIG_NL" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_CONFIG_NL="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ ac_cv_path_ac_pt_CONFIG_NL="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
IFS=$as_save_IFS
+ ;;
+esac
fi
-fi
-ac_ct_CONFIG_NL=$ac_cv_prog_ac_ct_CONFIG_NL
-if test -n "$ac_ct_CONFIG_NL"; then
- { echo "$as_me:$LINENO: result: $ac_ct_CONFIG_NL" >&5
-echo "${ECHO_T}$ac_ct_CONFIG_NL" >&6; }
+ac_pt_CONFIG_NL=$ac_cv_path_ac_pt_CONFIG_NL
+if test -n "$ac_pt_CONFIG_NL"; then
+ { $as_echo "$as_me:$LINENO: result: $ac_pt_CONFIG_NL" >&5
+$as_echo "$ac_pt_CONFIG_NL" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
-
- test -n "$ac_ct_CONFIG_NL" && break
-done
-
- if test "x$ac_ct_CONFIG_NL" = x; then
+ if test "x$ac_pt_CONFIG_NL" = x; then
CONFIG_NL=""
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
- CONFIG_NL=$ac_ct_CONFIG_NL
+ CONFIG_NL=$ac_pt_CONFIG_NL
fi
+else
+ CONFIG_NL="$ac_cv_path_CONFIG_NL"
fi
if test -n "$CONFIG_NL"; then
@@ -14366,17 +15067,17 @@
if test $cs_cv_prog_config_NL_ok = yes; then
if test -z "$cs_cv_prog_config_NL_flags"; then
- cs_check_lib_cflag=`{ (echo "$as_me:$LINENO: \$CONFIG_NL --cflags ") >&5
+ cs_check_lib_cflag=`{ ($as_echo "$as_me:$LINENO: \$CONFIG_NL --cflags ") >&5
($CONFIG_NL --cflags ) 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } | tr '\\\\' '/' | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } | tr '\\\\' '/' | sed 's/ */ /g;s/^ //;s/ $//'`
cs_check_lib_lflag=''
- cs_check_lib_libs=`{ (echo "$as_me:$LINENO: \$CONFIG_NL --libs ") >&5
+ cs_check_lib_libs=`{ ($as_echo "$as_me:$LINENO: \$CONFIG_NL --libs ") >&5
($CONFIG_NL --libs ) 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } | tr '\\\\' '/' | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } | tr '\\\\' '/' | sed 's/ */ /g;s/^ //;s/ $//'`
cs_cv_prog_config_NL_flags=`echo @$cs_check_lib_cflag@$cs_check_lib_lflag@$cs_check_lib_libs | sed 'y% %#%'`
fi
@@ -14415,6 +15116,7 @@
shift
fi
+
if test $# -eq 0; then
cs_check_libdir=''
else
@@ -14427,6 +15129,7 @@
shift
fi
+
if test -n "$cs_check_incdir"; then
cs_check_lib_cflag="-I$cs_check_incdir"
else
@@ -14503,10 +15206,10 @@
if test "$cs_ignore_cache" != yes; then
- { echo "$as_me:$LINENO: checking for libNL" >&5
-echo $ECHO_N "checking for libNL... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for libNL" >&5
+$as_echo_n "checking for libNL... " >&6; }
if test "${cs_cv_libNL+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
@@ -14538,6 +15241,7 @@
shift
fi
+
if test $# -eq 0; then
cs_cflags_test=''
else
@@ -14549,6 +15253,7 @@
shift
fi
+
if test $# -eq 0; then
cs_lflags_test=''
else
@@ -14560,6 +15265,7 @@
shift
fi
+
if test $# -eq 0; then
cs_libs_test=''
else
@@ -14572,6 +15278,7 @@
shift
fi
+
cs_cflags_test=`echo $cs_cflags_test | sed 'y%#% %'`
cs_lflags_test=`echo $cs_lflags_test | sed 'y%#% %'`
cs_libs_test=`echo $cs_libs_test | sed 'y%#% %'`
@@ -14600,26 +15307,30 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
cs_build_ok=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
fi
+rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test $cs_build_ok = yes; then
@@ -14652,11 +15363,11 @@
fi
fi
-{ echo "$as_me:$LINENO: result: $cs_cv_libNL" >&5
-echo "${ECHO_T}$cs_cv_libNL" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $cs_cv_libNL" >&5
+$as_echo "$cs_cv_libNL" >&6; }
else
- { echo "$as_me:$LINENO: checking for libNL" >&5
-echo $ECHO_N "checking for libNL... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for libNL" >&5
+$as_echo_n "checking for libNL... " >&6; }
ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -14687,6 +15398,7 @@
shift
fi
+
if test $# -eq 0; then
cs_cflags_test=''
else
@@ -14698,6 +15410,7 @@
shift
fi
+
if test $# -eq 0; then
cs_lflags_test=''
else
@@ -14709,6 +15422,7 @@
shift
fi
+
if test $# -eq 0; then
cs_libs_test=''
else
@@ -14721,6 +15435,7 @@
shift
fi
+
cs_cflags_test=`echo $cs_cflags_test | sed 'y%#% %'`
cs_lflags_test=`echo $cs_lflags_test | sed 'y%#% %'`
cs_libs_test=`echo $cs_libs_test | sed 'y%#% %'`
@@ -14749,26 +15464,30 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
cs_build_ok=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
fi
+rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test $cs_build_ok = yes; then
@@ -14800,8 +15519,8 @@
cs_cv_libNL=no
fi
- { echo "$as_me:$LINENO: result: $cs_cv_libNL" >&5
-echo "${ECHO_T}$cs_cv_libNL" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $cs_cv_libNL" >&5
+$as_echo "$cs_cv_libNL" >&6; }
fi
if test $cs_cv_libNL = yes; then
@@ -14916,25 +15635,51 @@
# Split the DESIRED-VERSION into the major and minor version number
# components.
-cs_version_desired=1.4
+cs_version_desired=1.1
sed_expr_base='\([0-9][0-9]*\)\.\([0-9][0-9]*\).*'
cs_version_major=`echo $cs_version_desired | sed "s/$sed_expr_base/\1/"`
cs_version_minor=`echo $cs_version_desired | sed "s/$sed_expr_base/\2/"`
# Try to find an installed cs-config.
cs_path=''
+
if test -n "$CRYSTAL"; then
+ # On MinGW, CRYSTAL may contain the path in one of two flavors:
+ # MSYS paths, separated by $PATH_SEPARATOR, or Win32 paths, separated
+ # by ';'. Since for the configure check we need MSYS paths, CRYSTAL
+ # is first treated like a Win32-style list. If that yields sensible
+ # results these are used subsequently. Otherwise use CRYSTAL as-is.
+ case $host_os in
+ mingw*)
+ my_IFS=$IFS; IFS=\;
+ for win32_dir in $CRYSTAL; do
+ win32_dir=`echo "x$win32_dir" | tr '\\\\' '/' | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+ win32_dir=`echo $win32_dir | sed "s/\(.\):/\\/\\1/"`
+ if test -d "$win32_dir"; then
+ if test -n "$cs_path"; then
+ cs_path="$cs_path$PATH_SEPARATOR"
+fi
+
+ cs_path="$cs_path$win32_dir$PATH_SEPARATOR$win32_dir/bin"
+fi
+
+ done
+ IFS=$my_IFS
+ ;;
+ esac
+ if test -z "$cs_path"; then
my_IFS=$IFS; IFS=$PATH_SEPARATOR
- for cs_dir in $CRYSTAL; do
- if test -n "$cs_path"; then
+ for cs_dir in $CRYSTAL; do
+ if test -n "$cs_path"; then
cs_path="$cs_path$PATH_SEPARATOR"
fi
- cs_path="$cs_path$cs_dir$PATH_SEPARATOR$cs_dir/bin"
- done
- IFS=$my_IFS
+ cs_path="$cs_path$cs_dir$PATH_SEPARATOR$cs_dir/bin"
+ done
+ IFS=$my_IFS
fi
+fi
if test -n "$cs_path"; then
cs_path="$cs_path$PATH_SEPARATOR"
@@ -14995,10 +15740,10 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}cs-config-$test_version", so it can be a program name with args.
set dummy ${ac_tool_prefix}cs-config-$test_version; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_path_CRYSTAL_CONFIG_TOOL+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
case $CRYSTAL_CONFIG_TOOL in
[\\/]* | ?:[\\/]*)
@@ -15013,7 +15758,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_CRYSTAL_CONFIG_TOOL="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -15025,11 +15770,11 @@
fi
CRYSTAL_CONFIG_TOOL=$ac_cv_path_CRYSTAL_CONFIG_TOOL
if test -n "$CRYSTAL_CONFIG_TOOL"; then
- { echo "$as_me:$LINENO: result: $CRYSTAL_CONFIG_TOOL" >&5
-echo "${ECHO_T}$CRYSTAL_CONFIG_TOOL" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $CRYSTAL_CONFIG_TOOL" >&5
+$as_echo "$CRYSTAL_CONFIG_TOOL" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -15038,10 +15783,10 @@
ac_pt_CRYSTAL_CONFIG_TOOL=$CRYSTAL_CONFIG_TOOL
# Extract the first word of "cs-config-$test_version", so it can be a program name with args.
set dummy cs-config-$test_version; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_path_ac_pt_CRYSTAL_CONFIG_TOOL+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
case $ac_pt_CRYSTAL_CONFIG_TOOL in
[\\/]* | ?:[\\/]*)
@@ -15056,7 +15801,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_ac_pt_CRYSTAL_CONFIG_TOOL="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -15068,11 +15813,11 @@
fi
ac_pt_CRYSTAL_CONFIG_TOOL=$ac_cv_path_ac_pt_CRYSTAL_CONFIG_TOOL
if test -n "$ac_pt_CRYSTAL_CONFIG_TOOL"; then
- { echo "$as_me:$LINENO: result: $ac_pt_CRYSTAL_CONFIG_TOOL" >&5
-echo "${ECHO_T}$ac_pt_CRYSTAL_CONFIG_TOOL" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_pt_CRYSTAL_CONFIG_TOOL" >&5
+$as_echo "$ac_pt_CRYSTAL_CONFIG_TOOL" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
if test "x$ac_pt_CRYSTAL_CONFIG_TOOL" = x; then
@@ -15080,12 +15825,8 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
CRYSTAL_CONFIG_TOOL=$ac_pt_CRYSTAL_CONFIG_TOOL
@@ -15104,10 +15845,10 @@
if test -n "$ac_tool_prefix"; then
# Extract the first word of "${ac_tool_prefix}cs-config", so it can be a program name with args.
set dummy ${ac_tool_prefix}cs-config; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_path_CRYSTAL_CONFIG_TOOL+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
case $CRYSTAL_CONFIG_TOOL in
[\\/]* | ?:[\\/]*)
@@ -15122,7 +15863,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_CRYSTAL_CONFIG_TOOL="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -15134,11 +15875,11 @@
fi
CRYSTAL_CONFIG_TOOL=$ac_cv_path_CRYSTAL_CONFIG_TOOL
if test -n "$CRYSTAL_CONFIG_TOOL"; then
- { echo "$as_me:$LINENO: result: $CRYSTAL_CONFIG_TOOL" >&5
-echo "${ECHO_T}$CRYSTAL_CONFIG_TOOL" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $CRYSTAL_CONFIG_TOOL" >&5
+$as_echo "$CRYSTAL_CONFIG_TOOL" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -15147,10 +15888,10 @@
ac_pt_CRYSTAL_CONFIG_TOOL=$CRYSTAL_CONFIG_TOOL
# Extract the first word of "cs-config", so it can be a program name with args.
set dummy cs-config; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_path_ac_pt_CRYSTAL_CONFIG_TOOL+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
case $ac_pt_CRYSTAL_CONFIG_TOOL in
[\\/]* | ?:[\\/]*)
@@ -15165,7 +15906,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_ac_pt_CRYSTAL_CONFIG_TOOL="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -15177,11 +15918,11 @@
fi
ac_pt_CRYSTAL_CONFIG_TOOL=$ac_cv_path_ac_pt_CRYSTAL_CONFIG_TOOL
if test -n "$ac_pt_CRYSTAL_CONFIG_TOOL"; then
- { echo "$as_me:$LINENO: result: $ac_pt_CRYSTAL_CONFIG_TOOL" >&5
-echo "${ECHO_T}$ac_pt_CRYSTAL_CONFIG_TOOL" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_pt_CRYSTAL_CONFIG_TOOL" >&5
+$as_echo "$ac_pt_CRYSTAL_CONFIG_TOOL" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
if test "x$ac_pt_CRYSTAL_CONFIG_TOOL" = x; then
@@ -15189,12 +15930,8 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
CRYSTAL_CONFIG_TOOL=$ac_pt_CRYSTAL_CONFIG_TOOL
@@ -15211,10 +15948,10 @@
# Still do cs-config version check - this one will also take the release
# component into account. Also needed for legacy cs-config.
- { echo "$as_me:$LINENO: checking if Crystal Space version >= 1.4" >&5
-echo $ECHO_N "checking if Crystal Space version >= 1.4... $ECHO_C" >&6; }
-if test "${cs_cv_prog_Crystal_Space_version_m4_default__1_4___cs_min_version_default___ok_annotated+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ { $as_echo "$as_me:$LINENO: checking if Crystal Space version >= 1.1" >&5
+$as_echo_n "checking if Crystal Space version >= 1.1... " >&6; }
+if test "${cs_cv_prog_Crystal_Space_version_m4_default_1_1_cs_min_version_default__ok_annotated+set}" = set; then
+ $as_echo_n "(cached) " >&6
else
cs_prog_Crystal_Space_is_version=
cs_prog_Crystal_Space_min_version=
@@ -15226,10 +15963,10 @@
-test -z $cs_prog_Crystal_Space_is_version && cs_prog_Crystal_Space_is_version=`$cfg --version | sed '/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*/\1/;q'`
+test -z $cs_prog_Crystal_Space_is_version && cs_prog_Crystal_Space_is_version=`"$cfg" --version | sed '/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*/\1/;q'`
test -n "$cs_prog_Crystal_Space_is_version" && test -z $cs_prog_Crystal_Space_is_suffix_done && { cs_prog_Crystal_Space_is_suffix_done=yes ; cs_prog_Crystal_Space_is_suffix= ; }
-test -z $cs_prog_Crystal_Space_is_version && cs_prog_Crystal_Space_is_version=`$cfg --version | sed '/[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\.[0-9][0-9]*\).*/\1/;q'`
+test -z $cs_prog_Crystal_Space_is_version && cs_prog_Crystal_Space_is_version=`"$cfg" --version | sed '/[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\.[0-9][0-9]*\).*/\1/;q'`
test -n "$cs_prog_Crystal_Space_is_version" && test -z $cs_prog_Crystal_Space_is_suffix_done && { cs_prog_Crystal_Space_is_suffix_done=yes ; cs_prog_Crystal_Space_is_suffix=.0 ; }
@@ -15237,10 +15974,10 @@
-test -z $cs_prog_Crystal_Space_min_version && cs_prog_Crystal_Space_min_version=`echo 1.4 | sed '/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*/\1/;q'`
+test -z $cs_prog_Crystal_Space_min_version && cs_prog_Crystal_Space_min_version=`echo 1.1 | sed '/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*/\1/;q'`
test -n "$cs_prog_Crystal_Space_min_version" && test -z $cs_prog_Crystal_Space_min_suffix_done && { cs_prog_Crystal_Space_min_suffix_done=yes ; cs_prog_Crystal_Space_min_suffix= ; }
-test -z $cs_prog_Crystal_Space_min_version && cs_prog_Crystal_Space_min_version=`echo 1.4 | sed '/[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\.[0-9][0-9]*\).*/\1/;q'`
+test -z $cs_prog_Crystal_Space_min_version && cs_prog_Crystal_Space_min_version=`echo 1.1 | sed '/[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\.[0-9][0-9]*\).*/\1/;q'`
test -n "$cs_prog_Crystal_Space_min_version" && test -z $cs_prog_Crystal_Space_min_suffix_done && { cs_prog_Crystal_Space_min_suffix_done=yes ; cs_prog_Crystal_Space_min_suffix=.0 ; }
@@ -15252,39 +15989,39 @@
cs_prog_Crystal_Space_min_ver_2=`echo $cs_prog_Crystal_Space_min_version${cs_prog_Crystal_Space_min_suffix} | sed '/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*/\2/'`
cs_prog_Crystal_Space_min_ver_3=`echo $cs_prog_Crystal_Space_min_version${cs_prog_Crystal_Space_min_suffix} | sed '/[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*/!d;s/.*\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*/\3/'`
-cs_cv_prog_Crystal_Space_version_m4_default__1_4___cs_min_version_default___ok=''
-test -z "$cs_cv_prog_Crystal_Space_version_m4_default__1_4___cs_min_version_default___ok" \
+cs_cv_prog_Crystal_Space_version_m4_default_1_1_cs_min_version_default__ok=''
+test -z "$cs_cv_prog_Crystal_Space_version_m4_default_1_1_cs_min_version_default__ok" \
&& { expr "$cs_prog_Crystal_Space_is_ver_1" ">=" "$cs_prog_Crystal_Space_min_ver_1" >/dev/null \
- || cs_cv_prog_Crystal_Space_version_m4_default__1_4___cs_min_version_default___ok=no ; }
-test -z "$cs_cv_prog_Crystal_Space_version_m4_default__1_4___cs_min_version_default___ok" \
+ || cs_cv_prog_Crystal_Space_version_m4_default_1_1_cs_min_version_default__ok=no ; }
+test -z "$cs_cv_prog_Crystal_Space_version_m4_default_1_1_cs_min_version_default__ok" \
&& { expr "$cs_prog_Crystal_Space_min_ver_1" ">=" "$cs_prog_Crystal_Space_is_ver_1" >/dev/null \
- || cs_cv_prog_Crystal_Space_version_m4_default__1_4___cs_min_version_default___ok=yes ; }
-test -z "$cs_cv_prog_Crystal_Space_version_m4_default__1_4___cs_min_version_default___ok" \
+ || cs_cv_prog_Crystal_Space_version_m4_default_1_1_cs_min_version_default__ok=yes ; }
+test -z "$cs_cv_prog_Crystal_Space_version_m4_default_1_1_cs_min_version_default__ok" \
&& { expr "$cs_prog_Crystal_Space_is_ver_2" ">=" "$cs_prog_Crystal_Space_min_ver_2" >/dev/null \
- || cs_cv_prog_Crystal_Space_version_m4_default__1_4___cs_min_version_default___ok=no ; }
-test -z "$cs_cv_prog_Crystal_Space_version_m4_default__1_4___cs_min_version_default___ok" \
+ || cs_cv_prog_Crystal_Space_version_m4_default_1_1_cs_min_version_default__ok=no ; }
+test -z "$cs_cv_prog_Crystal_Space_version_m4_default_1_1_cs_min_version_default__ok" \
&& { expr "$cs_prog_Crystal_Space_min_ver_2" ">=" "$cs_prog_Crystal_Space_is_ver_2" >/dev/null \
- || cs_cv_prog_Crystal_Space_version_m4_default__1_4___cs_min_version_default___ok=yes ; }
-test -z "$cs_cv_prog_Crystal_Space_version_m4_default__1_4___cs_min_version_default___ok" \
+ || cs_cv_prog_Crystal_Space_version_m4_default_1_1_cs_min_version_default__ok=yes ; }
+test -z "$cs_cv_prog_Crystal_Space_version_m4_default_1_1_cs_min_version_default__ok" \
&& { expr "$cs_prog_Crystal_Space_is_ver_3" ">=" "$cs_prog_Crystal_Space_min_ver_3" >/dev/null \
- || cs_cv_prog_Crystal_Space_version_m4_default__1_4___cs_min_version_default___ok=no ; }
-test -z "$cs_cv_prog_Crystal_Space_version_m4_default__1_4___cs_min_version_default___ok" \
+ || cs_cv_prog_Crystal_Space_version_m4_default_1_1_cs_min_version_default__ok=no ; }
+test -z "$cs_cv_prog_Crystal_Space_version_m4_default_1_1_cs_min_version_default__ok" \
&& { expr "$cs_prog_Crystal_Space_min_ver_3" ">=" "$cs_prog_Crystal_Space_is_ver_3" >/dev/null \
- || cs_cv_prog_Crystal_Space_version_m4_default__1_4___cs_min_version_default___ok=yes ; }
+ || cs_cv_prog_Crystal_Space_version_m4_default_1_1_cs_min_version_default__ok=yes ; }
-if test -z "$cs_cv_prog_Crystal_Space_version_m4_default__1_4___cs_min_version_default___ok"; then
- cs_cv_prog_Crystal_Space_version_m4_default__1_4___cs_min_version_default___ok=yes
+if test -z "$cs_cv_prog_Crystal_Space_version_m4_default_1_1_cs_min_version_default__ok"; then
+ cs_cv_prog_Crystal_Space_version_m4_default_1_1_cs_min_version_default__ok=yes
fi
-if test "$cs_cv_prog_Crystal_Space_version_m4_default__1_4___cs_min_version_default___ok" = yes; then
+if test "$cs_cv_prog_Crystal_Space_version_m4_default_1_1_cs_min_version_default__ok" = yes; then
cs_prog_Crystal_Space_version_ok=yes
else
cs_prog_Crystal_Space_version_ok=no
fi
-cs_cv_prog_Crystal_Space_version_m4_default__1_4___cs_min_version_default___ok_annotated="$cs_cv_prog_Crystal_Space_version_m4_default__1_4___cs_min_version_default___ok"
+cs_cv_prog_Crystal_Space_version_m4_default_1_1_cs_min_version_default__ok_annotated="$cs_cv_prog_Crystal_Space_version_m4_default_1_1_cs_min_version_default__ok"
if test -n "$cs_prog_Crystal_Space_is_version"; then
- cs_cv_prog_Crystal_Space_version_m4_default__1_4___cs_min_version_default___ok_annotated="$cs_cv_prog_Crystal_Space_version_m4_default__1_4___cs_min_version_default___ok_annotated (version $cs_prog_Crystal_Space_is_version)"
+ cs_cv_prog_Crystal_Space_version_m4_default_1_1_cs_min_version_default__ok_annotated="$cs_cv_prog_Crystal_Space_version_m4_default_1_1_cs_min_version_default__ok_annotated (version $cs_prog_Crystal_Space_is_version)"
cs_prog_Crystal_Space_version="$cs_prog_Crystal_Space_is_version"
else
cs_prog_Crystal_Space_version=''
@@ -15292,9 +16029,9 @@
fi
-{ echo "$as_me:$LINENO: result: $cs_cv_prog_Crystal_Space_version_m4_default__1_4___cs_min_version_default___ok_annotated" >&5
-echo "${ECHO_T}$cs_cv_prog_Crystal_Space_version_m4_default__1_4___cs_min_version_default___ok_annotated" >&6; }
-if test "$cs_cv_prog_Crystal_Space_version_m4_default__1_4___cs_min_version_default___ok" = yes; then
+{ $as_echo "$as_me:$LINENO: result: $cs_cv_prog_Crystal_Space_version_m4_default_1_1_cs_min_version_default__ok_annotated" >&5
+$as_echo "$cs_cv_prog_Crystal_Space_version_m4_default_1_1_cs_min_version_default__ok_annotated" >&6; }
+if test "$cs_cv_prog_Crystal_Space_version_m4_default_1_1_cs_min_version_default__ok" = yes; then
cs_sdk=yes
else
cs_sdk=no
@@ -15305,28 +16042,43 @@
cs_liblist="crystalspace"
cs_optlibs=`echo x$cs_opt_libs | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
if test -n "$cs_optlibs"; then
- cs_optlibs=`$cfg --available-libs $cs_optlibs`
+ cs_optlibs=`"$cfg" --available-libs $cs_optlibs`
cs_liblist="$cs_liblist $cs_optlibs"
fi
- CRYSTAL_VERSION=`$cfg --version $cs_liblist`
- CRYSTAL_CFLAGS=`{ (echo "$as_me:$LINENO: \$cfg --cxxflags \$cs_liblist") >&5
- ($cfg --cxxflags $cs_liblist) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } | tr '\\\\' '/' | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
- CRYSTAL_LIBS=`{ (echo "$as_me:$LINENO: \$cfg --libs \$cs_liblist") >&5
- ($cfg --libs $cs_liblist) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } | tr '\\\\' '/' | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
- CRYSTAL_INCLUDE_DIR=`{ (echo "$as_me:$LINENO: \$cfg --includedir \$cs_liblist") >&5
- ($cfg --includedir $cs_liblist) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } | tr '\\\\' '/' | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
- CRYSTAL_AVAILABLE_LIBS=`$cfg --available-libs`
- CRYSTAL_STATICDEPS=`$cfg --static-deps`
+ CRYSTAL_VERSION=`"$cfg" --version $cs_liblist`
+ CRYSTAL_CFLAGS=`{ ($as_echo "$as_me:$LINENO: \"\$cfg\" --cxxflags \$cs_liblist") >&5
+ ("$cfg" --cxxflags $cs_liblist) 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } | tr '\\\\' '/' | sed 's/ */ /g;s/^ //;s/ $//'`
+ CRYSTAL_LIBS=`{ ($as_echo "$as_me:$LINENO: \"\$cfg\" --libs \$cs_liblist") >&5
+ ("$cfg" --libs $cs_liblist) 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } | tr '\\\\' '/' | sed 's/ */ /g;s/^ //;s/ $//'`
+ CRYSTAL_INCLUDE_DIR=`{ ($as_echo "$as_me:$LINENO: \"\$cfg\" --includedir \$cs_liblist") >&5
+ ("$cfg" --includedir $cs_liblist) 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } | tr '\\\\' '/' | sed 's/ */ /g;s/^ //;s/ $//'`
+ CRYSTAL_AVAILABLE_LIBS=`"$cfg" --available-libs`
+ CRYSTAL_STATICDEPS=`"$cfg" --static-deps`
+ CRYSTAL_PREFIX=`{ ($as_echo "$as_me:$LINENO: \"\$cfg\" --prefix") >&5
+ ("$cfg" --prefix) 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } | tr '\\\\' '/' | sed 's/ */ /g;s/^ //;s/ $//'`
+ CRYSTAL_EXEC_PREFIX=`{ ($as_echo "$as_me:$LINENO: \"\$cfg\" --exec-prefix") >&5
+ ("$cfg" --exec-prefix) 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } | tr '\\\\' '/' | sed 's/ */ /g;s/^ //;s/ $//'`
+ CRYSTAL_TOOLS_PREFIX=`{ ($as_echo "$as_me:$LINENO: \"\$cfg\" --tools-prefix") >&5
+ ("$cfg" --tools-prefix) 2>&5
+ ac_status=$?
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } | tr '\\\\' '/' | sed 's/ */ /g;s/^ //;s/ $//'`
if test -z "$CRYSTAL_LIBS"; then
cs_sdk=no
fi
@@ -15340,10 +16092,10 @@
if test "$cs_sdk" = yes && test "$enable_cstest" = yes; then
if test "" != yes; then
- { echo "$as_me:$LINENO: checking if Crystal Space SDK is usable" >&5
-echo $ECHO_N "checking if Crystal Space SDK is usable... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking if Crystal Space SDK is usable" >&5
+$as_echo_n "checking if Crystal Space SDK is usable... " >&6; }
if test "${cs_cv_crystal_sdk+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
@@ -15375,6 +16127,7 @@
shift
fi
+
if test $# -eq 0; then
cs_cflags_test=''
else
@@ -15386,6 +16139,7 @@
shift
fi
+
if test $# -eq 0; then
cs_lflags_test=''
else
@@ -15397,6 +16151,7 @@
shift
fi
+
if test $# -eq 0; then
cs_libs_test=''
else
@@ -15409,6 +16164,7 @@
shift
fi
+
cs_cflags_test=`echo $cs_cflags_test | sed 'y%#% %'`
cs_lflags_test=`echo $cs_lflags_test | sed 'y%#% %'`
cs_libs_test=`echo $cs_libs_test | sed 'y%#% %'`
@@ -15439,26 +16195,30 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
cs_build_ok=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
fi
+rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test $cs_build_ok = yes; then
@@ -15491,11 +16251,11 @@
fi
fi
-{ echo "$as_me:$LINENO: result: $cs_cv_crystal_sdk" >&5
-echo "${ECHO_T}$cs_cv_crystal_sdk" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $cs_cv_crystal_sdk" >&5
+$as_echo "$cs_cv_crystal_sdk" >&6; }
else
- { echo "$as_me:$LINENO: checking if Crystal Space SDK is usable" >&5
-echo $ECHO_N "checking if Crystal Space SDK is usable... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking if Crystal Space SDK is usable" >&5
+$as_echo_n "checking if Crystal Space SDK is usable... " >&6; }
ac_ext=cpp
ac_cpp='$CXXCPP $CPPFLAGS'
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -15526,6 +16286,7 @@
shift
fi
+
if test $# -eq 0; then
cs_cflags_test=''
else
@@ -15537,6 +16298,7 @@
shift
fi
+
if test $# -eq 0; then
cs_lflags_test=''
else
@@ -15548,6 +16310,7 @@
shift
fi
+
if test $# -eq 0; then
cs_libs_test=''
else
@@ -15560,6 +16323,7 @@
shift
fi
+
cs_cflags_test=`echo $cs_cflags_test | sed 'y%#% %'`
cs_lflags_test=`echo $cs_lflags_test | sed 'y%#% %'`
cs_libs_test=`echo $cs_libs_test | sed 'y%#% %'`
@@ -15590,26 +16354,30 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_cxx_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
cs_build_ok=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
fi
+rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test $cs_build_ok = yes; then
@@ -15641,8 +16409,8 @@
cs_cv_crystal_sdk=no
fi
- { echo "$as_me:$LINENO: result: $cs_cv_crystal_sdk" >&5
-echo "${ECHO_T}$cs_cv_crystal_sdk" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $cs_cv_crystal_sdk" >&5
+$as_echo "$cs_cv_crystal_sdk" >&6; }
fi
if test $cs_cv_crystal_sdk = yes; then
@@ -15666,13 +16434,16 @@
CRYSTAL_VERSION=''
CRYSTAL_LIBS=''
CRYSTAL_INCLUDE_DIR=''
- { { echo "$as_me:$LINENO: error:
+ CRYSTAL_PREFIX=''
+ CRYSTAL_EXEC_PREFIX=''
+ CRYSTAL_TOOLS_PREFIX=''
+ { { $as_echo "$as_me:$LINENO: error:
*** Crystal Space could not be found or was unusable. The latest version is
*** always available from http://www.crystalspace3d.org/
*** Also, be sure that you have either installed Crystal Space or set the
*** CRYSTAL environment variable properly.
" >&5
-echo "$as_me: error:
+$as_echo "$as_me: error:
*** Crystal Space could not be found or was unusable. The latest version is
*** always available from http://www.crystalspace3d.org/
*** Also, be sure that you have either installed Crystal Space or set the
@@ -15731,6 +16502,20 @@
"
fi
+cs_build_prop_val="$CRYSTAL_EXEC_PREFIX"
+ cs_build_prop_val=`echo x$cs_build_prop_val | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+ if test -n "$cs_build_prop_val"; then
+ cs_jamconfig_text="${cs_jamconfig_text}CRYSTAL.EXEC_PREFIX ?= $cs_build_prop_val ;
+"
+fi
+
+cs_build_prop_val="$CRYSTAL_TOOLS_PREFIX"
+ cs_build_prop_val=`echo x$cs_build_prop_val | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+ if test -n "$cs_build_prop_val"; then
+ cs_jamconfig_text="${cs_jamconfig_text}CRYSTAL.TOOLS_PREFIX ?= $cs_build_prop_val ;
+"
+fi
+
fi
@@ -15740,8 +16525,8 @@
# Check if the Crystal Space static plugins lib was built.
#----------------------------------------------------------------------------
if test $with_cs != no; then
- { echo "$as_me:$LINENO: checking for Crystal Space static plugins" >&5
-echo $ECHO_N "checking for Crystal Space static plugins... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for Crystal Space static plugins" >&5
+$as_echo_n "checking for Crystal Space static plugins... " >&6; }
cel_have_crystal_static=no
for m in $CRYSTAL_AVAILABLE_LIBS; do
if test crystalspace_staticplugins = "$m"; then
@@ -15750,8 +16535,8 @@
fi
done
- { echo "$as_me:$LINENO: result: $cel_have_crystal_static" >&5
-echo "${ECHO_T}$cel_have_crystal_static" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $cel_have_crystal_static" >&5
+$as_echo "$cel_have_crystal_static" >&6; }
cs_build_prop_val="$cel_have_crystal_static"
cs_build_prop_val=`echo x$cs_build_prop_val | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
if test -n "$cs_build_prop_val"; then
@@ -15764,6 +16549,137 @@
#------------------------------------------------------------------------------
+# Check for relaytool. (After CS check so we can use the version
+# shipped with CS.)
+#------------------------------------------------------------------------------
+# Check whether --enable-relaytool was given.
+if test "${enable_relaytool+set}" = set; then
+ enableval=$enable_relaytool;
+fi
+
+ if test -z "$enable_relaytool"; then
+ enable_relaytool=yes
+fi
+
+ if test "$enable_relaytool" != "no"; then
+
+ if test "$cs_prog_path_prepared" != yes; then
+ cs_prog_path_prepared=yes
+ PATH="$PATH$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin$PATH_SEPARATOR${srcdir}/bin"
+ export PATH
+fi
+
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}relaytool", so it can be a program name with args.
+set dummy ${ac_tool_prefix}relaytool; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_RELAYTOOL+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ case $RELAYTOOL in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_RELAYTOOL="$RELAYTOOL" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $CRYSTAL_TOOLS_PREFIX/bin$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin$PATH_SEPARATOR${srcdir}/bin
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_RELAYTOOL="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+RELAYTOOL=$ac_cv_path_RELAYTOOL
+if test -n "$RELAYTOOL"; then
+ { $as_echo "$as_me:$LINENO: result: $RELAYTOOL" >&5
+$as_echo "$RELAYTOOL" >&6; }
+else
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_path_RELAYTOOL"; then
+ ac_pt_RELAYTOOL=$RELAYTOOL
+ # Extract the first word of "relaytool", so it can be a program name with args.
+set dummy relaytool; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_ac_pt_RELAYTOOL+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ case $ac_pt_RELAYTOOL in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_ac_pt_RELAYTOOL="$ac_pt_RELAYTOOL" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $CRYSTAL_TOOLS_PREFIX/bin$PATH_SEPARATOR/usr/local/bin$PATH_SEPARATOR/sw/bin$PATH_SEPARATOR${srcdir}/bin
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_ac_pt_RELAYTOOL="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+ac_pt_RELAYTOOL=$ac_cv_path_ac_pt_RELAYTOOL
+if test -n "$ac_pt_RELAYTOOL"; then
+ { $as_echo "$as_me:$LINENO: result: $ac_pt_RELAYTOOL" >&5
+$as_echo "$ac_pt_RELAYTOOL" >&6; }
+else
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+ if test "x$ac_pt_RELAYTOOL" = x; then
+ RELAYTOOL=""
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+ RELAYTOOL=$ac_pt_RELAYTOOL
+ fi
+else
+ RELAYTOOL="$ac_cv_path_RELAYTOOL"
+fi
+
+ cs_build_prop_val="$RELAYTOOL"
+ cs_build_prop_val=`echo x$cs_build_prop_val | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+ if test -n "$cs_build_prop_val"; then
+ cs_jamconfig_text="${cs_jamconfig_text}CMD.RELAYTOOL ?= $cs_build_prop_val ;
+"
+fi
+
+fi
+
+
+
+
+#------------------------------------------------------------------------------
# Determine if plugin meta-information should be embedded directly into plugin
# modules or if it should exist in stand-alone .csplugin files.
#------------------------------------------------------------------------------
@@ -15772,15 +16688,15 @@
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
+$as_echo_n "checking how to run the C preprocessor... " >&6; }
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
fi
if test -z "$CPP"; then
if test "${ac_cv_prog_CPP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
# Double quotes because CPP needs to be expanded
for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
@@ -15812,20 +16728,21 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null && {
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
test ! -s conftest.err
}; then
:
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
# Broken: fails on valid input.
@@ -15849,13 +16766,14 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null && {
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
test ! -s conftest.err
@@ -15863,7 +16781,7 @@
# Broken: success on invalid input.
continue
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
# Passes both tests.
@@ -15888,8 +16806,8 @@
else
ac_cv_prog_CPP=$CPP
fi
-{ echo "$as_me:$LINENO: result: $CPP" >&5
-echo "${ECHO_T}$CPP" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $CPP" >&5
+$as_echo "$CPP" >&6; }
ac_preproc_ok=false
for ac_c_preproc_warn_flag in '' yes
do
@@ -15917,20 +16835,21 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null && {
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
test ! -s conftest.err
}; then
:
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
# Broken: fails on valid input.
@@ -15954,13 +16873,14 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null && {
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
test ! -s conftest.err
@@ -15968,7 +16888,7 @@
# Broken: success on invalid input.
continue
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
# Passes both tests.
@@ -15984,11 +16904,13 @@
if $ac_preproc_ok; then
:
else
- { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
+ { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+{ { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
See \`config.log' for more details." >&5
-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
+$as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
See \`config.log' for more details." >&2;}
- { (exit 1); exit 1; }; }
+ { (exit 1); exit 1; }; }; }
fi
ac_ext=c
@@ -15998,42 +16920,37 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
-echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
-if test "${ac_cv_path_GREP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- # Extract the first word of "grep ggrep" to use in msg output
-if test -z "$GREP"; then
-set dummy grep ggrep; ac_prog_name=$2
+{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
+$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
if test "${ac_cv_path_GREP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
+ if test -z "$GREP"; then
ac_path_GREP_found=false
-# Loop through the user's path and test for each of PROGNAME-LIST
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ # Loop through the user's path and test for each of PROGNAME-LIST
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_prog in grep ggrep; do
- for ac_exec_ext in '' $ac_executable_extensions; do
- ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
- # Check for GNU ac_path_GREP and select it if it is found.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
+ { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+# Check for GNU ac_path_GREP and select it if it is found.
# Check for GNU $ac_path_GREP
case `"$ac_path_GREP" --version 2>&1` in
*GNU*)
ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
*)
ac_count=0
- echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+ $as_echo_n 0123456789 >"conftest.in"
while :
do
cat "conftest.in" "conftest.in" >"conftest.tmp"
mv "conftest.tmp" "conftest.in"
cp "conftest.in" "conftest.nl"
- echo 'GREP' >> "conftest.nl"
+ $as_echo 'GREP' >> "conftest.nl"
"$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
ac_count=`expr $ac_count + 1`
@@ -16048,74 +16965,60 @@
rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
esac
-
- $ac_path_GREP_found && break 3
+ $ac_path_GREP_found && break 3
+ done
done
done
-
-done
IFS=$as_save_IFS
-
-
-fi
-
-GREP="$ac_cv_path_GREP"
-if test -z "$GREP"; then
- { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+ if test -z "$ac_cv_path_GREP"; then
+ { { $as_echo "$as_me:$LINENO: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+$as_echo "$as_me: error: no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
{ (exit 1); exit 1; }; }
-fi
-
+ fi
else
ac_cv_path_GREP=$GREP
fi
-
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
-echo "${ECHO_T}$ac_cv_path_GREP" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5
+$as_echo "$ac_cv_path_GREP" >&6; }
GREP="$ac_cv_path_GREP"
-{ echo "$as_me:$LINENO: checking for egrep" >&5
-echo $ECHO_N "checking for egrep... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for egrep" >&5
+$as_echo_n "checking for egrep... " >&6; }
if test "${ac_cv_path_EGREP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
then ac_cv_path_EGREP="$GREP -E"
else
- # Extract the first word of "egrep" to use in msg output
-if test -z "$EGREP"; then
-set dummy egrep; ac_prog_name=$2
-if test "${ac_cv_path_EGREP+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
+ if test -z "$EGREP"; then
ac_path_EGREP_found=false
-# Loop through the user's path and test for each of PROGNAME-LIST
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ # Loop through the user's path and test for each of PROGNAME-LIST
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_prog in egrep; do
- for ac_exec_ext in '' $ac_executable_extensions; do
- ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
- # Check for GNU ac_path_EGREP and select it if it is found.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
+ { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+# Check for GNU ac_path_EGREP and select it if it is found.
# Check for GNU $ac_path_EGREP
case `"$ac_path_EGREP" --version 2>&1` in
*GNU*)
ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
*)
ac_count=0
- echo $ECHO_N "0123456789$ECHO_C" >"conftest.in"
+ $as_echo_n 0123456789 >"conftest.in"
while :
do
cat "conftest.in" "conftest.in" >"conftest.tmp"
mv "conftest.tmp" "conftest.in"
cp "conftest.in" "conftest.nl"
- echo 'EGREP' >> "conftest.nl"
+ $as_echo 'EGREP' >> "conftest.nl"
"$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
ac_count=`expr $ac_count + 1`
@@ -16130,40 +17033,31 @@
rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
esac
-
- $ac_path_EGREP_found && break 3
+ $ac_path_EGREP_found && break 3
+ done
done
done
-
-done
IFS=$as_save_IFS
-
-
-fi
-
-EGREP="$ac_cv_path_EGREP"
-if test -z "$EGREP"; then
- { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
-echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
+ if test -z "$ac_cv_path_EGREP"; then
+ { { $as_echo "$as_me:$LINENO: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5
+$as_echo "$as_me: error: no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;}
{ (exit 1); exit 1; }; }
-fi
-
+ fi
else
ac_cv_path_EGREP=$EGREP
fi
-
fi
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
-echo "${ECHO_T}$ac_cv_path_EGREP" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5
+$as_echo "$ac_cv_path_EGREP" >&6; }
EGREP="$ac_cv_path_EGREP"
-{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for ANSI C header files" >&5
+$as_echo_n "checking for ANSI C header files... " >&6; }
if test "${ac_cv_header_stdc+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -16190,20 +17084,21 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_cv_header_stdc=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_header_stdc=no
@@ -16295,37 +17190,40 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
{ (case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_try") 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
- echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: program exited with status $ac_status" >&5
+$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
ac_cv_header_stdc=no
fi
+rm -rf conftest.dSYM
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
fi
fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
+$as_echo "$ac_cv_header_stdc" >&6; }
if test $ac_cv_header_stdc = yes; then
cat >>confdefs.h <<\_ACEOF
@@ -16347,11 +17245,11 @@
for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
inttypes.h stdint.h unistd.h
do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
@@ -16369,20 +17267,21 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
eval "$as_ac_Header=yes"
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
eval "$as_ac_Header=no"
@@ -16390,12 +17289,15 @@
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
+as_val=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ if test "x$as_val" = x""yes; then
cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
fi
@@ -16408,20 +17310,21 @@
for ac_header in elf.h
do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- { echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
else
# Is the header compilable?
-{ echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header usability" >&5
+$as_echo_n "checking $ac_header usability... " >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -16437,32 +17340,33 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_compile") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest.$ac_objext; then
ac_header_compiler=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_header_compiler=no
fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+$as_echo "$ac_header_compiler" >&6; }
# Is the header present?
-{ echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking $ac_header presence" >&5
+$as_echo_n "checking $ac_header presence... " >&6; }
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -16476,51 +17380,52 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } >/dev/null && {
test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
test ! -s conftest.err
}; then
ac_header_preproc=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_header_preproc=no
fi
rm -f conftest.err conftest.$ac_ext
-{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+$as_echo "$ac_header_preproc" >&6; }
# So? What about this header?
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
yes:no: )
- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
+$as_echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
ac_header_preproc=yes
;;
no:yes:* )
- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
+$as_echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
+$as_echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
+$as_echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
+$as_echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
+$as_echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
+$as_echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
( cat <<\_ASBOX
## --------------------------------------------- ##
## Report this to cel-main@lists.sourceforge.net ##
@@ -16529,21 +17434,24 @@
) | sed "s/^/$as_me: WARNING: /" >&2
;;
esac
-{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_header" >&5
+$as_echo_n "checking for $ac_header... " >&6; }
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
eval "$as_ac_Header=\$ac_header_preproc"
fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
- { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
+ac_res=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
+$as_echo "$ac_res" >&6; }
fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
+as_val=`eval 'as_val=${'$as_ac_Header'}
+ $as_echo "$as_val"'`
+ if test "x$as_val" = x""yes; then
cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
_ACEOF
cs_header_elf_h=yes
else
@@ -16552,8 +17460,8 @@
done
- { echo "$as_me:$LINENO: checking whether to embed plugin meta-information" >&5
-echo $ECHO_N "checking whether to embed plugin meta-information... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking whether to embed plugin meta-information" >&5
+$as_echo_n "checking whether to embed plugin meta-information... " >&6; }
case $cs_host_target in
unix) if test $cs_header_elf_h = yes; then
cs_embed_meta_info_default=yes
@@ -16570,8 +17478,8 @@
enable_meta_info_embedding=$cs_embed_meta_info_default
fi
- { echo "$as_me:$LINENO: result: $enable_meta_info_embedding" >&5
-echo "${ECHO_T}$enable_meta_info_embedding" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $enable_meta_info_embedding" >&5
+$as_echo "$enable_meta_info_embedding" >&6; }
cs_build_prop_val="$enable_meta_info_embedding"
cs_build_prop_val=`echo x$cs_build_prop_val | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
if test -n "$cs_build_prop_val"; then
@@ -16592,10 +17500,10 @@
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_WINDRES+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$WINDRES"; then
ac_cv_prog_WINDRES="$WINDRES" # Let the user override the test.
@@ -16608,7 +17516,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_WINDRES="$ac_tool_prefix$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -16619,11 +17527,11 @@
fi
WINDRES=$ac_cv_prog_WINDRES
if test -n "$WINDRES"; then
- { echo "$as_me:$LINENO: result: $WINDRES" >&5
-echo "${ECHO_T}$WINDRES" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $WINDRES" >&5
+$as_echo "$WINDRES" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -16636,10 +17544,10 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_ac_ct_WINDRES+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_WINDRES"; then
ac_cv_prog_ac_ct_WINDRES="$ac_ct_WINDRES" # Let the user override the test.
@@ -16652,7 +17560,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_WINDRES="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -16663,11 +17571,11 @@
fi
ac_ct_WINDRES=$ac_cv_prog_ac_ct_WINDRES
if test -n "$ac_ct_WINDRES"; then
- { echo "$as_me:$LINENO: result: $ac_ct_WINDRES" >&5
-echo "${ECHO_T}$ac_ct_WINDRES" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_ct_WINDRES" >&5
+$as_echo "$ac_ct_WINDRES" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -16679,12 +17587,8 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
WINDRES=$ac_ct_WINDRES
@@ -16711,10 +17615,10 @@
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_OBJCOPY+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$OBJCOPY"; then
ac_cv_prog_OBJCOPY="$OBJCOPY" # Let the user override the test.
@@ -16727,7 +17631,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_OBJCOPY="$ac_tool_prefix$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -16738,11 +17642,11 @@
fi
OBJCOPY=$ac_cv_prog_OBJCOPY
if test -n "$OBJCOPY"; then
- { echo "$as_me:$LINENO: result: $OBJCOPY" >&5
-echo "${ECHO_T}$OBJCOPY" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $OBJCOPY" >&5
+$as_echo "$OBJCOPY" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -16755,10 +17659,10 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_ac_ct_OBJCOPY+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_OBJCOPY"; then
ac_cv_prog_ac_ct_OBJCOPY="$ac_ct_OBJCOPY" # Let the user override the test.
@@ -16771,7 +17675,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_OBJCOPY="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -16782,11 +17686,11 @@
fi
ac_ct_OBJCOPY=$ac_cv_prog_ac_ct_OBJCOPY
if test -n "$ac_ct_OBJCOPY"; then
- { echo "$as_me:$LINENO: result: $ac_ct_OBJCOPY" >&5
-echo "${ECHO_T}$ac_ct_OBJCOPY" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_ct_OBJCOPY" >&5
+$as_echo "$ac_ct_OBJCOPY" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -16798,12 +17702,8 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
OBJCOPY=$ac_ct_OBJCOPY
@@ -16893,10 +17793,10 @@
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_PKG_CONFIG+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$PKG_CONFIG"; then
ac_cv_prog_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test.
@@ -16909,7 +17809,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_PKG_CONFIG="$ac_tool_prefix$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -16920,11 +17820,11 @@
fi
PKG_CONFIG=$ac_cv_prog_PKG_CONFIG
if test -n "$PKG_CONFIG"; then
- { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -16937,10 +17837,10 @@
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
if test "${ac_cv_prog_ac_ct_PKG_CONFIG+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if test -n "$ac_ct_PKG_CONFIG"; then
ac_cv_prog_ac_ct_PKG_CONFIG="$ac_ct_PKG_CONFIG" # Let the user override the test.
@@ -16953,7 +17853,7 @@
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_PKG_CONFIG="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
@@ -16964,11 +17864,11 @@
fi
ac_ct_PKG_CONFIG=$ac_cv_prog_ac_ct_PKG_CONFIG
if test -n "$ac_ct_PKG_CONFIG"; then
- { echo "$as_me:$LINENO: result: $ac_ct_PKG_CONFIG" >&5
-echo "${ECHO_T}$ac_ct_PKG_CONFIG" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $ac_ct_PKG_CONFIG" >&5
+$as_echo "$ac_ct_PKG_CONFIG" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
@@ -16980,12 +17880,8 @@
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
PKG_CONFIG=$ac_ct_PKG_CONFIG
@@ -17010,10 +17906,10 @@
fi
if test $cs_cv_prog_pkg_config_ok = yes; then
- { echo "$as_me:$LINENO: checking if $PKG_CONFIG recognizes bfd" >&5
-echo $ECHO_N "checking if $PKG_CONFIG recognizes bfd... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking if $PKG_CONFIG recognizes bfd" >&5
+$as_echo_n "checking if $PKG_CONFIG recognizes bfd... " >&6; }
if test "${cs_cv_prog_pkg_config_bfd+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
if $PKG_CONFIG --exists bfd; then
cs_cv_prog_pkg_config_bfd=yes
@@ -17022,21 +17918,21 @@
fi
fi
-{ echo "$as_me:$LINENO: result: $cs_cv_prog_pkg_config_bfd" >&5
-echo "${ECHO_T}$cs_cv_prog_pkg_config_bfd" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $cs_cv_prog_pkg_config_bfd" >&5
+$as_echo "$cs_cv_prog_pkg_config_bfd" >&6; }
if test $cs_cv_prog_pkg_config_bfd = yes; then
if test -z "$cs_cv_prog_pkg_config_bfd_flags"; then
- cs_check_lib_cflag=`{ (echo "$as_me:$LINENO: \$PKG_CONFIG --cflags bfd") >&5
+ cs_check_lib_cflag=`{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --cflags bfd") >&5
($PKG_CONFIG --cflags bfd) 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } | tr '\\\\' '/' | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } | tr '\\\\' '/' | sed 's/ */ /g;s/^ //;s/ $//'`
cs_check_lib_lflag=''
- cs_check_lib_libs=`{ (echo "$as_me:$LINENO: \$PKG_CONFIG --libs bfd") >&5
+ cs_check_lib_libs=`{ ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --libs bfd") >&5
($PKG_CONFIG --libs bfd) 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } | tr '\\\\' '/' | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } | tr '\\\\' '/' | sed 's/ */ /g;s/^ //;s/ $//'`
cs_cv_prog_pkg_config_bfd_flags=`echo @$cs_check_lib_cflag@$cs_check_lib_lflag@$cs_check_lib_libs | sed 'y% %#%'`
fi
@@ -17053,107 +17949,101 @@
fi
if test -n "$ac_tool_prefix"; then
- for ac_prog in bfd-config
- do
- # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_CONFIG_BFD+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ # Extract the first word of "${ac_tool_prefix}bfd-config", so it can be a program name with args.
+set dummy ${ac_tool_prefix}bfd-config; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_CONFIG_BFD+set}" = set; then
+ $as_echo_n "(cached) " >&6
else
- if test -n "$CONFIG_BFD"; then
- ac_cv_prog_CONFIG_BFD="$CONFIG_BFD" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ case $CONFIG_BFD in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_CONFIG_BFD="$CONFIG_BFD" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_CONFIG_BFD="$ac_tool_prefix$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ ac_cv_path_CONFIG_BFD="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
IFS=$as_save_IFS
+ ;;
+esac
fi
-fi
-CONFIG_BFD=$ac_cv_prog_CONFIG_BFD
+CONFIG_BFD=$ac_cv_path_CONFIG_BFD
if test -n "$CONFIG_BFD"; then
- { echo "$as_me:$LINENO: result: $CONFIG_BFD" >&5
-echo "${ECHO_T}$CONFIG_BFD" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $CONFIG_BFD" >&5
+$as_echo "$CONFIG_BFD" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
- test -n "$CONFIG_BFD" && break
- done
fi
-if test -z "$CONFIG_BFD"; then
- ac_ct_CONFIG_BFD=$CONFIG_BFD
- for ac_prog in bfd-config
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_CONFIG_BFD+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$ac_ct_CONFIG_BFD"; then
- ac_cv_prog_ac_ct_CONFIG_BFD="$ac_ct_CONFIG_BFD" # Let the user override the test.
+if test -z "$ac_cv_path_CONFIG_BFD"; then
+ ac_pt_CONFIG_BFD=$CONFIG_BFD
+ # Extract the first word of "bfd-config", so it can be a program name with args.
+set dummy bfd-config; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_ac_pt_CONFIG_BFD+set}" = set; then
+ $as_echo_n "(cached) " >&6
else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ case $ac_pt_CONFIG_BFD in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_ac_pt_CONFIG_BFD="$ac_pt_CONFIG_BFD" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_CONFIG_BFD="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ ac_cv_path_ac_pt_CONFIG_BFD="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
IFS=$as_save_IFS
+ ;;
+esac
fi
-fi
-ac_ct_CONFIG_BFD=$ac_cv_prog_ac_ct_CONFIG_BFD
-if test -n "$ac_ct_CONFIG_BFD"; then
- { echo "$as_me:$LINENO: result: $ac_ct_CONFIG_BFD" >&5
-echo "${ECHO_T}$ac_ct_CONFIG_BFD" >&6; }
+ac_pt_CONFIG_BFD=$ac_cv_path_ac_pt_CONFIG_BFD
+if test -n "$ac_pt_CONFIG_BFD"; then
+ { $as_echo "$as_me:$LINENO: result: $ac_pt_CONFIG_BFD" >&5
+$as_echo "$ac_pt_CONFIG_BFD" >&6; }
else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
fi
-
- test -n "$ac_ct_CONFIG_BFD" && break
-done
-
- if test "x$ac_ct_CONFIG_BFD" = x; then
+ if test "x$ac_pt_CONFIG_BFD" = x; then
CONFIG_BFD=""
else
case $cross_compiling:$ac_tool_warned in
yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
+{ $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
ac_tool_warned=yes ;;
esac
- CONFIG_BFD=$ac_ct_CONFIG_BFD
+ CONFIG_BFD=$ac_pt_CONFIG_BFD
fi
+else
+ CONFIG_BFD="$ac_cv_path_CONFIG_BFD"
fi
if test -n "$CONFIG_BFD"; then
@@ -17168,17 +18058,17 @@
if test $cs_cv_prog_config_bfd_ok = yes; then
if test -z "$cs_cv_prog_config_bfd_flags"; then
- cs_check_lib_cflag=`{ (echo "$as_me:$LINENO: \$CONFIG_BFD --cflags ") >&5
+ cs_check_lib_cflag=`{ ($as_echo "$as_me:$LINENO: \$CONFIG_BFD --cflags ") >&5
($CONFIG_BFD --cflags ) 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } | tr '\\\\' '/' | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } | tr '\\\\' '/' | sed 's/ */ /g;s/^ //;s/ $//'`
cs_check_lib_lflag=''
- cs_check_lib_libs=`{ (echo "$as_me:$LINENO: \$CONFIG_BFD --libs ") >&5
+ cs_check_lib_libs=`{ ($as_echo "$as_me:$LINENO: \$CONFIG_BFD --libs ") >&5
($CONFIG_BFD --libs ) 2>&5
ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } | tr '\\\\' '/' | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } | tr '\\\\' '/' | sed 's/ */ /g;s/^ //;s/ $//'`
cs_cv_prog_config_bfd_flags=`echo @$cs_check_lib_cflag@$cs_check_lib_lflag@$cs_check_lib_libs | sed 'y% %#%'`
fi
@@ -17217,6 +18107,7 @@
shift
fi
+
if test $# -eq 0; then
cs_check_libdir=''
else
@@ -17229,6 +18120,7 @@
shift
fi
+
if test -n "$cs_check_incdir"; then
cs_check_lib_cflag="-I$cs_check_incdir"
else
@@ -17305,10 +18197,10 @@
if test "$cs_ignore_cache" != yes; then
- { echo "$as_me:$LINENO: checking for libbfd" >&5
-echo $ECHO_N "checking for libbfd... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for libbfd" >&5
+$as_echo_n "checking for libbfd... " >&6; }
if test "${cs_cv_libbfd+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
@@ -17340,6 +18232,7 @@
shift
fi
+
if test $# -eq 0; then
cs_cflags_test=''
else
@@ -17351,6 +18244,7 @@
shift
fi
+
if test $# -eq 0; then
cs_lflags_test=''
else
@@ -17362,6 +18256,7 @@
shift
fi
+
if test $# -eq 0; then
cs_libs_test=''
else
@@ -17374,6 +18269,7 @@
shift
fi
+
cs_cflags_test=`echo $cs_cflags_test | sed 'y%#% %'`
cs_lflags_test=`echo $cs_lflags_test | sed 'y%#% %'`
cs_libs_test=`echo $cs_libs_test | sed 'y%#% %'`
@@ -17402,26 +18298,30 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
cs_build_ok=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
fi
+rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test $cs_build_ok = yes; then
@@ -17454,11 +18354,11 @@
fi
fi
-{ echo "$as_me:$LINENO: result: $cs_cv_libbfd" >&5
-echo "${ECHO_T}$cs_cv_libbfd" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $cs_cv_libbfd" >&5
+$as_echo "$cs_cv_libbfd" >&6; }
else
- { echo "$as_me:$LINENO: checking for libbfd" >&5
-echo $ECHO_N "checking for libbfd... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking for libbfd" >&5
+$as_echo_n "checking for libbfd... " >&6; }
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -17489,6 +18389,7 @@
shift
fi
+
if test $# -eq 0; then
cs_cflags_test=''
else
@@ -17500,6 +18401,7 @@
shift
fi
+
if test $# -eq 0; then
cs_lflags_test=''
else
@@ -17511,6 +18413,7 @@
shift
fi
+
if test $# -eq 0; then
cs_libs_test=''
else
@@ -17523,6 +18426,7 @@
shift
fi
+
cs_cflags_test=`echo $cs_cflags_test | sed 'y%#% %'`
cs_lflags_test=`echo $cs_lflags_test | sed 'y%#% %'`
cs_libs_test=`echo $cs_libs_test | sed 'y%#% %'`
@@ -17551,26 +18455,30 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
cs_build_ok=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
fi
+rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test $cs_build_ok = yes; then
@@ -17602,8 +18510,8 @@
cs_cv_libbfd=no
fi
- { echo "$as_me:$LINENO: result: $cs_cv_libbfd" >&5
-echo "${ECHO_T}$cs_cv_libbfd" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $cs_cv_libbfd" >&5
+$as_echo "$cs_cv_libbfd" >&6; }
fi
if test $cs_cv_libbfd = yes; then
@@ -17633,10 +18541,10 @@
if test $cs_cv_libbfd = yes; then
if test "" != yes; then
- { echo "$as_me:$LINENO: checking if libbfd is usable" >&5
-echo $ECHO_N "checking if libbfd is usable... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking if libbfd is usable" >&5
+$as_echo_n "checking if libbfd is usable... " >&6; }
if test "${cs_cv_libbfd_ok+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ $as_echo_n "(cached) " >&6
else
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
@@ -17668,6 +18576,7 @@
shift
fi
+
if test $# -eq 0; then
cs_cflags_test=''
else
@@ -17679,6 +18588,7 @@
shift
fi
+
if test $# -eq 0; then
cs_lflags_test=''
else
@@ -17690,6 +18600,7 @@
shift
fi
+
if test $# -eq 0; then
cs_libs_test=''
else
@@ -17702,6 +18613,7 @@
shift
fi
+
cs_cflags_test=`echo $cs_cflags_test | sed 'y%#% %'`
cs_lflags_test=`echo $cs_lflags_test | sed 'y%#% %'`
cs_libs_test=`echo $cs_libs_test | sed 'y%#% %'`
@@ -17738,26 +18650,30 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
cs_build_ok=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
fi
+rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test $cs_build_ok = yes; then
@@ -17790,11 +18706,11 @@
fi
fi
-{ echo "$as_me:$LINENO: result: $cs_cv_libbfd_ok" >&5
-echo "${ECHO_T}$cs_cv_libbfd_ok" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $cs_cv_libbfd_ok" >&5
+$as_echo "$cs_cv_libbfd_ok" >&6; }
else
- { echo "$as_me:$LINENO: checking if libbfd is usable" >&5
-echo $ECHO_N "checking if libbfd is usable... $ECHO_C" >&6; }
+ { $as_echo "$as_me:$LINENO: checking if libbfd is usable" >&5
+$as_echo_n "checking if libbfd is usable... " >&6; }
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -17825,6 +18741,7 @@
shift
fi
+
if test $# -eq 0; then
cs_cflags_test=''
else
@@ -17836,6 +18753,7 @@
shift
fi
+
if test $# -eq 0; then
cs_lflags_test=''
else
@@ -17847,6 +18765,7 @@
shift
fi
+
if test $# -eq 0; then
cs_libs_test=''
else
@@ -17859,6 +18778,7 @@
shift
fi
+
cs_cflags_test=`echo $cs_cflags_test | sed 'y%#% %'`
cs_lflags_test=`echo $cs_lflags_test | sed 'y%#% %'`
cs_libs_test=`echo $cs_libs_test | sed 'y%#% %'`
@@ -17895,26 +18815,30 @@
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
cs_build_ok=yes
else
- echo "$as_me: failed program was:" >&5
+ $as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
fi
+rm -rf conftest.dSYM
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test $cs_build_ok = yes; then
@@ -17946,8 +18870,8 @@
cs_cv_libbfd_ok=no
fi
- { echo "$as_me:$LINENO: result: $cs_cv_libbfd_ok" >&5
-echo "${ECHO_T}$cs_cv_libbfd_ok" >&6; }
+ { $as_echo "$as_me:$LINENO: result: $cs_cv_libbfd_ok" >&5
+$as_echo "$cs_cv_libbfd_ok" >&6; }
fi
if test $cs_cv_libbfd_ok = yes; then
@@ -18033,10 +18957,10 @@
#------------------------------------------------------------------------------
# Determine whether link libraries should be static or shared.
#------------------------------------------------------------------------------
-{ echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
-echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
+$as_echo_n "checking whether to build shared libraries... " >&6; }
case $host_os in
- mingw*|cygwin*|linux*) enable_shared_default=yes ;;
+ cygwin*|linux*) enable_shared_default=yes ;;
*) enable_shared_default=no ;;
esac
# Check whether --enable-shared was given.
@@ -18046,8 +18970,8 @@
enable_shared=$enable_shared_default
fi
-{ echo "$as_me:$LINENO: result: $enable_shared" >&5
-echo "${ECHO_T}$enable_shared" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $enable_shared" >&5
+$as_echo "$enable_shared" >&6; }
cs_build_prop_val="$enable_shared"
cs_build_prop_val=`echo x$cs_build_prop_val | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
if test -n "$cs_build_prop_val"; then
@@ -18070,16 +18994,16 @@
enableval=$enable_debug; test "$enableval" = "yes" && cs_build_mode="debug"
fi
-{ echo "$as_me:$LINENO: checking build mode" >&5
-echo $ECHO_N "checking build mode... $ECHO_C" >&6; }
+{ $as_echo "$as_me:$LINENO: checking build mode" >&5
+$as_echo_n "checking build mode... " >&6; }
if test "${cs_build_mode+set}" = set; then
:
else
cs_build_mode=optimize
fi
-{ echo "$as_me:$LINENO: result: $cs_build_mode" >&5
-echo "${ECHO_T}$cs_build_mode" >&6; }
+{ $as_echo "$as_me:$LINENO: result: $cs_build_mode" >&5
+$as_echo "$cs_build_mode" >&6; }
cs_build_prop_val="$cs_build_mode"
cs_build_prop_val=`echo x$cs_build_prop_val | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`
if test -n "$cs_build_prop_val"; then
@@ -18154,7 +19078,7 @@
"
cs_jamconfig_text="${cs_jamconfig_text}PACKAGE_COPYRIGHT ?= \"$PACKAGE_COPYRIGHT\" ;
"
- cs_jamconfig_text="${cs_jamconfig_text}PACKAGE_VERSION_LIST ?= 1 9 ;
+ cs_jamconfig_text="${cs_jamconfig_text}PACKAGE_VERSION_LIST ?= 1 4 0 ;
"
@@ -18196,11 +19120,12 @@
case $ac_val in #(
*${as_nl}*)
case $ac_var in #(
- *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5
-echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;;
+ *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5
+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
esac
case $ac_var in #(
_ | IFS | as_nl) ;; #(
+ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #(
*) $as_unset $ac_var ;;
esac ;;
esac
@@ -18233,12 +19158,12 @@
if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
if test -w "$cache_file"; then
test "x$cache_file" != "x/dev/null" &&
- { echo "$as_me:$LINENO: updating cache $cache_file" >&5
-echo "$as_me: updating cache $cache_file" >&6;}
+ { $as_echo "$as_me:$LINENO: updating cache $cache_file" >&5
+$as_echo "$as_me: updating cache $cache_file" >&6;}
cat confcache >$cache_file
else
- { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
-echo "$as_me: not updating unwritable cache $cache_file" >&6;}
+ { $as_echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5
+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
fi
fi
rm -f confcache
@@ -18255,6 +19180,12 @@
# take arguments), then branch to the quote section. Otherwise,
# look for a macro that doesn't take arguments.
ac_script='
+:mline
+/\\$/{
+ N
+ s,\\\n,,
+ b mline
+}
t clear
:clear
s/^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\)/-D\1=\2/g
@@ -18284,7 +19215,7 @@
for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
# 1. Remove the extension, and $U if already installed.
ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
- ac_i=`echo "$ac_i" | sed "$ac_script"`
+ ac_i=`$as_echo "$ac_i" | sed "$ac_script"`
# 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
# will be set to the directory where LIBOBJS objects are built.
ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
@@ -18297,11 +19228,12 @@
: ${CONFIG_STATUS=./config.status}
+ac_write_fail=0
ac_clean_files_save=$ac_clean_files
ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF
+{ $as_echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
+cat >$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
#! $SHELL
# Generated by $as_me.
# Run this file to recreate the current configuration.
@@ -18314,7 +19246,7 @@
SHELL=\${CONFIG_SHELL-$SHELL}
_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
## --------------------- ##
## M4sh Initialization. ##
## --------------------- ##
@@ -18324,7 +19256,7 @@
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
@@ -18346,17 +19278,45 @@
as_cr_digits='0123456789'
as_cr_alnum=$as_cr_Letters$as_cr_digits
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
- echo "#! /bin/sh" >conf$$.sh
- echo "exit 0" >>conf$$.sh
- chmod +x conf$$.sh
- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
- PATH_SEPARATOR=';'
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+ as_echo='printf %s\n'
+ as_echo_n='printf %s'
+else
+ if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+ as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+ as_echo_n='/usr/ucb/echo -n'
else
- PATH_SEPARATOR=:
+ as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+ as_echo_n_body='eval
+ arg=$1;
+ case $arg in
+ *"$as_nl"*)
+ expr "X$arg" : "X\\(.*\\)$as_nl";
+ arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+ esac;
+ expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+ '
+ export as_echo_n_body
+ as_echo_n='sh -c $as_echo_n_body as_echo'
fi
- rm -f conf$$.sh
+ export as_echo_body
+ as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+ PATH_SEPARATOR=:
+ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+ PATH_SEPARATOR=';'
+ }
fi
# Support unset when possible.
@@ -18372,8 +19332,6 @@
# there to prevent editors from complaining about space-tab.
# (If _AS_PATH_WALK were called with IFS unset, it would disable word
# splitting by setting IFS to empty value.)
-as_nl='
-'
IFS=" "" $as_nl"
# Find who we are. Look in the path if we contain no directory separator.
@@ -18396,7 +19354,7 @@
as_myself=$0
fi
if test ! -f "$as_myself"; then
- echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
{ (exit 1); exit 1; }
fi
@@ -18409,17 +19367,10 @@
PS4='+ '
# NLS nuisances.
-for as_var in \
- LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
- LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
- LC_TELEPHONE LC_TIME
-do
- if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
- eval $as_var=C; export $as_var
- else
- ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
- fi
-done
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
# Required to use basename.
if expr a : '\(a\)' >/dev/null 2>&1 &&
@@ -18441,7 +19392,7 @@
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
X"$0" : 'X\(//\)$' \| \
X"$0" : 'X\(/\)' \| . 2>/dev/null ||
-echo X/"$0" |
+$as_echo X/"$0" |
sed '/^.*\/\([^/][^/]*\)\/*$/{
s//\1/
q
@@ -18492,7 +19443,7 @@
s/-\n.*//
' >$as_me.lineno &&
chmod +x "$as_me.lineno" ||
- { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
+ { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
{ (exit 1); exit 1; }; }
# Don't try to exec as it changes $[0], causing all sort of problems
@@ -18520,7 +19471,6 @@
*)
ECHO_N='-n';;
esac
-
if expr a : '\(a\)' >/dev/null 2>&1 &&
test "X`expr 00001 : '.*\(...\)'`" = X001; then
as_expr=expr
@@ -18533,19 +19483,22 @@
rm -f conf$$.dir/conf$$.file
else
rm -f conf$$.dir
- mkdir conf$$.dir
+ mkdir conf$$.dir 2>/dev/null
fi
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
- as_ln_s='ln -s'
- # ... but there are two gotchas:
- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
- # In both cases, we have to default to `cp -p'.
- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+if (echo >conf$$.file) 2>/dev/null; then
+ if ln -s conf$$.file conf$$ 2>/dev/null; then
+ as_ln_s='ln -s'
+ # ... but there are two gotchas:
+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+ # In both cases, we have to default to `cp -p'.
+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+ as_ln_s='cp -p'
+ elif ln conf$$.file conf$$ 2>/dev/null; then
+ as_ln_s=ln
+ else
as_ln_s='cp -p'
-elif ln conf$$.file conf$$ 2>/dev/null; then
- as_ln_s=ln
+ fi
else
as_ln_s='cp -p'
fi
@@ -18572,10 +19525,10 @@
as_test_x='
eval sh -c '\''
if test -d "$1"; then
- test -d "$1/.";
+ test -d "$1/.";
else
case $1 in
- -*)set "./$1";;
+ -*)set "./$1";;
esac;
case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
???[sx]*):;;*)false;;esac;fi
@@ -18597,8 +19550,8 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by cel $as_me 1.9, which was
-generated by GNU Autoconf 2.61. Invocation command line was
+This file was extended by cel $as_me 1.4.0, which was
+generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
@@ -18611,27 +19564,34 @@
_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+case $ac_config_files in *"
+"*) set x $ac_config_files; shift; ac_config_files=$*;;
+esac
+
+
+
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
# Files that config.status was made for.
config_files="$ac_config_files"
config_commands="$ac_config_commands"
_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
ac_cs_usage="\
\`$as_me' instantiates files from templates according to the
current configuration.
-Usage: $0 [OPTIONS] [FILE]...
+Usage: $0 [OPTION]... [FILE]...
-h, --help print this help, then exit
-V, --version print version number and configuration settings, then exit
- -q, --quiet do not print progress messages
+ -q, --quiet, --silent
+ do not print progress messages
-d, --debug don't remove temporary files
--recheck update $as_me by reconfiguring in the same conditions
- --file=FILE[:TEMPLATE]
- instantiate the configuration file FILE
+ --file=FILE[:TEMPLATE]
+ instantiate the configuration file FILE
Configuration files:
$config_files
@@ -18642,23 +19602,23 @@
Report bugs to ."
_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-cel config.status 1.9
-configured by $0, generated by GNU Autoconf 2.61,
- with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+cel config.status 1.4.0
+configured by $0, generated by GNU Autoconf 2.63,
+ with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
-Copyright (C) 2006 Free Software Foundation, Inc.
+Copyright (C) 2008 Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
ac_pwd='$ac_pwd'
srcdir='$srcdir'
+test -n "\$AWK" || AWK=awk
_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-# If no file are specified by the user, then we need to provide default
-# value. By we need to know if files were specified by the user.
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+# The default lists apply if the user does not specify any file.
ac_need_defaults=:
while test $# != 0
do
@@ -18680,21 +19640,24 @@
-recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
ac_cs_recheck=: ;;
--version | --versio | --versi | --vers | --ver | --ve | --v | -V )
- echo "$ac_cs_version"; exit ;;
+ $as_echo "$ac_cs_version"; exit ;;
--debug | --debu | --deb | --de | --d | -d )
debug=: ;;
--file | --fil | --fi | --f )
$ac_shift
- CONFIG_FILES="$CONFIG_FILES $ac_optarg"
+ case $ac_optarg in
+ *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+ esac
+ CONFIG_FILES="$CONFIG_FILES '$ac_optarg'"
ac_need_defaults=false;;
--he | --h | --help | --hel | -h )
- echo "$ac_cs_usage"; exit ;;
+ $as_echo "$ac_cs_usage"; exit ;;
-q | -quiet | --quiet | --quie | --qui | --qu | --q \
| -silent | --silent | --silen | --sile | --sil | --si | --s)
ac_cs_silent=: ;;
# This is an error.
- -*) { echo "$as_me: error: unrecognized option: $1
+ -*) { $as_echo "$as_me: error: unrecognized option: $1
Try \`$0 --help' for more information." >&2
{ (exit 1); exit 1; }; } ;;
@@ -18713,27 +19676,29 @@
fi
_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
if \$ac_cs_recheck; then
- echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
- CONFIG_SHELL=$SHELL
+ set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+ shift
+ \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
+ CONFIG_SHELL='$SHELL'
export CONFIG_SHELL
- exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+ exec "\$@"
fi
_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
exec 5>>config.log
{
echo
sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
## Running $as_me. ##
_ASBOX
- echo "$ac_log"
+ $as_echo "$ac_log"
} >&5
_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
#
# INIT-COMMANDS
#
@@ -18743,7 +19708,7 @@
Xinclude/celconfig.h : 'X\(//\)[^/]' \| \
Xinclude/celconfig.h : 'X\(//\)$' \| \
Xinclude/celconfig.h : 'X\(/\)' \| . 2>/dev/null ||
-echo Xinclude/celconfig.h |
+$as_echo Xinclude/celconfig.h |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
@@ -18773,7 +19738,7 @@
X"\$as_dir" : 'X\\(//\\)^/' \\| \\
X"\$as_dir" : 'X\\(//\\)\$' \\| \\
X"\$as_dir" : 'X\\(/\\)' \\| . 2>/dev/null ||
-echo X"\$as_dir" |
+\$as_echo X"\$as_dir" |
sed '/^X\\(.*^/\\)\\/\\/*^/^/*\\/*\$/{
s//\\1/
q
@@ -18793,8 +19758,8 @@
s/.*/./; q'\`
done
test ! -n "\$as_dirs" || mkdir \$as_dirs
- fi || { { echo "\$as_me:\$LINENO: error: cannot create directory \$cs_dir" >&5
-echo "\$as_me: error: cannot create directory \$cs_dir" >&2;}
+ fi || { { \$as_echo "\$as_me:\$LINENO: error: cannot create directory \$cs_dir" >&5
+\$as_echo "\$as_me: error: cannot create directory \$cs_dir" >&2;}
{ (exit 1); exit 1; }; }; }
cs_jamconfig_text='$cs_jamconfig_text'
@@ -18803,7 +19768,7 @@
XJamconfig : 'X\(//\)[^/]' \| \
XJamconfig : 'X\(//\)$' \| \
XJamconfig : 'X\(/\)' \| . 2>/dev/null ||
-echo XJamconfig |
+$as_echo XJamconfig |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
@@ -18833,7 +19798,7 @@
X"\$as_dir" : 'X\\(//\\)^/' \\| \\
X"\$as_dir" : 'X\\(//\\)\$' \\| \\
X"\$as_dir" : 'X\\(/\\)' \\| . 2>/dev/null ||
-echo X"\$as_dir" |
+\$as_echo X"\$as_dir" |
sed '/^X\\(.*^/\\)\\/\\/*^/^/*\\/*\$/{
s//\\1/
q
@@ -18853,14 +19818,14 @@
s/.*/./; q'\`
done
test ! -n "\$as_dirs" || mkdir \$as_dirs
- fi || { { echo "\$as_me:\$LINENO: error: cannot create directory \$cs_dir" >&5
-echo "\$as_me: error: cannot create directory \$cs_dir" >&2;}
+ fi || { { \$as_echo "\$as_me:\$LINENO: error: cannot create directory \$cs_dir" >&5
+\$as_echo "\$as_me: error: cannot create directory \$cs_dir" >&2;}
{ (exit 1); exit 1; }; }; }
_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# Handling of arguments.
for ac_config_target in $ac_config_targets
@@ -18871,8 +19836,8 @@
"Jamfile") CONFIG_FILES="$CONFIG_FILES Jamfile" ;;
"scripts/autopackage/celstart_static.apspec") CONFIG_FILES="$CONFIG_FILES scripts/autopackage/celstart_static.apspec" ;;
- *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+ *) { { $as_echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
+$as_echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
{ (exit 1); exit 1; }; };;
esac
done
@@ -18912,217 +19877,143 @@
(umask 077 && mkdir "$tmp")
} ||
{
- echo "$me: cannot create a temporary directory in ." >&2
+ $as_echo "$as_me: cannot create a temporary directory in ." >&2
{ (exit 1); exit 1; }
}
-#
-# Set up the sed scripts for CONFIG_FILES section.
-#
-
-# No need to generate the scripts if there are no CONFIG_FILES.
-# This happens for instance when ./config.status config.h
+# Set up the scripts for CONFIG_FILES section.
+# No need to generate them if there are no CONFIG_FILES.
+# This happens for instance with `./config.status config.h'.
if test -n "$CONFIG_FILES"; then
-_ACEOF
-
-
-
-ac_delim='%!_!# '
-for ac_last_try in false false false false false :; do
- cat >conf$$subs.sed <<_ACEOF
-SHELL!$SHELL$ac_delim
-PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim
-PACKAGE_NAME!$PACKAGE_NAME$ac_delim
-PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim
-PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim
-PACKAGE_STRING!$PACKAGE_STRING$ac_delim
-PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim
-exec_prefix!$exec_prefix$ac_delim
-prefix!$prefix$ac_delim
-program_transform_name!$program_transform_name$ac_delim
-bindir!$bindir$ac_delim
-sbindir!$sbindir$ac_delim
-libexecdir!$libexecdir$ac_delim
-datarootdir!$datarootdir$ac_delim
-datadir!$datadir$ac_delim
-sysconfdir!$sysconfdir$ac_delim
-sharedstatedir!$sharedstatedir$ac_delim
-localstatedir!$localstatedir$ac_delim
-includedir!$includedir$ac_delim
-oldincludedir!$oldincludedir$ac_delim
-docdir!$docdir$ac_delim
-infodir!$infodir$ac_delim
-htmldir!$htmldir$ac_delim
-dvidir!$dvidir$ac_delim
-pdfdir!$pdfdir$ac_delim
-psdir!$psdir$ac_delim
-libdir!$libdir$ac_delim
-localedir!$localedir$ac_delim
-mandir!$mandir$ac_delim
-DEFS!$DEFS$ac_delim
-ECHO_C!$ECHO_C$ac_delim
-ECHO_N!$ECHO_N$ac_delim
-ECHO_T!$ECHO_T$ac_delim
-LIBS!$LIBS$ac_delim
-build_alias!$build_alias$ac_delim
-host_alias!$host_alias$ac_delim
-target_alias!$target_alias$ac_delim
-build!$build$ac_delim
-build_cpu!$build_cpu$ac_delim
-build_vendor!$build_vendor$ac_delim
-build_os!$build_os$ac_delim
-host!$host$ac_delim
-host_cpu!$host_cpu$ac_delim
-host_vendor!$host_vendor$ac_delim
-host_os!$host_os$ac_delim
-CC!$CC$ac_delim
-CFLAGS!$CFLAGS$ac_delim
-LDFLAGS!$LDFLAGS$ac_delim
-CPPFLAGS!$CPPFLAGS$ac_delim
-ac_ct_CC!$ac_ct_CC$ac_delim
-EXEEXT!$EXEEXT$ac_delim
-OBJEXT!$OBJEXT$ac_delim
-CXX!$CXX$ac_delim
-CXXFLAGS!$CXXFLAGS$ac_delim
-ac_ct_CXX!$ac_ct_CXX$ac_delim
-LD!$LD$ac_delim
-ac_ct_LD!$ac_ct_LD$ac_delim
-RANLIB!$RANLIB$ac_delim
-DLLTOOL!$DLLTOOL$ac_delim
-ac_ct_DLLTOOL!$ac_ct_DLLTOOL$ac_delim
-DLLWRAP!$DLLWRAP$ac_delim
-ac_ct_DLLWRAP!$ac_ct_DLLWRAP$ac_delim
-WINDRES!$WINDRES$ac_delim
-ac_ct_WINDRES!$ac_ct_WINDRES$ac_delim
-STRINGS!$STRINGS$ac_delim
-ac_ct_STRINGS!$ac_ct_STRINGS$ac_delim
-OBJCOPY!$OBJCOPY$ac_delim
-ac_ct_OBJCOPY!$ac_ct_OBJCOPY$ac_delim
-LIBTOOL_TEST!$LIBTOOL_TEST$ac_delim
-ac_ct_LIBTOOL_TEST!$ac_ct_LIBTOOL_TEST$ac_delim
-LIBTOOL_PATH!$LIBTOOL_PATH$ac_delim
-LIBTOOL!$LIBTOOL$ac_delim
-ac_ct_LIBTOOL!$ac_ct_LIBTOOL$ac_delim
-CS_LT_APPLE!$CS_LT_APPLE$ac_delim
-APPLE_LIBTOOL!$APPLE_LIBTOOL$ac_delim
-MKDIR!$MKDIR$ac_delim
-MKDIRS!$MKDIRS$ac_delim
-INSTALL!$INSTALL$ac_delim
-LN_S!$LN_S$ac_delim
-TEXI2DVI!$TEXI2DVI$ac_delim
-TEXI2PDF!$TEXI2PDF$ac_delim
-DVIPS!$DVIPS$ac_delim
-DVIPDF!$DVIPDF$ac_delim
-MAKEINFO!$MAKEINFO$ac_delim
-DOXYGEN!$DOXYGEN$ac_delim
-DOT!$DOT$ac_delim
-ac_ct_DOT!$ac_ct_DOT$ac_delim
-RSVG!$RSVG$ac_delim
-ICOTOOL!$ICOTOOL$ac_delim
-CONVERT!$CONVERT$ac_delim
-PERL!$PERL$ac_delim
-TTREE!$TTREE$ac_delim
-SWIG!$SWIG$ac_delim
-CSLIBS_CONFIG!$CSLIBS_CONFIG$ac_delim
-ac_ct_CSLIBS_CONFIG!$ac_ct_CSLIBS_CONFIG$ac_delim
-PYTHON!$PYTHON$ac_delim
-ac_ct_PYTHON!$ac_ct_PYTHON$ac_delim
-_ACEOF
-
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
- break
- elif $ac_last_try; then
- { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
- { (exit 1); exit 1; }; }
- else
- ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
- fi
-done
-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-if test -n "$ac_eof"; then
- ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
- ac_eof=`expr $ac_eof + 1`
+ac_cr=`echo X | tr X '\015'`
+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null`
+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
+ ac_cs_awk_cr='\\r'
+else
+ ac_cs_awk_cr=$ac_cr
fi
-cat >>$CONFIG_STATUS <<_ACEOF
-cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-_ACEOF
-sed '
-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-s/^/s,@/; s/!/@,|#_!!_#|/
-:n
-t n
-s/'"$ac_delim"'$/,g/; t
-s/$/\\/; p
-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF
-CEOF$ac_eof
+echo 'BEGIN {' >"$tmp/subs1.awk" &&
_ACEOF
+{
+ echo "cat >conf$$subs.awk <<_ACEOF" &&
+ echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
+ echo "_ACEOF"
+} >conf$$subs.sh ||
+ { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+ { (exit 1); exit 1; }; }
+ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
- cat >conf$$subs.sed <<_ACEOF
-PKG_CONFIG!$PKG_CONFIG$ac_delim
-ac_ct_PKG_CONFIG!$ac_ct_PKG_CONFIG$ac_delim
-CONFIG_CPPUNIT!$CONFIG_CPPUNIT$ac_delim
-ac_ct_CONFIG_CPPUNIT!$ac_ct_CONFIG_CPPUNIT$ac_delim
-CONFIG_NL!$CONFIG_NL$ac_delim
-ac_ct_CONFIG_NL!$ac_ct_CONFIG_NL$ac_delim
-CRYSTAL!$CRYSTAL$ac_delim
-CRYSTAL_CONFIG_TOOL!$CRYSTAL_CONFIG_TOOL$ac_delim
-CPP!$CPP$ac_delim
-GREP!$GREP$ac_delim
-EGREP!$EGREP$ac_delim
-CONFIG_BFD!$CONFIG_BFD$ac_delim
-ac_ct_CONFIG_BFD!$ac_ct_CONFIG_BFD$ac_delim
-LIBOBJS!$LIBOBJS$ac_delim
-LTLIBOBJS!$LTLIBOBJS$ac_delim
-_ACEOF
+ . ./conf$$subs.sh ||
+ { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+ { (exit 1); exit 1; }; }
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 15; then
+ ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
+ if test $ac_delim_n = $ac_delim_num; then
break
elif $ac_last_try; then
- { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
+ { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
{ (exit 1); exit 1; }; }
else
ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
fi
done
+rm -f conf$$subs.sh
-ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed`
-if test -n "$ac_eof"; then
- ac_eof=`echo "$ac_eof" | sort -nru | sed 1q`
- ac_eof=`expr $ac_eof + 1`
-fi
-
-cat >>$CONFIG_STATUS <<_ACEOF
-cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end
-_ACEOF
-sed '
-s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g
-s/^/s,@/; s/!/@,|#_!!_#|/
-:n
-t n
-s/'"$ac_delim"'$/,g/; t
-s/$/\\/; p
-N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n
-' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF
-:end
-s/|#_!!_#|//g
-CEOF$ac_eof
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
_ACEOF
+sed -n '
+h
+s/^/S["/; s/!.*/"]=/
+p
+g
+s/^[^!]*!//
+:repl
+t repl
+s/'"$ac_delim"'$//
+t delim
+:nl
+h
+s/\(.\{148\}\).*/\1/
+t more1
+s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
+p
+n
+b repl
+:more1
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t nl
+:delim
+h
+s/\(.\{148\}\).*/\1/
+t more2
+s/["\\]/\\&/g; s/^/"/; s/$/"/
+p
+b
+:more2
+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
+p
+g
+s/.\{148\}//
+t delim
+' >$CONFIG_STATUS || ac_write_fail=1
+rm -f conf$$subs.awk
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+_ACAWK
+cat >>"\$tmp/subs1.awk" <<_ACAWK &&
+ for (key in S) S_is_set[key] = 1
+ FS = ""
+}
+{
+ line = $ 0
+ nfields = split(line, field, "@")
+ substed = 0
+ len = length(field[1])
+ for (i = 2; i < nfields; i++) {
+ key = field[i]
+ keylen = length(key)
+ if (S_is_set[key]) {
+ value = S[key]
+ line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
+ len += length(value) + length(field[++i])
+ substed = 1
+ } else
+ len += 1 + keylen
+ }
+
+ print line
+}
+
+_ACAWK
+_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
+ sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
+else
+ cat
+fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
+ || { { $as_echo "$as_me:$LINENO: error: could not setup config files machinery" >&5
+$as_echo "$as_me: error: could not setup config files machinery" >&2;}
+ { (exit 1); exit 1; }; }
+_ACEOF
# VPATH may cause trouble with some makes, so we remove $(srcdir),
# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
@@ -19139,19 +20030,21 @@
}'
fi
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
fi # test -n "$CONFIG_FILES"
-for ac_tag in :F $CONFIG_FILES :C $CONFIG_COMMANDS
+eval set X " :F $CONFIG_FILES :C $CONFIG_COMMANDS"
+shift
+for ac_tag
do
case $ac_tag in
:[FHLC]) ac_mode=$ac_tag; continue;;
esac
case $ac_mode$ac_tag in
:[FHL]*:*);;
- :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5
-echo "$as_me: error: Invalid tag $ac_tag." >&2;}
+ :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5
+$as_echo "$as_me: error: invalid tag $ac_tag" >&2;}
{ (exit 1); exit 1; }; };;
:[FH]-) ac_tag=-:-;;
:[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
@@ -19180,26 +20073,38 @@
[\\/$]*) false;;
*) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
esac ||
- { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
-echo "$as_me: error: cannot find input file: $ac_f" >&2;}
+ { { $as_echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5
+$as_echo "$as_me: error: cannot find input file: $ac_f" >&2;}
{ (exit 1); exit 1; }; };;
esac
- ac_file_inputs="$ac_file_inputs $ac_f"
+ case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+ ac_file_inputs="$ac_file_inputs '$ac_f'"
done
# Let's still pretend it is `configure' which instantiates (i.e., don't
# use $as_me), people would be surprised to read:
# /* config.h. Generated by config.status. */
- configure_input="Generated from "`IFS=:
- echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure."
+ configure_input='Generated from '`
+ $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+ `' by configure.'
if test x"$ac_file" != x-; then
configure_input="$ac_file. $configure_input"
- { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
+ { $as_echo "$as_me:$LINENO: creating $ac_file" >&5
+$as_echo "$as_me: creating $ac_file" >&6;}
fi
+ # Neutralize special characters interpreted by sed in replacement strings.
+ case $configure_input in #(
+ *\&* | *\|* | *\\* )
+ ac_sed_conf_input=`$as_echo "$configure_input" |
+ sed 's/[\\\\&|]/\\\\&/g'`;; #(
+ *) ac_sed_conf_input=$configure_input;;
+ esac
case $ac_tag in
- *:-:* | *:-) cat >"$tmp/stdin";;
+ *:-:* | *:-) cat >"$tmp/stdin" \
+ || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+ { (exit 1); exit 1; }; } ;;
esac
;;
esac
@@ -19209,7 +20114,7 @@
X"$ac_file" : 'X\(//\)[^/]' \| \
X"$ac_file" : 'X\(//\)$' \| \
X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$ac_file" |
+$as_echo X"$ac_file" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
@@ -19239,7 +20144,7 @@
X"$as_dir" : 'X\(//\)[^/]' \| \
X"$as_dir" : 'X\(//\)$' \| \
X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
-echo X"$as_dir" |
+$as_echo X"$as_dir" |
sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
s//\1/
q
@@ -19259,8 +20164,8 @@
s/.*/./; q'`
done
test ! -n "$as_dirs" || mkdir $as_dirs
- fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
+ fi || { { $as_echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
+$as_echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
{ (exit 1); exit 1; }; }; }
ac_builddir=.
@@ -19268,9 +20173,9 @@
case "$ac_dir" in
.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
*)
- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
+ ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
# A ".." for each directory in $ac_dir_suffix.
- ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'`
+ ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
case $ac_top_builddir_sub in
"") ac_top_builddir_sub=. ac_top_build_prefix= ;;
*) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
@@ -19306,12 +20211,13 @@
_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# If the template does not know about datarootdir, expand it.
# FIXME: This hack should be removed a few years after 2.60.
ac_datarootdir_hack=; ac_datarootdir_seen=
-case `sed -n '/datarootdir/ {
+ac_sed_dataroot='
+/datarootdir/ {
p
q
}
@@ -19320,13 +20226,14 @@
/@infodir@/p
/@localedir@/p
/@mandir@/p
-' $ac_file_inputs` in
+'
+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
*datarootdir*) ac_datarootdir_seen=yes;;
*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
- { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
-echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_datarootdir_hack='
s&@datadir@&$datadir&g
s&@docdir@&$docdir&g
@@ -19340,15 +20247,16 @@
# Neutralize VPATH when `$srcdir' = `.'.
# Shell code in configure.ac might set extrasub.
# FIXME: do we really want to maintain this feature?
-cat >>$CONFIG_STATUS <<_ACEOF
- sed "$ac_vpsub
+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_sed_extra="$ac_vpsub
$extrasub
_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
:t
/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s&@configure_input@&$configure_input&;t t
+s|@configure_input@|$ac_sed_conf_input|;t t
s&@top_builddir@&$ac_top_builddir_sub&;t t
+s&@top_build_prefix@&$ac_top_build_prefix&;t t
s&@srcdir@&$ac_srcdir&;t t
s&@abs_srcdir@&$ac_abs_srcdir&;t t
s&@top_srcdir@&$ac_top_srcdir&;t t
@@ -19357,26 +20265,33 @@
s&@abs_builddir@&$ac_abs_builddir&;t t
s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
$ac_datarootdir_hack
-" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out
+"
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
+ || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+ { (exit 1); exit 1; }; }
test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
{ ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
{ ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
- { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+ { $as_echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir'
which seems to be undefined. Please make sure it is defined." >&5
-echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
which seems to be undefined. Please make sure it is defined." >&2;}
rm -f "$tmp/stdin"
case $ac_file in
- -) cat "$tmp/out"; rm -f "$tmp/out";;
- *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;;
- esac
+ -) cat "$tmp/out" && rm -f "$tmp/out";;
+ *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+ esac \
+ || { { $as_echo "$as_me:$LINENO: error: could not create $ac_file" >&5
+$as_echo "$as_me: error: could not create $ac_file" >&2;}
+ { (exit 1); exit 1; }; }
;;
- :C) { echo "$as_me:$LINENO: executing $ac_file commands" >&5
-echo "$as_me: executing $ac_file commands" >&6;}
+ :C) { $as_echo "$as_me:$LINENO: executing $ac_file commands" >&5
+$as_echo "$as_me: executing $ac_file commands" >&6;}
;;
esac
@@ -19384,8 +20299,8 @@
case $ac_file$ac_mode in
"include/celconfig.h":C) echo $ECHO_N "$cs_header_text$ECHO_C" > $tmp/tcache
if diff include/celconfig.h $tmp/tcache >/dev/null 2>&1; then
- { echo "$as_me:$LINENO: include/celconfig.h is unchanged" >&5
-echo "$as_me: include/celconfig.h is unchanged" >&6;}
+ { $as_echo "$as_me:$LINENO: include/celconfig.h is unchanged" >&5
+$as_echo "$as_me: include/celconfig.h is unchanged" >&6;}
else
rm -f include/celconfig.h
cp $tmp/tcache include/celconfig.h
@@ -19394,8 +20309,8 @@
rm -f $tmp/tcache ;;
"Jamconfig":C) echo $ECHO_N "$cs_jamconfig_text$ECHO_C" > $tmp/tcache
if diff Jamconfig $tmp/tcache >/dev/null 2>&1; then
- { echo "$as_me:$LINENO: Jamconfig is unchanged" >&5
-echo "$as_me: Jamconfig is unchanged" >&6;}
+ { $as_echo "$as_me:$LINENO: Jamconfig is unchanged" >&5
+$as_echo "$as_me: Jamconfig is unchanged" >&6;}
else
rm -f Jamconfig
cp $tmp/tcache Jamconfig
@@ -19412,6 +20327,11 @@
chmod +x $CONFIG_STATUS
ac_clean_files=$ac_clean_files_save
+test $ac_write_fail = 0 ||
+ { { $as_echo "$as_me:$LINENO: error: write failure creating $CONFIG_STATUS" >&5
+$as_echo "$as_me: error: write failure creating $CONFIG_STATUS" >&2;}
+ { (exit 1); exit 1; }; }
+
# configure is writing to config.log, and then calls config.status.
# config.status does its own redirection, appending to config.log.
@@ -19433,9 +20353,13 @@
# would make configure fail if this is the last instruction.
$ac_cs_success || { (exit 1); exit 1; }
fi
+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+ { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
+fi
-{ echo "$as_me:$LINENO:
+{ $as_echo "$as_me:$LINENO:
Please note that this project uses Jam as its build tool,
therefore you must type 'jam' to build the project.
@@ -19443,7 +20367,7 @@
Jam home: http://www.perforce.com/jam/jam.html
Jam source: ftp://ftp.perforce.com/jam/
" >&5
-echo "$as_me:
+$as_echo "$as_me:
Please note that this project uses Jam as its build tool,
therefore you must type 'jam' to build the project.
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/configure.ac /tmp/IB0bHXT4Oc/cel-1.4/configure.ac
--- cel-1.9+svn3615/configure.ac 2008-07-10 13:28:45.000000000 +0100
+++ cel-1.4/configure.ac 2009-11-28 16:47:59.000000000 +0000
@@ -9,19 +9,20 @@
#----------------------------------------------------------------------------
# Don't forget to update include/celversion.h, docs/texinfo/version.txi
# and mk/autoconf/cel.m4 when changing this version number.
-AC_INIT([cel], [1.9], [cel-main@lists.sourceforge.net])
+AC_INIT([cel], [1.4.0], [cel-main@lists.sourceforge.net])
CS_PACKAGEINFO([Crystal Entity Layer],
[Copyright (C)2002-2008 Jorrit Tyberghein and others.],
[http://www.crystalspace3d.org/main/CEL])
AC_CONFIG_SRCDIR([mk/jam/build.jam])
AC_CONFIG_AUX_DIR([mk/autoconf])
AC_CANONICAL_HOST
-CS_CHECK_MNO_CYGWIN
-
+CS_PATH_INIT
#----------------------------------------------------------------------------
# Check for tools.
#----------------------------------------------------------------------------
+CS_CHECK_MNO_CYGWIN
+
CS_PROG_CC
CS_PROG_CXX
CS_PROG_LINK
@@ -178,7 +179,7 @@
AS_IF([test -z "$with_cs"], [with_cs=yes])
AS_IF([test $with_cs != no],
- [CS_PATH_CRYSTAL_EMIT([1.4], [],
+ [CS_PATH_CRYSTAL_EMIT([1.1], [],
[AC_MSG_ERROR([
*** Crystal Space could not be found or was unusable. The latest version is
*** always available from http://www.crystalspace3d.org/
@@ -203,6 +204,14 @@
#------------------------------------------------------------------------------
+# Check for relaytool. (After CS check so we can use the version
+# shipped with CS.)
+#------------------------------------------------------------------------------
+CS_CHECK_COMMON_TOOLS_RELAYTOOL([$CRYSTAL_TOOLS_PREFIX/bin])
+
+
+
+#------------------------------------------------------------------------------
# Determine if plugin meta-information should be embedded directly into plugin
# modules or if it should exist in stand-alone .csplugin files.
#------------------------------------------------------------------------------
@@ -219,7 +228,7 @@
#------------------------------------------------------------------------------
AC_MSG_CHECKING([whether to build shared libraries])
case $host_os in
- mingw*|cygwin*|linux*) enable_shared_default=yes ;;
+ cygwin*|linux*) enable_shared_default=yes ;;
*) enable_shared_default=no ;;
esac
AC_ARG_ENABLE([shared], [AC_HELP_STRING([--enable-shared],
Binary files /tmp/GbaWLZOL1f/cel-1.9+svn3615/data/aqua.png and /tmp/IB0bHXT4Oc/cel-1.4/data/aqua.png differ
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/data/basic_entities /tmp/IB0bHXT4Oc/cel-1.4/data/basic_entities
--- cel-1.9+svn3615/data/basic_entities 2008-07-26 06:23:20.000000000 +0100
+++ cel-1.4/data/basic_entities 2009-11-28 16:46:14.000000000 +0000
@@ -27,7 +27,7 @@
marble
-
+
+
@@ -119,9 +119,9 @@
-
+
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/data/basic_world /tmp/IB0bHXT4Oc/cel-1.4/data/basic_world
--- cel-1.9+svn3615/data/basic_world 2008-08-03 15:24:58.000000000 +0100
+++ cel-1.4/data/basic_world 2009-11-28 16:46:15.000000000 +0000
@@ -2,8 +2,6 @@
crystalspace.texture.loader.plasma
crystalspace.texture.loader.fire
- crystalspace.mesh.loader.genmesh
- crystalspace.mesh.loader.factory.genmesh
@@ -13,7 +11,7 @@
/lib/stdtex/my_wood.jpg
- /cellib/objects/red.png
+ /lib/std/raindrop.png
/lib/std/snow.jpg
@@ -48,18 +46,6 @@
plasma
-
- /cellib/objects/blue.png
-
-
- /cellib/objects/aqua.png
-
-
- /cellib/objects/yellow.png
-
-
- /cellib/objects/purple.png
-
fireTexLoader
@@ -83,18 +69,6 @@
-
- orogor
-
-
- purple
-
-
- yellow
-
-
- aqua
-
andrew_wood.jpg
@@ -369,338 +343,7 @@
-
-
- crystalspace.mesh.loader.factory.genmesh
-
-
- no
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- crystalspace.mesh.loader.factory.genmesh
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- genmesh
-
- Cube
-
-
-
-
-
-
-
-
-
- genmesh
-
- Marker
- raindrop
-
-
-
-
-
-
-
-
-
- genmesh
-
- Marker
- raindrop
-
-
-
-
-
-
-
-
-
- genmesh
-
- Marker
- orogor
-
-
-
-
-
-
-
-
-
- genmesh
-
- Marker
- aqua
-
-
-
-
-
-
-
-
-
- genmesh
-
- Marker
- aqua
-
-
-
-
-
-
-
-
-
- genmesh
-
- Marker
- purple
-
-
-
-
-
-
-
-
-
- genmesh
-
- Marker
- purple
-
-
-
-
-
-
-
-
-
- genmesh
-
- Marker
- yellow
-
-
-
-
-
-
-
-
-
- genmesh
-
- Marker
- yellow
-
-
-
-
-
-
-
-
-
- genmesh
-
- Marker
- yellow
-
-
-
-
-
-
-
-
-
- genmesh
-
- Marker
- yellow
-
-
-
-
-
-
-
-
-
- genmesh
-
- Marker
- yellow
-
-
-
-
-
-
-
-
-
- genmesh
-
- Marker
- yellow
-
-
-
-
-
-
-
-
-
- genmesh
-
- Marker
- yellow
-
-
-
-
-
-
-
-
-
- genmesh
-
- Marker
- yellow
-
-
-
-
-
-
-
-
-
- genmesh
-
- Marker
- yellow
-
-
-
-
-
-
-
-
-
- genmesh
-
- Marker
- yellow
-
-
-
-
-
-
-
-
thing
@@ -709,10 +352,10 @@
-
-
-
-
+
+
+
+
@@ -721,14 +364,14 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
abstract
5
0.8
Binary files /tmp/GbaWLZOL1f/cel-1.9+svn3615/data/blue.png and /tmp/IB0bHXT4Oc/cel-1.4/data/blue.png differ
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/data/Jamfile /tmp/IB0bHXT4Oc/cel-1.4/data/Jamfile
--- cel-1.9+svn3615/data/Jamfile 2006-11-24 18:10:16.000000000 +0000
+++ cel-1.4/data/Jamfile 2009-11-28 16:46:14.000000000 +0000
@@ -2,7 +2,7 @@
SubInclude TOP data library ;
-InstallData
+CEL_DATA =
[ Wildcard *.txt *.cal3d ]
ball
basic_entities
@@ -25,9 +25,17 @@
walktut_box
walktut_entities
walktut_world
- : data ;
+ ;
+
+InstallData $(CEL_DATA) : data ;
InstallData [ Wildcard cally : *.caf *.cmf *.csf ] : data cally ;
InstallConfig [ Wildcard config : *.cfg ] ;
InstallData [ Wildcard images : *.jpg *.png *.gif ] : data images ;
InstallData [ Wildcard sounds : *.zip ] : data sounds ;
+
+FileListEntriesData $(CEL_DATA) : : data-demo ;
+FileListEntriesData [ Wildcard cally : *.caf *.cmf *.csf ] : cally : data-demo ;
+FileListEntriesData [ Wildcard config : *.cfg ] : config : data-demo ;
+FileListEntriesData [ Wildcard images : *.jpg *.png *.gif ] : images : data-demo ;
+FileListEntriesData [ Wildcard sounds : *.zip ] : sounds : data-demo ;
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/data/library/blpython/widgets/celMenu.py /tmp/IB0bHXT4Oc/cel-1.4/data/library/blpython/widgets/celMenu.py
--- cel-1.9+svn3615/data/library/blpython/widgets/celMenu.py 2008-07-04 14:41:23.000000000 +0100
+++ cel-1.4/data/library/blpython/widgets/celMenu.py 2009-11-28 16:46:10.000000000 +0000
@@ -20,7 +20,7 @@
self.font = '/fonts/unifont/unifont.csf'
#Add a menu element. sends message to menu when clicked. the behaviour chooses the widget.
- def addElement(self, name, message, position, sizes, fsize, material, behaviour = 'celButton'):
+ def addElement(self, name, message, position, sizes, fsize, material, behaviour = 'celButton', fpath = None):
elementEntity = CreateEntity(name, self.blpython, None)
pcbillboard = celBillboard(elementEntity)
pcbillboard.materialnamefast = material
@@ -31,7 +31,13 @@
pcbillboard.text_offset = csVector2(1500, 1500)
pcbillboard.text_fg_color = GetFontColor()
pcbillboard.text_font_size = fsize
- pcbillboard.text_font = self.font
+ if fpath is not None:
+ oldfont = self.font
+ self.setFont(fpath)
+ pcbillboard.text_font = self.font
+ self.font = oldfont
+ else:
+ pcbillboard.text_font = self.font
pcbillboard.text = name
elementEntity.CreateBehaviour(self.blpython, behaviour)
#Time to send a message if neccesary
@@ -86,3 +92,14 @@
for element in self.elements:
if element.Behaviour:
element.Behaviour.SendMessage('setinactive', None, celGenericParameterBlock(0))
+
+ #Get the current font's VFS path
+ def getFont(self):
+ return self.font
+
+ #Set the font's VFS path
+ def setFont(self, vfspath):
+ if Vfs.Exists(vfspath):
+ self.font = vfspath
+ else:
+ print 'celMenu: can''t find %s' % vfspath
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/data/library/blpython/widgets/celScroller.py /tmp/IB0bHXT4Oc/cel-1.4/data/library/blpython/widgets/celScroller.py
--- cel-1.9+svn3615/data/library/blpython/widgets/celScroller.py 2007-06-29 14:51:34.000000000 +0100
+++ cel-1.4/data/library/blpython/widgets/celScroller.py 2009-11-28 16:46:10.000000000 +0000
@@ -37,7 +37,7 @@
self.menu.addElement('', 'scroller_down' + name, bposdown, self.bsize, fc, 'scroller-down')
#Add an item to the scroller
- def additem(self, name, message):
+ def additem(self, name, message, vfsfontpath = None):
#Check that its not a dupe
if (name not in self.names) or self.allowdoubles:
button = pl.CreateEntity(name, self.blpython, 'celButton')
@@ -52,7 +52,13 @@
pcbb.text_offset = csVector2(3000, 2000)
pcbb.text_fg_color = self.fcolor
pcbb.text_font_size = self.fconst
- pcbb.text_font = '/outlaws/fonts/lcd2.ttf'
+ if vfsfontpath is not None:
+ oldfont = self.menu.getFont()
+ self.menu.setFont(vfsfontpath)
+ pcbb.text_font = self.menu.getFont()
+ self.menu.setFont(oldfont)
+ else:
+ pcbb.text_font = self.menu.getFont()
self.items.append(button)
self.names.append(name)
index = len(self.names) - 1
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/data/library/Jamfile /tmp/IB0bHXT4Oc/cel-1.4/data/library/Jamfile
--- cel-1.9+svn3615/data/library/Jamfile 2006-11-24 18:10:16.000000000 +0000
+++ cel-1.4/data/library/Jamfile 2009-11-28 16:46:12.000000000 +0000
@@ -5,4 +5,7 @@
InstallData [ Wildcard entitytpl : *.xml ] : data library entitytpl ;
InstallData [ Wildcard quest : *.xml ] : data library quest ;
-
+FileListEntriesData [ Wildcard blpython : *.py *.cfg ] : library blpython : data-runtime ;
+FileListEntriesData [ Wildcard blxml : *.xml ] : library blxml : data-runtime ;
+FileListEntriesData [ Wildcard entitytpl : *.xml ] : library entitytpl : data-runtime ;
+FileListEntriesData [ Wildcard quest : *.xml ] : library quest : data-runtime ;
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/data/library/quest/AnalogMotionControl.xml /tmp/IB0bHXT4Oc/cel-1.4/data/library/quest/AnalogMotionControl.xml
--- cel-1.9+svn3615/data/library/quest/AnalogMotionControl.xml 2008-07-15 14:24:25.000000000 +0100
+++ cel-1.4/data/library/quest/AnalogMotionControl.xml 1970-01-01 01:00:00.000000000 +0100
@@ -1,93 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Binary files /tmp/GbaWLZOL1f/cel-1.9+svn3615/data/purple.png and /tmp/IB0bHXT4Oc/cel-1.4/data/purple.png differ
Binary files /tmp/GbaWLZOL1f/cel-1.9+svn3615/data/red.png and /tmp/IB0bHXT4Oc/cel-1.4/data/red.png differ
Binary files /tmp/GbaWLZOL1f/cel-1.9+svn3615/data/yellow.png and /tmp/IB0bHXT4Oc/cel-1.4/data/yellow.png differ
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/debian/cel1.4-dev.install /tmp/IB0bHXT4Oc/cel-1.4/debian/cel1.4-dev.install
--- cel-1.9+svn3615/debian/cel1.4-dev.install 1970-01-01 01:00:00.000000000 +0100
+++ cel-1.4/debian/cel1.4-dev.install 2009-12-08 19:13:22.000000000 +0000
@@ -0,0 +1 @@
+debian/tmp/usr/share/doc/cel-1.4/html usr/share/doc/cel-1.4-doc/
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/debian/cel1.4-examples.dirs /tmp/IB0bHXT4Oc/cel-1.4/debian/cel1.4-examples.dirs
--- cel-1.9+svn3615/debian/cel1.4-examples.dirs 1970-01-01 01:00:00.000000000 +0100
+++ cel-1.4/debian/cel1.4-examples.dirs 2009-12-08 19:11:57.000000000 +0000
@@ -0,0 +1,2 @@
+usr/bin
+etc/cel-1.4
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/debian/cel1.4-examples.install /tmp/IB0bHXT4Oc/cel-1.4/debian/cel1.4-examples.install
--- cel-1.9+svn3615/debian/cel1.4-examples.install 1970-01-01 01:00:00.000000000 +0100
+++ cel-1.4/debian/cel1.4-examples.install 2009-12-08 19:10:51.000000000 +0000
@@ -0,0 +1,20 @@
+debian/tmp/usr/bin/bootstrap
+debian/tmp/usr/bin/bootstrap-1.4
+debian/tmp/usr/bin/celtst
+debian/tmp/usr/bin/celtst-1.4
+debian/tmp/usr/bin/evolvecraft
+debian/tmp/usr/bin/evolvecraft-1.4
+debian/tmp/usr/bin/graph
+debian/tmp/usr/bin/graph-1.4
+debian/tmp/usr/bin/hovertest
+debian/tmp/usr/bin/hovertest-1.4
+debian/tmp/usr/bin/nettest
+debian/tmp/usr/bin/nettest-1.4
+debian/tmp/usr/bin/steering
+debian/tmp/usr/bin/steering-1.4
+debian/tmp/usr/bin/walktut
+debian/tmp/usr/bin/walktut-1.4
+debian/tmp/usr/bin/wheeledtest
+debian/tmp/usr/bin/wheeledtest-1.4
+debian/tmp/etc/cel-1.4/bootstrap.cfg
+debian/tmp/etc/cel-1.4/celtest.cfg
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/debian/cel1.9-doc.install /tmp/IB0bHXT4Oc/cel-1.4/debian/cel1.9-doc.install
--- cel-1.9+svn3615/debian/cel1.9-doc.install 2009-12-09 03:12:10.000000000 +0000
+++ cel-1.4/debian/cel1.9-doc.install 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-debian/tmp/usr/share/doc/cel-1.9/html usr/share/doc/cel-1.9-doc/
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/debian/cel1.9-examples.dirs /tmp/IB0bHXT4Oc/cel-1.4/debian/cel1.9-examples.dirs
--- cel-1.9+svn3615/debian/cel1.9-examples.dirs 2009-12-09 03:12:10.000000000 +0000
+++ cel-1.4/debian/cel1.9-examples.dirs 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-usr/bin
-etc/cel-1.3
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/debian/cel1.9-examples.install /tmp/IB0bHXT4Oc/cel-1.4/debian/cel1.9-examples.install
--- cel-1.9+svn3615/debian/cel1.9-examples.install 2009-12-09 03:12:10.000000000 +0000
+++ cel-1.4/debian/cel1.9-examples.install 1970-01-01 01:00:00.000000000 +0100
@@ -1,20 +0,0 @@
-debian/tmp/usr/bin/bootstrap
-debian/tmp/usr/bin/bootstrap-1.9
-debian/tmp/usr/bin/celtst
-debian/tmp/usr/bin/celtst-1.9
-debian/tmp/usr/bin/evolvecraft
-debian/tmp/usr/bin/evolvecraft-1.9
-debian/tmp/usr/bin/graph
-debian/tmp/usr/bin/graph-1.9
-debian/tmp/usr/bin/hovertest
-debian/tmp/usr/bin/hovertest-1.9
-debian/tmp/usr/bin/nettest
-debian/tmp/usr/bin/nettest-1.9
-debian/tmp/usr/bin/steering
-debian/tmp/usr/bin/steering-1.9
-debian/tmp/usr/bin/walktut
-debian/tmp/usr/bin/walktut-1.9
-debian/tmp/usr/bin/wheeledtest
-debian/tmp/usr/bin/wheeledtest-1.9
-debian/tmp/etc/cel-1.9/bootstrap.cfg
-debian/tmp/etc/cel-1.9/celtest.cfg
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/debian/celstart1.4.install /tmp/IB0bHXT4Oc/cel-1.4/debian/celstart1.4.install
--- cel-1.9+svn3615/debian/celstart1.4.install 1970-01-01 01:00:00.000000000 +0100
+++ cel-1.4/debian/celstart1.4.install 2009-12-08 19:14:43.000000000 +0000
@@ -0,0 +1,2 @@
+debian/tmp/usr/bin/celstart
+debian/tmp/usr/bin/celstart-1.4
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/debian/celstart1.9.install /tmp/IB0bHXT4Oc/cel-1.4/debian/celstart1.9.install
--- cel-1.9+svn3615/debian/celstart1.9.install 2009-12-09 03:12:10.000000000 +0000
+++ cel-1.4/debian/celstart1.9.install 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-debian/tmp/usr/bin/celstart
-debian/tmp/usr/bin/celstart-1.9
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/debian/changelog /tmp/IB0bHXT4Oc/cel-1.4/debian/changelog
--- cel-1.9+svn3615/debian/changelog 2009-12-09 03:12:10.000000000 +0000
+++ cel-1.4/debian/changelog 2009-12-08 19:11:17.000000000 +0000
@@ -1,3 +1,9 @@
+cel (1.4-1karmic1) karmic; urgency=low
+
+ * New Upstream Version
+
+ -- Pablo Martin (caedes) Tue, 08 Dec 2009 20:09:06 +0100
+
cel (1.9+svn3615-7karmic2) karmic; urgency=low
* Fix issue with python pth file path.
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/debian/control /tmp/IB0bHXT4Oc/cel-1.4/debian/control
--- cel-1.9+svn3615/debian/control 2009-12-09 03:12:10.000000000 +0000
+++ cel-1.4/debian/control 2009-12-08 19:14:30.000000000 +0000
@@ -5,9 +5,9 @@
Build-Depends: debhelper (>= 5), autotools-dev, python-support, python-dev, cdbs, zlib1g-dev, pkg-config, jam, libcrystalspace1.4-dev (>= 1.3+svn30855), libcppunit-dev, libtool, dash, mawk, swig (>= 1.3.22), dpatch
Standards-Version: 3.7.2
-Package: cel1.9
+Package: cel1.4
Architecture: all
-Depends: libcel1.9 (= ${binary:Version}), celstart1.9 (= ${binary:Version}), cel1.9-examples (= ${binary:Version}), libcel1.9-data (= ${binary:Version}), python-cel1.9 (= ${binary:Version})
+Depends: libcel1.4 (= ${binary:Version}), celstart1.4 (= ${binary:Version}), cel1.4-examples (= ${binary:Version}), libcel1.4-data (= ${binary:Version}), python-cel1.4 (= ${binary:Version})
Description: plugins and applications for Crystal Space
CEL provides a set of commonly used abstractions to
specifically help with writing games. CEL introduces
@@ -23,9 +23,9 @@
while being extremely easy to use from within Python and/or
Xml.
-Package: cel1.9-examples
+Package: cel1.4-examples
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libcel1.9 (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, libcel1.4 (= ${binary:Version})
Description: plugins and applications for Crystal Space
CEL provides a set of commonly used abstractions to
specifically help with writing games. CEL introduces
@@ -41,9 +41,9 @@
while being extremely easy to use from within Python and/or
Xml.
-Package: celstart1.9
+Package: celstart1.4
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libcel1.9 (= ${binary:Version}), python-cel1.9 (= ${binary:Version}), libcel1.9-data (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, libcel1.4 (= ${binary:Version}), python-cel1.4 (= ${binary:Version}), libcel1.4-data (= ${binary:Version})
Description: plugins and applications for Crystal Space
CEL provides a set of commonly used abstractions to
specifically help with writing games. CEL introduces
@@ -59,10 +59,10 @@
while being extremely easy to use from within Python and/or
Xml.
-Package: libcel1.9
+Package: libcel1.4
Architecture: any
Section: libs
-Depends: ${shlibs:Depends}, ${misc:Depends}, libcrystalspace1.4, libcel1.9-data (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, libcrystalspace1.4, libcel1.4-data (= ${binary:Version})
Description: plugins and applications for Crystal Space
CEL provides a set of commonly used abstractions to
specifically help with writing games. CEL introduces
@@ -78,10 +78,10 @@
while being extremely easy to use from within Python and/or
Xml.
-Package: libcel1.9-dev
+Package: libcel1.4-dev
Architecture: any
Section: devel
-Depends: ${shlibs:Depends}, ${misc:Depends}, libcel1.9 (= ${binary:Version}), libcrystalspace1.4-dev
+Depends: ${shlibs:Depends}, ${misc:Depends}, libcel1.4 (= ${binary:Version}), libcrystalspace1.4-dev
Description: plugins and applications for Crystal Space
CEL provides a set of commonly used abstractions to
specifically help with writing games. CEL introduces
@@ -97,7 +97,7 @@
while being extremely easy to use from within Python and/or
Xml.
-Package: libcel1.9-data
+Package: libcel1.4-data
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: plugins and applications for Crystal Space
@@ -115,7 +115,7 @@
while being extremely easy to use from within Python and/or
Xml.
-Package: libcel1.9-dbg
+Package: libcel1.4-dbg
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: plugins and applications for Crystal Space
@@ -133,10 +133,10 @@
while being extremely easy to use from within Python and/or
Xml.
-Package: python-cel1.9
+Package: python-cel1.4
Architecture: any
Section: python
-Depends: ${shlibs:Depends}, ${misc:Depends}, libcel1.9 (= ${binary:Version}), python-crystalspace1.4
+Depends: ${shlibs:Depends}, ${misc:Depends}, libcel1.4 (= ${binary:Version}), python-crystalspace1.4
Description: plugins and applications for Crystal Space
CEL provides a set of commonly used abstractions to
specifically help with writing games. CEL introduces
@@ -152,7 +152,7 @@
while being extremely easy to use from within Python and/or
Xml.
-Package: cel1.9-doc
+Package: cel1.4-doc
Architecture: all
Section: doc
Depends: ${shlibs:Depends}, ${misc:Depends}
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/debian/libcel1.4-data.dirs /tmp/IB0bHXT4Oc/cel-1.4/debian/libcel1.4-data.dirs
--- cel-1.9+svn3615/debian/libcel1.4-data.dirs 1970-01-01 01:00:00.000000000 +0100
+++ cel-1.4/debian/libcel1.4-data.dirs 2009-12-08 18:42:24.000000000 +0000
@@ -0,0 +1 @@
+usr/share/cel-1.3
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/debian/libcel1.4-data.install /tmp/IB0bHXT4Oc/cel-1.4/debian/libcel1.4-data.install
--- cel-1.9+svn3615/debian/libcel1.4-data.install 1970-01-01 01:00:00.000000000 +0100
+++ cel-1.4/debian/libcel1.4-data.install 2009-12-08 19:13:35.000000000 +0000
@@ -0,0 +1 @@
+debian/tmp/usr/share/cel-1.4/data
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/debian/libcel1.4-dev.dirs /tmp/IB0bHXT4Oc/cel-1.4/debian/libcel1.4-dev.dirs
--- cel-1.9+svn3615/debian/libcel1.4-dev.dirs 1970-01-01 01:00:00.000000000 +0100
+++ cel-1.4/debian/libcel1.4-dev.dirs 2009-12-08 18:42:24.000000000 +0000
@@ -0,0 +1,2 @@
+usr/bin
+Usr/include/cel-1.3
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/debian/libcel1.4-dev.install /tmp/IB0bHXT4Oc/cel-1.4/debian/libcel1.4-dev.install
--- cel-1.9+svn3615/debian/libcel1.4-dev.install 1970-01-01 01:00:00.000000000 +0100
+++ cel-1.4/debian/libcel1.4-dev.install 2009-12-08 19:13:41.000000000 +0000
@@ -0,0 +1,3 @@
+debian/tmp/usr/bin/cel-config-1.4
+debian/tmp/usr/bin/cel-config
+debian/tmp/usr/include
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/debian/libcel1.4.dirs /tmp/IB0bHXT4Oc/cel-1.4/debian/libcel1.4.dirs
--- cel-1.9+svn3615/debian/libcel1.4.dirs 1970-01-01 01:00:00.000000000 +0100
+++ cel-1.4/debian/libcel1.4.dirs 2009-12-08 18:42:24.000000000 +0000
@@ -0,0 +1,2 @@
+usr/lib/cel-1.3
+etc/cel-1.3
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/debian/libcel1.4.install /tmp/IB0bHXT4Oc/cel-1.4/debian/libcel1.4.install
--- cel-1.9+svn3615/debian/libcel1.4.install 1970-01-01 01:00:00.000000000 +0100
+++ cel-1.4/debian/libcel1.4.install 2009-12-08 19:13:52.000000000 +0000
@@ -0,0 +1,3 @@
+debian/tmp/usr/lib/
+debian/tmp/etc/cel-1.4/celconsole.cfg
+debian/tmp/etc/cel-1.4/vfs.cfg
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/debian/libcel1.9-data.dirs /tmp/IB0bHXT4Oc/cel-1.4/debian/libcel1.9-data.dirs
--- cel-1.9+svn3615/debian/libcel1.9-data.dirs 2009-12-09 03:12:10.000000000 +0000
+++ cel-1.4/debian/libcel1.9-data.dirs 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-usr/share/cel-1.3
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/debian/libcel1.9-data.install /tmp/IB0bHXT4Oc/cel-1.4/debian/libcel1.9-data.install
--- cel-1.9+svn3615/debian/libcel1.9-data.install 2009-12-09 03:12:10.000000000 +0000
+++ cel-1.4/debian/libcel1.9-data.install 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-debian/tmp/usr/share/cel-1.9/data
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/debian/libcel1.9-dev.dirs /tmp/IB0bHXT4Oc/cel-1.4/debian/libcel1.9-dev.dirs
--- cel-1.9+svn3615/debian/libcel1.9-dev.dirs 2009-12-09 03:12:10.000000000 +0000
+++ cel-1.4/debian/libcel1.9-dev.dirs 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-usr/bin
-Usr/include/cel-1.3
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/debian/libcel1.9-dev.install /tmp/IB0bHXT4Oc/cel-1.4/debian/libcel1.9-dev.install
--- cel-1.9+svn3615/debian/libcel1.9-dev.install 2009-12-09 03:12:10.000000000 +0000
+++ cel-1.4/debian/libcel1.9-dev.install 1970-01-01 01:00:00.000000000 +0100
@@ -1,3 +0,0 @@
-debian/tmp/usr/bin/cel-config-1.9
-debian/tmp/usr/bin/cel-config
-debian/tmp/usr/include
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/debian/libcel1.9.dirs /tmp/IB0bHXT4Oc/cel-1.4/debian/libcel1.9.dirs
--- cel-1.9+svn3615/debian/libcel1.9.dirs 2009-12-09 03:12:10.000000000 +0000
+++ cel-1.4/debian/libcel1.9.dirs 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-usr/lib/cel-1.3
-etc/cel-1.3
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/debian/libcel1.9.install /tmp/IB0bHXT4Oc/cel-1.4/debian/libcel1.9.install
--- cel-1.9+svn3615/debian/libcel1.9.install 2009-12-09 03:12:10.000000000 +0000
+++ cel-1.4/debian/libcel1.9.install 1970-01-01 01:00:00.000000000 +0100
@@ -1,3 +0,0 @@
-debian/tmp/usr/lib/
-debian/tmp/etc/cel-1.9/celconsole.cfg
-debian/tmp/etc/cel-1.9/vfs.cfg
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/debian/patches/00list /tmp/IB0bHXT4Oc/cel-1.4/debian/patches/00list
--- cel-1.9+svn3615/debian/patches/00list 2009-12-09 03:12:10.000000000 +0000
+++ cel-1.4/debian/patches/00list 2009-12-08 18:43:30.000000000 +0000
@@ -1,11 +1,2 @@
-01_run_with_14.dpatch
-02_quest_v3fix.dpatch
-03_quest_overflow.dpatch
-04_billboard_changeproperty.dpatch
-05_create_entity.dpatch
-06_changeproperty_reward_crash.dpatch
-07_fix_commandinput_activeaction.dpatch
-08_fix_questproperty_changed.dpatch
-09_fix_const_char_python.dpatch
10_fix_py_pth_path.dpatch
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/debian/python-cel1.4.dirs /tmp/IB0bHXT4Oc/cel-1.4/debian/python-cel1.4.dirs
--- cel-1.9+svn3615/debian/python-cel1.4.dirs 1970-01-01 01:00:00.000000000 +0100
+++ cel-1.4/debian/python-cel1.4.dirs 2009-12-08 18:42:24.000000000 +0000
@@ -0,0 +1 @@
+debian/tmp/usr/share/cel-1.3/bindings/python
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/debian/python-cel1.4.install /tmp/IB0bHXT4Oc/cel-1.4/debian/python-cel1.4.install
--- cel-1.9+svn3615/debian/python-cel1.4.install 1970-01-01 01:00:00.000000000 +0100
+++ cel-1.4/debian/python-cel1.4.install 2009-12-08 19:14:58.000000000 +0000
@@ -0,0 +1,2 @@
+debian/tmp/usr/share/cel-1.4/bindings/python
+debian/tmp/usr/lib/python*
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/debian/python-cel1.9.dirs /tmp/IB0bHXT4Oc/cel-1.4/debian/python-cel1.9.dirs
--- cel-1.9+svn3615/debian/python-cel1.9.dirs 2009-12-09 03:12:10.000000000 +0000
+++ cel-1.4/debian/python-cel1.9.dirs 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-debian/tmp/usr/share/cel-1.3/bindings/python
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/debian/python-cel1.9.install /tmp/IB0bHXT4Oc/cel-1.4/debian/python-cel1.9.install
--- cel-1.9+svn3615/debian/python-cel1.9.install 2009-12-09 03:12:10.000000000 +0000
+++ cel-1.4/debian/python-cel1.9.install 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-debian/tmp/usr/share/cel-1.9/bindings/python
-debian/tmp/usr/lib/python*
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/debian/rules /tmp/IB0bHXT4Oc/cel-1.4/debian/rules
--- cel-1.9+svn3615/debian/rules 2009-12-09 03:12:10.000000000 +0000
+++ cel-1.4/debian/rules 2009-12-08 19:14:17.000000000 +0000
@@ -10,9 +10,9 @@
jam clean
rm -rf config.status config.log Jamfile Jamconfig scripts/autopackage/celstart_static.apspec
-binary-fixup/python-cel1.9::
- install scripts/pycel.py debian/python-cel1.9/usr/share/cel-1.9/bindings/python/
- dh_pysupport -ppython-cel1.9
+binary-fixup/python-cel1.4::
+ install scripts/pycel.py debian/python-cel1.4/usr/share/cel-1.4/bindings/python/
+ dh_pysupport -ppython-cel1.4
DEB_INSTALL_CHANGELOGS_ALL := docs/history.txt
DEB_COMPRESS_EXCLUDE := .py
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/docs/html/Jamfile /tmp/IB0bHXT4Oc/cel-1.4/docs/html/Jamfile
--- cel-1.9+svn3615/docs/html/Jamfile 2004-12-21 07:30:34.000000000 +0000
+++ cel-1.4/docs/html/Jamfile 2009-11-28 16:46:39.000000000 +0000
@@ -1,5 +1,15 @@
SubDir TOP docs html ;
+rule FilelistEntryManual
+{
+ FileListEntriesData $(1) : $(2) : doc-manual ;
+}
+
+rule FilelistEntryAPI
+{
+ FileListEntriesData $(1) : $(2) : doc-api ;
+}
+
CELDOCFILES_HTML = .html .jpg .jpeg .png .gif .css ;
# The 'manual' and 'api' subdirectories are generated automatically by
@@ -12,6 +22,8 @@
SubDir TOP docs html manual ;
Recurse InstallDoc : $(CELDOCFILES_HTML) : html manual ;
+Recurse FilelistEntryManual : $(CELDOCFILES_HTML) ;
SubDir TOP docs html api ;
Recurse InstallDoc : $(CELDOCFILES_HTML) : html api ;
+Recurse FilelistEntryAPI : $(CELDOCFILES_HTML) ;
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/docs/html/manual/Addons-CelEntity.html /tmp/IB0bHXT4Oc/cel-1.4/docs/html/manual/Addons-CelEntity.html
--- cel-1.9+svn3615/docs/html/manual/Addons-CelEntity.html 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/docs/html/manual/Addons-CelEntity.html 2009-11-28 16:46:40.000000000 +0000
@@ -11,10 +11,10 @@
-->
-Crystal Entity Layer 1.9dev: 4.4.1 CelEntity Addon
+Crystal Entity Layer 1.4.0: 4.4.1 CelEntity Addon
-
-
+
+
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/docs/html/manual/Addons-CelEntityTemplate.html /tmp/IB0bHXT4Oc/cel-1.4/docs/html/manual/Addons-CelEntityTemplate.html
--- cel-1.9+svn3615/docs/html/manual/Addons-CelEntityTemplate.html 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/docs/html/manual/Addons-CelEntityTemplate.html 2009-11-28 16:46:40.000000000 +0000
@@ -11,10 +11,10 @@
-->
-Crystal Entity Layer 1.9dev: 4.4.2 CelEntity Template Addon
+Crystal Entity Layer 1.4.0: 4.4.2 CelEntity Template Addon
-
-
+
+
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/docs/html/manual/Addons.html /tmp/IB0bHXT4Oc/cel-1.4/docs/html/manual/Addons.html
--- cel-1.9+svn3615/docs/html/manual/Addons.html 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/docs/html/manual/Addons.html 2009-11-28 16:46:40.000000000 +0000
@@ -11,10 +11,10 @@
-->
-Crystal Entity Layer 1.9dev: 4.4 Addons
+Crystal Entity Layer 1.4.0: 4.4 Addons
-
-
+
+
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/docs/html/manual/Addons-QuestDef.html /tmp/IB0bHXT4Oc/cel-1.4/docs/html/manual/Addons-QuestDef.html
--- cel-1.9+svn3615/docs/html/manual/Addons-QuestDef.html 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/docs/html/manual/Addons-QuestDef.html 2009-11-28 16:46:40.000000000 +0000
@@ -11,10 +11,10 @@
-->
-Crystal Entity Layer 1.9dev: 4.4.4 Quest Definition Addon
+Crystal Entity Layer 1.4.0: 4.4.4 Quest Definition Addon
-
-
+
+
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/docs/html/manual/Addons-XmlScripts.html /tmp/IB0bHXT4Oc/cel-1.4/docs/html/manual/Addons-XmlScripts.html
--- cel-1.9+svn3615/docs/html/manual/Addons-XmlScripts.html 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/docs/html/manual/Addons-XmlScripts.html 2009-11-28 16:46:40.000000000 +0000
@@ -11,10 +11,10 @@
-->
-Crystal Entity Layer 1.9dev: 4.4.3 XML Scripts Addon
+Crystal Entity Layer 1.4.0: 4.4.3 XML Scripts Addon
-
-
+
+
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/docs/html/manual/AppBootstrap.html /tmp/IB0bHXT4Oc/cel-1.4/docs/html/manual/AppBootstrap.html
--- cel-1.9+svn3615/docs/html/manual/AppBootstrap.html 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/docs/html/manual/AppBootstrap.html 2009-11-28 16:46:40.000000000 +0000
@@ -11,10 +11,10 @@
-->
-Crystal Entity Layer 1.9dev: 3.3 bootstrap
+Crystal Entity Layer 1.4.0: 3.3 bootstrap
-
-
+
+
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/docs/html/manual/AppCelstart.html /tmp/IB0bHXT4Oc/cel-1.4/docs/html/manual/AppCelstart.html
--- cel-1.9+svn3615/docs/html/manual/AppCelstart.html 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/docs/html/manual/AppCelstart.html 2009-11-28 16:46:40.000000000 +0000
@@ -11,10 +11,10 @@
-->
-Crystal Entity Layer 1.9dev: 3.4 celstart
+Crystal Entity Layer 1.4.0: 3.4 celstart
-
-
+
+
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/docs/html/manual/AppCeltest.html /tmp/IB0bHXT4Oc/cel-1.4/docs/html/manual/AppCeltest.html
--- cel-1.9+svn3615/docs/html/manual/AppCeltest.html 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/docs/html/manual/AppCeltest.html 2009-11-28 16:46:40.000000000 +0000
@@ -11,10 +11,10 @@
-->
-Crystal Entity Layer 1.9dev: 3.2 celtest
+Crystal Entity Layer 1.4.0: 3.2 celtest
-
-
+
+
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/docs/html/manual/Applications.html /tmp/IB0bHXT4Oc/cel-1.4/docs/html/manual/Applications.html
--- cel-1.9+svn3615/docs/html/manual/Applications.html 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/docs/html/manual/Applications.html 2009-11-28 16:46:40.000000000 +0000
@@ -11,10 +11,10 @@
-->
-Crystal Entity Layer 1.9dev: 3. Applications
+Crystal Entity Layer 1.4.0: 3. Applications
-
-
+
+
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/docs/html/manual/AppOverview.html /tmp/IB0bHXT4Oc/cel-1.4/docs/html/manual/AppOverview.html
--- cel-1.9+svn3615/docs/html/manual/AppOverview.html 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/docs/html/manual/AppOverview.html 2009-11-28 16:46:40.000000000 +0000
@@ -11,10 +11,10 @@
-->
-Crystal Entity Layer 1.9dev: 3.1 Overview
+Crystal Entity Layer 1.4.0: 3.1 Overview
-
-
+
+
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/docs/html/manual/Building.html /tmp/IB0bHXT4Oc/cel-1.4/docs/html/manual/Building.html
--- cel-1.9+svn3615/docs/html/manual/Building.html 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/docs/html/manual/Building.html 2009-11-28 16:46:40.000000000 +0000
@@ -11,10 +11,10 @@
-->
-Crystal Entity Layer 1.9dev: 2. Building and Installing
+Crystal Entity Layer 1.4.0: 2. Building and Installing
-
-
+
+
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/docs/html/manual/cel_abt.html /tmp/IB0bHXT4Oc/cel-1.4/docs/html/manual/cel_abt.html
--- cel-1.9+svn3615/docs/html/manual/cel_abt.html 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/docs/html/manual/cel_abt.html 2009-11-28 16:46:40.000000000 +0000
@@ -11,10 +11,10 @@
-->
-Crystal Entity Layer 1.9dev: About This Document
+Crystal Entity Layer 1.4.0: About This Document
-
-
+
+
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/docs/html/manual/CEL-Environment-Variable.html /tmp/IB0bHXT4Oc/cel-1.4/docs/html/manual/CEL-Environment-Variable.html
--- cel-1.9+svn3615/docs/html/manual/CEL-Environment-Variable.html 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/docs/html/manual/CEL-Environment-Variable.html 2009-11-28 16:46:40.000000000 +0000
@@ -11,10 +11,10 @@
-->
-Crystal Entity Layer 1.9dev: 2.4 CEL Environment Variable
+Crystal Entity Layer 1.4.0: 2.4 CEL Environment Variable
-
-
+
+
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/docs/html/manual/cel_toc.html /tmp/IB0bHXT4Oc/cel-1.4/docs/html/manual/cel_toc.html
--- cel-1.9+svn3615/docs/html/manual/cel_toc.html 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/docs/html/manual/cel_toc.html 2009-11-28 16:46:40.000000000 +0000
@@ -11,10 +11,10 @@
-->
-Crystal Entity Layer 1.9dev: Table of Contents
+Crystal Entity Layer 1.4.0: Table of Contents
-
-
+
+
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/docs/html/manual/Concepts.html /tmp/IB0bHXT4Oc/cel-1.4/docs/html/manual/Concepts.html
--- cel-1.9+svn3615/docs/html/manual/Concepts.html 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/docs/html/manual/Concepts.html 2009-11-28 16:46:40.000000000 +0000
@@ -11,10 +11,10 @@
-->
-Crystal Entity Layer 1.9dev: 1.2 Concepts
+Crystal Entity Layer 1.4.0: 1.2 Concepts
-
-
+
+
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/docs/html/manual/Cpp-specifics.html /tmp/IB0bHXT4Oc/cel-1.4/docs/html/manual/Cpp-specifics.html
--- cel-1.9+svn3615/docs/html/manual/Cpp-specifics.html 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/docs/html/manual/Cpp-specifics.html 2009-11-28 16:46:40.000000000 +0000
@@ -11,10 +11,10 @@
-->
-Crystal Entity Layer 1.9dev: 4.7 Using CEL from c++
+Crystal Entity Layer 1.4.0: 4.7 Using CEL from c++
-
-
+
+
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/docs/html/manual/cs_Index.html /tmp/IB0bHXT4Oc/cel-1.4/docs/html/manual/cs_Index.html
--- cel-1.9+svn3615/docs/html/manual/cs_Index.html 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/docs/html/manual/cs_Index.html 2009-11-28 16:46:40.000000000 +0000
@@ -11,10 +11,10 @@
-->
-Crystal Entity Layer 1.9dev: Index
+Crystal Entity Layer 1.4.0: Index
-
-
+
+
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/docs/html/manual/Current-Status.html /tmp/IB0bHXT4Oc/cel-1.4/docs/html/manual/Current-Status.html
--- cel-1.9+svn3615/docs/html/manual/Current-Status.html 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/docs/html/manual/Current-Status.html 2009-11-28 16:46:40.000000000 +0000
@@ -11,10 +11,10 @@
-->
-Crystal Entity Layer 1.9dev: 1.4 Current Status
+Crystal Entity Layer 1.4.0: 1.4 Current Status
-
-
+
+
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/docs/html/manual/Directory-Hierarchy.html /tmp/IB0bHXT4Oc/cel-1.4/docs/html/manual/Directory-Hierarchy.html
--- cel-1.9+svn3615/docs/html/manual/Directory-Hierarchy.html 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/docs/html/manual/Directory-Hierarchy.html 2009-11-28 16:46:40.000000000 +0000
@@ -11,10 +11,10 @@
-->
-Crystal Entity Layer 1.9dev: 2.1 Directory Hierarchy
+Crystal Entity Layer 1.4.0: 2.1 Directory Hierarchy
-
-
+
+
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/docs/html/manual/External-Libraries.html /tmp/IB0bHXT4Oc/cel-1.4/docs/html/manual/External-Libraries.html
--- cel-1.9+svn3615/docs/html/manual/External-Libraries.html 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/docs/html/manual/External-Libraries.html 2009-11-28 16:46:40.000000000 +0000
@@ -11,10 +11,10 @@
-->
-Crystal Entity Layer 1.9dev: 2.3 External Libraries
+Crystal Entity Layer 1.4.0: 2.3 External Libraries
-
-
+
+
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/docs/html/manual/Features.html /tmp/IB0bHXT4Oc/cel-1.4/docs/html/manual/Features.html
--- cel-1.9+svn3615/docs/html/manual/Features.html 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/docs/html/manual/Features.html 2009-11-28 16:46:40.000000000 +0000
@@ -11,10 +11,10 @@
-->
-Crystal Entity Layer 1.9dev: 1.7 Feature List
+Crystal Entity Layer 1.4.0: 1.7 Feature List
-
-
+
+
@@ -60,6 +60,83 @@
1.7 Feature List
+The Crystal Entity Layer provides higher-level ways to control objects than
+you'd have by using Crystal Space alone. It also provides features not
+present in Crystal Space, therefore saving you a lot of time you'd spend
+implementing them yourself.
+
+
+-
+Entity system
+
+
Entities provide a convenient way to access and control objects' features and
+properties. Entities are not required to have a visual representation.
+One simply adds features to an entity by attaching property classes, then
+handling the messages this entity receives.
+
+ -
+Scripting
+
+
CEL has Python bindings, and its own XML-based script language.
+You can use either of those, on a per-entity basis.
+Using CELStart, you can build an application without any line of C++.
+Indeed, you can also use them from your own C++ code.
+
+ -
+Movement helpers
+
+
+-
+Linear: handles everything related to moving, from collision detection
+to dead reckoning.
+
+
-
+Physics
+
+
-
+Vehicles: support for 4+ wheels vehicles (including tank-like
+behaviour), and hovercraft.
+
+
+
+ -
+Abstracted mesh objects management: you can manipulate meshes and
+animations independently of the underlying mesh object type.
+
+
-
+Camera helpers: it's easy to get 3rd person view, and specific
+object-tracking behaviour.
+
+
-
+Networking: there's a TCP network plugin, based on HawkNL.
+
+
-
+Artificial Intelligence
+
+
+-
+Steering behaviour
+
+
-
+Neural network
+
+
+
+ -
+Miscellaneous
+
+
+- Billboards
+
- Inventory
+
- Timers
+
- Quests (finite state machine)
+
- Projectiles
+
- Mesh deformation
+
- Zone manager: can load and unload parts of the level, depending on
+actor's position.
+
+
+
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/docs/html/manual/Guide.html /tmp/IB0bHXT4Oc/cel-1.4/docs/html/manual/Guide.html
--- cel-1.9+svn3615/docs/html/manual/Guide.html 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/docs/html/manual/Guide.html 2009-11-28 16:46:40.000000000 +0000
@@ -11,10 +11,10 @@
-->
-Crystal Entity Layer 1.9dev: 1.6 A Guide To This Documentation
+Crystal Entity Layer 1.4.0: 1.6 A Guide To This Documentation
-
-
+
+
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/docs/html/manual/How-To-Read.html /tmp/IB0bHXT4Oc/cel-1.4/docs/html/manual/How-To-Read.html
--- cel-1.9+svn3615/docs/html/manual/How-To-Read.html 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/docs/html/manual/How-To-Read.html 2009-11-28 16:46:40.000000000 +0000
@@ -11,10 +11,10 @@
-->
-Crystal Entity Layer 1.9dev: 1.3 How To Read This Manual
+Crystal Entity Layer 1.4.0: 1.3 How To Read This Manual
-
-
+
+
@@ -61,7 +61,7 @@
1.3 How To Read This Manual
-This manual was written and is currently maintained by Daniel Thoroughgood.
+
This manual was originally written by Daniel Thoroughgood.
Constructive feedback, suggestions and contributions are always welcome.
If you find something in this manual which you believe is not correct please
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/docs/html/manual/index.html /tmp/IB0bHXT4Oc/cel-1.4/docs/html/manual/index.html
--- cel-1.9+svn3615/docs/html/manual/index.html 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/docs/html/manual/index.html 2009-11-28 16:46:40.000000000 +0000
@@ -11,10 +11,10 @@
-->
-Crystal Entity Layer 1.9dev: Crystal Entity Layer
+Crystal Entity Layer 1.4.0: Crystal Entity Layer
-
-
+
+
@@ -60,8 +60,8 @@
This document includes usage instructions, conceptual material, and detailed
technical information.
-This manual, edition 1.9dev.0, is for Crystal Entity Layer, version
-1.9dev, and was last updated on 17 Jun 2008.
+
This manual, edition 1.4.0, is for Crystal Entity Layer, version
+1.4.0, and was last updated on 01 Mar 2009.
Copyright © 2003 by Daniel Thoroughgood
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/docs/html/manual/Introduction.html /tmp/IB0bHXT4Oc/cel-1.4/docs/html/manual/Introduction.html
--- cel-1.9+svn3615/docs/html/manual/Introduction.html 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/docs/html/manual/Introduction.html 2009-11-28 16:46:40.000000000 +0000
@@ -11,10 +11,10 @@
-->
-Crystal Entity Layer 1.9dev: 1. Introduction
+Crystal Entity Layer 1.4.0: 1. Introduction
-
-
+
+
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/docs/html/manual/Licence.html /tmp/IB0bHXT4Oc/cel-1.4/docs/html/manual/Licence.html
--- cel-1.9+svn3615/docs/html/manual/Licence.html 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/docs/html/manual/Licence.html 2009-11-28 16:46:40.000000000 +0000
@@ -11,10 +11,10 @@
-->
-Crystal Entity Layer 1.9dev: 1.10 GNU Library General Public License
+Crystal Entity Layer 1.4.0: 1.10 GNU Library General Public License
-
-
+
+
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/docs/html/manual/Mailing-Lists.html /tmp/IB0bHXT4Oc/cel-1.4/docs/html/manual/Mailing-Lists.html
--- cel-1.9+svn3615/docs/html/manual/Mailing-Lists.html 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/docs/html/manual/Mailing-Lists.html 2009-11-28 16:46:40.000000000 +0000
@@ -11,10 +11,10 @@
-->
-Crystal Entity Layer 1.9dev: 1.9 Mailing Lists
+Crystal Entity Layer 1.4.0: 1.9 Mailing Lists
-
-
+
+
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/docs/html/manual/PropClass-Billboard.html /tmp/IB0bHXT4Oc/cel-1.4/docs/html/manual/PropClass-Billboard.html
--- cel-1.9+svn3615/docs/html/manual/PropClass-Billboard.html 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/docs/html/manual/PropClass-Billboard.html 2009-11-28 16:46:40.000000000 +0000
@@ -11,10 +11,10 @@
-->
-Crystal Entity Layer 1.9dev: 4.3.1 Billboard
+Crystal Entity Layer 1.4.0: 4.3.1 Billboard
-
-
+
+
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/docs/html/manual/PropClass-CommandInput.html /tmp/IB0bHXT4Oc/cel-1.4/docs/html/manual/PropClass-CommandInput.html
--- cel-1.9+svn3615/docs/html/manual/PropClass-CommandInput.html 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/docs/html/manual/PropClass-CommandInput.html 2009-11-28 16:46:40.000000000 +0000
@@ -11,10 +11,10 @@
-->
-Crystal Entity Layer 1.9dev: 4.3.2 Command Input
+Crystal Entity Layer 1.4.0: 4.3.2 Command Input
-
-
+
+
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/docs/html/manual/PropClass-Hover.html /tmp/IB0bHXT4Oc/cel-1.4/docs/html/manual/PropClass-Hover.html
--- cel-1.9+svn3615/docs/html/manual/PropClass-Hover.html 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/docs/html/manual/PropClass-Hover.html 2009-11-28 16:46:40.000000000 +0000
@@ -11,10 +11,10 @@
-->
-Crystal Entity Layer 1.9dev: 4.3.3 Hover
+Crystal Entity Layer 1.4.0: 4.3.3 Hover
-
-
+
+
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/docs/html/manual/PropClass-LinMove.html /tmp/IB0bHXT4Oc/cel-1.4/docs/html/manual/PropClass-LinMove.html
--- cel-1.9+svn3615/docs/html/manual/PropClass-LinMove.html 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/docs/html/manual/PropClass-LinMove.html 2009-11-28 16:46:40.000000000 +0000
@@ -11,10 +11,10 @@
-->
-Crystal Entity Layer 1.9dev: 4.3.4 Linear Movement
+Crystal Entity Layer 1.4.0: 4.3.4 Linear Movement
-
-
+
+
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/docs/html/manual/PropClass-Mesh.html /tmp/IB0bHXT4Oc/cel-1.4/docs/html/manual/PropClass-Mesh.html
--- cel-1.9+svn3615/docs/html/manual/PropClass-Mesh.html 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/docs/html/manual/PropClass-Mesh.html 2009-11-28 16:46:40.000000000 +0000
@@ -11,10 +11,10 @@
-->
-Crystal Entity Layer 1.9dev: 4.3.5 Mesh
+Crystal Entity Layer 1.4.0: 4.3.5 Mesh
-
-
+
+
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/docs/html/manual/PropClass-Mover.html /tmp/IB0bHXT4Oc/cel-1.4/docs/html/manual/PropClass-Mover.html
--- cel-1.9+svn3615/docs/html/manual/PropClass-Mover.html 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/docs/html/manual/PropClass-Mover.html 2009-11-28 16:46:40.000000000 +0000
@@ -11,10 +11,10 @@
-->
-Crystal Entity Layer 1.9dev: 4.3.6 Mover
+Crystal Entity Layer 1.4.0: 4.3.6 Mover
-
-
+
+
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/docs/html/manual/PropClass-Projectile.html /tmp/IB0bHXT4Oc/cel-1.4/docs/html/manual/PropClass-Projectile.html
--- cel-1.9+svn3615/docs/html/manual/PropClass-Projectile.html 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/docs/html/manual/PropClass-Projectile.html 2009-11-28 16:46:40.000000000 +0000
@@ -11,10 +11,10 @@
-->
-Crystal Entity Layer 1.9dev: 4.3.7 Projectile
+Crystal Entity Layer 1.4.0: 4.3.7 Projectile
-
-
+
+
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/docs/html/manual/PropClass-Quest-Manager.html /tmp/IB0bHXT4Oc/cel-1.4/docs/html/manual/PropClass-Quest-Manager.html
--- cel-1.9+svn3615/docs/html/manual/PropClass-Quest-Manager.html 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/docs/html/manual/PropClass-Quest-Manager.html 2009-11-28 16:46:40.000000000 +0000
@@ -11,10 +11,10 @@
-->
-Crystal Entity Layer 1.9dev: 4.3.8 Quest Manager
+Crystal Entity Layer 1.4.0: 4.3.8 Quest Manager
-
-
+
+
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/docs/html/manual/PropClass-Spawn.html /tmp/IB0bHXT4Oc/cel-1.4/docs/html/manual/PropClass-Spawn.html
--- cel-1.9+svn3615/docs/html/manual/PropClass-Spawn.html 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/docs/html/manual/PropClass-Spawn.html 2009-11-28 16:46:40.000000000 +0000
@@ -11,10 +11,10 @@
-->
-Crystal Entity Layer 1.9dev: 4.3.9 Spawn
+Crystal Entity Layer 1.4.0: 4.3.9 Spawn
-
-
+
+
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/docs/html/manual/PropClass-Timer.html /tmp/IB0bHXT4Oc/cel-1.4/docs/html/manual/PropClass-Timer.html
--- cel-1.9+svn3615/docs/html/manual/PropClass-Timer.html 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/docs/html/manual/PropClass-Timer.html 2009-11-28 16:46:40.000000000 +0000
@@ -11,10 +11,10 @@
-->
-Crystal Entity Layer 1.9dev: 4.3.10 Timer
+Crystal Entity Layer 1.4.0: 4.3.10 Timer
-
-
+
+
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/docs/html/manual/PropClass-Trigger.html /tmp/IB0bHXT4Oc/cel-1.4/docs/html/manual/PropClass-Trigger.html
--- cel-1.9+svn3615/docs/html/manual/PropClass-Trigger.html 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/docs/html/manual/PropClass-Trigger.html 2009-11-28 16:46:40.000000000 +0000
@@ -11,10 +11,10 @@
-->
-Crystal Entity Layer 1.9dev: 4.3.11 Trigger
+Crystal Entity Layer 1.4.0: 4.3.11 Trigger
-
-
+
+
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/docs/html/manual/PropClass-ZoneMgr.html /tmp/IB0bHXT4Oc/cel-1.4/docs/html/manual/PropClass-ZoneMgr.html
--- cel-1.9+svn3615/docs/html/manual/PropClass-ZoneMgr.html 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/docs/html/manual/PropClass-ZoneMgr.html 2009-11-28 16:46:40.000000000 +0000
@@ -11,10 +11,10 @@
-->
-Crystal Entity Layer 1.9dev: 4.3.12 Zone Manager
+Crystal Entity Layer 1.4.0: 4.3.12 Zone Manager
-
-
+
+
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/docs/html/manual/Property-Classes.html /tmp/IB0bHXT4Oc/cel-1.4/docs/html/manual/Property-Classes.html
--- cel-1.9+svn3615/docs/html/manual/Property-Classes.html 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/docs/html/manual/Property-Classes.html 2009-11-28 16:46:40.000000000 +0000
@@ -11,10 +11,10 @@
-->
-Crystal Entity Layer 1.9dev: 4.3 Property Classes
+Crystal Entity Layer 1.4.0: 4.3 Property Classes
-
-
+
+
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/docs/html/manual/Python-Behaviour-Layer.html /tmp/IB0bHXT4Oc/cel-1.4/docs/html/manual/Python-Behaviour-Layer.html
--- cel-1.9+svn3615/docs/html/manual/Python-Behaviour-Layer.html 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/docs/html/manual/Python-Behaviour-Layer.html 2009-11-28 16:46:40.000000000 +0000
@@ -11,10 +11,10 @@
-->
-Crystal Entity Layer 1.9dev: 4.6 The Python Behaviour Layer
+Crystal Entity Layer 1.4.0: 4.6 The Python Behaviour Layer
-
-
+
+
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/docs/html/manual/Requirements.html /tmp/IB0bHXT4Oc/cel-1.4/docs/html/manual/Requirements.html
--- cel-1.9+svn3615/docs/html/manual/Requirements.html 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/docs/html/manual/Requirements.html 2009-11-28 16:46:40.000000000 +0000
@@ -11,10 +11,10 @@
-->
-Crystal Entity Layer 1.9dev: 2.2 Requirements
+Crystal Entity Layer 1.4.0: 2.2 Requirements
-
-
+
+
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/docs/html/manual/The-Basics.html /tmp/IB0bHXT4Oc/cel-1.4/docs/html/manual/The-Basics.html
--- cel-1.9+svn3615/docs/html/manual/The-Basics.html 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/docs/html/manual/The-Basics.html 2009-11-28 16:46:40.000000000 +0000
@@ -11,10 +11,10 @@
-->
-Crystal Entity Layer 1.9dev: 4.1 The Basics
+Crystal Entity Layer 1.4.0: 4.1 The Basics
-
-
+
+
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/docs/html/manual/Tutorial-App-Header.html /tmp/IB0bHXT4Oc/cel-1.4/docs/html/manual/Tutorial-App-Header.html
--- cel-1.9+svn3615/docs/html/manual/Tutorial-App-Header.html 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/docs/html/manual/Tutorial-App-Header.html 2009-11-28 16:46:40.000000000 +0000
@@ -11,10 +11,10 @@
-->
-Crystal Entity Layer 1.9dev: 4.2.1.2 app.h
+Crystal Entity Layer 1.4.0: 4.2.1.2 app.h
-
-
+
+
@@ -71,6 +71,7 @@
#include <physicallayer/entity.h>
#include <physicallayer/pl.h>
+#include <behaviourlayer/bl.h>
/*
* Our main application class inherits from csApplicationFramework
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/docs/html/manual/Tutorial-App.html /tmp/IB0bHXT4Oc/cel-1.4/docs/html/manual/Tutorial-App.html
--- cel-1.9+svn3615/docs/html/manual/Tutorial-App.html 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/docs/html/manual/Tutorial-App.html 2009-11-28 16:46:40.000000000 +0000
@@ -11,10 +11,10 @@
-->
-Crystal Entity Layer 1.9dev: 4.2.1.3 app.cpp
+Crystal Entity Layer 1.4.0: 4.2.1.3 app.cpp
-
-
+
+
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/docs/html/manual/Tutorial-Behave-Header.html /tmp/IB0bHXT4Oc/cel-1.4/docs/html/manual/Tutorial-Behave-Header.html
--- cel-1.9+svn3615/docs/html/manual/Tutorial-Behave-Header.html 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/docs/html/manual/Tutorial-Behave-Header.html 2009-11-28 16:46:40.000000000 +0000
@@ -11,10 +11,10 @@
-->
-Crystal Entity Layer 1.9dev: 4.2.1.4 behave.h
+Crystal Entity Layer 1.4.0: 4.2.1.4 behave.h
-
-
+
+
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/docs/html/manual/Tutorial-Behave.html /tmp/IB0bHXT4Oc/cel-1.4/docs/html/manual/Tutorial-Behave.html
--- cel-1.9+svn3615/docs/html/manual/Tutorial-Behave.html 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/docs/html/manual/Tutorial-Behave.html 2009-11-28 16:46:40.000000000 +0000
@@ -11,10 +11,10 @@
-->
-Crystal Entity Layer 1.9dev: 4.2.1.5 behave.cpp
+Crystal Entity Layer 1.4.0: 4.2.1.5 behave.cpp
-
-
+
+
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/docs/html/manual/Tutorial-Main.html /tmp/IB0bHXT4Oc/cel-1.4/docs/html/manual/Tutorial-Main.html
--- cel-1.9+svn3615/docs/html/manual/Tutorial-Main.html 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/docs/html/manual/Tutorial-Main.html 2009-11-28 16:46:40.000000000 +0000
@@ -11,10 +11,10 @@
-->
-Crystal Entity Layer 1.9dev: 4.2.1.1 main.cpp
+Crystal Entity Layer 1.4.0: 4.2.1.1 main.cpp
-
-
+
+
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/docs/html/manual/Tutorials.html /tmp/IB0bHXT4Oc/cel-1.4/docs/html/manual/Tutorials.html
--- cel-1.9+svn3615/docs/html/manual/Tutorials.html 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/docs/html/manual/Tutorials.html 2009-11-28 16:46:40.000000000 +0000
@@ -11,10 +11,10 @@
-->
-Crystal Entity Layer 1.9dev: 4.2 Tutorials
+Crystal Entity Layer 1.4.0: 4.2 Tutorials
-
-
+
+
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/docs/html/manual/Tutorial-WalkTut.html /tmp/IB0bHXT4Oc/cel-1.4/docs/html/manual/Tutorial-WalkTut.html
--- cel-1.9+svn3615/docs/html/manual/Tutorial-WalkTut.html 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/docs/html/manual/Tutorial-WalkTut.html 2009-11-28 16:46:40.000000000 +0000
@@ -11,10 +11,10 @@
-->
-Crystal Entity Layer 1.9dev: 4.2.1 WalkTut Tutorial
+Crystal Entity Layer 1.4.0: 4.2.1 WalkTut Tutorial
-
-
+
+
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/docs/html/manual/Using-CEL-For-Your-Project.html /tmp/IB0bHXT4Oc/cel-1.4/docs/html/manual/Using-CEL-For-Your-Project.html
--- cel-1.9+svn3615/docs/html/manual/Using-CEL-For-Your-Project.html 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/docs/html/manual/Using-CEL-For-Your-Project.html 2009-11-28 16:46:40.000000000 +0000
@@ -11,10 +11,10 @@
-->
-Crystal Entity Layer 1.9dev: 1.5 Using Crystal Entity Layer For Your Project
+Crystal Entity Layer 1.4.0: 1.5 Using Crystal Entity Layer For Your Project
-
-
+
+
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/docs/html/manual/Using-CEL.html /tmp/IB0bHXT4Oc/cel-1.4/docs/html/manual/Using-CEL.html
--- cel-1.9+svn3615/docs/html/manual/Using-CEL.html 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/docs/html/manual/Using-CEL.html 2009-11-28 16:46:40.000000000 +0000
@@ -11,10 +11,10 @@
-->
-Crystal Entity Layer 1.9dev: 4. Using CEL
+Crystal Entity Layer 1.4.0: 4. Using CEL
-
-
+
+
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/docs/html/manual/What-Is-CEL.html /tmp/IB0bHXT4Oc/cel-1.4/docs/html/manual/What-Is-CEL.html
--- cel-1.9+svn3615/docs/html/manual/What-Is-CEL.html 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/docs/html/manual/What-Is-CEL.html 2009-11-28 16:46:40.000000000 +0000
@@ -11,10 +11,10 @@
-->
-Crystal Entity Layer 1.9dev: 1.1 What Is Crystal Entity Layer?
+Crystal Entity Layer 1.4.0: 1.1 What Is Crystal Entity Layer?
-
-
+
+
@@ -61,8 +61,8 @@
1.1 What Is Crystal Entity Layer?
-Crystal Entity Layer is a plugin developed to be used in conjunction with
-Crystal Space. It is designed to make it easier for game developers to
+
Crystal Entity Layer is a set of plugins developed to be used in conjunction
+with Crystal Space. It is designed to make it easier for game developers to
create games based on Crystal Space by providing such concepts as entities,
properties and behaviours.
@@ -83,7 +83,7 @@
Crystal Entity Layer is free and should remain free. Crystal Entity Layer
falls under the GNU copyleft license for libraries (LGPL). A copy of of the
LGPL is included in this manual for your perusal. In short, the LGPL allows
-you to use CrystalSpace as a library in your products, even commercial
+you to use Crystal Space as a library in your products, even commercial
products, but modifications to the library or derivative works incorporating
parts of the library must be made freely available to everyone, under the
LGPL's terms.
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/docs/html/manual/Where-To-Get-CEL.html /tmp/IB0bHXT4Oc/cel-1.4/docs/html/manual/Where-To-Get-CEL.html
--- cel-1.9+svn3615/docs/html/manual/Where-To-Get-CEL.html 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/docs/html/manual/Where-To-Get-CEL.html 2009-11-28 16:46:40.000000000 +0000
@@ -11,10 +11,10 @@
-->
-Crystal Entity Layer 1.9dev: 1.8 Where to Get Crystal Entity Layer
+Crystal Entity Layer 1.4.0: 1.8 Where to Get Crystal Entity Layer
-
-
+
+
@@ -67,7 +67,7 @@
difference being that release versions should be well tested and generally
stable.
-With the development version your milage may vary. Sometimes it may not
+
With the development version your mileage may vary. Sometimes it may not
compile easily on all platforms, or may not compile at all. There may be
features that are only partially implemented and these probably will not
be very well documented.
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/docs/html/manual/XML-Behaviour-Layer.html /tmp/IB0bHXT4Oc/cel-1.4/docs/html/manual/XML-Behaviour-Layer.html
--- cel-1.9+svn3615/docs/html/manual/XML-Behaviour-Layer.html 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/docs/html/manual/XML-Behaviour-Layer.html 2009-11-28 16:46:40.000000000 +0000
@@ -11,10 +11,10 @@
-->
-Crystal Entity Layer 1.9dev: 4.5 The XML Behaviour Layer
+Crystal Entity Layer 1.4.0: 4.5 The XML Behaviour Layer
-
-
+
+
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/docs/texinfo/intro/chapter.txi /tmp/IB0bHXT4Oc/cel-1.4/docs/texinfo/intro/chapter.txi
--- cel-1.9+svn3615/docs/texinfo/intro/chapter.txi 2006-11-07 21:07:54.000000000 +0000
+++ cel-1.4/docs/texinfo/intro/chapter.txi 2009-11-28 16:46:41.000000000 +0000
@@ -19,8 +19,8 @@
@node What Is CEL, Concepts, Introduction, Introduction
@section What Is Crystal Entity Layer?
-Crystal Entity Layer is a plugin developed to be used in conjunction with
-Crystal Space. It is designed to make it easier for game developers to
+Crystal Entity Layer is a set of plugins developed to be used in conjunction
+with Crystal Space. It is designed to make it easier for game developers to
create games based on Crystal Space by providing such concepts as entities,
properties and behaviours.
@@ -41,7 +41,7 @@
Crystal Entity Layer is free and should remain free. Crystal Entity Layer
falls under the GNU copyleft license for libraries (LGPL). A copy of of the
LGPL is included in this manual for your perusal. In short, the LGPL allows
-you to use CrystalSpace as a library in your products, even commercial
+you to use Crystal Space as a library in your products, even commercial
products, but modifications to the library or derivative works incorporating
parts of the library must be made freely available to everyone, under the
LGPL's terms.
@@ -111,7 +111,7 @@
@node How To Read, Current Status, Concepts, Introduction
@section How To Read This Manual
-This manual was written and is currently maintained by Daniel Thoroughgood.
+This manual was originally written by Daniel Thoroughgood.
Constructive feedback, suggestions and contributions are always welcome.
If you find something in this manual which you believe is not correct please
@@ -166,6 +166,83 @@
@node Features, Where To Get CEL, Guide, Introduction
@section Feature List
+The Crystal Entity Layer provides higher-level ways to control objects than
+you'd have by using Crystal Space alone. It also provides features not
+present in Crystal Space, therefore saving you a lot of time you'd spend
+implementing them yourself.
+
+@itemize @bullet
+@item
+@emph{Entity system}
+
+Entities provide a convenient way to access and control objects' features and
+properties. Entities are not required to have a visual representation.
+One simply adds features to an entity by attaching property classes, then
+handling the messages this entity receives.
+
+@item
+@emph{Scripting}
+
+@sc{cel} has Python bindings, and its own @sc{xml}-based script language.
+You can use either of those, on a per-entity basis.
+Using CELStart, you can build an application without any line of C++.
+Indeed, you can also use them from your own C++ code.
+
+@item
+@emph{Movement helpers}
+
+@itemize @bullet
+@item
+@emph{Linear}: handles everything related to moving, from collision detection
+to dead reckoning.
+
+@item
+@emph{Physics}
+
+@item
+@emph{Vehicles}: support for 4+ wheels vehicles (including tank-like
+behaviour), and hovercraft.
+
+@end itemize
+
+@item
+@emph{Abstracted mesh objects management}: you can manipulate meshes and
+animations independently of the underlying mesh object type.
+
+@item
+@emph{Camera helpers}: it's easy to get 3rd person view, and specific
+object-tracking behaviour.
+
+@item
+@emph{Networking}: there's a TCP network plugin, based on HawkNL.
+
+@item
+@emph{Artificial Intelligence}
+
+@itemize @bullet
+@item
+@emph{Steering behaviour}
+
+@item
+@emph{Neural network}
+
+@end itemize
+
+@item
+@emph{Miscellaneous}
+
+@itemize @bullet
+@item Billboards
+@item Inventory
+@item Timers
+@item Quests (finite state machine)
+@item Projectiles
+@item Mesh deformation
+@item Zone manager: can load and unload parts of the level, depending on
+actor's position.
+@end itemize
+
+@end itemize
@node Where To Get CEL, Mailing Lists, Features, Introduction
@section Where to Get Crystal Entity Layer
@@ -176,7 +253,7 @@
difference being that release versions should be well tested and generally
stable.
-With the development version your milage may vary. Sometimes it may not
+With the development version your mileage may vary. Sometimes it may not
compile easily on all platforms, or may not compile at all. There may be
features that are only partially implemented and these probably will not
be very well documented.
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/docs/texinfo/usingcel/tutorials/tutorial1.txi /tmp/IB0bHXT4Oc/cel-1.4/docs/texinfo/usingcel/tutorials/tutorial1.txi
--- cel-1.9+svn3615/docs/texinfo/usingcel/tutorials/tutorial1.txi 2007-07-25 07:33:57.000000000 +0100
+++ cel-1.4/docs/texinfo/usingcel/tutorials/tutorial1.txi 2009-11-28 16:46:41.000000000 +0000
@@ -191,6 +191,7 @@
#include
#include
+#include
/*
* Our main application class inherits from csApplicationFramework
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/docs/texinfo/version.txi /tmp/IB0bHXT4Oc/cel-1.4/docs/texinfo/version.txi
--- cel-1.9+svn3615/docs/texinfo/version.txi 2008-06-17 14:17:50.000000000 +0100
+++ cel-1.4/docs/texinfo/version.txi 2009-11-28 16:46:41.000000000 +0000
@@ -1,4 +1,4 @@
@c -*-texinfo-*-
-@set UPDATED 17 Jun 2008
-@set EDITION 1.9dev.0
-@set VERSION 1.9dev
+@set UPDATED 01 Mar 2009
+@set EDITION 1.4.0
+@set VERSION 1.4.0
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/include/bindings/blcel.i /tmp/IB0bHXT4Oc/cel-1.4/include/bindings/blcel.i
--- cel-1.9+svn3615/include/bindings/blcel.i 2008-06-20 21:55:59.000000000 +0100
+++ cel-1.4/include/bindings/blcel.i 2009-11-28 16:46:42.000000000 +0000
@@ -226,7 +226,7 @@
// fake arrays to handle stuff managed by the physical layer.
// iCelEntityTemplatePlFakeArray
CEL_FAKE_ARRAY(Pl,iCelEntityTemplate,GetEntityTemplateCount,
- GetEntityTemplateByIndex,FindEntityTemplate,RemoveEntityTemplate,__noappend__)
+ GetEntityTemplate,FindEntityTemplate,RemoveEntityTemplate,__noappend__)
// iCelEntityPlFakeArray
CEL_FAKE_ARRAY(Pl,iCelEntity,GetEntityCount,GetEntityByIndex,FindEntity,RemoveEntity,__noappend__)
@@ -473,18 +473,9 @@
//-----------------------------------------------------------------------------
-// yeah lets deprecate
%include "propclass/actoranalog.h"
CEL_PC(iPcActorAnalog, ActorAnalog, pcmove.actor.analog)
-%include "propclass/analogmotion.h"
-CEL_PC(iPcAnalogMotion, AnalogMotion, pcmove.analogmotion)
-
-//-----------------------------------------------------------------------------
-
-%include "propclass/jump.h"
-CEL_PC(iPcJump, Jump, pcmove.jump)
-
//-----------------------------------------------------------------------------
// TODO must review distance methods
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/include/bindings/celproperties.i /tmp/IB0bHXT4Oc/cel-1.4/include/bindings/celproperties.i
--- cel-1.9+svn3615/include/bindings/celproperties.i 2008-06-20 16:20:05.000000000 +0100
+++ cel-1.4/include/bindings/celproperties.i 2009-11-28 16:46:42.000000000 +0000
@@ -581,8 +581,10 @@
/* iCelRegion (include/propclass/zone.h) */
%cs_attribute(blcelc,iCelRegion,const char*,Name,GetName)
+%cs_attribute(blcelc,iCelRegion,const char*,CsRegionName,GetCsRegionName)
%cs_attribute(blcelc,iCelRegion,const char*,CachePath)
%cs_attribute(blcelc,iCelRegion,size_t,MapFileCount,GetMapFileCount)
+%cs_attribute(blcelc,iCelRegion,iRegion*,CsRegion,GetCsRegion)
/* iCelZone (include/propclass/zone.h) */
%cs_attribute(blcelc,iCelZone,const char*,Name,GetName)
@@ -652,6 +654,7 @@
%cs_attribute(blcelc,iPcRegion,const char*,RegionName)
%cs_multi_attr_readonly(blcelc,iPcRegion,StartSector,GetStartSector)
%cs_multi_attr_readonly(blcelc,iPcRegion,StartPosition,GetStartPosition)
+%cs_attribute(blcelc,iPcRegion,iRegion*,Region,GetRegion)
/* iCelBlLayer (include/behaviourlayer/bl.h) */
%cs_attribute(blcelc,iCelBlLayer,const char*,Name,GetName)
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/include/bindings/python/pcdirector.i /tmp/IB0bHXT4Oc/cel-1.4/include/bindings/python/pcdirector.i
--- cel-1.9+svn3615/include/bindings/python/pcdirector.i 2008-07-31 18:06:39.000000000 +0100
+++ cel-1.4/include/bindings/python/pcdirector.i 2009-11-28 16:46:42.000000000 +0000
@@ -455,18 +455,3 @@
};
%}
-/* iPcInventoryListener */
-CALLBACK_INTERFACE_HDR(pyPcInventoryListener,iPcInventoryListener)
-%inline %{
-class pyPcInventoryListener :
- public scfImplementation1
-{
-public:
- pyPcInventoryListener(iObjectRegistry* object_reg) : scfImplementationType (this) {}
-~pyPcInventoryListener() {}
- virtual void AddChild (iPcInventory* inventory, iCelEntity* entity) { }
- virtual void RemoveChild (iPcInventory* inventory, iCelEntity* entity) { }
-};
-%}
-
-
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/include/celtool/camera.h /tmp/IB0bHXT4Oc/cel-1.4/include/celtool/camera.h
--- cel-1.9+svn3615/include/celtool/camera.h 2008-07-20 17:31:44.000000000 +0100
+++ cel-1.4/include/celtool/camera.h 2009-11-28 16:46:42.000000000 +0000
@@ -36,7 +36,6 @@
struct iEngine;
struct iVirtualClock;
struct iCamera;
-struct iPerspectiveCamera;
struct iView;
struct iPcRegion;
struct iPcZoneManager;
@@ -93,7 +92,6 @@
void SetPerspectiveCenter (float x, float y);
iCamera* GetCamera () const;
- iPerspectiveCamera* GetPerspectiveCamera () const;
iView* GetView () const { return view; }
void SetClearZBuffer (bool flag) { clear_zbuf = flag; }
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/include/celtool/celpaths.h /tmp/IB0bHXT4Oc/cel-1.4/include/celtool/celpaths.h
--- cel-1.9+svn3615/include/celtool/celpaths.h 1970-01-01 01:00:00.000000000 +0100
+++ cel-1.4/include/celtool/celpaths.h 2009-11-28 16:46:42.000000000 +0000
@@ -0,0 +1,40 @@
+/*
+ Copyright (C) 2008 by Frank Richter
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with this library; if not, write to the Free
+ Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#ifndef __CEL_CELTOOL_CELPATHS_H__
+#define __CEL_CELTOOL_CELPATHS_H__
+
+#include
+#include
+
+#include "celtool/celtoolextern.h"
+
+namespace CEL
+{
+ /**
+ * Return one or more paths which themselves or whose subdirectories can
+ * contain CEL-related resources, plugins as well as common data and
+ * configuration. There's no guarantee that any entry actually contains some
+ * useable resource; it's up to the caller to check what resources are
+ * available and to pick the appropriate entries for some purpose.
+ * \remark Caller is responsible to free the list with delete after using it.
+ */
+ CEL_CELTOOL_EXPORT csPathsList* GetPlatformInstallationPaths ();
+} // namespace CEL
+
+#endif // __CEL_CELTOOL_CELPATHS_H__
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/include/celtool/stdpcimp.h /tmp/IB0bHXT4Oc/cel-1.4/include/celtool/stdpcimp.h
--- cel-1.9+svn3615/include/celtool/stdpcimp.h 2008-08-02 21:41:47.000000000 +0100
+++ cel-1.4/include/celtool/stdpcimp.h 2009-11-28 16:46:42.000000000 +0000
@@ -24,7 +24,6 @@
#include "iutil/comp.h"
#include "iutil/objreg.h"
#include "ivaria/reporter.h"
-#include "csutil/csobject.h"
#include "csutil/scf.h"
#include "csutil/scf_implementation.h"
#include "csutil/refarr.h"
@@ -85,8 +84,11 @@
* from which all other property classes can inherit.
* This makes it easier to write a property class.
*/
-class CEL_CELTOOL_EXPORT celPcCommon
- : public scfImplementation3
+class CEL_CELTOOL_EXPORT celPcCommon :
+ public scfImplementation3
{
private:
csRefArray callbacks;
@@ -96,8 +98,8 @@
// and cleared by HavePropertyClassesChanged().
bool propclasses_dirty;
char* tag;
- // the name of the property class stored in the iObject
- csObject csobj;
+ // the name of the property class
+ const char* name;
protected:
iCelEntity* entity;
@@ -138,10 +140,10 @@
if (rep)
rep->ReportError("crystalspace.cel.physicallayer",
"celPcCommon::AddProperty out of bounds %zu >= %zu!",
- idx, propholder->propertycount);
+ idx,propholder->propertycount);
else
csPrintf("Error: celPcCommon::AddProperty out of bounds %zu >= %zu!",
- idx, propholder->propertycount);
+ idx,propholder->propertycount);
return;
}
if (propdata == 0)
@@ -186,10 +188,8 @@
virtual void SetTag (const char* tagname);
virtual const char* GetTag () const { return tag; }
- virtual const char* GetName () const;
virtual void SetName (const char* pcname);
-
- iObject *QueryObject ();
+ virtual const char* GetName () const { return name; }
virtual iCelEntity* GetEntity () { return entity; }
virtual void SetEntity (iCelEntity* entity);
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/include/celtool.h /tmp/IB0bHXT4Oc/cel-1.4/include/celtool.h
--- cel-1.9+svn3615/include/celtool.h 2008-06-10 17:26:12.000000000 +0100
+++ cel-1.4/include/celtool.h 2009-11-28 16:46:44.000000000 +0000
@@ -22,6 +22,7 @@
* subdirectory of the top CEL include directory.
*/
#include "celtool/camera.h"
+#include "celtool/celpaths.h"
#include "celtool/celtoolextern.h"
#include "celtool/initapp.h"
#include "celtool/navigation.h"
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/include/celversion.h /tmp/IB0bHXT4Oc/cel-1.4/include/celversion.h
--- cel-1.9+svn3615/include/celversion.h 2008-06-17 14:17:50.000000000 +0100
+++ cel-1.4/include/celversion.h 2009-11-28 16:46:44.000000000 +0000
@@ -32,7 +32,7 @@
/// Major version
#define CEL_VERSION_MAJOR CS_VER_QUOTE(1)
/// Minor version (even are stable versions, odd are development versions)
-#define CEL_VERSION_MINOR CS_VER_QUOTE(9)
+#define CEL_VERSION_MINOR CS_VER_QUOTE(4)
/// Maintenance release / RC
#define CEL_VERSION_BUILD CS_VER_QUOTE(0)
/// Date of release
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/include/Jamfile /tmp/IB0bHXT4Oc/cel-1.4/include/Jamfile
--- cel-1.9+svn3615/include/Jamfile 2008-06-08 05:30:02.000000000 +0100
+++ cel-1.4/include/Jamfile 2009-11-28 16:46:44.000000000 +0000
@@ -2,6 +2,20 @@
Recurse InstallHeader : .h .i ;
+rule FilelistEntryHeader
+{
+ if "$(2)" != "" || $(1) != "celconfig.h"
+ {
+ local file_gristed = $(1:G=$(2:J=!)) ;
+ FileListEntriesData $(file_gristed) : $(2) : headers ;
+ }
+}
+Recurse FilelistEntryHeader : .h .i .inc .fun .tok ;
+{
+ local SUBDIR = [ ConcatDirs $(BUILDTOP) include ] ; # Temporary for Recurse.
+ FileListEntriesData celconfig.h : : headers-platform ;
+}
+
#------------------------------------------------------------------------------
# Master-header creation / automation
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/include/physicallayer/propclas.h /tmp/IB0bHXT4Oc/cel-1.4/include/physicallayer/propclas.h
--- cel-1.9+svn3615/include/physicallayer/propclas.h 2008-07-26 06:23:20.000000000 +0100
+++ cel-1.4/include/physicallayer/propclas.h 2009-11-28 16:46:42.000000000 +0000
@@ -117,11 +117,6 @@
virtual const char* GetName () const = 0;
/**
- * Get the associated iObject from this property class.
- */
- virtual iObject *QueryObject () = 0;
-
- /**
* Set the optional tag of this property class. Multiple property
* classes of the same type (same name) can be attached to the same
* entity. To do that you need to add a tag so that you can uniquely
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/include/propclass/actoranalog.h /tmp/IB0bHXT4Oc/cel-1.4/include/propclass/actoranalog.h
--- cel-1.9+svn3615/include/propclass/actoranalog.h 2008-06-19 15:56:07.000000000 +0100
+++ cel-1.4/include/propclass/actoranalog.h 2009-11-28 16:46:44.000000000 +0000
@@ -17,14 +17,109 @@
Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-#ifndef __CEL_PF_ACTORANALOG__
-#define __CEL_PF_ACTORANALOG__
+#ifndef __CEL_PF_ACTORLARA__
+#define __CEL_PF_ACTORLARA__
#include "cstypes.h"
#include "csutil/scf.h"
-#include "propclass/analogmotion.h"
+/**
+ * This is a property class for analog character movement using a joystick
+ * or analog pad.
+ *
+ * This property class supports the following actions (add prefix
+ * 'cel.action.' to get the ID of the action and add prefix 'cel.parameter.'
+ * to get the ID of the parameter):
+ * - SetAxis: parameters 'axis' (long), 'value' (float).
+ * - AddAxis: parameters 'axis' (long), 'value' (float).
+ * - SetMovementSpeed: parameters 'value' (float).
+ * - SetTurningSpeed: parameters 'value' (float).
+ *
+ * This property class supports the following properties (add prefix
+ * 'cel.property.' to get the ID of the property:
+ * - axisx (float, read/write): Left/Right axis value (-1.0 to 1.0).
+ * - axisy (float, read/write): Forward/Backwards axis value (-1.0 to 1.0).
+ * - movespeed (float, read/write): Movement speed.
+ * - turnspeed (float, read/write): Turning speed.
+ */
+struct iPcActorAnalog : public virtual iBase
+{
+ SCF_INTERFACE (iPcActorAnalog, 0, 0, 1);
-typedef iPcAnalogMotion iPcActorAnalog;
+ /**
+ * Set axis to a value.
+ * \param axis This is the axis. 0 for left/right axis,
+ * 1 for forwards/backwards axis, 2 or above for both together.
+ * \param value The value in the range [-1,1] to set it to. Anything
+ * else is invalid and is clipped.
+ */
+ virtual void SetAxis (size_t axis, float value) = 0;
-#endif // __CEL_PF_ACTORANALOG__
+ /**
+ * Get an axis' value.
+ * \param axis This is the axis. 0 for left/right axis,
+ * 1 for forwards/backwards axis.
+ * \param value The value in the range [-1,1].
+ */
+ virtual float GetAxis (size_t axis) const = 0;
+
+ /**
+ * Increase axis by a value. This is for keyboard keys to avoid
+ * 'deadlock'
+ * \param axis This is the axis. 0 for left/right axis,
+ * 1 for forwards/backwards axis, 2 or above for both together.
+ * \param value The value to add to it. Anything resulting in the
+ * target axis value being out of the range [-1,1] will be clipped.
+ */
+ virtual void AddAxis (size_t axis, float value) = 0;
+
+ /**
+ * Set the movement speed of the character.
+ * \param movespeed How fast the character moves in the direction its facing.
+ */
+ virtual void SetMovementSpeed (float movespeed) = 0;
+
+ /**
+ * Get the movement speed of the character.
+ * \return How fast the character moves in the direction its facing.
+ */
+ virtual float GetMovementSpeed () const = 0;
+
+ /**
+ * Set the movement acceleration of the character for when you start moving.
+ * \param moveaccel Acceleration of character.
+ */
+ virtual void SetMovementAcceleration (float moveaccel) = 0;
+
+ /**
+ * Get the movement acceleration of the character for when you start moving.
+ * \return Acceleration of character.
+ */
+ virtual float GetMovementAcceleration () const = 0;
+
+ /**
+ * Set the movement deceleration of the character for when you stop moving.
+ * \param movedecel Deceleration of character.
+ */
+ virtual void SetMovementDeceleration (float movedecel) = 0;
+
+ /**
+ * Get the movement deceleration of the character for when you stop moving.
+ * \return Deceleration of character.
+ */
+ virtual float GetMovementDeceleration () const = 0;
+
+ /**
+ * Set the turning speed of the character.
+ * \param turnspeed How fast turns to face its target.
+ */
+ virtual void SetTurningSpeed (float turnspeed) = 0;
+
+ /**
+ * Get the turning speed of the character.
+ * \return How fast turns to face its target.
+ */
+ virtual float GetTurningSpeed () const = 0;
+};
+
+#endif // __CEL_PF_ACTORLARA__
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/include/propclass/actormove.h /tmp/IB0bHXT4Oc/cel-1.4/include/propclass/actormove.h
--- cel-1.9+svn3615/include/propclass/actormove.h 2007-09-29 01:56:05.000000000 +0100
+++ cel-1.4/include/propclass/actormove.h 2009-11-28 16:46:43.000000000 +0000
@@ -61,6 +61,9 @@
* - Jump.
* - ToggleCameraMode.
* - SetAnimation: parameters 'name' (string) and 'cycle' (bool default=true).
+ * - SetAnimationName: parameters 'mapping' (string) specifying the cel name
+ * (like walk, run, rotateleft...) and 'name' (string) specifying the model
+ * name for the animation.
*
* This property class supports the following properties (add prefix
* 'cel.property.' to get the ID of the property:
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/include/propclass/analogmotion.h /tmp/IB0bHXT4Oc/cel-1.4/include/propclass/analogmotion.h
--- cel-1.9+svn3615/include/propclass/analogmotion.h 2008-07-03 14:22:24.000000000 +0100
+++ cel-1.4/include/propclass/analogmotion.h 1970-01-01 01:00:00.000000000 +0100
@@ -1,184 +0,0 @@
-/*
- Crystal Space Entity Layer
- Copyright (C) 2001 by Jorrit Tyberghein
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public
- License along with this library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __CEL_PF_ANALOGMOTION__
-#define __CEL_PF_ANALOGMOTION__
-
-#include "cstypes.h"
-#include "csutil/scf.h"
-
-/**
- * This is a property class for analog character movement using a joystick
- * or analog pad.
- *
- * This property class supports the following actions (add prefix
- * 'cel.action.' to get the ID of the action and add prefix 'cel.parameter.'
- * to get the ID of the parameter):
- * - SetAxis: parameters 'axis' (long), 'value' (float).
- * - AddAxis: parameters 'axis' (long), 'value' (float).
- * - SetMovementSpeed: parameters 'value' (float).
- * - SetTurningSpeed: parameters 'value' (float).
- *
- * This property class supports the following properties (add prefix
- * 'cel.property.' to get the ID of the property:
- * - axisx (float, read/write): Left/Right axis value (-1.0 to 1.0).
- * - axisy (float, read/write): Forward/Backwards axis value (-1.0 to 1.0).
- * - movespeed (float, read/write): Movement speed.
- * - turnspeed (float, read/write): Turning speed.
- */
-struct iPcAnalogMotion : public virtual iBase
-{
- SCF_INTERFACE (iPcAnalogMotion, 0, 0, 1);
-
- /**
- * Set axis to a value.
- * \param axis This is the axis. 0 for left/right axis,
- * 1 for forwards/backwards axis, 2 or above for both together.
- * \param value The value in the range [-1,1] to set it to. Anything
- * else is invalid and is clipped.
- */
- virtual void SetAxis (size_t axis, float value) = 0;
-
- /**
- * Get an axis' value.
- * \param axis This is the axis. 0 for left/right axis,
- * 1 for forwards/backwards axis.
- * \param value The value in the range [-1,1].
- */
- virtual float GetAxis (size_t axis) const = 0;
-
- /**
- * Set both the axis values using a vector.
- */
- virtual void SetAxis (const csVector2 &axis) = 0;
-
- /**
- * Get both the axis values as a vector.
- */
- virtual const csVector2 &GetAxis () const = 0;
-
- /**
- * Increase axis by a value. This is for keyboard keys to avoid
- * 'deadlock'
- * \param axis This is the axis. 0 for left/right axis,
- * 1 for forwards/backwards axis, 2 or above for both together.
- * \param value The value to add to it. Anything resulting in the
- * target axis value being out of the range [-1,1] will be clipped.
- */
- virtual void AddAxis (size_t axis, float value) = 0;
-
- /**
- * Set the movement speed of the character.
- * \param movespeed How fast the character moves in the direction its facing.
- */
- virtual void SetMovementSpeed (float movespeed) = 0;
-
- /**
- * Get the movement speed of the character.
- * \return How fast the character moves in the direction its facing.
- */
- virtual float GetMovementSpeed () const = 0;
-
- /**
- * Set the movement acceleration of the character for when you start moving.
- * \param moveaccel Acceleration of character.
- */
- virtual void SetMovementAcceleration (float moveaccel) = 0;
-
- /**
- * Get the movement acceleration of the character for when you start moving.
- * \return Acceleration of character.
- */
- virtual float GetMovementAcceleration () const = 0;
-
- /**
- * Set the movement deceleration of the character for when you stop moving.
- * \param movedecel Deceleration of character.
- */
- virtual void SetMovementDeceleration (float movedecel) = 0;
-
- /**
- * Get the movement deceleration of the character for when you stop moving.
- * \return Deceleration of character.
- */
- virtual float GetMovementDeceleration () const = 0;
-
- CS_DEPRECATED_METHOD_MSG("Use Set(Minimum|Maximum)TurningSpeed () instead")
- /**
- * Set the turning speed of the character.
- * \param turnspeed How fast the player turns to face its target.
- */
- virtual void SetTurningSpeed (float turnspeed) = 0;
-
- CS_DEPRECATED_METHOD_MSG("Use Get(Minimum|Maximum)TurningSpeed () instead")
- /**
- * Get the turning speed of the character.
- * \return How fast the player turns to face its target.
- */
- virtual float GetTurningSpeed () const = 0;
-
- /**
- * Set the minimum turning speed of the character. This is the speed of turning
- * when moving at full speed.
- * Turning is decelerating in one direction and accelerating in another. Faster
- * movement means a slower turning speed, and vice versa.
- * \param turnspeed How fast the player turns to face its target.
- */
- virtual void SetMinimumTurningSpeed (float turnspeed) = 0;
-
- /**
- * Get the minimum turning speed of the character. This is the speed of turning
- * when moving at full speed.
- * Turning is decelerating in one direction and accelerating in another. Faster
- * movement means a slower turning speed, and vice versa.
- * \return How fast the player turns to face its target.
- */
- virtual float GetMinimumTurningSpeed () const = 0;
-
- /**
- * Set the maximum turning speed of the character. This is the speed of turning
- * when not moving at all.
- * Turning is decelerating in one direction and accelerating in another. Slower
- * movement means a faster turning speed, and vice versa.
- * \param turnspeed How fast the player turns to face its target.
- */
- virtual void SetMaximumTurningSpeed (float turnspeed) = 0;
-
- /**
- * Get the maximum turning speed of the character. This is the speed of turning
- * when not moving at all.
- * Turning is decelerating in one direction and accelerating in another. Slower
- * movement means a faster turning speed, and vice versa.
- * \return How fast the player turns to face its target.
- */
- virtual float GetMaximumTurningSpeed () const = 0;
-
- /**
- * Whether this component is updating the player's position every frame. Turning
- * this off effectively makes this component deactivated.
- */
- virtual void Enable (bool en = true) = 0;
-
- /**
- * Get whether this component is actively updating the player.
- */
- virtual bool IsEnabled () const = 0;
-};
-
-#endif // __CEL_PF_ANALOGMOTION__
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/include/propclass/cameras/tracking.h /tmp/IB0bHXT4Oc/cel-1.4/include/propclass/cameras/tracking.h
--- cel-1.9+svn3615/include/propclass/cameras/tracking.h 2008-07-19 17:19:24.000000000 +0100
+++ cel-1.4/include/propclass/cameras/tracking.h 2009-11-28 16:46:44.000000000 +0000
@@ -71,24 +71,6 @@
virtual void SetTargetYOffset (float targetyoffset) = 0;
/**
- * Since position is often set at the 'feet' of an object, get
- * the fixed offset upwards
- */
- virtual float GetTargetYOffset () const = 0;
-
- /**
- * Whenever the target is changed, the old position will
- * interpolate over time to the new position. Set this time.
- */
- virtual void SetTargetInterpolationTime (csTicks t) = 0;
-
- /**
- * Whenever the target is changed, the old position will
- * interpolate over time to the new position. Get this time.
- */
- virtual csTicks GetTargetInterpolationTime () const = 0;
-
- /**
* Camera offset from the player is described as an angle and a distance.
* Here you can set the angle in radians.
*/
@@ -133,16 +115,22 @@
*/
virtual float SetFollowMinimumSpringFactor () const = 0;
+ enum PanDirection
+ {
+ PAN_LEFT = 0,
+ PAN_NONE,
+ PAN_RIGHT
+ };
+
/**
* Pan the camera around the player in the direction specified.
- * 1 right, -1 left
*/
- virtual void SetPanDirection (float pandir) = 0;
+ virtual void Pan (PanDirection pandir) = 0;
/**
* Get the direction that the camera is panning in.
*/
- virtual float GetPanDirection () const = 0;
+ virtual PanDirection GetPanDirection () const = 0;
/**
* Set the panning speed. Angle to move per frame.
@@ -164,16 +152,22 @@
*/
virtual float GetPanAcceleration () const = 0;
+ enum TiltDirection
+ {
+ TILT_UP = 0,
+ TILT_NONE,
+ TILT_DOWN
+ };
+
/**
* Tilt camera in the direction specified.
- * -1 up, 1 down
*/
- virtual void SetTiltDirection (float tdir) = 0;
+ virtual void Tilt (TiltDirection tiltdir) = 0;
/**
* Get the direction that the camera is tilting in.
*/
- virtual float GetTiltDirection () const = 0;
+ virtual TiltDirection GetTiltDirection () const = 0;
/**
* Set the tilting speed. Angle to move per frame.
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/include/propclass/delegcam.h /tmp/IB0bHXT4Oc/cel-1.4/include/propclass/delegcam.h
--- cel-1.9+svn3615/include/propclass/delegcam.h 2008-07-03 14:22:24.000000000 +0100
+++ cel-1.4/include/propclass/delegcam.h 2009-11-28 16:46:44.000000000 +0000
@@ -63,8 +63,8 @@
virtual void SetCurrentMode (iPcCameraMode* mode) = 0;
virtual iPcCameraMode* GetCurrentMode () const = 0;
- virtual void SetTransitionTime (csTicks t) = 0;
- virtual csTicks GetTransitionTime () const = 0;
+ virtual void SetTransitionTime (float t) = 0;
+ virtual float GetTransitionTime () const = 0;
};
#endif // __CEL_PF_DELEGATECAMERA__
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/include/propclass/grab.h /tmp/IB0bHXT4Oc/cel-1.4/include/propclass/grab.h
--- cel-1.9+svn3615/include/propclass/grab.h 2008-08-06 12:01:50.000000000 +0100
+++ cel-1.4/include/propclass/grab.h 1970-01-01 01:00:00.000000000 +0100
@@ -1,49 +0,0 @@
-/*
- Crystal Space Entity Layer
- Copyright (C) 2001 by Jorrit Tyberghein
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public
- License along with this library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __CEL_PF_GRAB__
-#define __CEL_PF_GRAB__
-
-#include "cstypes.h"
-#include "csutil/scf.h"
-
-struct iPcGrab : public virtual iBase
-{
- SCF_INTERFACE (iPcGrab, 0, 0, 1);
-
- enum GrabState
- {
- DISABLED = 0,
- SEARCHING,
- HANG,
- };
- virtual void SetState (GrabState state) = 0;
- virtual GrabState GetState () const = 0;
-
- virtual void SetShimmyDirection (float sdir) = 0;
- virtual float GetShimmyDirection () const = 0;
- virtual void SetShimmyTime (float time) = 0;
- virtual float GetShimmyTime () const = 0;
- virtual void SetShimmyDistance (float dist) = 0;
- virtual float GetShimmyDistance () const = 0;
- virtual void SetShimmyInitialVelocity (float vel) = 0;
- virtual float GetShimmyInitialVelocity () const = 0;
-};
-
-#endif // __CEL_PF_GRAB__
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/include/propclass/jump.h /tmp/IB0bHXT4Oc/cel-1.4/include/propclass/jump.h
--- cel-1.9+svn3615/include/propclass/jump.h 2008-07-14 20:27:49.000000000 +0100
+++ cel-1.4/include/propclass/jump.h 1970-01-01 01:00:00.000000000 +0100
@@ -1,202 +0,0 @@
-/*
- Crystal Space Entity Layer
- Copyright (C) 2001 by Jorrit Tyberghein
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public
- License along with this library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __CEL_PF_JUMP__
-#define __CEL_PF_JUMP__
-
-#include "cstypes.h"
-#include "csutil/scf.h"
-
-struct iPcJump : public virtual iBase
-{
- SCF_INTERFACE (iPcJump, 0, 0, 1);
-
- /**
- * Do a jump. When called again while still jumping,
- * if near the top of a jump a double jump is performed.
- * By default the double jump is disabled- to enable call
- * SetDoubleJumpSpeed () with a positive non zero value.
- */
- virtual void Jump () = 0;
-
- /**
- * If the boost is being used, then this will finish it...
- * for when the player releases the jump button.
- */
- virtual void FinishBoost () = 0;
-
- /**
- * Freeze the character mid-air for grabbing ledges.
- */
- virtual void Freeze (bool frozen) = 0;
-
- enum State
- {
- STAND = 0,
- JUMP,
- DOUBLEJUMP,
- GLIDE,
- FROZEN
- };
-
- /**
- * Get the current state.
- */
- virtual State GetState () const = 0;
-
- enum GlideTurnDirection
- {
- GLIDE_NOTURN = 0,
- GLIDE_LEFT,
- GLIDE_RIGHT
- };
-
- /**
- * If gliding then turn in a certain direction.
- */
- virtual void GlideTurn (GlideTurnDirection gtur) = 0;
-
- enum GlidePitchDirection
- {
- GLIDE_NOPITCH = 0,
- GLIDE_UP,
- GLIDE_DOWN
- };
-
- /**
- * If gliding then pitch the player up/down
- */
- virtual void GlidePitch (GlidePitchDirection gpit) = 0;
-
- /**
- * Set the gravity during gliding
- */
- virtual void SetGlideGravity (float glidegrav) = 0;
-
- /**
- * Get the gravity during gliding
- */
- virtual float GetGlideGravity () const = 0;
-
- /**
- * Set the pitch limits during gliding in radians
- */
- virtual void SetGlidePitchLimit (float gptlim) = 0;
-
- /**
- * Get the pitch limits during gliding in radians
- */
- virtual float GetGlidePitchLimit () const = 0;
-
- /**
- * Set the pitch speed in radians while gliding
- */
- virtual void SetGlidePitchSpeed (float gptspd) = 0;
-
- /**
- * Get the pitch speed in radians while gliding
- */
- virtual float GetGlidePitchSpeed () const = 0;
-
- /**
- * Set the turn speed in radians while gliding
- */
- virtual void SetGlideTurnSpeed (float gtrspd) = 0;
-
- /**
- * Get the turn speed in radians while gliding
- */
- virtual float GetGlideTurnSpeed () const = 0;
-
- /**
- * Set the jumping speed.
- */
- virtual void SetJumpSpeed (float spd) = 0;
-
- /**
- * Get the jumping speed.
- */
- virtual float GetJumpSpeed () const = 0;
-
- /**
- * Set the maximum height of the jump. Will change jumpspeed.
- */
- virtual void SetJumpHeight (float height) = 0;
-
- /**
- * Get the maximum height of the jump. Actually calculated from
- * the jumpspeed.
- */
- virtual float GetJumpHeight () const = 0;
-
- /**
- * Calculate the time it takes from jump to land on same plane.
- */
- virtual csTicks GetAirTime () const = 0;
-
- /**
- * Set the speed of the double jump- normally is lower than normal jump.
- */
- virtual void SetDoubleJumpSpeed (float spd) = 0;
-
- /**
- * Get the double jump.
- */
- virtual float GetDoubleJumpSpeed () const = 0;
-
- /**
- * Set the gravity acting on the player. This gravity value is only applied
- * when hitting the wall, landing from a jump and going from FROZEN->JUMP
- * Otherwise changes to linmove->SetGravity () are left untouched.
- */
- virtual void SetGravity (float grav) = 0;
-
- /**
- * Get the gravity acting on the player.
- */
- virtual float GetGravity () const = 0;
-
- /**
- * Should the jumps be fixed length?
- */
- virtual void SetFixedJump (bool fixjump) = 0;
-
- /**
- * Are the jumps be fixed length?
- */
- virtual bool GetFixedJump () const = 0;
-
- /**
- * Boost the jump. So longer you hold jump, the higher you go.
- */
- virtual void SetBoostJump (bool boost) = 0;
-
- /**
- * Boost the jump. So longer you hold jump, the higher you go.
- */
- virtual bool GetBoostJump () const = 0;
-
- virtual void SetBoostTime (float t) = 0;
- virtual float GetBoostTime () const = 0;
- virtual void SetBoostAcceleration (float a) = 0;
- virtual float GetBoostAcceleration () const = 0;
-};
-
-#endif // __CEL_PF_JUMP__
-
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/include/propclass/linmove.h /tmp/IB0bHXT4Oc/cel-1.4/include/propclass/linmove.h
--- cel-1.9+svn3615/include/propclass/linmove.h 2008-07-20 17:31:44.000000000 +0100
+++ cel-1.4/include/propclass/linmove.h 2009-11-28 16:46:43.000000000 +0000
@@ -30,7 +30,7 @@
#include "csutil/scf.h"
#include "csutil/strhash.h"
-class csReversibleTransform;
+
struct iDataBuffer;
struct iSector;
struct iPath;
@@ -124,30 +124,21 @@
*/
virtual void SetSpeed (float speedZ) = 0;
- CS_DEPRECATED_METHOD_MSG("Use void SetBodyVelocity () instead.")
/**
* Set the current velocity vector in body coordinates.
*/
virtual void SetVelocity (const csVector3& vel) = 0;
/**
- * Set the current velocity vector in body coordinates.
- */
- virtual void SetBodyVelocity (const csVector3& vel) = 0;
-
- /**
- * Set the current world velocity vector in body coordinates.
- */
- virtual void SetWorldVelocity (const csVector3& vel) = 0;
-
- /**
* Exerts a velocity on the body in world coordinates
*/
+
virtual void AddVelocity (const csVector3& vel) = 0;
/// Resets the velocity of this body in world coordinates.
virtual void ClearWorldVelocity () = 0;
+
/**
* Get the current velocity vector.
* \deprecated Use csVector3 GetVelocity () instead.
@@ -156,18 +147,7 @@
virtual void GetVelocity (csVector3& v) const = 0;
/**
- * Get the body's velocity- velocity minus physical effects like gravity.
- */
- virtual const csVector3 &GetBodyVelocity () const = 0;
-
- /**
- * Get the world's velocity- velocity for simulating physical effects like gravity.
- */
- virtual const csVector3 &GetWorldVelocity () const = 0;
-
- /**
- * Get the current velocity vector in local coordinate space:
- * WorldToObject(worldvel) + bodyvel.
+ * Get the current velocity vector.
*/
virtual const csVector3 GetVelocity () const = 0;
@@ -278,11 +258,6 @@
*/
virtual const csVector3 GetFullPosition () = 0;
- /**
- * Get the full transform describing the world to this transform.
- */
- virtual const csReversibleTransform GetFullTransform () = 0;
-
/// Is a csPath active now or standard DR movement?
virtual bool IsPath () const = 0;
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/include/propclass/newcamera.h /tmp/IB0bHXT4Oc/cel-1.4/include/propclass/newcamera.h
--- cel-1.9+svn3615/include/propclass/newcamera.h 2008-07-20 17:31:44.000000000 +0100
+++ cel-1.4/include/propclass/newcamera.h 2009-11-28 16:46:43.000000000 +0000
@@ -49,7 +49,7 @@
class csView;
class celPcNewCamera;
class csReversibleTransform;
-class csOrthoTransform;
+struct csOrthoTransform;
struct iPcZoneManager;
struct iPcNewCamera;
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/include/propclass/region.h /tmp/IB0bHXT4Oc/cel-1.4/include/propclass/region.h
--- cel-1.9+svn3615/include/propclass/region.h 2008-06-18 21:32:14.000000000 +0100
+++ cel-1.4/include/propclass/region.h 2009-11-28 16:46:43.000000000 +0000
@@ -26,7 +26,7 @@
struct iSector;
struct iPcCamera;
-struct iCollection;
+struct iRegion;
/**
* The representation of a region.
@@ -117,10 +117,10 @@
virtual void PointCamera (iPcCamera* pccamera, const char* name = 0) = 0;
/**
- * Returns the CS collection associated to this propclass. This function has a
+ * Returns the CS region associated to this propclass. This function has a
* meaning only if the region has been loaded.
*/
- virtual iCollection* GetCollection() = 0;
+ virtual iRegion* GetRegion() = 0;
};
#endif // __CEL_PF_REGION__
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/include/propclass/sound.h /tmp/IB0bHXT4Oc/cel-1.4/include/propclass/sound.h
--- cel-1.9+svn3615/include/propclass/sound.h 2008-07-04 20:18:27.000000000 +0100
+++ cel-1.4/include/propclass/sound.h 2009-11-28 16:46:43.000000000 +0000
@@ -53,7 +53,7 @@
virtual iSndSysListener* GetSoundListener () = 0;
};
-/*
+/**
* This is the sound source property class.
*
* This property class supports the following actions (add prefix
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/include/propclass/timer.h /tmp/IB0bHXT4Oc/cel-1.4/include/propclass/timer.h
--- cel-1.9+svn3615/include/propclass/timer.h 2008-07-05 20:46:52.000000000 +0100
+++ cel-1.4/include/propclass/timer.h 2009-11-28 16:46:43.000000000 +0000
@@ -41,8 +41,8 @@
*
* This property class can send out the following messages
* to the behaviour (add prefix 'cel.parameter.' to get the ID for parameters):
- * - cel.timer.wakeup: wakeup message
- * - cel.timer.wakeup.frame: wakeup every frame (elapsedticks,currentticks)
+ * - pctimer_wakeup: wakeup message
+ * - pctimer_wakeupframe: wakeup every frame (elapsedticks,currentticks)
*/
struct iPcTimer : public virtual iBase
{
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/include/propclass/zone.h /tmp/IB0bHXT4Oc/cel-1.4/include/propclass/zone.h
--- cel-1.9+svn3615/include/propclass/zone.h 2008-06-18 21:32:14.000000000 +0100
+++ cel-1.4/include/propclass/zone.h 2009-11-28 16:46:43.000000000 +0000
@@ -25,7 +25,7 @@
#include "csutil/scf.h"
struct iSector;
-struct iCollection;
+struct iRegion;
struct iPcCamera;
struct iPcMesh;
struct iCelEntity;
@@ -108,7 +108,7 @@
* manager appended with the name of the region. i.e. like:
* _
*/
- virtual const char* GetCsCollectionName () const = 0;
+ virtual const char* GetCsRegionName () const = 0;
/**
* Set the VFS path that will be used during the call to engine->Prepare()
@@ -176,7 +176,7 @@
/**
* Get the CS region that is used for this region.
*/
- virtual iCollection* GetCollection () = 0;
+ virtual iRegion* GetCsRegion () = 0;
};
/**
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/include/propclass.h /tmp/IB0bHXT4Oc/cel-1.4/include/propclass.h
--- cel-1.9+svn3615/include/propclass.h 2008-07-03 14:22:24.000000000 +0100
+++ cel-1.4/include/propclass.h 2009-11-28 16:46:44.000000000 +0000
@@ -38,8 +38,6 @@
#include "propclass/hover.h"
#include "propclass/input.h"
#include "propclass/inv.h"
-#include "propclass/jump.h"
-#include "propclass/grab.h"
#include "propclass/light.h"
#include "propclass/linmove.h"
#include "propclass/mechcommon.h"
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/include/tools/ledges.h /tmp/IB0bHXT4Oc/cel-1.4/include/tools/ledges.h
--- cel-1.9+svn3615/include/tools/ledges.h 2008-07-27 23:22:33.000000000 +0100
+++ cel-1.4/include/tools/ledges.h 1970-01-01 01:00:00.000000000 +0100
@@ -1,52 +0,0 @@
-/*
- Crystal Space Entity Layer
- Copyright (C) 2006 by Jorrit Tyberghein
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public
- License along with this library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __CEL_CELLESGES__
-#define __CEL_CELLESGES__
-
-#include "cstypes.h"
-#include "csutil/scf.h"
-#include "csgeom/vector2.h"
-
-struct iLedge : public virtual iBase
-{
- SCF_INTERFACE (iLedge, 0, 0, 1);
-
- virtual void AddPoint (const csVector2 &p) = 0;
- virtual void SetYPosition (float y) = 0;
- virtual float GetYPosition () const = 0;
- virtual size_t GetPointCount () const = 0;
- virtual const csVector2 &GetPoint (size_t i) const = 0;
-};
-
-struct iLedgeGroup : public virtual iBase
-{
- SCF_INTERFACE (iLedgeGroup, 0, 0, 1);
-
- /**
- * Query the underlying iObject
- */
- virtual iObject* QueryObject () = 0;
- virtual iLedge* CreateLedge () = 0;
-
- virtual size_t GetCount () const = 0;
- virtual iLedge* Get (size_t i) = 0;
-};
-
-#endif
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/Jamfile.in /tmp/IB0bHXT4Oc/cel-1.4/Jamfile.in
--- cel-1.9+svn3615/Jamfile.in 2008-03-11 15:59:11.000000000 +0000
+++ cel-1.4/Jamfile.in 2009-11-28 16:46:41.000000000 +0000
@@ -1,5 +1,5 @@
-TOP ?= "@top_srcdir@" ;
-BUILDTOP ?= "@top_builddir@" ;
+TOP ?= "@CS_TOP_SRCDIR@" ;
+BUILDTOP ?= "@CS_TOP_BUILDDIR@" ;
SubDir TOP ;
@@ -107,3 +107,6 @@
local SUBDIR = [ ConcatDirs $(BUILDTOP) include ] ; # Temporary for Recurse.
Recurse InstallHeader : .h ;
}
+
+# Create a file list for vfs.cfg
+FileListEntriesData vfs.cfg : : vfs ;
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/libs/celtool/camera.cpp /tmp/IB0bHXT4Oc/cel-1.4/libs/celtool/camera.cpp
--- cel-1.9+svn3615/libs/celtool/camera.cpp 2008-07-20 17:31:44.000000000 +0100
+++ cel-1.4/libs/celtool/camera.cpp 2009-11-28 16:46:44.000000000 +0000
@@ -35,7 +35,7 @@
#include "iutil/virtclk.h"
#include "iengine/engine.h"
#include "iengine/camera.h"
-#include "iengine/collection.h"
+#include "iengine/region.h"
#include "iengine/campos.h"
#include "iengine/sector.h"
#include "cstool/csview.h"
@@ -161,7 +161,7 @@
{
center_x = x;
center_y = y;
- GetPerspectiveCamera ()->SetPerspectiveCenter (x, y);
+ GetCamera ()->SetPerspectiveCenter (x, y);
center_set = true;
}
@@ -170,12 +170,6 @@
return view->GetCamera ();
}
-iPerspectiveCamera* celPcCameraCommon::GetPerspectiveCamera () const
-{
- return view->GetPerspectiveCamera ();
-}
-
-
void celPcCameraCommon::DisableDistanceClipping ()
{
fp.use_farplane = false;
@@ -392,7 +386,7 @@
view->SetRectangle (rect_x, rect_y, rect_w, rect_h);
if (center_set)
- GetPerspectiveCamera () -> SetPerspectiveCenter (center_x, center_y);
+ GetCamera () -> SetPerspectiveCenter (center_x, center_y);
return true;
}
@@ -419,4 +413,3 @@
//---------------------------------------------------------------------------
-
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/libs/celtool/celpaths.cpp /tmp/IB0bHXT4Oc/cel-1.4/libs/celtool/celpaths.cpp
--- cel-1.9+svn3615/libs/celtool/celpaths.cpp 1970-01-01 01:00:00.000000000 +0100
+++ cel-1.4/libs/celtool/celpaths.cpp 2009-11-28 16:46:44.000000000 +0000
@@ -0,0 +1,54 @@
+/*
+ Copyright (C) 2004 by Eric Sunshine
+ (C) 2008 by Frank Richter
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with this library; if not, write to the Free
+ Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include
+#include "celtool/celpaths.h"
+#include "packagedefs.h"
+
+// These defines should be set by the configure script
+#ifndef CEL_CONFIGDIR
+#ifdef CS_COMPILER_GCC
+#warning CEL_CONFIGDIR not set
+#endif
+#define CEL_CONFIGDIR "/usr/local/" CEL_PACKAGE_NAME_VER
+#endif
+
+namespace CEL
+{
+ csPathsList* GetPlatformInstallationPaths ()
+ {
+ csPathsList cel_paths;
+ csString cel_env (getenv ("CEL_" CEL_VERSION_STR));
+ if (cel_env.IsEmpty())
+ cel_env = getenv ("CEL");
+ if (!cel_env.IsEmpty())
+ {
+ cel_paths = csPathsList (cel_env);
+ // Assign "cel" type to all paths
+ for (size_t i = 0; i < cel_paths.GetSize(); i++)
+ cel_paths[i].type = "cel";
+ }
+ else
+ {
+ cel_paths.AddUniqueExpanded (CEL_CONFIGDIR);
+ }
+ return new csPathsList (cel_paths);
+ }
+} // namespace CEL
+
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/libs/celtool/initapp.cpp /tmp/IB0bHXT4Oc/cel-1.4/libs/celtool/initapp.cpp
--- cel-1.9+svn3615/libs/celtool/initapp.cpp 2007-07-18 00:44:13.000000000 +0100
+++ cel-1.4/libs/celtool/initapp.cpp 2009-11-28 16:46:44.000000000 +0000
@@ -16,8 +16,9 @@
Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+#include "celtool/celpaths.h"
#include "celtool/initapp.h"
-#include "celversion.h"
+#include "packagedefs.h"
#include
#include "iutil/cfgmgr.h"
@@ -34,19 +35,8 @@
// can be quite costly to recurse over the entire tree.
#define CEL_PLUGIN_SCAN_RECURSE false
-#define VERSION_STR CEL_VERSION_MAJOR "_" CEL_VERSION_MINOR
-#define VERSION_STR_DOTTED CEL_VERSION_MAJOR "." CEL_VERSION_MINOR
-
-#define CEL_PACKAGE_NAME "cel"
-#define CEL_PACKAGE_NAME_VER CEL_PACKAGE_NAME "-" VERSION_STR_DOTTED
// These defines should be set by the configure script
-#ifndef CEL_CONFIGDIR
-#ifdef CS_COMPILER_GCC
-#warning CEL_CONFIGDIR not set
-#endif
-#define CEL_CONFIGDIR "/usr/local/" CEL_PACKAGE_NAME_VER
-#endif
#ifndef CEL_PLUGINDIR
#ifdef CEL_COMPILER_GCC
#warning CEL_PLUGINDIR not set
@@ -62,33 +52,26 @@
static bool done = false;
if (!done)
{
+ static const char* const celDirs[] = {
+ "",
+ "lib/",
+ "cel/",
+#ifdef CS_COMPILER_NAME_AND_VERSION
+ CS_COMPILER_NAME_AND_VERSION "/bin",
+#endif
+ 0};
csPathsList cel_paths;
- csString cel_env (getenv ("CEL_" VERSION_STR));
- if (cel_env.IsEmpty())
- cel_env = getenv ("CEL");
- if (!cel_env.IsEmpty())
- {
- static const char* const celDirs[] = {
- "",
- "lib/",
- "cel/",
- 0};
- csPathsList cel_env_paths (cel_env);
- // Assign "cel" type to all paths
- for (size_t i = 0; i < cel_env_paths.GetSize(); i++)
- cel_env_paths[i].type = "cel";
- // Add CEL paths to try
- cel_paths.AddUniqueExpanded(cel_env_paths * csPathsList (celDirs),
- CEL_PLUGIN_SCAN_RECURSE);
- }
- else
- {
- cel_paths.AddUniqueExpanded(CEL_PLUGINDIR, CEL_PLUGIN_SCAN_RECURSE);
- }
+ csPathsList* cel_env_paths = CEL::GetPlatformInstallationPaths();
+ // Add CEL paths to try
+ cel_paths.AddUniqueExpanded (*cel_env_paths * csPathsList (celDirs),
+ CEL_PLUGIN_SCAN_RECURSE);
+ cel_paths.AddUniqueExpanded(CEL_PLUGINDIR, CEL_PLUGIN_SCAN_RECURSE);
if (dir0 != 0)
cel_paths.AddUniqueExpanded(dir0, CEL_PLUGIN_SCAN_RECURSE, "cel");
+ delete cel_env_paths;
+
scfInitialize(&cel_paths);
done = true;
}
@@ -134,20 +117,10 @@
bool ok = false;
if (cel_config_done) return true;
// find and add cel vfs file
- csPathsList cel_env_path;
- csString cel_env (getenv ("CEL_" VERSION_STR));
- if (cel_env.IsEmpty())
- cel_env = getenv ("CEL");
- // find dir
- if (cel_env.IsEmpty())
- cel_env_path = csPathsList(CEL_CONFIGDIR);
- else
- {
- cel_env_path = csPathsList(cel_env);
- }
+ csPathsList* cel_env_paths = CEL::GetPlatformInstallationPaths();
// check vfs.cfg file is actually there.
csPathsList vfs_file_path =
- csPathsUtilities::LocateFile(cel_env_path,"vfs.cfg");
+ csPathsUtilities::LocateFile(*cel_env_paths,"vfs.cfg");
if (vfs_file_path.GetSize())
{
csString cel_vfs_file =
@@ -158,7 +131,7 @@
else
{
csRef cmdline = csQueryRegistry (r);
- cel_env_path = csPathsList(cmdline->GetAppDir ());
+ csPathsList cel_env_path = csPathsList(cmdline->GetAppDir ());
vfs_file_path = csPathsUtilities::LocateFile(cel_env_path,"vfs.cfg");
if (vfs_file_path.GetSize())
ok = true;
@@ -166,6 +139,7 @@
csReport(r,CS_REPORTER_SEVERITY_WARNING,"cel.initializer",
"Couldn't find vfs.cfg!");
}
+ delete cel_env_paths;
return ok;
}
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/libs/celtool/packagedefs.h /tmp/IB0bHXT4Oc/cel-1.4/libs/celtool/packagedefs.h
--- cel-1.9+svn3615/libs/celtool/packagedefs.h 1970-01-01 01:00:00.000000000 +0100
+++ cel-1.4/libs/celtool/packagedefs.h 2009-11-28 16:46:44.000000000 +0000
@@ -0,0 +1,25 @@
+/*
+ Copyright (C) 2004 by Eric Sunshine
+ (C) 2008 by Frank Richter
+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; either
+ version 2 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with this library; if not, write to the Free
+ Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+#include "celversion.h"
+
+#define CEL_VERSION_STR CEL_VERSION_MAJOR "_" CEL_VERSION_MINOR
+#define CEL_VERSION_STR_DOTTED CEL_VERSION_MAJOR "." CEL_VERSION_MINOR
+
+#define CEL_PACKAGE_NAME "cel"
+#define CEL_PACKAGE_NAME_VER CEL_PACKAGE_NAME "-" CEL_VERSION_STR_DOTTED
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/libs/celtool/stdpcimp.cpp /tmp/IB0bHXT4Oc/cel-1.4/libs/celtool/stdpcimp.cpp
--- cel-1.9+svn3615/libs/celtool/stdpcimp.cpp 2008-08-02 21:41:47.000000000 +0100
+++ cel-1.4/libs/celtool/stdpcimp.cpp 2009-11-28 16:46:44.000000000 +0000
@@ -39,6 +39,7 @@
propholder = 0;
propclasses_dirty = true;
tag = 0;
+ name = 0;
pl = csQueryRegistry (object_reg);
}
@@ -46,6 +47,7 @@
celPcCommon::~celPcCommon ()
{
delete[] tag;
+ delete[] name;
}
void celPcCommon::SetTag (const char* tagname)
@@ -53,21 +55,13 @@
delete[] tag;
tag = csStrNew (tagname);
}
-
-const char* celPcCommon::GetName () const
-{
- return csobj.GetName ();
-}
// @@@ (ge) Please note that after the alternate names are deprecated
// that this can turn into a simple assignment and the macro factory
// definition should pass in a hard reference for the name.
void celPcCommon::SetName (const char* pcname)
{
- csobj.SetName (pcname);
-}
-iObject *celPcCommon::QueryObject ()
-{
- return &csobj;
+ delete[] name;
+ name = csStrNew (pcname);
}
void celPcCommon::SetEntity (iCelEntity* entity)
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/mk/autoconf/cel.m4 /tmp/IB0bHXT4Oc/cel-1.4/mk/autoconf/cel.m4
--- cel-1.9+svn3615/mk/autoconf/cel.m4 2008-06-17 14:17:50.000000000 +0100
+++ cel-1.4/mk/autoconf/cel.m4 2009-11-28 16:46:44.000000000 +0000
@@ -20,7 +20,7 @@
#==============================================================================
AC_PREREQ([2.56])
-m4_define([cel_min_version_default], [1.9])
+m4_define([cel_min_version_default], [1.4.0])
#------------------------------------------------------------------------------
# CS_PATH_CEL_CHECK([MINIMUM-VERSION], [ACTION-IF-FOUND],
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/mk/autoconf/checkbinutils.m4 /tmp/IB0bHXT4Oc/cel-1.4/mk/autoconf/checkbinutils.m4
--- cel-1.9+svn3615/mk/autoconf/checkbinutils.m4 2008-04-15 18:31:30.000000000 +0100
+++ cel-1.4/mk/autoconf/checkbinutils.m4 2009-11-28 16:46:44.000000000 +0000
@@ -33,13 +33,13 @@
# to stderr rather than stdout. Handle these anomalies.
AS_IF([echo `ld -v 2>&1` | grep GNU 2>&1 > /dev/null],
[# binutils versions come in the flavors X.Y as well as X.Y.Z
- CS_CHECK_PROG_VERSION([binutils], [$LD -v], [2.17], [9.9|.9|.9|.9],
+ CS_CHECK_PROG_VERSION([binutils], [$LD -v], [2.17], [9.9|.9|.9|.9|.9],
[cs_cv_binutils_true_2_17=yes],
[cs_cv_binutils_true_2_17=no])
AS_IF([test "$cs_cv_binutils_true_2_17" = yes],
[cs_cv_binutils_2_17=yes])
AS_IF([test -z "$cs_cv_binutils_2_17"],
[CS_CHECK_PROG_VERSION([binutils], [$LD -v], [2.16.91],
- [9.9.9|.9|.9], [cs_cv_binutils_2_17=yes])])
+ [9.9.9|.9|.9|.9], [cs_cv_binutils_2_17=yes])])
AS_IF([test -z "$cs_cv_binutils_2_17"],
[cs_cv_binutils_2_17=no])])])])
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/mk/autoconf/checkcommon.m4 /tmp/IB0bHXT4Oc/cel-1.4/mk/autoconf/checkcommon.m4
--- cel-1.9+svn3615/mk/autoconf/checkcommon.m4 2007-04-27 03:26:01.000000000 +0100
+++ cel-1.4/mk/autoconf/checkcommon.m4 2009-11-28 16:46:44.000000000 +0000
@@ -1,5 +1,5 @@
#==============================================================================
-# Copyright (C)2003-2006 by Eric Sunshine
+# Copyright (C)2003-2008 by Eric Sunshine
#
# This library is free software; you can redistribute it and/or modify it
# under the terms of the GNU Library General Public License as published by
@@ -19,116 +19,167 @@
AC_PREREQ([2.56])
#------------------------------------------------------------------------------
-# CS_CHECK_COMMON_TOOLS_LINK
-# Checks for common tools related to linking.
+# CS_CHECK_COMMON_TOOLS_LINK([EMITTER])
+# Checks for common tools related to linking. Results of the checks are
+# recorded with CS_EMIT_BUILD_PROPERTY() via the optional EMITTER. If
+# EMITTER is omitted, then CS_EMIT_BUILD_PROPERTY()'s default emitter is
+# employed.
#------------------------------------------------------------------------------
AC_DEFUN([CS_CHECK_COMMON_TOOLS_LINK],
- [
- # The default RANLIB in Jambase is wrong on some platforms, and is also
- # unsuitable during cross-compilation, so we set the value unconditionally
- # (sixth argument of CS_EMIT_BUILD_PROPERTY).
+ [# The default RANLIB in Jambase is wrong on some platforms, and is also
+ # unsuitable during cross-compilation, so value is set unconditionally.
AC_PROG_RANLIB
- CS_EMIT_BUILD_PROPERTY([RANLIB], [$RANLIB], [], [], [], [Y])
+ CS_EMIT_BUILD_PROPERTY([RANLIB], [$RANLIB], [unconditional], [], [$1])
CS_CHECK_TOOLS([DLLTOOL], [dlltool])
- CS_EMIT_BUILD_PROPERTY([CMD.DLLTOOL], [$DLLTOOL])
+ CS_EMIT_BUILD_PROPERTY([CMD.DLLTOOL], [$DLLTOOL], [], [], [$1])
CS_CHECK_TOOLS([DLLWRAP], [dllwrap])
AS_IF([test "$cs_mno_cygwin" = "yes"],
[DLLWRAP="$DLLWRAP --target i386-mingw32"])
- CS_EMIT_BUILD_PROPERTY([CMD.DLLWRAP], [$DLLWRAP])
+ CS_EMIT_BUILD_PROPERTY([CMD.DLLWRAP], [$DLLWRAP], [], [], [$1])
CS_CHECK_TOOLS([WINDRES], [windres])
- CS_EMIT_BUILD_PROPERTY([CMD.WINDRES], [$WINDRES])
+ CS_EMIT_BUILD_PROPERTY([CMD.WINDRES], [$WINDRES], [], [], [$1])
CS_CHECK_TOOLS([STRINGS], [strings])
- CS_EMIT_BUILD_PROPERTY([CMD.STRINGS], [$STRINGS])
+ CS_EMIT_BUILD_PROPERTY([CMD.STRINGS], [$STRINGS], [], [], [$1])
CS_CHECK_TOOLS([OBJCOPY], [objcopy])
- CS_EMIT_BUILD_PROPERTY([CMD.OBJCOPY], [$OBJCOPY])
+ CS_EMIT_BUILD_PROPERTY([CMD.OBJCOPY], [$OBJCOPY], [], [], [$1])
CS_CHECK_LIBTOOL
- CS_EMIT_BUILD_PROPERTY([LIBTOOL], [$LIBTOOL])
- CS_EMIT_BUILD_PROPERTY([APPLE_LIBTOOL], [$APPLE_LIBTOOL])
- ])
+ CS_EMIT_BUILD_PROPERTY([LIBTOOL], [$LIBTOOL], [], [], [$1])
+ CS_EMIT_BUILD_PROPERTY([APPLE_LIBTOOL], [$APPLE_LIBTOOL], [], [], [$1])])
#------------------------------------------------------------------------------
-# CS_CHECK_COMMON_TOOLS_BASIC
-# Checks for basic tools for building things.
+# CS_CHECK_COMMON_TOOLS_RELAYTOOL([PATH], [EMITTER])
+# Checks for relaytool. Prepends PATH to the search path.
+# The result of the check is recorded with CS_EMIT_BUILD_PROPERTY() via
+# the optional EMITTER. If EMITTER is omitted, then
+# CS_EMIT_BUILD_PROPERTY()'s default emitter is employed.
+#------------------------------------------------------------------------------
+AC_DEFUN([CS_CHECK_COMMON_TOOLS_RELAYTOOL],
+ [AC_ARG_ENABLE([relaytool], [AC_HELP_STRING([--enable-relaytool],
+ [enable use of relaytool for some libraries (default YES)])])
+ AS_IF([test -z "$enable_relaytool"],
+ [enable_relaytool=yes])
+ AS_IF([test "$enable_relaytool" != "no"],
+ [CS_PATH_TOOL([RELAYTOOL], [relaytool], [], [$1])
+ CS_EMIT_BUILD_PROPERTY([CMD.RELAYTOOL], [$RELAYTOOL], [], [], [$2])])])
+
+
+#------------------------------------------------------------------------------
+# CS_CHECK_COMMON_TOOLS_BASIC([EMITTER])
+# Checks for basic tools for building things. Results of the checks are
+# recorded with CS_EMIT_BUILD_PROPERTY() via the optional EMITTER. If
+# EMITTER is omitted, then CS_EMIT_BUILD_PROPERTY()'s default emitter is
+# employed.
#------------------------------------------------------------------------------
AC_DEFUN([CS_CHECK_COMMON_TOOLS_BASIC],
[CS_CHECK_MKDIR
- CS_EMIT_BUILD_PROPERTY([CMD.MKDIR], [$MKDIR])
- CS_EMIT_BUILD_PROPERTY([CMD.MKDIRS], [$MKDIRS])
+ CS_EMIT_BUILD_PROPERTY([CMD.MKDIR], [$MKDIR], [], [], [$1])
+ CS_EMIT_BUILD_PROPERTY([CMD.MKDIRS], [$MKDIRS], [], [], [$1])
- CS_CHECK_PROGS([INSTALL], [install])
- CS_EMIT_BUILD_PROPERTY([INSTALL], [$INSTALL])
+ CS_CHECK_PROGS([INSTALL], [install], [], [], [$1])
+ CS_EMIT_BUILD_PROPERTY([INSTALL], [$INSTALL], [], [], [$1])
AC_PROG_LN_S
- CS_EMIT_BUILD_PROPERTY([LN_S], [$LN_S])])
+ CS_EMIT_BUILD_PROPERTY([LN_S], [$LN_S], [], [], [$1])])
#------------------------------------------------------------------------------
-# CS_CHECK_COMMON_TOOLS_DOC_TEXINFO
-# Checks for tools to generate documentation from texinfo files.
+# CS_CHECK_COMMON_TOOLS_DOC_TEXINFO([EMITTER])
+# Checks for tools to generate documentation from texinfo files. Results
+# of the checks are recorded with CS_EMIT_BUILD_PROPERTY() via the
+# optional EMITTER. If EMITTER is omitted, then
+# CS_EMIT_BUILD_PROPERTY()'s default emitter is employed.
#------------------------------------------------------------------------------
AC_DEFUN([CS_CHECK_COMMON_TOOLS_DOC_TEXINFO],
[CS_CHECK_PROGS([TEXI2DVI], [texi2dvi])
- CS_EMIT_BUILD_PROPERTY([CMD.TEXI2DVI], [$TEXI2DVI])
+ CS_EMIT_BUILD_PROPERTY([CMD.TEXI2DVI], [$TEXI2DVI], [], [], [$1])
CS_CHECK_PROGS([TEXI2PDF], [texi2pdf])
- CS_EMIT_BUILD_PROPERTY([CMD.TEXI2PDF], [$TEXI2PDF])
+ CS_EMIT_BUILD_PROPERTY([CMD.TEXI2PDF], [$TEXI2PDF], [], [], [$1])
CS_CHECK_PROGS([DVIPS], [dvips])
- CS_EMIT_BUILD_PROPERTY([CMD.DVIPS], [$DVIPS])
+ CS_EMIT_BUILD_PROPERTY([CMD.DVIPS], [$DVIPS], [], [], [$1])
CS_CHECK_PROGS([DVIPDF], [dvipdf])
- CS_EMIT_BUILD_PROPERTY([CMD.DVIPDF], [$DVIPDF])
+ CS_EMIT_BUILD_PROPERTY([CMD.DVIPDF], [$DVIPDF], [], [], [$1])
CS_CHECK_PROGS([MAKEINFO], [makeinfo])
- CS_EMIT_BUILD_PROPERTY([CMD.MAKEINFO], [$MAKEINFO])])
+ CS_EMIT_BUILD_PROPERTY([CMD.MAKEINFO], [$MAKEINFO], [], [], [$1])])
#------------------------------------------------------------------------------
-# CS_CHECK_COMMON_TOOLS_DOC_DOXYGEN
-# Checks for tools to generate source documentation via doxygen.
+# CS_CHECK_COMMON_TOOLS_DOC_DOXYGEN([EMITTER])
+# Checks for tools to generate source documentation via doxygen. Results
+# of the checks are recorded with CS_EMIT_BUILD_PROPERTY() via the
+# optional EMITTER. If EMITTER is omitted, then
+# CS_EMIT_BUILD_PROPERTY()'s default emitter is employed.
#------------------------------------------------------------------------------
AC_DEFUN([CS_CHECK_COMMON_TOOLS_DOC_DOXYGEN],
[CS_CHECK_PROGS([DOXYGEN], [doxygen])
- CS_EMIT_BUILD_PROPERTY([CMD.DOXYGEN], [$DOXYGEN])
+ CS_EMIT_BUILD_PROPERTY([CMD.DOXYGEN], [$DOXYGEN], [], [], [$1])
CS_CHECK_TOOLS([DOT], [dot])
- CS_EMIT_BUILD_PROPERTY([CMD.DOT], [$DOT])])
+ CS_EMIT_BUILD_PROPERTY([CMD.DOT], [$DOT], [], [], [$1])])
#------------------------------------------------------------------------------
-# CS_CHECK_COMMON_TOOLS_ICONS
-# Checks for tools required by the icon generation rules from icons.jam.
+# CS_CHECK_COMMON_TOOLS_ICONS([EMITTER])
+# Checks for tools required by the icon generation rules from
+# icons.jam. Results of the checks are recorded with
+# CS_EMIT_BUILD_PROPERTY() via the optional EMITTER. If EMITTER is
+# omitted, then CS_EMIT_BUILD_PROPERTY()'s default emitter is employed.
#------------------------------------------------------------------------------
AC_DEFUN([CS_CHECK_COMMON_TOOLS_ICONS],
[# rsvg: for svg to png conversion
CS_CHECK_PROGS([RSVG], [rsvg])
- CS_EMIT_BUILD_PROPERTY([CMD.RSVG], [$RSVG])
+ CS_EMIT_BUILD_PROPERTY([CMD.RSVG], [$RSVG], [], [], [$1])
# icotool: for creating Win32 ICO files
CS_CHECK_PROGS([ICOTOOL], [icotool])
- CS_EMIT_BUILD_PROPERTY([CMD.ICOTOOL], [$ICOTOOL])
+ CS_EMIT_BUILD_PROPERTY([CMD.ICOTOOL], [$ICOTOOL], [], [], [$1])
# convert: for various image manipulations from both the svg conversion and
# ICO creation.
CS_CHECK_PROGS([CONVERT], [convert])
- CS_EMIT_BUILD_PROPERTY([CMD.CONVERT], [$CONVERT])])
+ CS_EMIT_BUILD_PROPERTY([CMD.CONVERT], [$CONVERT], [], [], [$1])])
#------------------------------------------------------------------------------
-# CS_CHECK_COMMON_LIBS
-# Check for typical required libraries (libm, libmx, libdl, libnsl).
+# CS_CHECK_COMMON_LIBS([EMITTER])
+# Check for typical required libraries (libc, libm, libmx, libdl,
+# libnsl). Results of the checks are recorded under build key
+# "COMPILER.LFLAGS" via CS_EMIT_BUILD_PROPERTY() using the optional
+# EMITTER. If EMITTER is omitted, then CS_EMIT_BUILD_PROPERTY()'s default
+# emitter is employed.
#------------------------------------------------------------------------------
AC_DEFUN([CS_CHECK_COMMON_LIBS],
[AC_LANG_PUSH([C])
+
+ AC_CHECK_LIB([c], [fopen])
+ AS_IF([test $ac_cv_lib_c_fopen = yes],
+ [CS_EMIT_BUILD_PROPERTY([COMPILER.LFLAGS], [-lc], [append],[],[$1])])
+
AC_CHECK_LIB([m], [pow], [cs_cv_libm_libs=-lm], [cs_cv_libm_libs=])
AC_CHECK_LIB([m], [cosf], [cs_cv_libm_libs=-lm])
+ AS_IF([test $ac_cv_lib_m_pow = yes || test $ac_cv_lib_m_cosf = yes],
+ [CS_EMIT_BUILD_PROPERTY([COMPILER.LFLAGS], [-lm], [append],[],[$1])])
+
AC_CHECK_LIB([mx], [cosf])
+ AS_IF([test $ac_cv_lib_mx_cosf = yes],
+ [CS_EMIT_BUILD_PROPERTY([COMPILER.LFLAGS], [-lmx], [append],[],[$1])])
+
AC_CHECK_LIB([dl], [dlopen], [cs_cv_libdl_libs=-ldl], [cs_cv_libdl_libs=])
+ AS_IF([test $ac_cv_lib_dl_dlopen = yes],
+ [CS_EMIT_BUILD_PROPERTY([COMPILER.LFLAGS], [-ldl], [append],[],[$1])])
+
AC_CHECK_LIB([nsl], [gethostbyname])
- AC_LANG_POP([C])])
+ AS_IF([test $ac_cv_lib_nsl_gethostbyname = yes],
+ [CS_EMIT_BUILD_PROPERTY([COMPILER.LFLAGS], [-lnsl], [append],[],[$1])])
+
+ AC_LANG_POP([C])
+])
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/mk/autoconf/checklib.m4 /tmp/IB0bHXT4Oc/cel-1.4/mk/autoconf/checklib.m4
--- cel-1.9+svn3615/mk/autoconf/checklib.m4 2007-11-14 06:05:35.000000000 +0000
+++ cel-1.4/mk/autoconf/checklib.m4 2009-11-28 16:46:44.000000000 +0000
@@ -243,7 +243,7 @@
# list of tuples stored in the shell variable VARIABLE.
#------------------------------------------------------------------------------
AC_DEFUN([_CS_CHECK_LIB_CONFIG_FLAGS],
- [CS_CHECK_TOOLS(_CS_CLCF_SHVAR([$2]), [$2-config])
+ [CS_PATH_TOOL(_CS_CLCF_SHVAR([$2]), [$2-config])
AS_IF([test -n "$_CS_CLCF_SHVAR([$2])"],
[AS_IF([test -z "$_CS_CLCF_CVAR([$2])"],
[AS_IF([$_CS_CLCF_SHVAR([$2]) --cflags --libs >/dev/null 2>&1],
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/mk/autoconf/checktt2.m4 /tmp/IB0bHXT4Oc/cel-1.4/mk/autoconf/checktt2.m4
--- cel-1.9+svn3615/mk/autoconf/checktt2.m4 2005-01-14 15:32:01.000000000 +0000
+++ cel-1.4/mk/autoconf/checktt2.m4 2009-11-28 16:46:44.000000000 +0000
@@ -29,7 +29,7 @@
# CS_EMIT_BUILD_PROPERTY() is invoked with EMITTER in order to record the
# value of the TTREE variable in an output file. As a convenience, if
# EMITTER is the literal value "emit" or "yes", then
-# CS_EMIT_BUILD_RESULT()'s default emitter will be used.
+# CS_EMIT_BUILD_PROPERTY()'s default emitter will be used.
#------------------------------------------------------------------------------
AC_DEFUN([CS_CHECK_TEMPLATE_TOOLKIT2],
[CS_CHECK_PROGS([PERL], [perl5 perl])
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/mk/autoconf/compiler.m4 /tmp/IB0bHXT4Oc/cel-1.4/mk/autoconf/compiler.m4
--- cel-1.9+svn3615/mk/autoconf/compiler.m4 2008-01-09 15:16:10.000000000 +0000
+++ cel-1.4/mk/autoconf/compiler.m4 2009-11-28 16:46:44.000000000 +0000
@@ -1,6 +1,6 @@
# compiler.m4 -*- Autoconf -*-
#=============================================================================
-# Copyright (C)2003-2007 by Eric Sunshine
+# Copyright (C)2003-2009 by Eric Sunshine
# Copyright (C)2003 by Matze Braun
#
# This library is free software; you can redistribute it and/or modify it
@@ -30,9 +30,12 @@
# COMPILER.C.TYPE, and (as an historic anomaly) COMPILER.TYPE variables
# in Jamconfig. The shell variable cs_compiler_name_c is also exported.
#-----------------------------------------------------------------------------
-AC_DEFUN([CS_PROG_CC],[
+AC_DEFUN([_CS_PROG_CC_CFLAGS_FILTER],[
CFLAGS="$CFLAGS" # Filter undesired flags
- AC_PROG_CC
+])
+AC_DEFUN([CS_PROG_CC],[
+ AC_REQUIRE([_CS_PROG_CC_CFLAGS_FILTER])
+ AC_REQUIRE([AC_PROG_CC])
AS_IF([test -n "$CC"],[
CS_EMIT_BUILD_PROPERTY([CMD.CC], [$CC])
CS_EMIT_BUILD_PROPERTY([COMPILER.CFLAGS], [$CPPFLAGS $CFLAGS], [+])
@@ -40,7 +43,15 @@
# Check if compiler recognizes -pipe directive.
CS_EMIT_BUILD_FLAGS([if $CC accepts -pipe], [cs_cv_prog_cc_pipe],
- [CS_CREATE_TUPLE([-pipe])], [C], [COMPILER.CFLAGS], [+])
+ [CS_CREATE_TUPLE([-pipe])], [C], [COMPILER.CFLAGS], [append])
+
+ # Check if compiler recognizes Sparc v9 CPU. Ugly to pollute
+ # project-agnostic C compiler check, but it is needed by assembly code
+ # implementing Sparc atomic threading operations, and it should not
+ # hurt if the option is not recognized.
+ CS_EMIT_BUILD_FLAGS([if $CC handles Sparc v9],
+ [cs_cv_prog_cc_sparc_v9],
+ [CS_CREATE_TUPLE([-mcpu=v9])], [C], [COMPILER.CFLAGS], [append])
])
])
@@ -53,9 +64,12 @@
# COMPILER.C++.TYPE, and (as an historic anomaly) COMPILER.TYPE variables
# in Jamconfig. The shell variable cs_compiler_name_cxx is also exported.
#-----------------------------------------------------------------------------
-AC_DEFUN([CS_PROG_CXX],[
+AC_DEFUN([_CS_PROG_CXX_CFLAGS_FILTER],[
CXXFLAGS="$CXXFLAGS" # Filter undesired flags
- AC_PROG_CXX
+])
+AC_DEFUN([CS_PROG_CXX],[
+ AC_REQUIRE([_CS_PROG_CXX_CFLAGS_FILTER])
+ AC_REQUIRE([AC_PROG_CXX])
AS_IF([test -n "$CXX"],[
CS_EMIT_BUILD_PROPERTY([CMD.C++], [$CXX])
CS_EMIT_BUILD_PROPERTY([COMPILER.C++FLAGS], [$CPPFLAGS $CXXFLAGS], [+])
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/mk/autoconf/crystal.m4 /tmp/IB0bHXT4Oc/cel-1.4/mk/autoconf/crystal.m4
--- cel-1.9+svn3615/mk/autoconf/crystal.m4 2008-07-10 13:28:45.000000000 +0100
+++ cel-1.4/mk/autoconf/crystal.m4 2009-11-28 16:46:44.000000000 +0000
@@ -20,7 +20,43 @@
AC_PREREQ([2.56])
# Should stay in sync with csver.h
-m4_define([cs_min_version_default], [1.4])
+m4_define([cs_min_version_default], [1.4.0])
+
+
+#------------------------------------------------------------------------------
+# _CS_AUGMENT_PATHS([PATH-VAR], [PATHS])
+# Add paths from PATHS to the variable PATH-VAR.
+# Handles PATHS being a Win32-style path list.
+# Also adds 'bin/' subdirectories of elements in PATHS to PATH-VAR.
+#------------------------------------------------------------------------------
+AC_DEFUN([_CS_AUGMENT_PATHS],
+[AC_REQUIRE([CS_CHECK_HOST])
+AS_IF([test -n "$2"],
+ [# On MinGW, CRYSTAL may contain the path in one of two flavors:
+ # MSYS paths, separated by $PATH_SEPARATOR, or Win32 paths, separated
+ # by ';'. Since for the configure check we need MSYS paths, CRYSTAL
+ # is first treated like a Win32-style list. If that yields sensible
+ # results these are used subsequently. Otherwise use CRYSTAL as-is.
+ case $host_os in
+ mingw*)
+ my_IFS=$IFS; IFS=\;
+ for win32_dir in $2; do
+ win32_dir=CS_PATH_NORMALIZE_EMBEDDED([$win32_dir])
+ win32_dir=`echo $win32_dir | sed "s/\(.\):/\\/\\1/"`
+ AS_IF([test -d "$win32_dir"],
+ [AS_IF([test -n "$$1"], [$1="$$1$PATH_SEPARATOR"])
+ $1="$$1$win32_dir$PATH_SEPARATOR$win32_dir/bin"])
+ done
+ IFS=$my_IFS
+ ;;
+ esac
+ AS_IF([test -z "$$1"],
+ [my_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for cs_dir in $2; do
+ AS_IF([test -n "$$1"], [$1="$$1$PATH_SEPARATOR"])
+ $1="$$1$cs_dir$PATH_SEPARATOR$cs_dir/bin"
+ done
+ IFS=$my_IFS])])])
#------------------------------------------------------------------------------
# CS_PATH_CRYSTAL_CHECK([DESIRED-VERSION], [ACTION-IF-FOUND],
@@ -72,14 +108,7 @@
# Try to find an installed cs-config.
cs_path=''
-AS_IF([test -n "$CRYSTAL"],
- [my_IFS=$IFS; IFS=$PATH_SEPARATOR
- for cs_dir in $CRYSTAL; do
- AS_IF([test -n "$cs_path"], [cs_path="$cs_path$PATH_SEPARATOR"])
- cs_path="$cs_path$cs_dir$PATH_SEPARATOR$cs_dir/bin"
- done
- IFS=$my_IFS])
-
+_CS_AUGMENT_PATHS([cs_path], [$CRYSTAL])
AS_IF([test -n "$cs_path"], [cs_path="$cs_path$PATH_SEPARATOR"])
cs_path="$cs_path$PATH$PATH_SEPARATOR/usr/local/crystalspace/bin"
@@ -139,7 +168,7 @@
# Still do cs-config version check - this one will also take the release
# component into account. Also needed for legacy cs-config.
- CS_CHECK_PROG_VERSION([Crystal Space], [$cfg --version],
+ CS_CHECK_PROG_VERSION([Crystal Space], ["$cfg" --version],
[m4_default([$1],[cs_min_version_default])], [9.9|.9],
[cs_sdk=yes], [cs_sdk=no])
@@ -147,15 +176,18 @@
[cs_liblist="$4"
cs_optlibs=CS_TRIM([$5])
AS_IF([test -n "$cs_optlibs"],
- [cs_optlibs=`$cfg --available-libs $cs_optlibs`
+ [cs_optlibs=`"$cfg" --available-libs $cs_optlibs`
cs_liblist="$cs_liblist $cs_optlibs"])
- CRYSTAL_VERSION=`$cfg --version $cs_liblist`
- CRYSTAL_CFLAGS=CS_RUN_PATH_NORMALIZE([$cfg --cxxflags $cs_liblist])
- CRYSTAL_LIBS=CS_RUN_PATH_NORMALIZE([$cfg --libs $cs_liblist])
+ CRYSTAL_VERSION=`"$cfg" --version $cs_liblist`
+ CRYSTAL_CFLAGS=CS_RUN_PATH_NORMALIZE(["$cfg" --cxxflags $cs_liblist])
+ CRYSTAL_LIBS=CS_RUN_PATH_NORMALIZE(["$cfg" --libs $cs_liblist])
CRYSTAL_INCLUDE_DIR=CS_RUN_PATH_NORMALIZE(
- [$cfg --includedir $cs_liblist])
- CRYSTAL_AVAILABLE_LIBS=`$cfg --available-libs`
- CRYSTAL_STATICDEPS=`$cfg --static-deps`
+ ["$cfg" --includedir $cs_liblist])
+ CRYSTAL_AVAILABLE_LIBS=`"$cfg" --available-libs`
+ CRYSTAL_STATICDEPS=`"$cfg" --static-deps`
+ CRYSTAL_PREFIX=CS_RUN_PATH_NORMALIZE(["$cfg" --prefix])
+ CRYSTAL_EXEC_PREFIX=CS_RUN_PATH_NORMALIZE(["$cfg" --exec-prefix])
+ CRYSTAL_TOOLS_PREFIX=CS_RUN_PATH_NORMALIZE(["$cfg" --tools-prefix])
AS_IF([test -z "$CRYSTAL_LIBS"], [cs_sdk=no])])],
[cs_sdk=no])
@@ -177,6 +209,9 @@
CRYSTAL_VERSION=''
CRYSTAL_LIBS=''
CRYSTAL_INCLUDE_DIR=''
+ CRYSTAL_PREFIX=''
+ CRYSTAL_EXEC_PREFIX=''
+ CRYSTAL_TOOLS_PREFIX=''
$3])
])
@@ -206,7 +241,10 @@
AC_SUBST([CRYSTAL_LIBS])
AC_SUBST([CRYSTAL_INCLUDE_DIR])
AC_SUBST([CRYSTAL_AVAILABLE_LIBS])
-AC_SUBST([CRYSTAL_STATICDEPS])])
+AC_SUBST([CRYSTAL_STATICDEPS])
+AC_SUBST([CRYSTAL_PREFIX])
+AC_SUBST([CRYSTAL_EXEC_PREFIX])])
+AC_SUBST([CRYSTAL_TOOLS_PREFIX])])
#------------------------------------------------------------------------------
@@ -232,6 +270,8 @@
_CS_PATH_CRYSTAL_EMIT([CRYSTAL.INCLUDE_DIR],[$CRYSTAL_INCLUDE_DIR],[$6])
_CS_PATH_CRYSTAL_EMIT([CRYSTAL.AVAILABLE_LIBS],[$CRYSTAL_AVAILABLE_LIBS],[$6])
_CS_PATH_CRYSTAL_EMIT([CRYSTAL.STATICDEPS],[$CRYSTAL_STATICDEPS],[$6])
+_CS_PATH_CRYSTAL_EMIT([CRYSTAL.EXEC_PREFIX],[$CRYSTAL_EXEC_PREFIX],[$6])
+_CS_PATH_CRYSTAL_EMIT([CRYSTAL.TOOLS_PREFIX],[$CRYSTAL_TOOLS_PREFIX],[$6])
])
AC_DEFUN([_CS_PATH_CRYSTAL_EMIT],
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/mk/autoconf/cs_check_host.m4 /tmp/IB0bHXT4Oc/cel-1.4/mk/autoconf/cs_check_host.m4
--- cel-1.9+svn3615/mk/autoconf/cs_check_host.m4 2006-06-01 16:09:54.000000000 +0100
+++ cel-1.4/mk/autoconf/cs_check_host.m4 2009-11-28 16:46:44.000000000 +0000
@@ -1,6 +1,6 @@
#------------------------------------------------------------------------------
-# Determine host platform. Recognized families: Unix, Windows, MacOS/X.
-# Orginial Macros Copyright (C)2003 Eric Sunshine
+# Determine host platform. Recognized families: Unix, Windows, Mac OS X.
+# Copyright (C)2003-2009 by Eric Sunshine
#
# This library is free software; you can redistribute it and/or modify it
# under the terms of the GNU Library General Public License as published by
@@ -19,34 +19,45 @@
#------------------------------------------------------------------------------
#------------------------------------------------------------------------------
-# Determine host CPU.
-#
-# CS_CHECK_HOST_CPU
+# CS_CHECK_HOST_CPU([EMITTER])
# Set the shell variable cs_host_cpu to a normalized form of the CPU name
# returned by config.guess/config.sub. Typically, Crystal Space's
# conception of CPU name is the same as that returned by
-# config.guess/config.sub, but there may be exceptions as seen in the
-# `case' statement. Also takes the normalized name, uppercases it to
-# form a name suitable for the C preprocessor. Additionally sets the
-# TARGET.PROCESSOR Jamconfig property.
+# config.guess/config.sub, but there may be exceptions, such as
+# normalizing all Intel x86 CPU names to the canonical "x86". Also takes
+# the normalized name, uppercases it to form a name suitable for the C
+# preprocessor and publishes it as shell variable cs_host_cpu_normalized.
+# Additionally, sets the TARGET.PROCESSOR build property to the value of
+# cs_host_cpu_normalized via the supplied EMITTER. If EMITTER is omitted,
+# then CS_EMIT_BUILD_PROPERTY()'s default emitter is employed.
#------------------------------------------------------------------------------
AC_DEFUN([CS_CHECK_HOST_CPU],
[AC_REQUIRE([AC_CANONICAL_HOST])
case $host_cpu in
[[Ii][3-9]86*|[Xx]86*]) cs_host_cpu=x86 ;;
+ powerpc*) cs_host_cpu=powerpc ;;
+ sparc*) cs_host_cpu=sparc ;;
+ mips*) cs_host_cpu=mips ;;
+ alpha*) cs_host_cpu=alpha ;;
*) cs_host_cpu=$host_cpu ;;
esac
cs_host_cpu_normalized="AS_TR_CPP([$cs_host_cpu])"
- CS_JAMCONFIG_PROPERTY([TARGET.PROCESSOR], [$cs_host_cpu_normalized])
+ CS_EMIT_BUILD_PROPERTY([TARGET.PROCESSOR], [$cs_host_cpu_normalized],
+ [], [], [$1])
])
#------------------------------------------------------------------------------
-# CS_CHECK_HOST
-# Sets the shell variables cs_host_target cs_host_family,
-# cs_host_os_normalized, and cs_host_os_normalized_uc. Emits appropriate
-# CS_PLATFORM_UNIX, CS_PLATFORM_WIN32, CS_PLATFORM_MACOSX via
-# AC_DEFINE(), and TARGET.OS and TARGET.OS.NORMALIZED to Jamconfig.
+# CS_CHECK_HOST([EMITTER])
+# Sets the shell variables cs_host_target, cs_host_family,
+# cs_host_os_normalized, and cs_host_os_normalized_uc (normalized and
+# uppercase). Emits appropriate CS_PLATFORM_UNIX, CS_PLATFORM_WIN32,
+# CS_PLATFORM_MACOSX via AC_DEFINE(). Note that these are not necessarily
+# mutually exclusive. For instance, on Mac OS X, both CS_PLATFORM_MACOSX
+# and CS_PLATFORM_UNIX are defined. Furthermore, emits build variables
+# TARGET.OS and TARGET.OS.NORMALIZED via CS_EMIT_BUILD_PROPERTY() using
+# the provided EMITTER or CS_EMIT_BUILD_PROPERTY()'s default emitter if
+# EMITTER is omitted.
#------------------------------------------------------------------------------
AC_DEFUN([CS_CHECK_HOST],
[AC_REQUIRE([AC_CANONICAL_HOST])
@@ -59,6 +70,7 @@
;;
darwin*)
_CS_CHECK_HOST_DARWIN
+ _CS_CHECK_UNIVERSAL_BINARY
;;
*)
# Everything else is assumed to be Unix or Unix-like.
@@ -76,44 +88,52 @@
;;
unix)
AC_DEFINE([CS_PLATFORM_UNIX], [],
- [Define when compiling for Unix and Unix-like (i.e. MacOS/X)])
+ [Define when compiling for Unix and Unix-like (i.e. Mac OS X)])
AS_IF([test -z "$cs_host_os_normalized"],
[cs_host_os_normalized='Unix'])
;;
esac
cs_host_os_normalized_uc="AS_TR_CPP([$cs_host_os_normalized])"
- CS_JAMCONFIG_PROPERTY([TARGET.OS], [$cs_host_os_normalized_uc])
- CS_JAMCONFIG_PROPERTY([TARGET.OS.NORMALIZED], [$cs_host_os_normalized])
+ CS_EMIT_BUILD_PROPERTY([TARGET.OS], [$cs_host_os_normalized_uc],
+ [], [], [$1])
+ CS_EMIT_BUILD_PROPERTY([TARGET.OS.NORMALIZED], [$cs_host_os_normalized],
+ [], [], [$1])
])
+#------------------------------------------------------------------------------
+# _CS_CHECK_HOST_DARWIN([EMITTER])
+# Both Mac OS X and Darwin are identified via $host_os as "darwin". We
+# need a way to distinguish between the two. If Carbon.h is present,
+# then assume Mac OX S; if not, assume Darwin. If --with-x=yes was
+# invoked, and Carbon.h is present, then assume that user wants to
+# cross-build for Darwin even though build host is Mac OS X.
+#
+# IMPLEMENTATION NOTES
+#
+# 1. The QuickTime 7.0 installer removes ,
+# which causes #include to fail
+# unconditionally. Re-installing the QuickTime SDK should restore the
+# header, however not all developers know to do this, so we work around
+# the problem of the missing CarbonSound.h by #defining __CARBONSOUND__
+# in the test in order to prevent Carbon.h from attempting to #include
+# the missing header.
+#
+# 2. At least one Mac OS X user switches between gcc 2.95 and gcc 3.3
+# with a script which toggles the values of CC, CXX, and CPP.
+# Unfortunately, CPP was being set to run the preprocessor directly
+# ("cpp", for instance) rather than running it via the compiler ("gcc
+# -E", for instance). The problem with running the preprocessor directly
+# is that __APPLE__ and __GNUC__ are not defined, which causes the
+# Carbon.h check to fail. We avoid this problem by supplying a non-empty
+# fourth argument to AC_CHECK_HEADER(), which causes it to test compile
+# the header only (which is a more robust test), rather than also testing
+# it via the preprocessor.
+#------------------------------------------------------------------------------
AC_DEFUN([_CS_CHECK_HOST_DARWIN],
[AC_REQUIRE([CS_PROG_CC])
AC_REQUIRE([CS_PROG_CXX])
- # Both MacOS/X and Darwin are identified via $host_os as "darwin". We need
- # a way to distinguish between the two. If Carbon.h is present, then
- # assume MacOX/S; if not, assume Darwin. If --with-x=yes was invoked, and
- # Carbon.h is present, then assume that user wants to cross-build for
- # Darwin even though build host is MacOS/X.
- # IMPLEMENTATION NOTE *1*
- # The QuickTime 7.0 installer removes , which
- # causes #include to fail unconditionally. Re-installing
- # the QuickTime SDK should restore the header, however not all developers
- # know to do this, so we work around the problem of the missing
- # CarbonSound.h by #defining __CARBONSOUND__ in the test in order to
- # prevent Carbon.h from attempting to #include the missing header.
- # IMPLEMENTATION NOTE *2*
- # At least one MacOS/X user switches between gcc 2.95 and gcc 3.3 with a
- # script which toggles the values of CC, CXX, and CPP. Unfortunately, CPP
- # was being set to run the preprocessor directly ("cpp", for instance)
- # rather than running it via the compiler ("gcc -E", for instance). The
- # problem with running the preprocessor directly is that __APPLE__ and
- # __GNUC__ are not defined, which causes the Carbon.h check to fail. We
- # avoid this problem by supplying a non-empty fourth argument to
- # AC_CHECK_HEADER(), which causes it to test compile the header only (which
- # is a more robust test), rather than also testing it via the preprocessor.
-
AC_DEFINE([__CARBONSOUND__], [],
[Avoid problem caused by missing ])
AC_CHECK_HEADER([Carbon/Carbon.h],
@@ -135,10 +155,60 @@
AC_CACHE_CHECK([for Objective-C compiler], [cs_cv_prog_objc],
[cs_cv_prog_objc="$CC"])
- CS_JAMCONFIG_PROPERTY([CMD.OBJC], [$cs_cv_prog_objc])
+ CS_EMIT_BUILD_PROPERTY([CMD.OBJC], [$cs_cv_prog_objc], [], [], [$1])
AC_CACHE_CHECK([for Objective-C++ compiler], [cs_cv_prog_objcxx],
[cs_cv_prog_objcxx="$CXX"])
- CS_JAMCONFIG_PROPERTY([CMD.OBJC++], [$cs_cv_prog_objcxx])],
+ CS_EMIT_BUILD_PROPERTY([CMD.OBJC++], [$cs_cv_prog_objcxx],
+ [], [], [$1])],
[cs_host_target=unix
cs_host_family=unix])])
+
+
+#------------------------------------------------------------------------------
+# _CS_CHECK_UNIVERSAL_BINARY([EMITTER])
+# Check if Mac OS X universal binaries should be built. This option is
+# enabled by default on Mac OS X only if the MacOSX10.4u universal SDK is
+# installed and if not cross-compiling. Otherwise, it is disabled. Emits
+# CS_UNIVERSAL_BINARY via AC_DEFINE() and CS_HEADER_PROPERTY(), and
+# augments CFLAGS, CXXFLAGS, and LDFLAGS appropriately when universal
+# binaries are enabled. Also emits augmented build properties
+# COMPILER.CFLAGS, COMPILER.C++FLAGS, and COMPILER.LFLAGS via
+# CS_EMIT_BUILD_PROPERTY() using the optional EMITTER or
+# CS_EMIT_BUILD_PROPERTY()'s default emitter if EMITTER is omitted.
+#------------------------------------------------------------------------------
+m4_define([CS_UNIVERSAL_ARCHS], [i386, ppc])
+m4_define([CS_UNIVERSAL_SDK], [/Developer/SDKs/MacOSX10.4u.sdk])
+m4_define([CS_UNIVERSAL_ARCHS_LIST],
+ m4_foreach([arch], [CS_UNIVERSAL_ARCHS], [[-arch] arch ]))
+m4_define([CS_UNIVERSAL_CFLAGS],
+ [-isysroot CS_UNIVERSAL_SDK -mmacosx-version-min=10.4])
+m4_define([CS_UNIVERSAL_CXXFLAGS], [CS_UNIVERSAL_CFLAGS])
+m4_define([CS_UNIVERSAL_LDFLAGS], [-Wl,-syslibroot,CS_UNIVERSAL_SDK])
+
+AC_DEFUN([_CS_CHECK_UNIVERSAL_BINARY],
+ [AS_IF([test "$cs_host_target" = macosx &&
+ test "$cross_compiling" != yes &&
+ test -d "CS_UNIVERSAL_SDK"],
+ [cs_universal_binary_default=yes], [cs_universal_binary_default=no])
+ AC_MSG_CHECKING([whether to build universal binaries])
+ AC_ARG_ENABLE([universal-binary],
+ [AC_HELP_STRING([--enable-universal-binary],
+ [build Mac OS X universal binaries (default YES on Mac OS X with
+ universal SDK installed, else NO)])],
+ [cs_universal_binary=$enableval],
+ [cs_universal_binary=$cs_universal_binary_default])
+ AC_MSG_RESULT([$cs_universal_binary])
+ AS_IF([test "$cs_universal_binary" = yes],
+ [AC_DEFINE([CS_UNIVERSAL_BINARY], [1],
+ [Define if building universal binaries on MacOSX.])
+ CFLAGS="$CFLAGS CS_UNIVERSAL_CFLAGS CS_UNIVERSAL_ARCHS_LIST"
+ CXXFLAGS="$CXXFLAGS CS_UNIVERSAL_CXXFLAGS CS_UNIVERSAL_ARCHS_LIST"
+ LDFLAGS="$LDFLAGS CS_UNIVERSAL_LDFLAGS CS_UNIVERSAL_ARCHS_LIST"
+ CS_HEADER_PROPERTY([CS_UNIVERSAL_BINARY])
+ CS_EMIT_BUILD_PROPERTY([COMPILER.CFLAGS],
+ [CS_UNIVERSAL_CFLAGS CS_UNIVERSAL_ARCHS_LIST], [append])
+ CS_EMIT_BUILD_PROPERTY([COMPILER.C++FLAGS],
+ [CS_UNIVERSAL_CXXFLAGS CS_UNIVERSAL_ARCHS_LIST], [append])
+ CS_EMIT_BUILD_PROPERTY([COMPILER.LFLAGS],
+ [CS_UNIVERSAL_LDFLAGS CS_UNIVERSAL_ARCHS_LIST], [append])])])
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/mk/autoconf/path.m4 /tmp/IB0bHXT4Oc/cel-1.4/mk/autoconf/path.m4
--- cel-1.9+svn3615/mk/autoconf/path.m4 2004-10-28 08:54:50.000000000 +0100
+++ cel-1.4/mk/autoconf/path.m4 2009-11-28 16:46:44.000000000 +0000
@@ -1,6 +1,6 @@
# path.m4 -*- Autoconf -*-
#==============================================================================
-# Copyright (C)2004 by Eric Sunshine
+# Copyright (C)2004,2008 by Eric Sunshine
#
# This library is free software; you can redistribute it and/or modify it
# under the terms of the GNU Library General Public License as published by
@@ -19,19 +19,117 @@
#==============================================================================
AC_PREREQ([2.56])
+
#------------------------------------------------------------------------------
-# CS_PATH_NORMALIZE(STRING)
-# Normalize a pathname at run-time by transliterating Windows/DOS
-# backslashes to forward slashes. Also collapses whitespace.
+# CS_PATH_NORMALIZE_EMBEDDED(STRING)
+# Normalize all paths embedded in STRING at run-time by transliterating
+# Windows/DOS backslashes to forward slashes. Also collapses whitespace.
+# This is useful when applied to command output which may include
+# embedded Windows-style paths since the backslashes in those paths could
+# be incorrectly interpreted in the context of Makefiles or other
+# development utilities. For instance, a string such as "-Ic:\foo\inc
+# -Ic:\foo\local\inc" is normalized to "-Ic:/foo/inc -Ic:/foo/local/inc".
+#
+# Usage: opts=CS_PATH_NORMALIZE_EMBEDDED([$opts])
#------------------------------------------------------------------------------
-AC_DEFUN([CS_PATH_NORMALIZE],
+AC_DEFUN([CS_PATH_NORMALIZE_EMBEDDED],
[`echo "x$1" | tr '\\\\' '/' | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`])
+
+#------------------------------------------------------------------------------
+# CS_PATH_NORMALIZE_OUTPUT(COMMAND)
+# Normalize all paths emitted by COMMAND by transliterating Windows/DOS
+# backslashes to forward slashes. Also collapses whitespace. This is
+# useful when the output of COMMAND may include embedded Windows-style
+# paths since the backslashes in those paths could be incorrectly
+# interpreted in the context of Makefiles or other development
+# utilities. For instance, if COMMAND "pkg-config --cflags foo" emits
+# "-Ic:\foo\inc -Ic:\foo\local\inc", the output is normalized to
+# "-Ic:/foo/inc -Ic:/foo/local/inc".
+#
+# Usage: opts=CS_PATH_NORMALIZE_OUTPUT([$cmd])
+#------------------------------------------------------------------------------
+AC_DEFUN([CS_PATH_NORMALIZE_OUTPUT],
+[`AC_RUN_LOG([$1]) | tr '\\\\' '/' | sed 's/ */ /g;s/^ //;s/ $//'`])
+
+
+
+#------------------------------------------------------------------------------
+# CS_PATH_NORMALIZE(STRING)
+# DEPRECATED: Use CS_PATH_NORMALIZE_EMBEDDED() instead.
+#------------------------------------------------------------------------------
+AC_DEFUN([CS_PATH_NORMALIZE], [CS_PATH_NORMALIZE_EMBEDDED([$1])])
+
+
+
#------------------------------------------------------------------------------
# CS_RUN_PATH_NORMALIZE(COMMAND)
-# Normalize the pathname emitted by COMMAND by transliterating
-# Windows/DOS backslashes to forward slashes. Also collapses whitespace.
+# DEPRECATED: Use CS_PATH_NORMALIZE_OUTPUT() instead.
+#------------------------------------------------------------------------------
+AC_DEFUN([CS_RUN_PATH_NORMALIZE], [CS_PATH_NORMALIZE_OUTPUT([$1])])
+
+
+
+#------------------------------------------------------------------------------
+# CS_PATH_CANONICALIZE(PATH)
+# Canonicalize PATH by transliterating Windows/DOS backslashes to forward
+# slashes. On MSYS/MinGW, also converts MSYS-style paths
+# (ex. /home/foo/bar/, /c/foo/bar) to proper Windows-style paths
+# (ex. c:/msys/home/foo/bar, c:/foo/bar). This is important because an
+# MSYS-style path is meaningful only to MSYS, but not to utilities which
+# might be invoked by a Makefile or other build tool. Such utilities
+# invariably expect Windows-style paths.
+#
+# Usage: path=CS_PATH_CANONICALIZE([$path])
+#------------------------------------------------------------------------------
+AC_DEFUN([CS_PATH_CANONICALIZE],
+ [$(
+ cs_indir=CS_PATH_NORMALIZE_EMBEDDED([$1])
+ MSYS_AC_CANONICAL_PATH([cs_outdir], [$cs_indir])
+ echo $cs_outdir
+ )])
+
+
+
+#------------------------------------------------------------------------------
+# MSYS_AC_CANONICAL_PATH(VAR, PATHNAME)
+# Set VAR to the canonically resolved absolute equivalent of PATHNAME,
+# (which may be a relative path, and need not refer to any existing
+# entity).
+#
+# On Win32-MSYS build hosts, the returned path is resolved to its true
+# native Win32 path name (but with slashes, not backslashes).
+#
+# On any other system, it is simply the result which would be obtained if
+# PATHNAME represented an existing directory, and the pwd command was
+# executed in that directory.
+#
+# Author: Keith Marshall
+# Source: http://article.gmane.org/gmane.comp.gnu.mingw.msys/2785
+#------------------------------------------------------------------------------
+AC_DEFUN([MSYS_AC_CANONICAL_PATH],
+ [ac_dir="$2"
+ pwd -W >/dev/null 2>&1 && ac_pwd_w="pwd -W" || ac_pwd_w=pwd
+ until ac_val=`exec 2>/dev/null; cd "$ac_dir" && $ac_pwd_w`
+ do
+ ac_dir=`AS_DIRNAME(["$ac_dir"])`
+ done
+ ac_dir=`echo "$ac_dir" | sed 's?^[[./]]*??'`
+ ac_val=`echo "$ac_val" | sed 's?/*$[]??'`
+ $1=`echo "$2" | sed "s?^[[./]]*$ac_dir/*?$ac_val/?"';s?/*$[]??'`])
+
+
+
+#------------------------------------------------------------------------------
+# CS_PATH_INIT
+# Initialize commonly-used variable substitutions via AC_SUBST().
+# Present implementation publishes CS_TOP_SRCDIR and CS_TOP_BUILDDIR,
+# which are canonicalized counterparts (via CS_PATH_CANONICALIZE()) of
+# Autoconf's top_srcdir and top_builddir substitutions (ex: in source
+# file, use @CS_TOP_SRCDIR@ rather than @top_srcdir@).
#------------------------------------------------------------------------------
-AC_DEFUN([CS_RUN_PATH_NORMALIZE],
-[`AC_RUN_LOG([$1]) | tr '\\\\' '/' | sed 's/^x//;s/ */ /g;s/^ //;s/ $//'`])
+AC_DEFUN([CS_PATH_INIT],
+ [AC_SUBST([CS_TOP_SRCDIR], [CS_PATH_CANONICALIZE([$srcdir])])
+ AC_SUBST([CS_TOP_BUILDDIR], [.])
+ ])
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/mk/autoconf/qualify.m4 /tmp/IB0bHXT4Oc/cel-1.4/mk/autoconf/qualify.m4
--- cel-1.9+svn3615/mk/autoconf/qualify.m4 2005-07-01 23:03:32.000000000 +0100
+++ cel-1.4/mk/autoconf/qualify.m4 2009-11-28 16:46:44.000000000 +0000
@@ -1,6 +1,6 @@
# qualify.m4 -*- Autoconf -*-
#==============================================================================
-# Copyright (C)2005 by Eric Sunshine
+# Copyright (C)2005,2008 by Eric Sunshine
#
# This library is free software; you can redistribute it and/or modify it
# under the terms of the GNU Library General Public License as published by
@@ -40,7 +40,7 @@
[AS_IF([test "$$2" = no],
[CS_BUILD_IFELSE(
[AC_LANG_PROGRAM(
- [cs_symbol_qualifier m4_default([$4],[void f()]);],
+ [m4_default([$4],[void f()]) cs_symbol_qualifier;],
[])],
[], [$5], [$2='cs_symbol_qualifier'], [$2='no'])])])])
AS_IF([test $$2 != no], [$6], [$7])])
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/mk/autoconf/split.m4 /tmp/IB0bHXT4Oc/cel-1.4/mk/autoconf/split.m4
--- cel-1.9+svn3615/mk/autoconf/split.m4 2004-05-05 11:36:23.000000000 +0100
+++ cel-1.4/mk/autoconf/split.m4 2009-11-28 16:46:44.000000000 +0000
@@ -46,4 +46,5 @@
AC_DEFUN([_CS_SPLIT],
[AS_IF([test $[@%:@] -eq 0], [$1=''],
[AS_IF([test "$[1]" = cs_split_filler], [$1=''], [$1=$[1]])
- shift])])
+ shift])
+])
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/mk/jam/application.jam /tmp/IB0bHXT4Oc/cel-1.4/mk/jam/application.jam
--- cel-1.9+svn3615/mk/jam/application.jam 2007-11-14 06:05:35.000000000 +0000
+++ cel-1.4/mk/jam/application.jam 2009-11-28 16:46:47.000000000 +0000
@@ -87,6 +87,7 @@
if $(LINK.DEBUG.INFO.SEPARATE) = "yes"
{
local debugfile = [ SplitDebugInfo $(target) : $(APPLICATION_SUFFIX) ] ;
+ $(target)_DEBUGFILE = $(debugfile) ;
cleanextra += $(debugfile) ;
if ! [ IsElem noinstall : $(3) ]
{
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/mk/jam/build.jam /tmp/IB0bHXT4Oc/cel-1.4/mk/jam/build.jam
--- cel-1.9+svn3615/mk/jam/build.jam 2007-11-21 16:21:46.000000000 +0000
+++ cel-1.4/mk/jam/build.jam 2009-11-28 16:46:47.000000000 +0000
@@ -62,6 +62,8 @@
include $(jamrulesdir)/unittest.jam ;
include $(jamrulesdir)/upload.jam ;
+include $(jamrulesdir)/filelist.jam ;
+include $(jamrulesdir)/msi.jam ;
# Include OS specific rules
switch $(TARGET.OS)
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/mk/jam/filelist.jam /tmp/IB0bHXT4Oc/cel-1.4/mk/jam/filelist.jam
--- cel-1.9+svn3615/mk/jam/filelist.jam 1970-01-01 01:00:00.000000000 +0100
+++ cel-1.4/mk/jam/filelist.jam 2009-11-28 16:46:48.000000000 +0000
@@ -0,0 +1,140 @@
+#============================================================================
+# Rules for file list creation
+# Copyright (C)2008 by Frank Richter
+#
+# This library is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Library General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or (at your
+# option) any later version.
+#
+# This library is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Library General Public License
+# along with this library; if not, write to the Free Software Foundation,
+# Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+#
+#============================================================================
+
+## ListFile list
+## Returns the output file name for a certain file list.
+rule ListFile
+{
+ listfile = $(1:S=.txt) ;
+ local dir = [ ConcatDirs $(BUILDTOP) out lists ] ;
+ MakeLocate $(listfile) : $(dir) ;
+ SEARCH on $(listfile) = $(dir) ;
+ Clean filelistsclean : $(listfile) ;
+ Depends clean : filelistsclean ;
+ return $(listfile) ;
+}
+
+## DoFileListEntries sourcenames : directory : list
+## Creates a new target adding the given sources named by
+## `sourcenames' to the file list `list`. `directory' is a list of
+## directory components indicating the directory part for entries of
+## `sourcenames' written to the file list - it is relative to a file list
+## dependent directory. The DoFileListEntries rule returns the names of
+## the file list targets.
+rule DoFileListEntries
+{
+ local targets i ;
+
+ for i in $(1)
+ {
+ targets += [ DoFileListEntry $(i) : $(2) : $(i) : $(3) ] ;
+ }
+
+ return $(targets) ;
+}
+
+## DoFileListEntry sourcename : directory : destname : list
+## Creates a new target adding the given source named by
+## `sourcename' to the file list `list`. `directory' is a list of
+## directory components indicating the directory part for `sourcename'
+## written to the file list - it is relative to a file list dependent
+## directory. The DoFileListEntries rule returns the names of the file
+## list targets.
+rule DoFileListEntry
+{
+ local target destdir srcdir listfile ;
+ dir = [ ConcatDirs $(2) ] ;
+ target = $(1:G=filelist!$(SUBDIR:J=!)) ;
+
+ listfile = [ ListFile $(4) ] ;
+
+ SEARCH on $(target) = [ on $(1) GetVar SEARCH ] ;
+ NoCare $(target) ;
+ WriteFileListEntry $(listfile) : $(target) : $(dir) : $(1) ;
+ Depends $(listfile) : $(target) ;
+
+ return $(listfile) ;
+}
+
+## FileListEntriesData sourcenames : directories : list
+## Add plain files to a file list.
+rule FileListEntriesData
+{
+ SEARCH on $(<) = $(SUBDIR) ;
+ Depends filelists : [ DoFileListEntries $(<) : $(2) : $(3) ] ;
+}
+
+## FileListEntryApplications app : list
+rule FileListEntryApplications
+{
+ $($(1)_TARGET)_FILELIST = $(2) ;
+ Depends filelists :
+ [ SystemDoFileListEntryApplications $(1) : $(2) ] ;
+}
+
+## FileListEntryPlugin plugin : list
+rule FileListEntryPlugin
+{
+ $($(1)_TARGET)_FILELIST = $(2) ;
+ Depends filelists :
+ [ SystemDoFileListEntryPlugin $(1) : $(2) ] ;
+}
+
+#----------------------------------------------------------------------------
+
+rule WriteFileListEntry
+{
+ local listfile = $(1) ;
+ local srcfile = $(2) ;
+
+ local destname = $(4:D=$(3):G=) ;
+ if $(destname) = ""
+ {
+ destname = $(4:G=) ;
+ }
+
+ local listfile_gristed = $(listfile:G=$(destname)) ;
+ MakeLocate $(listfile_gristed) : [ on $(listfile) GetVar LOCATE ] ;
+
+ DESTNAME on $(listfile_gristed) = $(destname) ;
+ LOCATE on $(srcfile) = [ on $(srcfile) GetVar SEARCH ] ;
+ if $($(listfile)_CREATED) != "yes"
+ {
+ WriteFileListEntry1 $(listfile_gristed) : $(srcfile) ;
+ $(listfile)_CREATED = yes ;
+ }
+ else
+ {
+ WriteFileListEntry2 $(listfile_gristed) : $(srcfile) ;
+ }
+ Depends $(listfile) : $(listfile_gristed) ;
+}
+
+actions WriteFileListEntry1
+{
+ echo "$(>):$(DESTNAME)" > $(<)
+}
+
+actions WriteFileListEntry2
+{
+ echo "$(>):$(DESTNAME)" >> $(<)
+}
+
+Help filelists : "Generate file lists for packages" ;
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/mk/jam/flags.jam /tmp/IB0bHXT4Oc/cel-1.4/mk/jam/flags.jam
--- cel-1.9+svn3615/mk/jam/flags.jam 2008-07-12 15:16:45.000000000 +0100
+++ cel-1.4/mk/jam/flags.jam 2009-11-28 16:46:48.000000000 +0000
@@ -79,6 +79,10 @@
NEEDLIBS on $($(target)_TARGET) =
[ RemoveDupFlags [ on $($(target)_TARGET) GetVar NEEDLIBS ] $(flags) ] ;
$(target).LFLAGS = [ RemoveDupFlags $($(target).LFLAGS) $(flags) ] ;
+ if ! [ IsElem noexternal : $(3) ]
+ {
+ $(target).LFLAGS.EXTERNAL = [ RemoveDupFlags $($(target).LFLAGS.EXTERNAL) $(flags) ] ;
+ }
UnitTestLFlags $(target) : $(flags) : $(options) ;
}
@@ -131,38 +135,25 @@
Clean clean : $(>) ;
}
-## RelayLibs target : indentifier : relaylibs
-## Link external libraries identified by 'identifier' with 'target' with
-## the help of "relaytool". This tool provides a wrapper object file that
-## dynamically loads the requested library at runtime. The client code can
-## check if a library is actually available and react gracefully if not.
-## This is much more end-user friendly than a refusal by the application to
-## start due to a missing dependency.
-## From the external dependency identified by 'identifier' the individual
-## libraries specified in 'relaylibs' will be dynamically loaded. For each
-## library 'foo' a symbol 'libfoo_is_present' will be provided.
-rule RelayLibs
+## RelayLFlags lflags : relaylibs [: minimal-objects ]
+## Get LFLAGS for relay-linking libraries. See RelayLibs for
+## more information.
+rule RelayLFlags
{
if ! $(CMD.RELAYTOOL)
{
- # Create fake libwhatever_is_present() symbols
- local stubfile = [ DoObjectGrist $(>).fake_stub.c ] ;
- MakeLocate $(stubfile) : $(LOCATE_TARGET) ;
- WHATEVER on $(stubfile) = $(3) ;
- WriteRelayLibStub $(stubfile) ;
- Clean $(<)clean : $(stubfile) ;
-
- local stub_object = [ CompileObjects $(stubfile) ] ;
- MakeLocate $(stub_object) : $(LOCATE_TARGET) ;
- Depends $($(<)_TARGET) : $(stub_object) ;
- Clean $(<)clean : $(stub_object) ;
- EXTRAOBJECTS on $($(<)_TARGET) += $(stub_object) ;
-
- ExternalLibs $(<) : $(>) ;
+ return $(1) ;
}
else
{
- local relayparamslist = "--relay $(3)" ;
+ local relayparamslist = "--relay $(2)" ;
+ local lflags = $(1[1]) ;
+ # Concatenate arrays into single strings
+ local lf ;
+ for lf in $(1[2-])
+ {
+ lflags = "$(lflags) $(lf)" ;
+ }
local relayparam = $(relayparamslist[1]) ;
local r ;
for r in $(relayparamslist[2-])
@@ -175,15 +166,74 @@
{
cflags = "$(cflags) $(c)" ;
}
- local extlib ;
- for extlib in $(>)
+ local minimalparam = "" ;
+ if "$(3)" != ""
{
- CFlags $(<) : $($(extlib).CFLAGS) ;
- LFlags $(<) :
- "`CFLAGS=\"$(cflags)\" $(CMD.RELAYTOOL) --out-dir $(LOCATE_TARGET) $(relayparam) $($(extlib).LFLAGS)`" ;
-
- $(<).EXTERNALLIBS += $(extlib) ;
+ minimalparam = "--minimal-list \"$(3)\"" ;
}
+ local extlib result_lflags ;
+ result_lflags +=
+ "`CFLAGS=\"$(cflags)\" $(CMD.RELAYTOOL) --out-dir $(LOCATE_TARGET) $(minimalparam) $(relayparam) $(lflags)`" ;
+ return $(result_lflags) ;
+ }
+}
+
+## RelayObjs target : relaylibs : identifier
+rule RelayObjs
+{
+ if ! $(CMD.RELAYTOOL)
+ {
+ # Create fake libwhatever_is_present() symbols
+ local stubfile = [ DoObjectGrist $(3).fake_stub.c ] ;
+ MakeLocate $(stubfile) : $(LOCATE_TARGET) ;
+ WHATEVER on $(stubfile) = $(2) ;
+ WriteRelayLibStub $(stubfile) ;
+ Clean $(<)clean : $(stubfile) ;
+
+ local stub_object = [ CompileObjects $(stubfile) ] ;
+ MakeLocate $(stub_object) : $(LOCATE_TARGET) ;
+ Depends $($(<)_TARGET) : $(stub_object) ;
+ Clean $(<)clean : $(stub_object) ;
+ #EXTRAOBJECTS on $($(<)_TARGET) += $(stub_object) ;
+
+ return $(stub_object) ;
+ }
+ else
+ {
+ return ;
+ }
+}
+
+## RelayLibs target : identifier : relaylibs
+## Link external libraries identified by 'identifier' with 'target' with
+## the help of "relaytool". This tool provides a wrapper object file that
+## dynamically loads the requested library at runtime. The client code can
+## check if a library is actually available and react gracefully if not.
+## This is much more end-user friendly than a refusal by the application to
+## start due to a missing dependency.
+## From the external dependency identified by 'identifier' the individual
+## libraries specified in 'relaylibs' will be dynamically loaded. For each
+## library 'foo' a symbol 'libfoo_is_present' will be provided.
+rule RelayLibs
+{
+ local extlib ;
+ for extlib in $(>)
+ {
+ # Construct list of object files for target.
+ # Used by relaytool to compute a minimal set of symbols that need relaying.
+ local minimal_list = "" ;
+ local o ;
+ for o in $($(<)_OBJECTS)
+ {
+ minimal_list = "$(minimal_list) $(LOCATE_TARGET)/$(o:G=)" ;
+ }
+
+ ExtraObjects $(<) : [ RelayObjs $(<) : $(3) : $(2) ] ;
+ CFlags $(<) : $($(extlib).CFLAGS) ;
+ LFlags $(<) : [ RelayLFlags $($(extlib).LFLAGS) : $(3) : $(minimal_list) ] : noexternal ;
+
+ $(<).RELAYDEPS += $(extlib) ;
+ $(<).RELAYLIBS.$(extlib) = $(3) ;
}
}
@@ -191,8 +241,13 @@
{
echo "" > $(<)
whatever=`echo "$(WHATEVER)" | tr '-' '_' | tr '.' '_' `
- echo "int lib${whatever}_is_present = 1;" >> $(<)
- echo "int lib${whatever}_symbol_is_present (char* s) { return 1; }" >> $(<)
+ my_IFS=$IFS; IFS=" "
+ for w in ${whatever}
+ do
+ echo "int lib${w}_is_present = 1;" >> $(<)
+ echo "int lib${w}_symbol_is_present (char* s) { return 1; }" >> $(<)
+ done
+ IFS=$my_IFS
}
## MergeLFlags flags1 : flags2
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/mk/jam/icons.jam /tmp/IB0bHXT4Oc/cel-1.4/mk/jam/icons.jam
--- cel-1.9+svn3615/mk/jam/icons.jam 2007-04-28 21:03:01.000000000 +0100
+++ cel-1.4/mk/jam/icons.jam 2009-11-28 16:46:48.000000000 +0000
@@ -1,3 +1,21 @@
+#============================================================================
+# Copyright (C)2006-2009 by Frank Richter
+#
+# This library is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Library General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or (at your
+# option) any later version.
+#
+# This library is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Library General Public License
+# along with this library; if not, write to the Free Software Foundation,
+# Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+#
+#============================================================================
if $(CMD.RSVG) != ""
{
## IconsFromSVG iconname
@@ -15,9 +33,8 @@
{
local icon = $(1) ;
local iconfile = $(icon).svg ;
- local svgscalabledir = [ ConcatDirs $(TOP) $(SUBDIR) icons-src scalable ] ;
+ local svgscalabledir = [ ConcatDirs $(SUBDIR) icons-src scalable ] ;
local svgsource = $(iconfile:G=$(svgscalabledir)) ;
- LOCATE on $(svgsource) = $(svgscalabledir) ;
SEARCH on $(svgsource) = $(svgscalabledir) ;
NotFile generateicons ;
@@ -36,7 +53,7 @@
# ** - Cause icon files to be really large. Vista supports PNG compression
# in icons and uses it for the 256x256 versions. Problem: resource
# compilers don't support that yet.
- for size in 16 22 32 48
+ for size in 16 22 32 48 128 256
{
local pngdir = [ ConcatDirs $(SUBDIR) icons $(size) ] ;
local pngfile = $(icon:G=$(pngdir)).png ;
@@ -155,7 +172,7 @@
if [ -e $ICONSSRC/\${ICONBASE}_8.png ] ; then
$(CP) $ICONSSRC/\${ICONBASE}_8.png $(<)
else
- # Makes transparency binary and reduces colors to 256-
+ # Makes transparency binary and reduces colors to 256
$(CMD.CONVERT) $(>) \( +clone -fx a +matte -monochrome \) -compose CopyOpacity -composite -colors 256 -dither $(<)
fi
}
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/mk/jam/library.jam /tmp/IB0bHXT4Oc/cel-1.4/mk/jam/library.jam
--- cel-1.9+svn3615/mk/jam/library.jam 2007-11-21 16:21:46.000000000 +0000
+++ cel-1.4/mk/jam/library.jam 2009-11-28 16:46:48.000000000 +0000
@@ -160,6 +160,11 @@
if ! $(target:D)
{
MakeLocate $(target) $(target)($(objects:BS)) : $(LOCATE.OBJECTS)/libs ;
+ SEARCH on $(target) = $(LOCATE.OBJECTS)/libs ;
+ }
+ else
+ {
+ SEARCH on $(target) = $(target:D) ;
}
if $(NOARSCAN)
@@ -224,6 +229,11 @@
RmTemps $(target) : $(objects) ;
}
+ if ! [ IsElem noinstall : $(options) ]
+ {
+ Depends filelists : [ DoFileListEntries $(target) : : libs-static ] ;
+ }
+
$(<)_CLEANEXTRA += $(target) ;
}
@@ -295,6 +305,15 @@
SystemLinkSharedLibrary $(libname) : $(target) : $(objects) $(deplibs) : $(linklib) ;
+ if ! [ IsElem noinstall : $(options) ]
+ {
+ Depends filelists : [ DoFileListEntries $(target) : : libs-shared ] ;
+ if $(linklib) != $(target)
+ {
+ Depends filelists : [ DoFileListEntries $(linklib) : : libs-static ] ;
+ }
+ }
+
if $(LINK.DEBUG.INFO.SEPARATE) = "yes"
{
local debugfile = [ SplitDebugInfo $(target) ] ;
@@ -303,6 +322,7 @@
{
NoCare $(debugfile) ;
Depends install_lib : [ DoInstall $(debugfile) : $(libdir) : $(INSTALL_DATA) ] ;
+ Depends filelists : [ DoFileListEntries $(debugfile) : : debug-libs-shared ] ;
}
if $(linklib) = $(target)
{
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/mk/jam/macosx.jam /tmp/IB0bHXT4Oc/cel-1.4/mk/jam/macosx.jam
--- cel-1.9+svn3615/mk/jam/macosx.jam 2007-04-27 03:26:01.000000000 +0100
+++ cel-1.4/mk/jam/macosx.jam 2009-11-28 16:46:48.000000000 +0000
@@ -20,7 +20,9 @@
SHELL ?= "/bin/sh" ;
MACOSX_ENVIRONMENT = "export MACOSX_DEPLOYMENT_TARGET=10.2" ;
+
PLUGIN.LFLAGS += "-bundle" ;
+
# We use the ugly -Wl form, which does not contain embedded whitespace (unlike
# "-framework AppKit"), to help external projects which use the result of
# "cs-config --libs" in conjunction with GNU libtool, since libtool likes to
@@ -40,6 +42,29 @@
# Jam 2.4, consequently we disable it.
NOARSCAN = true ;
+# Standard 'ar' command is incompatible with universal binaries and can not
+# "update" a static library when one or more object files have changed. To
+# work around the problem, we force the library to be created from scratch by
+# removing it and re-populating it with all object files (rather than with only
+# those which changed). The alternate approach of using Apple 'libtool' is
+# unsuitable for two reasons. First, libtool can only create libraries from
+# scratch; it is unable to update them. Second, the libtool can not be invoked
+# piecemeal, which means that a response file would instead have to be created
+# piecemeal and libtool invoked afterward. Such an approach requires much more
+# effort than the 'ar' workaround.
+
+CRELIB = true ;
+actions CreLib
+{
+ $(RM) $(<)
+}
+
+actions together piecemeal Archive
+{
+ $(AR) $(<) $(>)
+}
+
+
#------------------------------------------------------------------------------
# Public rules.
#------------------------------------------------------------------------------
@@ -133,6 +158,18 @@
}
}
+rule SystemDoFileListEntryApplications
+{
+ local target = $($(<)_TARGET) ;
+ local entries = [ DoFileListEntries $(target) : : $(2) ] ;
+ if $(LINK.DEBUG.INFO.SEPARATE) = "yes"
+ {
+ local debugfile = $($(target)_DEBUGFILE) ;
+ entries += [ DoFileListEntries $(debugfile) : : debug-$(2) ] ;
+ }
+ return $(entries) ;
+}
+
# SystemInstallPlugin target : subdirs : options
# Apply appropriate rule to install the plugin based upon the options.
rule SystemInstallPlugin
@@ -141,6 +178,19 @@
[ DoInstall $(<) : $(plugindir) $(2) : $(INSTALL_PROGRAM) ] ;
}
+rule SystemDoFileListEntryPlugin
+{
+ local target = $($(<)_TARGET) ;
+ local entries = [ DoFileListEntries $(target) : : $(2) ] ;
+ if $(LINK.DEBUG.INFO.SEPARATE) = "yes"
+ {
+ local debugfile = $($(target)_DEBUGFILE) ;
+ entries += [ DoFileListEntries $(debugfile) : : debug-$(2) ] ;
+ }
+ entries += [ DoFileListEntries $($(<)_METAFILE) : : $(2) ] ;
+ return $(entries) ;
+}
+
# SystemLinkPlugin target : objects : options
# Link a plugin module and handle meta-data appropriately.
rule SystemLinkPlugin
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/mk/jam/msi.jam /tmp/IB0bHXT4Oc/cel-1.4/mk/jam/msi.jam
--- cel-1.9+svn3615/mk/jam/msi.jam 1970-01-01 01:00:00.000000000 +0100
+++ cel-1.4/mk/jam/msi.jam 2009-11-28 16:46:48.000000000 +0000
@@ -0,0 +1,139 @@
+#============================================================================
+# Rules for creating MSI/MSM files via WiX
+# Copyright (C)2008 by Frank Richter
+#
+# This library is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Library General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or (at your
+# option) any later version.
+#
+# This library is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public
+# License for more details.
+#
+# You should have received a copy of the GNU Library General Public License
+# along with this library; if not, write to the Free Software Foundation,
+# Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+#
+#============================================================================
+
+CMD.GENMSM ?= $(TOP)/bin/cs-genwix-msm.py ;
+CMD.CANDLE ?= candle ;
+CMD.LIGHT ?= light ;
+
+LOCATE.MSI ?= $(BUILDTOP)/out/msi ;
+LOCATE.MSM ?= $(BUILDTOP)/out/msi ;
+LOCATE.MSI.TEMP ?= $(BUILDTOP)/out/msi/temp ;
+
+WIX_FLAGS = -v -nologo ; #-pedantic
+CANDLEFLAGS = ;
+LIGHTFLAGS = -ext WixUIExtension -cultures:en-us -ss -sval ;
+
+# MSIMergeModule msmfile : wxs [: preprocvars]
+rule MSIMergeModule
+{
+ local target = $(1) ;
+ local mod_src = $(2) ;
+ local env = $(3) ;
+
+ SEARCH on $(mod_src) = $(SEARCH_SOURCE) ;
+ local mod_obj = $(mod_src:S=.wixobj) ;
+ MakeLocate $(mod_obj) : $(LOCATE.MSI.TEMP) ;
+ Depends $(mod_obj) : $(mod_src) ;
+ VARS on $(mod_obj) = $(env) ;
+ CompileWXS $(mod_obj) : $(mod_src) ;
+ Clean mergemodulesclean : $(mod_obj) ;
+
+ Depends $(target) : $(mod_obj) ;
+ LinkWIXOBJ $(target) : $(mod_obj) ;
+ Clean mergemodulesclean : $(target) ;
+
+ Depends mergemodules : $(target) ;
+ Depends clean : mergemodulesclean ;
+}
+
+# MSIMergeModuleFromList id : filelist : version [: subdir]
+rule MSIMergeModuleFromList
+{
+ local target = $(1) ;
+ local mod_src = $(target).wxs ;
+ local filelistfile = [ ListFile $(2) ] ;
+
+ MakeLocate $(mod_src) : $(LOCATE.MSI.TEMP) ;
+ VERSION on $(mod_src) = $(3) ;
+ ID on $(mod_src) = $(target) ;
+ SUBDIR on $(mod_src) = $(4) ;
+ Depends $(mod_src) : $(filelistfile) ;
+ GenerateMSMSource $(mod_src) : $(filelistfile) ;
+ Clean mergemodulesclean : $(mod_src) ;
+
+ local mod_msm = $(mod_src:S=.msm) ;
+ MakeLocate $(mod_msm) : $(LOCATE.MSM) ;
+ MSIMergeModule $(mod_msm) : $(mod_src) ;
+
+ Depends $(target) : $(mod_msm) ;
+ NotFile $(target) ;
+ Depends mergemodules : $(target) ;
+ Depends clean : mergemodulesclean ;
+}
+
+## MSIPackage msifile : wxs [: preprocvars [: objfile]]
+rule MSIPackage
+{
+ local target = $(1) ;
+ local mod_src = $(2) ;
+ local env = $(3) ;
+
+ SEARCH on $(mod_src) = $(SEARCH_SOURCE) ;
+ local mod_obj = $(4:E=$(mod_src:S=)) ;
+ mod_obj = $(mod_obj).wixobj ;
+ MakeLocate $(mod_obj) : $(LOCATE.MSI.TEMP) ;
+ Depends $(mod_obj) : $(mod_src) ;
+ VARS on $(mod_obj) = $(env) ;
+ CompileWXS $(mod_obj) : $(mod_src) ;
+ Clean mergemodulesclean : $(mod_obj) ;
+
+ Depends $(target) : $(mod_obj) ;
+ LIGHTFLAGS.EXTRA on $(target) = -cc $(LOCATE.MSI.TEMP)/cabinets -reusecab ;
+ LinkWIXOBJ $(target) : $(mod_obj) ;
+ Clean msiclean : $(target) ;
+
+ Depends msi : $(target) ;
+ Depends clean : msiclean ;
+}
+
+actions together GenerateMSMSource
+{
+ $(CMD.GENMSM) -o $(<) --id $(ID) --version $(VERSION) \
+ --subdirmap=$(SUBDIR) \
+ $(>)
+}
+
+actions CompileWXS
+{
+ candle $(WIX_FLAGS) $(CANDLEFLAGS) $(>) -out $(<) \
+ -d$(VARS)
+}
+
+actions LinkWIXOBJ
+{
+ light $(WIX_FLAGS) $(LIGHTFLAGS) $(LIGHTFLAGS.EXTRA) $(>) -out $(<)
+}
+
+## UploadMSIs uploadtarget : msitargets : user@host : path/on/host
+rule UploadMSIs
+{
+ local target = $(1) ;
+ local files = $(2) ;
+
+ local m ;
+ for m in $(files)
+ {
+ local target2 = _$(target)_upload_$(m) ;
+ NotFile $(target2) ;
+ Always $(target2) ;
+ UploadFile $(target2) : $(m) : $(3) : $(4) ;
+ Depends $(target) : $(target2) ;
+ }
+}
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/mk/jam/msvcgen.jam /tmp/IB0bHXT4Oc/cel-1.4/mk/jam/msvcgen.jam
--- cel-1.9+svn3615/mk/jam/msvcgen.jam 2008-04-16 04:19:17.000000000 +0100
+++ cel-1.4/mk/jam/msvcgen.jam 2009-11-28 16:46:48.000000000 +0000
@@ -799,7 +799,7 @@
}
# Add resource file.
- if [ IsElem $(type) : dll plugin appgui appcon ]
+ if [ IsElem $(type) : dll plugin appgui appcon library_shared ]
{
local resource = $(msvcname:S=.rc) ;
Depends msvcgen : $(resource) ;
@@ -849,7 +849,7 @@
MANIFEST_NAME on $(manifestrc) = $(manifest) ;
GenerateWin32ManifestRc $(manifestrc) ;
Depends $(manifestrc) : $(manifest) ;
- if $(MSVC_VERSION) = 8
+ if $(MSVC_VERSION) >= 8
{
# VC8: Manifest appears in project along other files, a special build
# tool cares about the embedding into a resource. (The resource goop
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/mk/jam/plugin.jam /tmp/IB0bHXT4Oc/cel-1.4/mk/jam/plugin.jam
--- cel-1.9+svn3615/mk/jam/plugin.jam 2008-04-17 20:41:45.000000000 +0100
+++ cel-1.4/mk/jam/plugin.jam 2009-11-28 16:46:48.000000000 +0000
@@ -38,7 +38,7 @@
rule Plugin
{
# check options
- CheckOptions noinstall independent nohelp notest : $(3) : $(<) ;
+ CheckOptions noinstall independent nohelp notest nodefaultfilelist : $(3) : $(<) ;
local metafile ;
metafile = [ FAppendSuffix $(<) : $(SUFMETA) ] ;
@@ -115,6 +115,7 @@
if $(LINK.DEBUG.INFO.SEPARATE) = "yes"
{
local debugfile = [ SplitDebugInfo $(target) ] ;
+ $(target)_DEBUGFILE = $(debugfile) ;
cleanextra += $(debugfile) ;
if ! [ IsElem noinstall : $(3) ]
{
@@ -123,6 +124,12 @@
}
}
+ # Create file list entry
+ if ! [ IsElem nodefaultfilelist : $(3) ]
+ {
+ FileListEntryPlugin $(<) : plugin ;
+ }
+
CFlags $(<) : $(PLUGIN.CFLAGS) ;
LFlags $(<) : $(LINKLIBS) $(PLUGIN.LFLAGS) ;
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/mk/jam/pythmod.jam /tmp/IB0bHXT4Oc/cel-1.4/mk/jam/pythmod.jam
--- cel-1.9+svn3615/mk/jam/pythmod.jam 2008-04-17 20:41:45.000000000 +0100
+++ cel-1.4/mk/jam/pythmod.jam 2009-11-28 16:46:48.000000000 +0000
@@ -26,6 +26,13 @@
InstallBindingsModule $(1) : $(2) ;
}
+rule FileListEntryPythMod
+{
+ local target = $($(<)_TARGET) ;
+ SEARCH on $(target) = [ on $(target) GetVar LOCATE ] ;
+ Depends filelists : [ DoFileListEntries $(target) : $(2) : $(3) ] ;
+}
+
# USAGE:
# Pythmod targetname : module name : src files : install dir : LinkWith : ExternalLibs : desc
#
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/mk/jam/static.jam /tmp/IB0bHXT4Oc/cel-1.4/mk/jam/static.jam
--- cel-1.9+svn3615/mk/jam/static.jam 2008-07-12 15:59:30.000000000 +0100
+++ cel-1.4/mk/jam/static.jam 2009-11-28 16:46:48.000000000 +0000
@@ -208,7 +208,25 @@
optplugins = $(3) ;
package = $(4) ;
- local target_link_with target_lflags ;
+ local target_link_with target_lflags lflags_target relayobjs ;
+ if ( $(BUILD_SHARED_LIBS) = "yes" ) && ( $(TRUE_STATIC_PLUGINS) != "yes" )
+ {
+ local plugin_lib_name ;
+ if $(package)
+ {
+ plugin_lib_name = $(target)_plugins_$(package) ;
+ }
+ else
+ {
+ plugin_lib_name = $(target)_plugins ;
+ }
+
+ lflags_target = $(plugin_lib_name) ;
+ }
+ else
+ {
+ lflags_target = $(target) ;
+ }
if $(package)
{
@@ -242,6 +260,19 @@
}
CFlags $(target) : $(STATICPLUGIN.$(p).CFLAGS) ;
lflags = [ MergeRemovingDups $(lflags) : $(STATICPLUGIN.$(p).LFLAGS) ] ;
+
+ local relaydeps = $(STATICPLUGIN.$(p).RELAYDEPS) ;
+ for relaydep in $(relaydeps)
+ {
+ CFlags $(target) : $(STATICPLUGIN.$(p).RELAYCFLAGS.$(relaydep)) ;
+ lflags = [ MergeRemovingDups $(lflags) :
+ [ RelayLFlags $(STATICPLUGIN.$(p).RELAYLFLAGS.$(relaydep)) :
+ $(STATICPLUGIN.$(p).RELAYLIBS.$(relaydep)) ] ] ;
+ # @@@ If we can get the .a file name for the static plugin lib
+ # we could pass that for the minimal-objects
+ relayobjs += [ RelayObjs $(lflags_target) :
+ $(STATICPLUGIN.$(p).RELAYLIBS.$(relaydep)) : $(relaydep) ] ;
+ }
}
target_lflags = $(lflags) ;
}
@@ -261,8 +292,23 @@
# Grab flags
for p in $(plugins)
{
- lflags += [ Filter $($(p).LFLAGS) : $(LINKLIBS) $(PLUGIN.LFLAGS) ] ;
+ lflags += [ Filter $($(p).LFLAGS.EXTERNAL) : $(LINKLIBS) $(PLUGIN.LFLAGS) ] ;
libs += $($(p).NEEDLIBS) ;
+
+ local relaydeps = $($(p).RELAYDEPS) ;
+ for relaydep in $(relaydeps)
+ {
+ local libpath ;
+ libpath = [ ConcatDirs
+ [ on $($(STATICPLUGINS.LIBRARY)_TARGET) GetVar SEARCH ]
+ $($(STATICPLUGINS.LIBRARY)_TARGET)
+ ] ;
+ lflags = [ MergeRemovingDups $(lflags) :
+ [ RelayLFlags $($(relaydep).LFLAGS) :
+ $($(p).RELAYLIBS.$(relaydep)) : $(libpath) ] ] ;
+ relayobjs += [ RelayObjs $(target) :
+ $($(p).RELAYLIBS.$(relaydep)) : $(relaydep) ] ;
+ }
}
target_link_with = [ RemoveDupFlags $(libs) ] ;
target_lflags = [ RemoveDups $(lflags) ] ;
@@ -275,30 +321,22 @@
# This is done to be more LGPL-friendly.
if ( $(BUILD_SHARED_LIBS) = "yes" ) && ( $(TRUE_STATIC_PLUGINS) != "yes" )
{
- local plugin_lib_name appglue libglue ;
- if $(package)
- {
- plugin_lib_name = $(target)_plugins_$(package) ;
- }
- else
- {
- plugin_lib_name = $(target)_plugins ;
- }
-
- libglue = [ BuildStaticGlueFile $(target) : $(plugin_lib_name)
+ local libglue appglue ;
+ libglue = [ BuildStaticGlueFile $(target) : $(lflags_target)
: $(package) : lib ] ;
- Library $(plugin_lib_name) : $(libglue) $(staticobject) :
+ Library $(lflags_target) : $(libglue) $(staticobject)
+ $(relayobjs) :
noinstall notest independent nohelp shared ;
- LibDepends $(plugin_lib_name) : $(target_link_with) ;
- LFlags $(plugin_lib_name) : $(target_lflags) ;
+ LibDepends $(lflags_target) : $(target_link_with) ;
+ LFlags $(lflags_target) : $(target_lflags) ;
# We need to get the external libs for the plugin lib; but they have to be
# specified after LinkStaticPlugins
- $(target).PROPAGATE_EXTERNALLIBS += $(plugin_lib_name) ;
+ $(target).PROPAGATE_EXTERNALLIBS += $(lflags_target) ;
- appglue = [ BuildStaticGlueFile $(target) : $(plugin_lib_name)
+ appglue = [ BuildStaticGlueFile $(target) : $(lflags_target)
: $(package) : app ] ;
ExtraObjects $(target) : $(appglue) : inheritcflags ;
- LinkWith $(target) : $(plugin_lib_name) ;
+ LinkWith $(target) : $(lflags_target) ;
LFlags $(target) : $(target_lflags) ;
}
else
@@ -359,6 +397,7 @@
# Write out needed CFLAGS, LFLAGS
STATICPLUGINS.DEPENDENCIES = $(name).jam ;
MakeLocate $(STATICPLUGINS.DEPENDENCIES) : $(LOCATE.OBJECTS)/libs ;
+ SEARCH on $(STATICPLUGINS.DEPENDENCIES) = $(LOCATE.OBJECTS)/libs ;
for t in $(targets)
{
WriteDependencies $(STATICPLUGINS.DEPENDENCIES) : $(t) : $(name) ;
@@ -373,6 +412,9 @@
Depends install_staticplugins :
[ DoInstall $(STATICPLUGINS.DEPENDENCIES) : $(libdir) ] ;
Depends install_staticplugins : install_libs ;
+
+ Depends filelists : [ DoFileListEntries [ ConstructLibraryTarget $(name) ] : : libs-staticplugins ] ;
+ Depends filelists : [ DoFileListEntries $(STATICPLUGINS.DEPENDENCIES) : : libs-staticplugins ] ;
INSTALLEDLIBS_OPTIONAL += $(name) ;
@@ -422,7 +464,7 @@
cflags += $($(l).CFLAGS) ;
lflags = [ MergeRemovingDups $(lflags) : [ Filter $($(l).LFLAGS) : $(LINKLIBS) $(PLUGIN.LFLAGS) ] ] ;
}
- lflags = [ MergeRemovingDups $(lflags) : [ Filter $($(plugin).LFLAGS) : $(LINKLIBS) $(PLUGIN.LFLAGS) ] ] ;
+ lflags = [ MergeRemovingDups $(lflags) : [ Filter $($(plugin).LFLAGS.EXTERNAL) : $(LINKLIBS) $(PLUGIN.LFLAGS) ] ] ;
CFLAGS on $(depfile_gristed) = "$(cflags)" ;
LFLAGS on $(depfile_gristed) = "$(lflags)" ;
@@ -435,7 +477,23 @@
{
WriteDepFlags2 $(depfile_gristed) : $(plugin) ;
}
+
Depends $(depfile) : $(depfile_gristed) ;
+
+ RELAYDEPS on $(depfile_gristed) = "$($(plugin).RELAYDEPS)" ;
+ WriteRelayDeps $(depfile_gristed) : $(plugin) ;
+ for relaydep in $($(plugin).RELAYDEPS)
+ {
+ local depfile_gristed2 = $(depfile_gristed:G=$(plugin).$(relaydep)) ;
+ MakeLocate $(depfile_gristed2) : [ on $(depfile) GetVar LOCATE ] ;
+ Depends $(depfile) : $(depfile_gristed2) ;
+
+ RELAYDEP on $(depfile_gristed2) = $(relaydep) ;
+ RELAYCFLAGS on $(depfile_gristed2) = "$($(relaydep).CFLAGS)" ;
+ RELAYLFLAGS on $(depfile_gristed2) = "$($(relaydep).LFLAGS)" ;
+ RELAYLIBS on $(depfile_gristed2) = "$($(plugin).RELAYLIBS.$(relaydep))" ;
+ WriteRelayDepFlags $(depfile_gristed2) : $(plugin) ;
+ }
}
actions WriteDepFlags1
@@ -456,6 +514,22 @@
EOT
}
+actions WriteRelayDeps
+{
+ cat << EOT >> $(<)
+STATICPLUGIN.$(>).RELAYDEPS = $(RELAYDEPS) ;
+EOT
+}
+
+actions WriteRelayDepFlags
+{
+ cat << EOT >> $(<)
+STATICPLUGIN.$(>).RELAYLIBS.$(RELAYDEP) = $(RELAYLIBS) ;
+STATICPLUGIN.$(>).RELAYCFLAGS.$(RELAYDEP) = $(RELAYCFLAGS) ;
+STATICPLUGIN.$(>).RELAYLFLAGS.$(RELAYDEP) = $(RELAYLFLAGS) ;
+EOT
+}
+
actions piecemeal GenerateStaticPluginRegistration1
{
echo 'namespace csStaticPluginInit' >> $(<)
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/mk/jam/swig.jam /tmp/IB0bHXT4Oc/cel-1.4/mk/jam/swig.jam
--- cel-1.9+svn3615/mk/jam/swig.jam 2007-11-14 06:05:35.000000000 +0000
+++ cel-1.4/mk/jam/swig.jam 2009-11-28 16:46:48.000000000 +0000
@@ -61,10 +61,19 @@
#ifndef __STDC_LIMIT_MACROS\\
#define __STDC_LIMIT_MACROS\\
#endif\\
- #ifndef DEBUG_PYTHON\\
+ #ifdef _MSC_VER\\
+ #include \\
+ #include \\
+ #if defined(_DEBUG) \\\&\\\& !defined(DEBUG_PYTHON)\\
#undef _DEBUG\\
+ #define RESTORE__DEBUG\\
#endif\\
- \\1/g
+ #endif\\
+ \\1\\
+ #ifdef RESTORE__DEBUG\\
+ #define _DEBUG\\
+ #undef RESTORE__DEBUG\\
+ #endif/g
/\$Header:/d
s/new[ ][ ]*(\\([^)][^)]*\\))[ ]*\\[/new \\1 [/g
s/[ ]*#[ ]*define[ ][ ]*SWIG_init[ ]*init_\\(.*\\)/#define SWIG_init SWIG_init_\\1/g
@@ -78,8 +87,11 @@
## [ : swigfiledir [ : frozendirs [ : tag [ : outdir ]]]]]]
## Given a Swig input file `swigfile', generate `targets' for scripting
## language `language'. The first element of `targets' should name the
- ## generated C or C++ file, and the remaining optional elements should name
- ## any other language-specific scripting files which Swig will generate.
+ ## generated C or C++ file. The second, optional element should name
+ ## the generated C or C++ header accompanying the source file if Swig
+ ## generates one. It will be places in the same directory. The remaining
+ ## optional elements should name any other language-specific scripting
+ ## files which Swig will generate.
## For instance, the files widgets.cpp and widgets.py might be emitted by
## Swig for the input file widgets.i. The generated files are placed in
## $(LOCATE_TARGET). `swigflags' specifies additional flags to pass to
@@ -107,6 +119,12 @@
{
local target = $(1[1]) ;
local othertargets = $(1[2-]) ;
+ local headertarget ;
+ if $(othertargets[1]:S) = ".h"
+ {
+ headertarget = $(othertargets[1]) ;
+ othertargets = $(othertargets[2-]) ;
+ }
local swigfile = $(2) ;
local language = $(3) ;
local swigflags = $(4) ;
@@ -133,6 +151,7 @@
MkDir $(outdir) ;
}
MakeLocate $(othertargets) : $(outdir) ;
+ SEARCH on $(othertargets) = $(outdir) ;
# If any target, such as an install target, depends upon the other files,
# we force them to be built with a dependency upon the target.
@@ -142,6 +161,17 @@
SWIG.FLAGS on $(target) +=
$(SWIG.FLAGS) -$(language) $(swigflags) -I$(swigincdirs)
-outdir [ ConcatDirs $(outdir) ] -o $(target:G=:D=$(LOCATE_TARGET)) ;
+
+ if $(headertarget)
+ {
+ MakeLocate $(headertarget) : $(LOCATE_TARGET) ;
+ # If any target, such as an install target, depends upon the other files,
+ # we force them to be built with a dependency upon the target.
+ Depends $(headertarget) : $(target) ;
+
+ SWIG.FLAGS on $(target) +=
+ -oh $(headertarget:G=:D=$(LOCATE_TARGET)) ;
+ }
# Allow Swig input file to reside at location other than $(SEARCH_SOURCE).
if $(swigfiledir)
@@ -187,6 +217,15 @@
Depends $(tag)freeze : $(frozen_other) ;
}
+ if $(headertarget)
+ {
+ local frozen_header = $(headertarget:G=$(tag)freeze) ;
+ MakeLocate $(frozen_header) : $(frozentargetdir) ;
+ Depends $(frozen_header) : $(headertarget) ;
+ Copy $(frozen_header) : $(headertarget) ;
+ Depends $(tag)freeze : $(frozen_header) ;
+ }
+
NotFile $(tag)freeze ;
Help $(tag)freeze : "Copy generated Swig files to source directory" ;
}
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/mk/jam/unix.jam /tmp/IB0bHXT4Oc/cel-1.4/mk/jam/unix.jam
--- cel-1.9+svn3615/mk/jam/unix.jam 2007-11-21 16:21:46.000000000 +0000
+++ cel-1.4/mk/jam/unix.jam 2009-11-28 16:46:48.000000000 +0000
@@ -95,12 +95,40 @@
}
}
+rule SystemDoFileListEntryApplications
+{
+ local target = $($(<)_TARGET) ;
+ local entries = [ DoFileListEntries $(target) : : $(2) ] ;
+ if $(LINK.DEBUG.INFO.SEPARATE) = "yes"
+ {
+ local debugfile = $($(target)_DEBUGFILE) ;
+ entries += [ DoFileListEntries $(debugfile) : : debug-$(2) ] ;
+ }
+ return $(entries) ;
+}
+
rule SystemInstallPlugin
{
Depends install_plugin : [ DoInstall $(<) : $(plugindir) $(2) :
$(INSTALL_PROGRAM) ] ;
}
+rule SystemDoFileListEntryPlugin
+{
+ local target = $($(<)_TARGET) ;
+ local entries = [ DoFileListEntries $(target) : : $(2) ] ;
+ if $(LINK.DEBUG.INFO.SEPARATE) = "yes"
+ {
+ local debugfile = $($(target)_DEBUGFILE) ;
+ entries += [ DoFileListEntries $(debugfile) : : debug-$(2) ] ;
+ }
+ if $(EMBED_META) != "yes" || $(OBJCOPY.AVAILABLE) != "yes"
+ {
+ entries += [ DoFileListEntries $($(<)_METAFILE) : : $(2) ] ;
+ }
+ return $(entries) ;
+}
+
# Put the meta data into the object file headers
rule ObjTagMetaData
{
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/mk/jam/upload.jam /tmp/IB0bHXT4Oc/cel-1.4/mk/jam/upload.jam
--- cel-1.9+svn3615/mk/jam/upload.jam 2008-02-19 13:47:50.000000000 +0000
+++ cel-1.4/mk/jam/upload.jam 2009-11-28 16:46:48.000000000 +0000
@@ -70,15 +70,30 @@
local file = $(2) ;
local server_user = $(3) ;
local serverpath = $(4) ;
- FILE on $(target) = $(dir) ;
+ FILE on $(target) = $(file) ;
SERVER_USER on $(target) = $(server_user) ;
DESTPATH on $(target) = $(serverpath) ;
- DoUploadFile $(target) ;
+ DoUploadFile $(target) : $(file) ;
}
actions DoUploadFile
{
+ # Create target dir
+ DESTPATH=$(DESTPATH)
+ $(SSH) $(SERVER_USER) "mkdir -p $DESTPATH"
# transfer file
- $(SCP) -v $(FILE) $(SERVER_USER):$(DESTPATH)/
+ $(SCP) $(>) $(SERVER_USER):$(DESTPATH)/
}
+## UploadFiles target : files : server_and_user : serverpath
+rule UploadFiles
+{
+ local target = $(1) ;
+ local f ;
+ for f in $(2)
+ {
+ local filetarget = $(target)_upload_$(f) ;
+ UploadFile $(filetarget) : $(f) : $(3) : $(4) ;
+ Depends $(target) : $(filetarget) ;
+ }
+}
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/mk/jam/win32.jam /tmp/IB0bHXT4Oc/cel-1.4/mk/jam/win32.jam
--- cel-1.9+svn3615/mk/jam/win32.jam 2008-07-12 15:16:45.000000000 +0100
+++ cel-1.4/mk/jam/win32.jam 2009-11-28 16:46:48.000000000 +0000
@@ -20,6 +20,33 @@
#============================================================================
SHELL ?= "/bin/sh" ;
+# Helper to set unset elements of PACKAGE_VERSION_LIST to 0
+rule _NormalizeVersionList
+{
+ local v1, v2, v3, v4 ;
+ v1 = $(PACKAGE_VERSION_LIST[1]) ;
+ if ! $(v1) { v1 = 0 ; }
+ v2 = $(PACKAGE_VERSION_LIST[2]) ;
+ if ! $(v2) { v2 = 0 ; }
+ v3 = $(PACKAGE_VERSION_LIST[3]) ;
+ if ! $(v3) { v3 = 0 ; }
+ v4 = $(PACKAGE_VERSION_LIST[4]) ;
+ if ! $(v4) { v4 = 0 ; }
+ return $(v1) $(v2) $(v3) $(v4) ;
+}
+PACKAGE_VERSION_NORM = [ _NormalizeVersionList ] ;
+
+# Allow customization of some values written to the .rc file
+WIN32RC.EXTRAHEADER ?= ;
+WIN32RC.VERSIONNUMBER ?=
+ # Remove any RC tag
+ "`echo '$(PACKAGE_VERSION_NORM[1]),$(PACKAGE_VERSION_NORM[2]),$(PACKAGE_VERSION_NORM[3]),$(PACKAGE_VERSION_NORM[4])' | $(SED) 's/[^0123456789._,]//g'`" ;
+WIN32RC.VERSIONNUMBER.FILE ?= $(WIN32RC.VERSIONNUMBER) ;
+WIN32RC.VERSIONNUMBER.PRODUCT ?= $(WIN32RC.VERSIONNUMBER) ;
+WIN32RC.VERSIONSTR ?= "\"$(PACKAGE_VERSION)\"" ;
+WIN32RC.VERSIONSTR.FILE ?= $(WIN32RC.VERSIONSTR) ;
+WIN32RC.VERSIONSTR.PRODUCT ?= $(WIN32RC.VERSIONSTR) ;
+
CMD.WINDRES ?= windres ;
# DLL-tools not used by this script, but clients might have a need for them.
CMD.DLLTOOL ?= dlltool ;
@@ -58,20 +85,19 @@
{
cat > $(<) << __EOF__
// This file is generated automatically.
+__EOF__
-1 VERSIONINFO
-FILEVERSION
+ cat >> $(<) << __EOF__
+$(WIN32RC.EXTRAHEADER)
__EOF__
- # Remove any RC tag
- echo '$(PACKAGE_VERSION_LIST[1]),$(PACKAGE_VERSION_LIST[2]),$(PACKAGE_VERSION_LIST[3]),$(PACKAGE_VERSION_LIST[4])' | $(SED) 's/RC\([0-9]\)//g' | $(SED) 's/[^0123456789._,]//g' >> $(<)
+ cat >> $(<) << __EOF__
-cat >> $(<) << __EOF__
-PRODUCTVERSION
+1 VERSIONINFO
__EOF__
- # Remove any RC tag
- echo '$(PACKAGE_VERSION_LIST[1]),$(PACKAGE_VERSION_LIST[2]),$(PACKAGE_VERSION_LIST[3]),$(PACKAGE_VERSION_LIST[4])' | $(SED) 's/RC\([0-9]\)//g' | $(SED) 's/[^0123456789._,]//g' >> $(<)
+ echo FILEVERSION $(WIN32RC.VERSIONNUMBER.FILE) >> $(<)
+ echo PRODUCTVERSION $(WIN32RC.VERSIONNUMBER.PRODUCT) >> $(<)
cat >> $(<) << __EOF__
#ifdef CS_DEBUG
@@ -85,8 +111,8 @@
BLOCK "040904E4"
{
VALUE "ProductName", "$(PRODUCT_NAME)"
- VALUE "ProductVersion", "$(PACKAGE_VERSION)"
- VALUE "FileVersion", "$(PACKAGE_VERSION)"
+ VALUE "ProductVersion", $(WIN32RC.VERSIONSTR.PRODUCT)
+ VALUE "FileVersion", $(WIN32RC.VERSIONSTR.FILE)
VALUE "LegalCopyright", "$(PACKAGE_COPYRIGHT)"
VALUE "FileDescription", "$(PRODUCT_DESCRIPTION)"
#ifdef CS_DEBUG
@@ -125,7 +151,7 @@
# Filter out non-numerical characters from the version number. Windows does
# not like them.
- echo '$(PACKAGE_VERSION_LIST[1]).$(PACKAGE_VERSION_LIST[2]).$(PACKAGE_VERSION_LIST[3]).$(PACKAGE_VERSION_LIST[4])' | $(SED) 's/RC\([0-9]\)//g' | $(SED) 's/[^0123456789.]//g' | $(SED) 's/\(.*\)/ version="\1"/' >> $(<)
+ echo '$(PACKAGE_VERSION_NORM[1]).$(PACKAGE_VERSION_NORM[2]).$(PACKAGE_VERSION_NORM[3]).$(PACKAGE_VERSION_NORM[4])' | $(SED) 's/RC\([0-9]\)//g' | $(SED) 's/[^0123456789.]//g' | $(SED) 's/\(.*\)/ version="\1"/' >> $(<)
cat >> $(<) << __EOF__
processorArchitecture="X86"
@@ -174,7 +200,7 @@
actions together CompileResources
{
- cat $(>) | $(CMD.WINDRES) $(WINDRES.FLAGS) $(RCFLAGS) --include-dir=$(>:D) -o $(<)
+ cat $(>) | $(CMD.WINDRES) $(WINDRES.FLAGS) $(RCFLAGS) --include-dir=$(HDRS) --include-dir=$(>:D) -o $(<)
}
rule CompileResources
@@ -260,18 +286,6 @@
# Also invoked by msvcgen.jam.
rule MakeVersionRc
{
- # normalize version list
- local v1, v2, v3, v4 ;
- v1 = $(PACKAGE_VERSION_LIST[1]) ;
- if ! $(v1) { v1 = 0 ; }
- v2 = $(PACKAGE_VERSION_LIST[2]) ;
- if ! $(v2) { v2 = 0 ; }
- v3 = $(PACKAGE_VERSION_LIST[3]) ;
- if ! $(v3) { v3 = 0 ; }
- v4 = $(PACKAGE_VERSION_LIST[4]) ;
- if ! $(v4) { v4 = 0 ; }
- PACKAGE_VERSION_LIST on $(<) = $(v1) $(v2) $(v3) $(v4) ;
-
local desc = [ Description $(>) ] ;
if ! $(desc) { desc = "$(>)" ; }
PRODUCT_DESCRIPTION on $(<) = $(desc) ;
@@ -287,18 +301,6 @@
rule MakeManifestFile
{
- # normalize version list
- local v1, v2, v3, v4 ;
- v1 = $(PACKAGE_VERSION_LIST[1]) ;
- if ! $(v1) { v1 = 0 ; }
- v2 = $(PACKAGE_VERSION_LIST[2]) ;
- if ! $(v2) { v2 = 0 ; }
- v3 = $(PACKAGE_VERSION_LIST[3]) ;
- if ! $(v3) { v3 = 0 ; }
- v4 = $(PACKAGE_VERSION_LIST[4]) ;
- if ! $(v4) { v4 = 0 ; }
- PACKAGE_VERSION_LIST on $(<) = $(v1) $(v2) $(v3) $(v4) ;
-
local desc = [ Description $(>) ] ;
if ! $(desc) { desc = "$(>)" ; }
PRODUCT_DESCRIPTION on $(<) = $(desc) ;
@@ -406,6 +408,20 @@
Win32Resource $(<) : $(versionrc) $(metarc) ;
}
+rule SharedLibResourceWin32
+{
+ local versionrc ;
+
+ versionrc = [ DoObjectGrist $(<)_versionrc.rc ] ;
+ MakeLocate $(versionrc) : $(LOCATE_TARGET) ;
+ MakeVersionRc $(versionrc) : $(<) ;
+
+ Clean clean : $(versionrc) ;
+ Clean $(<)clean : $(versionrc) ;
+
+ Win32Resource $(<) : $(versionrc) ;
+}
+
# SystemLinkApplication target : objects : options
rule SystemLinkApplication
{
@@ -441,12 +457,41 @@
}
}
+rule SystemDoFileListEntryApplications
+{
+ local target = $($(<)_TARGET) ;
+ local entries = [ DoFileListEntries $(target) : : $(2) ] ;
+ if $(LINK.DEBUG.INFO.SEPARATE) = "yes"
+ {
+ local debugfile = $($(target)_DEBUGFILE) ;
+ entries += [ DoFileListEntries $(debugfile) : : debug-$(2) ] ;
+ }
+ return $(entries) ;
+}
+
+
rule SystemInstallPlugin
{
Depends install_plugin : [ DoInstall $(<) : $(plugindir) $(2) :
$(INSTALL_PROGRAM) ] ;
}
+rule SystemDoFileListEntryPlugin
+{
+ local target = $($(<)_TARGET) ;
+ local entries = [ DoFileListEntries $(target) : : $(2) ] ;
+ if $(LINK.DEBUG.INFO.SEPARATE) = "yes"
+ {
+ local debugfile = $($(target)_DEBUGFILE) ;
+ entries += [ DoFileListEntries $(debugfile) : : debug-$(2) ] ;
+ }
+ if $(EMBED_META) != "yes" || $(OBJCOPY.AVAILABLE) != "yes"
+ {
+ entries += [ DoFileListEntries $($(<)_METAFILE) : : $(2) ] ;
+ }
+ return $(entries) ;
+}
+
# SystemLinkPlugin target : objects : options
rule SystemLinkPlugin
{
@@ -542,6 +587,7 @@
IMPLIB on $(target) = $(linklib) ;
Depends $(linklib) : $(target) ;
LinkSharedLibrary $(target) : $(lib) ;
+ SharedLibResourceWin32 $(<) ;
Clean clean : $(target) ;
Clean $(barename)clean : $(target) ;
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/mk/staticplugins/crystalspace_staticplugins_msvc71.jam /tmp/IB0bHXT4Oc/cel-1.4/mk/staticplugins/crystalspace_staticplugins_msvc71.jam
--- cel-1.9+svn3615/mk/staticplugins/crystalspace_staticplugins_msvc71.jam 2008-06-26 04:12:22.000000000 +0100
+++ cel-1.4/mk/staticplugins/crystalspace_staticplugins_msvc71.jam 2009-11-28 16:46:49.000000000 +0000
@@ -383,21 +383,6 @@
STATICPLUGIN.tlfunc.CFLAGS.release.71 = ;
STATICPLUGIN.tlfunc.LFLAGS.debug.71 = libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib ;
STATICPLUGIN.tlfunc.LFLAGS.release.71 = libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib ;
-STATICPLUGINS.AVAILABLE += rm_rlcompat ;
-STATICPLUGIN.rm_rlcompat.CFLAGS.debug.71 = ;
-STATICPLUGIN.rm_rlcompat.CFLAGS.release.71 = ;
-STATICPLUGIN.rm_rlcompat.LFLAGS.debug.71 = libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib ;
-STATICPLUGIN.rm_rlcompat.LFLAGS.release.71 = libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib ;
-STATICPLUGINS.AVAILABLE += rm_shadow_pssm ;
-STATICPLUGIN.rm_shadow_pssm.CFLAGS.debug.71 = ;
-STATICPLUGIN.rm_shadow_pssm.CFLAGS.release.71 = ;
-STATICPLUGIN.rm_shadow_pssm.LFLAGS.debug.71 = libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib ;
-STATICPLUGIN.rm_shadow_pssm.LFLAGS.release.71 = libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib ;
-STATICPLUGINS.AVAILABLE += rm_unshadowed ;
-STATICPLUGIN.rm_unshadowed.CFLAGS.debug.71 = ;
-STATICPLUGIN.rm_unshadowed.CFLAGS.release.71 = ;
-STATICPLUGIN.rm_unshadowed.LFLAGS.debug.71 = libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib ;
-STATICPLUGIN.rm_unshadowed.LFLAGS.release.71 = libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib ;
STATICPLUGINS.AVAILABLE += reporter ;
STATICPLUGIN.reporter.CFLAGS.debug.71 = ;
STATICPLUGIN.reporter.CFLAGS.release.71 = ;
@@ -418,6 +403,11 @@
STATICPLUGIN.sndsysogg.CFLAGS.release.71 = ;
STATICPLUGIN.sndsysogg.LFLAGS.debug.71 = libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib vorbisfile.lib vorbis.lib ogg.lib ;
STATICPLUGIN.sndsysogg.LFLAGS.release.71 = libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib vorbisfile.lib vorbis.lib ogg.lib ;
+STATICPLUGINS.AVAILABLE += sndsysspeex ;
+STATICPLUGIN.sndsysspeex.CFLAGS.debug.71 = ;
+STATICPLUGIN.sndsysspeex.CFLAGS.release.71 = ;
+STATICPLUGIN.sndsysspeex.LFLAGS.debug.71 = libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib speex.lib ogg.lib ;
+STATICPLUGIN.sndsysspeex.LFLAGS.release.71 = libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib speex.lib ogg.lib ;
STATICPLUGINS.AVAILABLE += sndsyswav ;
STATICPLUGIN.sndsyswav.CFLAGS.debug.71 = ;
STATICPLUGIN.sndsyswav.CFLAGS.release.71 = ;
@@ -503,11 +493,6 @@
STATICPLUGIN.colladaconvertor.CFLAGS.release.71 = ;
STATICPLUGIN.colladaconvertor.LFLAGS.debug.71 = libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib ;
STATICPLUGIN.colladaconvertor.LFLAGS.release.71 = libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib ;
-STATICPLUGINS.AVAILABLE += cacacanvas ;
-STATICPLUGIN.cacacanvas.CFLAGS.debug.71 = ;
-STATICPLUGIN.cacacanvas.CFLAGS.release.71 = ;
-STATICPLUGIN.cacacanvas.LFLAGS.debug.71 = libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib libcaca.lib libcucul.lib ;
-STATICPLUGIN.cacacanvas.LFLAGS.release.71 = libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib libcaca.lib libcucul.lib ;
STATICPLUGINS.AVAILABLE += ddraw2d ;
STATICPLUGIN.ddraw2d.CFLAGS.debug.71 = ;
STATICPLUGIN.ddraw2d.CFLAGS.release.71 = ;
@@ -596,8 +581,8 @@
STATICPLUGINS.AVAILABLE += glshader_cg ;
STATICPLUGIN.glshader_cg.CFLAGS.debug.71 = ;
STATICPLUGIN.glshader_cg.CFLAGS.release.71 = ;
-STATICPLUGIN.glshader_cg.LFLAGS.debug.71 = libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib libcrystalspace_opengl_d.lib zlib.lib opengl32.lib cg.lib cgGL.lib ;
-STATICPLUGIN.glshader_cg.LFLAGS.release.71 = libcrystalspace_staticplugins.lib libcrystalspace.lib libcrystalspace_opengl.lib zlib.lib opengl32.lib cg.lib cgGL.lib ;
+STATICPLUGIN.glshader_cg.LFLAGS.debug.71 = libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib cg.lib cgGL.lib opengl32.lib ;
+STATICPLUGIN.glshader_cg.LFLAGS.release.71 = libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib cg.lib cgGL.lib opengl32.lib ;
STATICPLUGINS.AVAILABLE += glshader_fixed ;
STATICPLUGIN.glshader_fixed.CFLAGS.debug.71 = ;
STATICPLUGIN.glshader_fixed.CFLAGS.release.71 = ;
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/mk/staticplugins/crystalspace_staticplugins_msvc7.jam /tmp/IB0bHXT4Oc/cel-1.4/mk/staticplugins/crystalspace_staticplugins_msvc7.jam
--- cel-1.9+svn3615/mk/staticplugins/crystalspace_staticplugins_msvc7.jam 2008-06-26 04:12:22.000000000 +0100
+++ cel-1.4/mk/staticplugins/crystalspace_staticplugins_msvc7.jam 2009-11-28 16:46:49.000000000 +0000
@@ -383,21 +383,6 @@
STATICPLUGIN.tlfunc.CFLAGS.release.7 = ;
STATICPLUGIN.tlfunc.LFLAGS.debug.7 = libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib ;
STATICPLUGIN.tlfunc.LFLAGS.release.7 = libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib ;
-STATICPLUGINS.AVAILABLE += rm_rlcompat ;
-STATICPLUGIN.rm_rlcompat.CFLAGS.debug.7 = ;
-STATICPLUGIN.rm_rlcompat.CFLAGS.release.7 = ;
-STATICPLUGIN.rm_rlcompat.LFLAGS.debug.7 = libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib ;
-STATICPLUGIN.rm_rlcompat.LFLAGS.release.7 = libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib ;
-STATICPLUGINS.AVAILABLE += rm_shadow_pssm ;
-STATICPLUGIN.rm_shadow_pssm.CFLAGS.debug.7 = ;
-STATICPLUGIN.rm_shadow_pssm.CFLAGS.release.7 = ;
-STATICPLUGIN.rm_shadow_pssm.LFLAGS.debug.7 = libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib ;
-STATICPLUGIN.rm_shadow_pssm.LFLAGS.release.7 = libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib ;
-STATICPLUGINS.AVAILABLE += rm_unshadowed ;
-STATICPLUGIN.rm_unshadowed.CFLAGS.debug.7 = ;
-STATICPLUGIN.rm_unshadowed.CFLAGS.release.7 = ;
-STATICPLUGIN.rm_unshadowed.LFLAGS.debug.7 = libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib ;
-STATICPLUGIN.rm_unshadowed.LFLAGS.release.7 = libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib ;
STATICPLUGINS.AVAILABLE += reporter ;
STATICPLUGIN.reporter.CFLAGS.debug.7 = ;
STATICPLUGIN.reporter.CFLAGS.release.7 = ;
@@ -418,6 +403,11 @@
STATICPLUGIN.sndsysogg.CFLAGS.release.7 = ;
STATICPLUGIN.sndsysogg.LFLAGS.debug.7 = libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib vorbisfile.lib vorbis.lib ogg.lib ;
STATICPLUGIN.sndsysogg.LFLAGS.release.7 = libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib vorbisfile.lib vorbis.lib ogg.lib ;
+STATICPLUGINS.AVAILABLE += sndsysspeex ;
+STATICPLUGIN.sndsysspeex.CFLAGS.debug.7 = ;
+STATICPLUGIN.sndsysspeex.CFLAGS.release.7 = ;
+STATICPLUGIN.sndsysspeex.LFLAGS.debug.7 = libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib speex.lib ogg.lib ;
+STATICPLUGIN.sndsysspeex.LFLAGS.release.7 = libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib speex.lib ogg.lib ;
STATICPLUGINS.AVAILABLE += sndsyswav ;
STATICPLUGIN.sndsyswav.CFLAGS.debug.7 = ;
STATICPLUGIN.sndsyswav.CFLAGS.release.7 = ;
@@ -503,11 +493,6 @@
STATICPLUGIN.colladaconvertor.CFLAGS.release.7 = ;
STATICPLUGIN.colladaconvertor.LFLAGS.debug.7 = libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib ;
STATICPLUGIN.colladaconvertor.LFLAGS.release.7 = libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib ;
-STATICPLUGINS.AVAILABLE += cacacanvas ;
-STATICPLUGIN.cacacanvas.CFLAGS.debug.7 = ;
-STATICPLUGIN.cacacanvas.CFLAGS.release.7 = ;
-STATICPLUGIN.cacacanvas.LFLAGS.debug.7 = libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib libcaca.lib libcucul.lib ;
-STATICPLUGIN.cacacanvas.LFLAGS.release.7 = libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib libcaca.lib libcucul.lib ;
STATICPLUGINS.AVAILABLE += ddraw2d ;
STATICPLUGIN.ddraw2d.CFLAGS.debug.7 = ;
STATICPLUGIN.ddraw2d.CFLAGS.release.7 = ;
@@ -596,8 +581,8 @@
STATICPLUGINS.AVAILABLE += glshader_cg ;
STATICPLUGIN.glshader_cg.CFLAGS.debug.7 = ;
STATICPLUGIN.glshader_cg.CFLAGS.release.7 = ;
-STATICPLUGIN.glshader_cg.LFLAGS.debug.7 = libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib libcrystalspace_opengl_d.lib zlib.lib opengl32.lib cg.lib cgGL.lib ;
-STATICPLUGIN.glshader_cg.LFLAGS.release.7 = libcrystalspace_staticplugins.lib libcrystalspace.lib libcrystalspace_opengl.lib zlib.lib opengl32.lib cg.lib cgGL.lib ;
+STATICPLUGIN.glshader_cg.LFLAGS.debug.7 = libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib cg.lib cgGL.lib opengl32.lib ;
+STATICPLUGIN.glshader_cg.LFLAGS.release.7 = libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib cg.lib cgGL.lib opengl32.lib ;
STATICPLUGINS.AVAILABLE += glshader_fixed ;
STATICPLUGIN.glshader_fixed.CFLAGS.debug.7 = ;
STATICPLUGIN.glshader_fixed.CFLAGS.release.7 = ;
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/mk/staticplugins/crystalspace_staticplugins_msvc8.jam /tmp/IB0bHXT4Oc/cel-1.4/mk/staticplugins/crystalspace_staticplugins_msvc8.jam
--- cel-1.9+svn3615/mk/staticplugins/crystalspace_staticplugins_msvc8.jam 2008-06-26 04:12:22.000000000 +0100
+++ cel-1.4/mk/staticplugins/crystalspace_staticplugins_msvc8.jam 2009-11-28 16:46:49.000000000 +0000
@@ -383,21 +383,6 @@
STATICPLUGIN.tlfunc.CFLAGS.release.8 = ;
STATICPLUGIN.tlfunc.LFLAGS.debug.8 = libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib ;
STATICPLUGIN.tlfunc.LFLAGS.release.8 = libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib ;
-STATICPLUGINS.AVAILABLE += rm_rlcompat ;
-STATICPLUGIN.rm_rlcompat.CFLAGS.debug.8 = ;
-STATICPLUGIN.rm_rlcompat.CFLAGS.release.8 = ;
-STATICPLUGIN.rm_rlcompat.LFLAGS.debug.8 = libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib ;
-STATICPLUGIN.rm_rlcompat.LFLAGS.release.8 = libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib ;
-STATICPLUGINS.AVAILABLE += rm_shadow_pssm ;
-STATICPLUGIN.rm_shadow_pssm.CFLAGS.debug.8 = ;
-STATICPLUGIN.rm_shadow_pssm.CFLAGS.release.8 = ;
-STATICPLUGIN.rm_shadow_pssm.LFLAGS.debug.8 = libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib ;
-STATICPLUGIN.rm_shadow_pssm.LFLAGS.release.8 = libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib ;
-STATICPLUGINS.AVAILABLE += rm_unshadowed ;
-STATICPLUGIN.rm_unshadowed.CFLAGS.debug.8 = ;
-STATICPLUGIN.rm_unshadowed.CFLAGS.release.8 = ;
-STATICPLUGIN.rm_unshadowed.LFLAGS.debug.8 = libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib ;
-STATICPLUGIN.rm_unshadowed.LFLAGS.release.8 = libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib ;
STATICPLUGINS.AVAILABLE += reporter ;
STATICPLUGIN.reporter.CFLAGS.debug.8 = ;
STATICPLUGIN.reporter.CFLAGS.release.8 = ;
@@ -418,6 +403,11 @@
STATICPLUGIN.sndsysogg.CFLAGS.release.8 = ;
STATICPLUGIN.sndsysogg.LFLAGS.debug.8 = libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib vorbisfile.lib vorbis.lib ogg.lib ;
STATICPLUGIN.sndsysogg.LFLAGS.release.8 = libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib vorbisfile.lib vorbis.lib ogg.lib ;
+STATICPLUGINS.AVAILABLE += sndsysspeex ;
+STATICPLUGIN.sndsysspeex.CFLAGS.debug.8 = ;
+STATICPLUGIN.sndsysspeex.CFLAGS.release.8 = ;
+STATICPLUGIN.sndsysspeex.LFLAGS.debug.8 = libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib speex.lib ogg.lib ;
+STATICPLUGIN.sndsysspeex.LFLAGS.release.8 = libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib speex.lib ogg.lib ;
STATICPLUGINS.AVAILABLE += sndsyswav ;
STATICPLUGIN.sndsyswav.CFLAGS.debug.8 = ;
STATICPLUGIN.sndsyswav.CFLAGS.release.8 = ;
@@ -503,11 +493,6 @@
STATICPLUGIN.colladaconvertor.CFLAGS.release.8 = ;
STATICPLUGIN.colladaconvertor.LFLAGS.debug.8 = libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib ;
STATICPLUGIN.colladaconvertor.LFLAGS.release.8 = libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib ;
-STATICPLUGINS.AVAILABLE += cacacanvas ;
-STATICPLUGIN.cacacanvas.CFLAGS.debug.8 = ;
-STATICPLUGIN.cacacanvas.CFLAGS.release.8 = ;
-STATICPLUGIN.cacacanvas.LFLAGS.debug.8 = libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib libcaca.lib libcucul.lib ;
-STATICPLUGIN.cacacanvas.LFLAGS.release.8 = libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib libcaca.lib libcucul.lib ;
STATICPLUGINS.AVAILABLE += ddraw2d ;
STATICPLUGIN.ddraw2d.CFLAGS.debug.8 = ;
STATICPLUGIN.ddraw2d.CFLAGS.release.8 = ;
@@ -596,8 +581,8 @@
STATICPLUGINS.AVAILABLE += glshader_cg ;
STATICPLUGIN.glshader_cg.CFLAGS.debug.8 = ;
STATICPLUGIN.glshader_cg.CFLAGS.release.8 = ;
-STATICPLUGIN.glshader_cg.LFLAGS.debug.8 = libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib libcrystalspace_opengl_d.lib zlib.lib opengl32.lib cg.lib cgGL.lib ;
-STATICPLUGIN.glshader_cg.LFLAGS.release.8 = libcrystalspace_staticplugins.lib libcrystalspace.lib libcrystalspace_opengl.lib zlib.lib opengl32.lib cg.lib cgGL.lib ;
+STATICPLUGIN.glshader_cg.LFLAGS.debug.8 = libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib cg.lib cgGL.lib opengl32.lib ;
+STATICPLUGIN.glshader_cg.LFLAGS.release.8 = libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib cg.lib cgGL.lib opengl32.lib ;
STATICPLUGINS.AVAILABLE += glshader_fixed ;
STATICPLUGIN.glshader_fixed.CFLAGS.debug.8 = ;
STATICPLUGIN.glshader_fixed.CFLAGS.release.8 = ;
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/mk/staticplugins/crystalspace_staticplugins_msvc9.jam /tmp/IB0bHXT4Oc/cel-1.4/mk/staticplugins/crystalspace_staticplugins_msvc9.jam
--- cel-1.9+svn3615/mk/staticplugins/crystalspace_staticplugins_msvc9.jam 2008-06-26 04:12:22.000000000 +0100
+++ cel-1.4/mk/staticplugins/crystalspace_staticplugins_msvc9.jam 2009-11-28 16:46:49.000000000 +0000
@@ -383,21 +383,6 @@
STATICPLUGIN.tlfunc.CFLAGS.release.9 = ;
STATICPLUGIN.tlfunc.LFLAGS.debug.9 = libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib ;
STATICPLUGIN.tlfunc.LFLAGS.release.9 = libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib ;
-STATICPLUGINS.AVAILABLE += rm_rlcompat ;
-STATICPLUGIN.rm_rlcompat.CFLAGS.debug.9 = ;
-STATICPLUGIN.rm_rlcompat.CFLAGS.release.9 = ;
-STATICPLUGIN.rm_rlcompat.LFLAGS.debug.9 = libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib ;
-STATICPLUGIN.rm_rlcompat.LFLAGS.release.9 = libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib ;
-STATICPLUGINS.AVAILABLE += rm_shadow_pssm ;
-STATICPLUGIN.rm_shadow_pssm.CFLAGS.debug.9 = ;
-STATICPLUGIN.rm_shadow_pssm.CFLAGS.release.9 = ;
-STATICPLUGIN.rm_shadow_pssm.LFLAGS.debug.9 = libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib ;
-STATICPLUGIN.rm_shadow_pssm.LFLAGS.release.9 = libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib ;
-STATICPLUGINS.AVAILABLE += rm_unshadowed ;
-STATICPLUGIN.rm_unshadowed.CFLAGS.debug.9 = ;
-STATICPLUGIN.rm_unshadowed.CFLAGS.release.9 = ;
-STATICPLUGIN.rm_unshadowed.LFLAGS.debug.9 = libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib ;
-STATICPLUGIN.rm_unshadowed.LFLAGS.release.9 = libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib ;
STATICPLUGINS.AVAILABLE += reporter ;
STATICPLUGIN.reporter.CFLAGS.debug.9 = ;
STATICPLUGIN.reporter.CFLAGS.release.9 = ;
@@ -418,6 +403,11 @@
STATICPLUGIN.sndsysogg.CFLAGS.release.9 = ;
STATICPLUGIN.sndsysogg.LFLAGS.debug.9 = libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib vorbisfile.lib vorbis.lib ogg.lib ;
STATICPLUGIN.sndsysogg.LFLAGS.release.9 = libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib vorbisfile.lib vorbis.lib ogg.lib ;
+STATICPLUGINS.AVAILABLE += sndsysspeex ;
+STATICPLUGIN.sndsysspeex.CFLAGS.debug.9 = ;
+STATICPLUGIN.sndsysspeex.CFLAGS.release.9 = ;
+STATICPLUGIN.sndsysspeex.LFLAGS.debug.9 = libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib speex.lib ogg.lib ;
+STATICPLUGIN.sndsysspeex.LFLAGS.release.9 = libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib speex.lib ogg.lib ;
STATICPLUGINS.AVAILABLE += sndsyswav ;
STATICPLUGIN.sndsyswav.CFLAGS.debug.9 = ;
STATICPLUGIN.sndsyswav.CFLAGS.release.9 = ;
@@ -503,11 +493,6 @@
STATICPLUGIN.colladaconvertor.CFLAGS.release.9 = ;
STATICPLUGIN.colladaconvertor.LFLAGS.debug.9 = libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib ;
STATICPLUGIN.colladaconvertor.LFLAGS.release.9 = libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib ;
-STATICPLUGINS.AVAILABLE += cacacanvas ;
-STATICPLUGIN.cacacanvas.CFLAGS.debug.9 = ;
-STATICPLUGIN.cacacanvas.CFLAGS.release.9 = ;
-STATICPLUGIN.cacacanvas.LFLAGS.debug.9 = libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib libcaca.lib libcucul.lib ;
-STATICPLUGIN.cacacanvas.LFLAGS.release.9 = libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib libcaca.lib libcucul.lib ;
STATICPLUGINS.AVAILABLE += ddraw2d ;
STATICPLUGIN.ddraw2d.CFLAGS.debug.9 = ;
STATICPLUGIN.ddraw2d.CFLAGS.release.9 = ;
@@ -596,8 +581,8 @@
STATICPLUGINS.AVAILABLE += glshader_cg ;
STATICPLUGIN.glshader_cg.CFLAGS.debug.9 = ;
STATICPLUGIN.glshader_cg.CFLAGS.release.9 = ;
-STATICPLUGIN.glshader_cg.LFLAGS.debug.9 = libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib libcrystalspace_opengl_d.lib zlib.lib opengl32.lib cg.lib cgGL.lib ;
-STATICPLUGIN.glshader_cg.LFLAGS.release.9 = libcrystalspace_staticplugins.lib libcrystalspace.lib libcrystalspace_opengl.lib zlib.lib opengl32.lib cg.lib cgGL.lib ;
+STATICPLUGIN.glshader_cg.LFLAGS.debug.9 = libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib cg.lib cgGL.lib opengl32.lib ;
+STATICPLUGIN.glshader_cg.LFLAGS.release.9 = libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib cg.lib cgGL.lib opengl32.lib ;
STATICPLUGINS.AVAILABLE += glshader_fixed ;
STATICPLUGIN.glshader_fixed.CFLAGS.debug.9 = ;
STATICPLUGIN.glshader_fixed.CFLAGS.release.9 = ;
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/7/appbootstrap_static.vcproj /tmp/IB0bHXT4Oc/cel-1.4/msvc/7/appbootstrap_static.vcproj
--- cel-1.9+svn3615/msvc/7/appbootstrap_static.vcproj 2008-06-26 04:12:22.000000000 +0100
+++ cel-1.4/msvc/7/appbootstrap_static.vcproj 2009-11-28 16:46:53.000000000 +0000
@@ -54,7 +54,7 @@
OutputFile="..\..\bootstrap_static.exe"
ProgramDatabaseFile="..\..\out\release7\build\appbootstrap_static\bootstrap_static.pdb"
SubSystem="2"
- AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib ode.lib libcrystalspace_windows.lib version.lib libcrystalspace_directx.lib dsound.lib ddraw.lib dinput.lib libcrystalspace_opengl.lib cg.lib cgGL.lib opengl32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib "
+ AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib ode.lib libcrystalspace_windows.lib libcrystalspace_opengl.lib version.lib libcrystalspace_directx.lib dsound.lib ddraw.lib dinput.lib cg.lib cgGL.lib opengl32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib "
AdditionalDependencies="libcrystalspace.lib"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\..\CS\out\release7\libs;..\..\..\CS\libs\csutil\win32\libs;$(CRYSTAL)\out\release7\libs;$(CRYSTAL)\libs\csutil\win32\libs"
@@ -130,7 +130,7 @@
OutputFile="..\..\bootstrap_static.exe"
ProgramDatabaseFile="..\..\out\release7\build\appbootstrap_static\bootstrap_static.pdb"
SubSystem="2"
- AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib ode.lib libcrystalspace_windows.lib version.lib libcrystalspace_directx.lib dsound.lib ddraw.lib dinput.lib libcrystalspace_opengl.lib cg.lib cgGL.lib opengl32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib "
+ AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib ode.lib libcrystalspace_windows.lib libcrystalspace_opengl.lib version.lib libcrystalspace_directx.lib dsound.lib ddraw.lib dinput.lib cg.lib cgGL.lib opengl32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib "
AdditionalDependencies="libcrystalspace.lib"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\..\CS\out\release7\libs;..\..\..\CS\libs\csutil\win32\libs;$(CRYSTAL)\out\release7\libs;$(CRYSTAL)\libs\csutil\win32\libs"
@@ -203,7 +203,7 @@
OutputFile="..\..\bootstrap_static.exe"
ProgramDatabaseFile="..\..\out\debug7\build\appbootstrap_static\bootstrap_static.pdb"
SubSystem="1"
- AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib ode.lib libcrystalspace_windows_d.lib version.lib libcrystalspace_directx_d.lib dsound.lib ddraw.lib dinput.lib libcrystalspace_opengl_d.lib cg.lib cgGL.lib opengl32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib "
+ AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib ode.lib libcrystalspace_windows_d.lib libcrystalspace_opengl_d.lib version.lib libcrystalspace_directx_d.lib dsound.lib ddraw.lib dinput.lib cg.lib cgGL.lib opengl32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib "
AdditionalDependencies="libcrystalspace_d.lib"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\..\CS\out\debug7\libs;..\..\..\CS\libs\csutil\win32\libs;$(CRYSTAL)\out\debug7\libs;$(CRYSTAL)\libs\csutil\win32\libs"
@@ -276,7 +276,7 @@
OutputFile="..\..\bootstrap_static.exe"
ProgramDatabaseFile="..\..\out\debug7\build\appbootstrap_static\bootstrap_static.pdb"
SubSystem="1"
- AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib ode.lib libcrystalspace_windows_d.lib version.lib libcrystalspace_directx_d.lib dsound.lib ddraw.lib dinput.lib libcrystalspace_opengl_d.lib cg.lib cgGL.lib opengl32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib "
+ AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib ode.lib libcrystalspace_windows_d.lib libcrystalspace_opengl_d.lib version.lib libcrystalspace_directx_d.lib dsound.lib ddraw.lib dinput.lib cg.lib cgGL.lib opengl32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib "
AdditionalDependencies="libcrystalspace_d.lib"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\..\CS\out\debug7\libs;..\..\..\CS\libs\csutil\win32\libs;$(CRYSTAL)\out\debug7\libs;$(CRYSTAL)\libs\csutil\win32\libs"
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/7/appcelstart_static.vcproj /tmp/IB0bHXT4Oc/cel-1.4/msvc/7/appcelstart_static.vcproj
--- cel-1.9+svn3615/msvc/7/appcelstart_static.vcproj 2008-08-01 04:11:53.000000000 +0100
+++ cel-1.4/msvc/7/appcelstart_static.vcproj 2009-11-28 16:46:59.000000000 +0000
@@ -54,7 +54,7 @@
OutputFile="..\..\celstart_static.exe"
ProgramDatabaseFile="..\..\out\release7\build\appcelstart_static\celstart_static.pdb"
SubSystem="2"
- AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib cal3d-vc7.lib libcrystalspace_windows.lib version.lib libcrystalspace_directx.lib dsound.lib ddraw.lib dinput.lib bulletcollision-vc7.lib bulletdynamics-vc7.lib bulletmath-vc7.lib libcrystalspace_opengl.lib cg.lib cgGL.lib opengl32.lib ode.lib openal32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib "
+ AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib cal3d-vc7.lib libcrystalspace_windows.lib libcrystalspace_opengl.lib version.lib libcrystalspace_directx.lib dsound.lib ddraw.lib dinput.lib bulletcollision-vc7.lib bulletdynamics-vc7.lib bulletmath-vc7.lib CEGUIBase-vc7.lib cg.lib cgGL.lib opengl32.lib ode.lib openal32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib "
AdditionalDependencies="libcrystalspace.lib"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\..\CS\out\release7\libs;..\..\..\CS\libs\csutil\win32\libs;$(CRYSTAL)\out\release7\libs;$(CRYSTAL)\libs\csutil\win32\libs"
@@ -130,7 +130,7 @@
OutputFile="..\..\celstart_static.exe"
ProgramDatabaseFile="..\..\out\release7\build\appcelstart_static\celstart_static.pdb"
SubSystem="2"
- AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib cal3d-vc7.lib libcrystalspace_windows.lib version.lib libcrystalspace_directx.lib dsound.lib ddraw.lib dinput.lib bulletcollision-vc7.lib bulletdynamics-vc7.lib bulletmath-vc7.lib libcrystalspace_opengl.lib cg.lib cgGL.lib opengl32.lib ode.lib openal32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib "
+ AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib cal3d-vc7.lib libcrystalspace_windows.lib libcrystalspace_opengl.lib version.lib libcrystalspace_directx.lib dsound.lib ddraw.lib dinput.lib bulletcollision-vc7.lib bulletdynamics-vc7.lib bulletmath-vc7.lib CEGUIBase-vc7.lib cg.lib cgGL.lib opengl32.lib ode.lib openal32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib "
AdditionalDependencies="libcrystalspace.lib"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\..\CS\out\release7\libs;..\..\..\CS\libs\csutil\win32\libs;$(CRYSTAL)\out\release7\libs;$(CRYSTAL)\libs\csutil\win32\libs"
@@ -203,7 +203,7 @@
OutputFile="..\..\celstart_static.exe"
ProgramDatabaseFile="..\..\out\debug7\build\appcelstart_static\celstart_static.pdb"
SubSystem="1"
- AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib cal3d-vc7_d.lib libcrystalspace_windows_d.lib version.lib libcrystalspace_directx_d.lib dsound.lib ddraw.lib dinput.lib bulletcollision-vc7_d.lib bulletdynamics-vc7_d.lib bulletmath-vc7_d.lib libcrystalspace_opengl_d.lib cg.lib cgGL.lib opengl32.lib ode.lib openal32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib "
+ AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib cal3d-vc7_d.lib libcrystalspace_windows_d.lib libcrystalspace_opengl_d.lib version.lib libcrystalspace_directx_d.lib dsound.lib ddraw.lib dinput.lib bulletcollision-vc7_d.lib bulletdynamics-vc7_d.lib bulletmath-vc7_d.lib CEGUIBase-vc7_d.lib cg.lib cgGL.lib opengl32.lib ode.lib openal32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib "
AdditionalDependencies="libcrystalspace_d.lib"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\..\CS\out\debug7\libs;..\..\..\CS\libs\csutil\win32\libs;$(CRYSTAL)\out\debug7\libs;$(CRYSTAL)\libs\csutil\win32\libs"
@@ -276,7 +276,7 @@
OutputFile="..\..\celstart_static.exe"
ProgramDatabaseFile="..\..\out\debug7\build\appcelstart_static\celstart_static.pdb"
SubSystem="1"
- AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib cal3d-vc7_d.lib libcrystalspace_windows_d.lib version.lib libcrystalspace_directx_d.lib dsound.lib ddraw.lib dinput.lib bulletcollision-vc7_d.lib bulletdynamics-vc7_d.lib bulletmath-vc7_d.lib libcrystalspace_opengl_d.lib cg.lib cgGL.lib opengl32.lib ode.lib openal32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib "
+ AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib cal3d-vc7_d.lib libcrystalspace_windows_d.lib libcrystalspace_opengl_d.lib version.lib libcrystalspace_directx_d.lib dsound.lib ddraw.lib dinput.lib bulletcollision-vc7_d.lib bulletdynamics-vc7_d.lib bulletmath-vc7_d.lib CEGUIBase-vc7_d.lib cg.lib cgGL.lib opengl32.lib ode.lib openal32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib "
AdditionalDependencies="libcrystalspace_d.lib"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\..\CS\out\debug7\libs;..\..\..\CS\libs\csutil\win32\libs;$(CRYSTAL)\out\debug7\libs;$(CRYSTAL)\libs\csutil\win32\libs"
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/7/libbootstrap_static_plugins_CRYSTAL.vcproj /tmp/IB0bHXT4Oc/cel-1.4/msvc/7/libbootstrap_static_plugins_CRYSTAL.vcproj
--- cel-1.9+svn3615/msvc/7/libbootstrap_static_plugins_CRYSTAL.vcproj 2008-06-26 04:12:22.000000000 +0100
+++ cel-1.4/msvc/7/libbootstrap_static_plugins_CRYSTAL.vcproj 2009-11-28 16:47:19.000000000 +0000
@@ -49,7 +49,7 @@
EnableCOMDATFolding="2"
GenerateDebugInformation="TRUE"
IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD"
- AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib ode.lib libcrystalspace_windows.lib version.lib libcrystalspace_directx.lib dsound.lib ddraw.lib dinput.lib libcrystalspace_opengl.lib cg.lib cgGL.lib opengl32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib "
+ AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib ode.lib libcrystalspace_windows.lib libcrystalspace_opengl.lib version.lib libcrystalspace_directx.lib dsound.lib ddraw.lib dinput.lib cg.lib cgGL.lib opengl32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib "
AdditionalDependencies=""
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=""
@@ -99,7 +99,7 @@
RuntimeLibrary="2"
DebugInformationFormat="3"
BufferSecurityCheck="FALSE"
- ProgramDatabaseFileName="..\..\out\release7\build\libbootstrap_static_plugins_CRYSTAL\bootstrap_static_plugins_CRYSTAL-1.9-vc7.pdb"
+ ProgramDatabaseFileName="..\..\out\release7\build\libbootstrap_static_plugins_CRYSTAL\bootstrap_static_plugins_CRYSTAL-1.4-vc7.pdb"
PreprocessorDefinitions="NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;PACKAGE_NAME=CEL;_WINDOWS;WIN32;CS_BUILD_SHARED_LIBS;CEL_BUILD_SHARED_LIBS"
OptimizeForProcessor="1"
AdditionalOptions=" "
@@ -122,10 +122,10 @@
EnableCOMDATFolding="2"
GenerateDebugInformation="TRUE"
IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD"
- OutputFile="..\..\bootstrap_static_plugins_CRYSTAL-1.9-vc7.dll"
+ OutputFile="..\..\bootstrap_static_plugins_CRYSTAL-1.4-vc7.dll"
ImportLibrary="..\..\out\release7\libs\libbootstrap_static_plugins_CRYSTAL.lib"
- ProgramDatabaseFile="..\..\out\release7\build\libbootstrap_static_plugins_CRYSTAL\bootstrap_static_plugins_CRYSTAL-1.9-vc7.pdb"
- AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib ode.lib libcrystalspace_windows.lib version.lib libcrystalspace_directx.lib dsound.lib ddraw.lib dinput.lib libcrystalspace_opengl.lib cg.lib cgGL.lib opengl32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib "
+ ProgramDatabaseFile="..\..\out\release7\build\libbootstrap_static_plugins_CRYSTAL\bootstrap_static_plugins_CRYSTAL-1.4-vc7.pdb"
+ AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib ode.lib libcrystalspace_windows.lib libcrystalspace_opengl.lib version.lib libcrystalspace_directx.lib dsound.lib ddraw.lib dinput.lib cg.lib cgGL.lib opengl32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib "
AdditionalDependencies=""
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=""
@@ -194,7 +194,7 @@
LinkIncremental="2"
GenerateDebugInformation="TRUE"
IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD,MSVCRT"
- AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib ode.lib libcrystalspace_windows_d.lib version.lib libcrystalspace_directx_d.lib dsound.lib ddraw.lib dinput.lib libcrystalspace_opengl_d.lib cg.lib cgGL.lib opengl32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib "
+ AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib ode.lib libcrystalspace_windows_d.lib libcrystalspace_opengl_d.lib version.lib libcrystalspace_directx_d.lib dsound.lib ddraw.lib dinput.lib cg.lib cgGL.lib opengl32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib "
AdditionalDependencies=""
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=""
@@ -244,7 +244,7 @@
RuntimeLibrary="3"
- ProgramDatabaseFileName="..\..\out\debug7\build\libbootstrap_static_plugins_CRYSTAL\bootstrap_static_plugins_CRYSTAL-1.9-vc7_d.pdb"
+ ProgramDatabaseFileName="..\..\out\debug7\build\libbootstrap_static_plugins_CRYSTAL\bootstrap_static_plugins_CRYSTAL-1.4-vc7_d.pdb"
PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;PACKAGE_NAME=CEL;_WINDOWS;WIN32;CS_BUILD_SHARED_LIBS;CEL_BUILD_SHARED_LIBS"
OptimizeForProcessor="1"
AdditionalOptions=" "
@@ -265,10 +265,10 @@
LinkIncremental="2"
GenerateDebugInformation="TRUE"
IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD,MSVCRT"
- OutputFile="..\..\bootstrap_static_plugins_CRYSTAL-1.9-vc7_d.dll"
+ OutputFile="..\..\bootstrap_static_plugins_CRYSTAL-1.4-vc7_d.dll"
ImportLibrary="..\..\out\debug7\libs\libbootstrap_static_plugins_CRYSTAL_d.lib"
- ProgramDatabaseFile="..\..\out\debug7\build\libbootstrap_static_plugins_CRYSTAL\bootstrap_static_plugins_CRYSTAL-1.9-vc7_d.pdb"
- AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib ode.lib libcrystalspace_windows_d.lib version.lib libcrystalspace_directx_d.lib dsound.lib ddraw.lib dinput.lib libcrystalspace_opengl_d.lib cg.lib cgGL.lib opengl32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib "
+ ProgramDatabaseFile="..\..\out\debug7\build\libbootstrap_static_plugins_CRYSTAL\bootstrap_static_plugins_CRYSTAL-1.4-vc7_d.pdb"
+ AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib ode.lib libcrystalspace_windows_d.lib libcrystalspace_opengl_d.lib version.lib libcrystalspace_directx_d.lib dsound.lib ddraw.lib dinput.lib cg.lib cgGL.lib opengl32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib "
AdditionalDependencies=""
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=""
@@ -313,6 +313,13 @@
RelativePath="..\..\msvc\appbootstrap_static_staticuse_CRYSTAL.cpp">
+
+
+
+
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/7/libbootstrap_static_plugins.vcproj /tmp/IB0bHXT4Oc/cel-1.4/msvc/7/libbootstrap_static_plugins.vcproj
--- cel-1.9+svn3615/msvc/7/libbootstrap_static_plugins.vcproj 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/msvc/7/libbootstrap_static_plugins.vcproj 2009-11-28 16:47:19.000000000 +0000
@@ -99,7 +99,7 @@
RuntimeLibrary="2"
DebugInformationFormat="3"
BufferSecurityCheck="FALSE"
- ProgramDatabaseFileName="..\..\out\release7\build\libbootstrap_static_plugins\bootstrap_static_plugins-1.9-vc7.pdb"
+ ProgramDatabaseFileName="..\..\out\release7\build\libbootstrap_static_plugins\bootstrap_static_plugins-1.4-vc7.pdb"
PreprocessorDefinitions="NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;PACKAGE_NAME=CEL;_WINDOWS;WIN32;CS_BUILD_SHARED_LIBS;CEL_BUILD_SHARED_LIBS"
OptimizeForProcessor="1"
AdditionalOptions=" "
@@ -122,9 +122,9 @@
EnableCOMDATFolding="2"
GenerateDebugInformation="TRUE"
IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD"
- OutputFile="..\..\bootstrap_static_plugins-1.9-vc7.dll"
+ OutputFile="..\..\bootstrap_static_plugins-1.4-vc7.dll"
ImportLibrary="..\..\out\release7\libs\libbootstrap_static_plugins.lib"
- ProgramDatabaseFile="..\..\out\release7\build\libbootstrap_static_plugins\bootstrap_static_plugins-1.9-vc7.pdb"
+ ProgramDatabaseFile="..\..\out\release7\build\libbootstrap_static_plugins\bootstrap_static_plugins-1.4-vc7.pdb"
AdditionalOptions=" "
AdditionalDependencies="libcrystalspace.lib"
SuppressStartupBanner="TRUE"
@@ -244,7 +244,7 @@
RuntimeLibrary="3"
- ProgramDatabaseFileName="..\..\out\debug7\build\libbootstrap_static_plugins\bootstrap_static_plugins-1.9-vc7_d.pdb"
+ ProgramDatabaseFileName="..\..\out\debug7\build\libbootstrap_static_plugins\bootstrap_static_plugins-1.4-vc7_d.pdb"
PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;PACKAGE_NAME=CEL;_WINDOWS;WIN32;CS_BUILD_SHARED_LIBS;CEL_BUILD_SHARED_LIBS"
OptimizeForProcessor="1"
AdditionalOptions=" "
@@ -265,9 +265,9 @@
LinkIncremental="2"
GenerateDebugInformation="TRUE"
IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD,MSVCRT"
- OutputFile="..\..\bootstrap_static_plugins-1.9-vc7_d.dll"
+ OutputFile="..\..\bootstrap_static_plugins-1.4-vc7_d.dll"
ImportLibrary="..\..\out\debug7\libs\libbootstrap_static_plugins_d.lib"
- ProgramDatabaseFile="..\..\out\debug7\build\libbootstrap_static_plugins\bootstrap_static_plugins-1.9-vc7_d.pdb"
+ ProgramDatabaseFile="..\..\out\debug7\build\libbootstrap_static_plugins\bootstrap_static_plugins-1.4-vc7_d.pdb"
AdditionalOptions=" "
AdditionalDependencies="libcrystalspace_d.lib"
SuppressStartupBanner="TRUE"
@@ -313,6 +313,13 @@
RelativePath="..\..\msvc\appbootstrap_static_staticuse.cpp">
+
+
+
+
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/7/libcelstart_static_plugins_CRYSTAL.vcproj /tmp/IB0bHXT4Oc/cel-1.4/msvc/7/libcelstart_static_plugins_CRYSTAL.vcproj
--- cel-1.9+svn3615/msvc/7/libcelstart_static_plugins_CRYSTAL.vcproj 2008-08-01 04:11:53.000000000 +0100
+++ cel-1.4/msvc/7/libcelstart_static_plugins_CRYSTAL.vcproj 2009-11-28 16:47:19.000000000 +0000
@@ -49,7 +49,7 @@
EnableCOMDATFolding="2"
GenerateDebugInformation="TRUE"
IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD"
- AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib cal3d-vc7.lib libcrystalspace_windows.lib version.lib libcrystalspace_directx.lib dsound.lib ddraw.lib dinput.lib bulletcollision-vc7.lib bulletdynamics-vc7.lib bulletmath-vc7.lib libcrystalspace_opengl.lib cg.lib cgGL.lib opengl32.lib ode.lib openal32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib "
+ AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib cal3d-vc7.lib libcrystalspace_windows.lib libcrystalspace_opengl.lib version.lib libcrystalspace_directx.lib dsound.lib ddraw.lib dinput.lib bulletcollision-vc7.lib bulletdynamics-vc7.lib bulletmath-vc7.lib CEGUIBase-vc7.lib cg.lib cgGL.lib opengl32.lib ode.lib openal32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib "
AdditionalDependencies=""
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=""
@@ -99,7 +99,7 @@
RuntimeLibrary="2"
DebugInformationFormat="3"
BufferSecurityCheck="FALSE"
- ProgramDatabaseFileName="..\..\out\release7\build\libcelstart_static_plugins_CRYSTAL\celstart_static_plugins_CRYSTAL-1.9-vc7.pdb"
+ ProgramDatabaseFileName="..\..\out\release7\build\libcelstart_static_plugins_CRYSTAL\celstart_static_plugins_CRYSTAL-1.4-vc7.pdb"
PreprocessorDefinitions="NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;PACKAGE_NAME=CEL;_WINDOWS;WIN32;CS_BUILD_SHARED_LIBS;CEL_BUILD_SHARED_LIBS"
OptimizeForProcessor="1"
AdditionalOptions="/D CS_HAVE_CAL3D "
@@ -122,10 +122,10 @@
EnableCOMDATFolding="2"
GenerateDebugInformation="TRUE"
IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD"
- OutputFile="..\..\celstart_static_plugins_CRYSTAL-1.9-vc7.dll"
+ OutputFile="..\..\celstart_static_plugins_CRYSTAL-1.4-vc7.dll"
ImportLibrary="..\..\out\release7\libs\libcelstart_static_plugins_CRYSTAL.lib"
- ProgramDatabaseFile="..\..\out\release7\build\libcelstart_static_plugins_CRYSTAL\celstart_static_plugins_CRYSTAL-1.9-vc7.pdb"
- AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib cal3d-vc7.lib libcrystalspace_windows.lib version.lib libcrystalspace_directx.lib dsound.lib ddraw.lib dinput.lib bulletcollision-vc7.lib bulletdynamics-vc7.lib bulletmath-vc7.lib libcrystalspace_opengl.lib cg.lib cgGL.lib opengl32.lib ode.lib openal32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib "
+ ProgramDatabaseFile="..\..\out\release7\build\libcelstart_static_plugins_CRYSTAL\celstart_static_plugins_CRYSTAL-1.4-vc7.pdb"
+ AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib cal3d-vc7.lib libcrystalspace_windows.lib libcrystalspace_opengl.lib version.lib libcrystalspace_directx.lib dsound.lib ddraw.lib dinput.lib bulletcollision-vc7.lib bulletdynamics-vc7.lib bulletmath-vc7.lib CEGUIBase-vc7.lib cg.lib cgGL.lib opengl32.lib ode.lib openal32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib "
AdditionalDependencies=""
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=""
@@ -194,7 +194,7 @@
LinkIncremental="2"
GenerateDebugInformation="TRUE"
IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD,MSVCRT"
- AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib cal3d-vc7_d.lib libcrystalspace_windows_d.lib version.lib libcrystalspace_directx_d.lib dsound.lib ddraw.lib dinput.lib bulletcollision-vc7_d.lib bulletdynamics-vc7_d.lib bulletmath-vc7_d.lib libcrystalspace_opengl_d.lib cg.lib cgGL.lib opengl32.lib ode.lib openal32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib "
+ AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib cal3d-vc7_d.lib libcrystalspace_windows_d.lib libcrystalspace_opengl_d.lib version.lib libcrystalspace_directx_d.lib dsound.lib ddraw.lib dinput.lib bulletcollision-vc7_d.lib bulletdynamics-vc7_d.lib bulletmath-vc7_d.lib CEGUIBase-vc7_d.lib cg.lib cgGL.lib opengl32.lib ode.lib openal32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib "
AdditionalDependencies=""
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=""
@@ -244,7 +244,7 @@
RuntimeLibrary="3"
- ProgramDatabaseFileName="..\..\out\debug7\build\libcelstart_static_plugins_CRYSTAL\celstart_static_plugins_CRYSTAL-1.9-vc7_d.pdb"
+ ProgramDatabaseFileName="..\..\out\debug7\build\libcelstart_static_plugins_CRYSTAL\celstart_static_plugins_CRYSTAL-1.4-vc7_d.pdb"
PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;PACKAGE_NAME=CEL;_WINDOWS;WIN32;CS_BUILD_SHARED_LIBS;CEL_BUILD_SHARED_LIBS"
OptimizeForProcessor="1"
AdditionalOptions="/D CS_HAVE_CAL3D "
@@ -265,10 +265,10 @@
LinkIncremental="2"
GenerateDebugInformation="TRUE"
IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD,MSVCRT"
- OutputFile="..\..\celstart_static_plugins_CRYSTAL-1.9-vc7_d.dll"
+ OutputFile="..\..\celstart_static_plugins_CRYSTAL-1.4-vc7_d.dll"
ImportLibrary="..\..\out\debug7\libs\libcelstart_static_plugins_CRYSTAL_d.lib"
- ProgramDatabaseFile="..\..\out\debug7\build\libcelstart_static_plugins_CRYSTAL\celstart_static_plugins_CRYSTAL-1.9-vc7_d.pdb"
- AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib cal3d-vc7_d.lib libcrystalspace_windows_d.lib version.lib libcrystalspace_directx_d.lib dsound.lib ddraw.lib dinput.lib bulletcollision-vc7_d.lib bulletdynamics-vc7_d.lib bulletmath-vc7_d.lib libcrystalspace_opengl_d.lib cg.lib cgGL.lib opengl32.lib ode.lib openal32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib "
+ ProgramDatabaseFile="..\..\out\debug7\build\libcelstart_static_plugins_CRYSTAL\celstart_static_plugins_CRYSTAL-1.4-vc7_d.pdb"
+ AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib cal3d-vc7_d.lib libcrystalspace_windows_d.lib libcrystalspace_opengl_d.lib version.lib libcrystalspace_directx_d.lib dsound.lib ddraw.lib dinput.lib bulletcollision-vc7_d.lib bulletdynamics-vc7_d.lib bulletmath-vc7_d.lib CEGUIBase-vc7_d.lib cg.lib cgGL.lib opengl32.lib ode.lib openal32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib "
AdditionalDependencies=""
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=""
@@ -313,6 +313,13 @@
RelativePath="..\..\msvc\appcelstart_static_staticuse_CRYSTAL.cpp">
+
+
+
+
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/7/libcelstart_static_plugins.vcproj /tmp/IB0bHXT4Oc/cel-1.4/msvc/7/libcelstart_static_plugins.vcproj
--- cel-1.9+svn3615/msvc/7/libcelstart_static_plugins.vcproj 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/msvc/7/libcelstart_static_plugins.vcproj 2009-11-28 16:47:19.000000000 +0000
@@ -99,7 +99,7 @@
RuntimeLibrary="2"
DebugInformationFormat="3"
BufferSecurityCheck="FALSE"
- ProgramDatabaseFileName="..\..\out\release7\build\libcelstart_static_plugins\celstart_static_plugins-1.9-vc7.pdb"
+ ProgramDatabaseFileName="..\..\out\release7\build\libcelstart_static_plugins\celstart_static_plugins-1.4-vc7.pdb"
PreprocessorDefinitions="NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;PACKAGE_NAME=CEL;_WINDOWS;WIN32;CS_BUILD_SHARED_LIBS;CEL_BUILD_SHARED_LIBS"
OptimizeForProcessor="1"
AdditionalOptions=" "
@@ -122,9 +122,9 @@
EnableCOMDATFolding="2"
GenerateDebugInformation="TRUE"
IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD"
- OutputFile="..\..\celstart_static_plugins-1.9-vc7.dll"
+ OutputFile="..\..\celstart_static_plugins-1.4-vc7.dll"
ImportLibrary="..\..\out\release7\libs\libcelstart_static_plugins.lib"
- ProgramDatabaseFile="..\..\out\release7\build\libcelstart_static_plugins\celstart_static_plugins-1.9-vc7.pdb"
+ ProgramDatabaseFile="..\..\out\release7\build\libcelstart_static_plugins\celstart_static_plugins-1.4-vc7.pdb"
AdditionalOptions=" "
AdditionalDependencies="libcrystalspace.lib"
SuppressStartupBanner="TRUE"
@@ -244,7 +244,7 @@
RuntimeLibrary="3"
- ProgramDatabaseFileName="..\..\out\debug7\build\libcelstart_static_plugins\celstart_static_plugins-1.9-vc7_d.pdb"
+ ProgramDatabaseFileName="..\..\out\debug7\build\libcelstart_static_plugins\celstart_static_plugins-1.4-vc7_d.pdb"
PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;PACKAGE_NAME=CEL;_WINDOWS;WIN32;CS_BUILD_SHARED_LIBS;CEL_BUILD_SHARED_LIBS"
OptimizeForProcessor="1"
AdditionalOptions=" "
@@ -265,9 +265,9 @@
LinkIncremental="2"
GenerateDebugInformation="TRUE"
IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD,MSVCRT"
- OutputFile="..\..\celstart_static_plugins-1.9-vc7_d.dll"
+ OutputFile="..\..\celstart_static_plugins-1.4-vc7_d.dll"
ImportLibrary="..\..\out\debug7\libs\libcelstart_static_plugins_d.lib"
- ProgramDatabaseFile="..\..\out\debug7\build\libcelstart_static_plugins\celstart_static_plugins-1.9-vc7_d.pdb"
+ ProgramDatabaseFile="..\..\out\debug7\build\libcelstart_static_plugins\celstart_static_plugins-1.4-vc7_d.pdb"
AdditionalOptions=" "
AdditionalDependencies="libcrystalspace_d.lib"
SuppressStartupBanner="TRUE"
@@ -313,6 +313,13 @@
RelativePath="..\..\msvc\appcelstart_static_staticuse.cpp">
+
+
+
+
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/7/libcel_staticplugins.vcproj /tmp/IB0bHXT4Oc/cel-1.4/msvc/7/libcel_staticplugins.vcproj
--- cel-1.9+svn3615/msvc/7/libcel_staticplugins.vcproj 2008-07-28 04:02:17.000000000 +0100
+++ cel-1.4/msvc/7/libcel_staticplugins.vcproj 2009-11-28 16:47:14.000000000 +0000
@@ -376,31 +376,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
@@ -601,31 +576,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
@@ -676,53 +626,53 @@
+ RelativePath="..\..\msvc\libpfactoranalog_staticreg.cpp">
+ ObjectFile="..\..\out\release7\build\libcel_staticplugins\msvc_libpfactoranalog_staticreg.cpp.obj"/>
+ ObjectFile="..\..\out\release7\build\libcel_staticplugins\msvc_libpfactoranalog_staticreg.cpp.obj"/>
+ ObjectFile="..\..\out\debug7\build\libcel_staticplugins\msvc_libpfactoranalog_staticreg.cpp.obj"/>
+ ObjectFile="..\..\out\debug7\build\libcel_staticplugins\msvc_libpfactoranalog_staticreg.cpp.obj"/>
+ RelativePath="..\..\msvc\libpfactormove_staticreg.cpp">
+ ObjectFile="..\..\out\release7\build\libcel_staticplugins\msvc_libpfactormove_staticreg.cpp.obj"/>
+ ObjectFile="..\..\out\release7\build\libcel_staticplugins\msvc_libpfactormove_staticreg.cpp.obj"/>
+ ObjectFile="..\..\out\debug7\build\libcel_staticplugins\msvc_libpfactormove_staticreg.cpp.obj"/>
+ ObjectFile="..\..\out\debug7\build\libcel_staticplugins\msvc_libpfactormove_staticreg.cpp.obj"/>
-
-
-
-
-
-
-
-
-
-
-
-
@@ -976,31 +901,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1701,31 +1601,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
@@ -2001,78 +1876,78 @@
+ RelativePath="..\..\plugins\propclass\actoranalog\actoranalog.cpp">
+ ObjectFile="..\..\out\release7\build\libcel_staticplugins\plugins_propclass_actoranalog_actoranalog.cpp.obj"/>
+ ObjectFile="..\..\out\release7\build\libcel_staticplugins\plugins_propclass_actoranalog_actoranalog.cpp.obj"/>
+ ObjectFile="..\..\out\debug7\build\libcel_staticplugins\plugins_propclass_actoranalog_actoranalog.cpp.obj"/>
+ ObjectFile="..\..\out\debug7\build\libcel_staticplugins\plugins_propclass_actoranalog_actoranalog.cpp.obj"/>
+ RelativePath="..\..\plugins\propclass\actormove\actormove.cpp">
+ ObjectFile="..\..\out\release7\build\libcel_staticplugins\plugins_propclass_actormove_actormove.cpp.obj"/>
+ ObjectFile="..\..\out\release7\build\libcel_staticplugins\plugins_propclass_actormove_actormove.cpp.obj"/>
+ ObjectFile="..\..\out\debug7\build\libcel_staticplugins\plugins_propclass_actormove_actormove.cpp.obj"/>
+ ObjectFile="..\..\out\debug7\build\libcel_staticplugins\plugins_propclass_actormove_actormove.cpp.obj"/>
+ RelativePath="..\..\plugins\propclass\actormove\npcmove.cpp">
+ ObjectFile="..\..\out\release7\build\libcel_staticplugins\plugins_propclass_actormove_npcmove.cpp.obj"/>
+ ObjectFile="..\..\out\release7\build\libcel_staticplugins\plugins_propclass_actormove_npcmove.cpp.obj"/>
+ ObjectFile="..\..\out\debug7\build\libcel_staticplugins\plugins_propclass_actormove_npcmove.cpp.obj"/>
+ ObjectFile="..\..\out\debug7\build\libcel_staticplugins\plugins_propclass_actormove_npcmove.cpp.obj"/>
-
-
-
-
-
-
-
-
-
-
-
-
@@ -2376,31 +2226,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
@@ -3551,31 +3376,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
@@ -4314,9 +4114,6 @@
RelativePath="..\..\plugins\addons\celgraph\celgraph.h">
-
-
+ RelativePath="..\..\plugins\propclass\actoranalog\actoranalog.h">
+ RelativePath="..\..\plugins\propclass\actormove\actormove.h">
+ RelativePath="..\..\plugins\propclass\actormove\npcmove.h">
@@ -4380,9 +4177,6 @@
RelativePath="..\..\plugins\propclass\evolve\evolve.h">
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/7/libceltst_static_plugins_CRYSTAL.vcproj /tmp/IB0bHXT4Oc/cel-1.4/msvc/7/libceltst_static_plugins_CRYSTAL.vcproj
--- cel-1.9+svn3615/msvc/7/libceltst_static_plugins_CRYSTAL.vcproj 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/msvc/7/libceltst_static_plugins_CRYSTAL.vcproj 2009-11-28 16:47:19.000000000 +0000
@@ -99,7 +99,7 @@
RuntimeLibrary="2"
DebugInformationFormat="3"
BufferSecurityCheck="FALSE"
- ProgramDatabaseFileName="..\..\out\release7\build\libceltst_static_plugins_CRYSTAL\celtst_static_plugins_CRYSTAL-1.9-vc7.pdb"
+ ProgramDatabaseFileName="..\..\out\release7\build\libceltst_static_plugins_CRYSTAL\celtst_static_plugins_CRYSTAL-1.4-vc7.pdb"
PreprocessorDefinitions="NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;PACKAGE_NAME=CEL;_WINDOWS;WIN32;CS_BUILD_SHARED_LIBS;CEL_BUILD_SHARED_LIBS"
OptimizeForProcessor="1"
AdditionalOptions="/D CS_HAVE_CAL3D "
@@ -122,9 +122,9 @@
EnableCOMDATFolding="2"
GenerateDebugInformation="TRUE"
IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD"
- OutputFile="..\..\celtst_static_plugins_CRYSTAL-1.9-vc7.dll"
+ OutputFile="..\..\celtst_static_plugins_CRYSTAL-1.4-vc7.dll"
ImportLibrary="..\..\out\release7\libs\libceltst_static_plugins_CRYSTAL.lib"
- ProgramDatabaseFile="..\..\out\release7\build\libceltst_static_plugins_CRYSTAL\celtst_static_plugins_CRYSTAL-1.9-vc7.pdb"
+ ProgramDatabaseFile="..\..\out\release7\build\libceltst_static_plugins_CRYSTAL\celtst_static_plugins_CRYSTAL-1.4-vc7.pdb"
AdditionalOptions="libjpeg.lib libpng.lib cg.lib cgGL.lib cal3d-vc7.lib libcrystalspace_windows.lib libcrystalspace_opengl.lib opengl32.lib version.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins.lib libcrystalspace.lib libcrystalspace_directx.lib zlib.lib dsound.lib ddraw.lib dinput.lib "
AdditionalDependencies=""
SuppressStartupBanner="TRUE"
@@ -244,7 +244,7 @@
RuntimeLibrary="3"
- ProgramDatabaseFileName="..\..\out\debug7\build\libceltst_static_plugins_CRYSTAL\celtst_static_plugins_CRYSTAL-1.9-vc7_d.pdb"
+ ProgramDatabaseFileName="..\..\out\debug7\build\libceltst_static_plugins_CRYSTAL\celtst_static_plugins_CRYSTAL-1.4-vc7_d.pdb"
PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;PACKAGE_NAME=CEL;_WINDOWS;WIN32;CS_BUILD_SHARED_LIBS;CEL_BUILD_SHARED_LIBS"
OptimizeForProcessor="1"
AdditionalOptions="/D CS_HAVE_CAL3D "
@@ -265,9 +265,9 @@
LinkIncremental="2"
GenerateDebugInformation="TRUE"
IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD,MSVCRT"
- OutputFile="..\..\celtst_static_plugins_CRYSTAL-1.9-vc7_d.dll"
+ OutputFile="..\..\celtst_static_plugins_CRYSTAL-1.4-vc7_d.dll"
ImportLibrary="..\..\out\debug7\libs\libceltst_static_plugins_CRYSTAL_d.lib"
- ProgramDatabaseFile="..\..\out\debug7\build\libceltst_static_plugins_CRYSTAL\celtst_static_plugins_CRYSTAL-1.9-vc7_d.pdb"
+ ProgramDatabaseFile="..\..\out\debug7\build\libceltst_static_plugins_CRYSTAL\celtst_static_plugins_CRYSTAL-1.4-vc7_d.pdb"
AdditionalOptions="libjpeg.lib libpng.lib cg.lib cgGL.lib cal3d-vc7_d.lib libcrystalspace_windows_d.lib libcrystalspace_opengl_d.lib opengl32.lib version.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib libcrystalspace_directx_d.lib zlib.lib dsound.lib ddraw.lib dinput.lib "
AdditionalDependencies=""
SuppressStartupBanner="TRUE"
@@ -313,6 +313,13 @@
RelativePath="..\..\msvc\appceltst_static_staticuse_CRYSTAL.cpp">
+
+
+
+
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/7/libceltst_static_plugins.vcproj /tmp/IB0bHXT4Oc/cel-1.4/msvc/7/libceltst_static_plugins.vcproj
--- cel-1.9+svn3615/msvc/7/libceltst_static_plugins.vcproj 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/msvc/7/libceltst_static_plugins.vcproj 2009-11-28 16:47:19.000000000 +0000
@@ -99,7 +99,7 @@
RuntimeLibrary="2"
DebugInformationFormat="3"
BufferSecurityCheck="FALSE"
- ProgramDatabaseFileName="..\..\out\release7\build\libceltst_static_plugins\celtst_static_plugins-1.9-vc7.pdb"
+ ProgramDatabaseFileName="..\..\out\release7\build\libceltst_static_plugins\celtst_static_plugins-1.4-vc7.pdb"
PreprocessorDefinitions="NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;PACKAGE_NAME=CEL;_WINDOWS;WIN32;CS_BUILD_SHARED_LIBS;CEL_BUILD_SHARED_LIBS"
OptimizeForProcessor="1"
AdditionalOptions=" "
@@ -122,9 +122,9 @@
EnableCOMDATFolding="2"
GenerateDebugInformation="TRUE"
IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD"
- OutputFile="..\..\celtst_static_plugins-1.9-vc7.dll"
+ OutputFile="..\..\celtst_static_plugins-1.4-vc7.dll"
ImportLibrary="..\..\out\release7\libs\libceltst_static_plugins.lib"
- ProgramDatabaseFile="..\..\out\release7\build\libceltst_static_plugins\celtst_static_plugins-1.9-vc7.pdb"
+ ProgramDatabaseFile="..\..\out\release7\build\libceltst_static_plugins\celtst_static_plugins-1.4-vc7.pdb"
AdditionalOptions=" "
AdditionalDependencies="libcrystalspace.lib"
SuppressStartupBanner="TRUE"
@@ -244,7 +244,7 @@
RuntimeLibrary="3"
- ProgramDatabaseFileName="..\..\out\debug7\build\libceltst_static_plugins\celtst_static_plugins-1.9-vc7_d.pdb"
+ ProgramDatabaseFileName="..\..\out\debug7\build\libceltst_static_plugins\celtst_static_plugins-1.4-vc7_d.pdb"
PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;PACKAGE_NAME=CEL;_WINDOWS;WIN32;CS_BUILD_SHARED_LIBS;CEL_BUILD_SHARED_LIBS"
OptimizeForProcessor="1"
AdditionalOptions=" "
@@ -265,9 +265,9 @@
LinkIncremental="2"
GenerateDebugInformation="TRUE"
IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD,MSVCRT"
- OutputFile="..\..\celtst_static_plugins-1.9-vc7_d.dll"
+ OutputFile="..\..\celtst_static_plugins-1.4-vc7_d.dll"
ImportLibrary="..\..\out\debug7\libs\libceltst_static_plugins_d.lib"
- ProgramDatabaseFile="..\..\out\debug7\build\libceltst_static_plugins\celtst_static_plugins-1.9-vc7_d.pdb"
+ ProgramDatabaseFile="..\..\out\debug7\build\libceltst_static_plugins\celtst_static_plugins-1.4-vc7_d.pdb"
AdditionalOptions=" "
AdditionalDependencies="libcrystalspace_d.lib"
SuppressStartupBanner="TRUE"
@@ -313,6 +313,13 @@
RelativePath="..\..\msvc\appceltst_static_staticuse.cpp">
+
+
+
+
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/7/libnettest_static_plugins_CRYSTAL.vcproj /tmp/IB0bHXT4Oc/cel-1.4/msvc/7/libnettest_static_plugins_CRYSTAL.vcproj
--- cel-1.9+svn3615/msvc/7/libnettest_static_plugins_CRYSTAL.vcproj 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/msvc/7/libnettest_static_plugins_CRYSTAL.vcproj 2009-11-28 16:47:19.000000000 +0000
@@ -99,7 +99,7 @@
RuntimeLibrary="2"
DebugInformationFormat="3"
BufferSecurityCheck="FALSE"
- ProgramDatabaseFileName="..\..\out\release7\build\libnettest_static_plugins_CRYSTAL\nettest_static_plugins_CRYSTAL-1.9-vc7.pdb"
+ ProgramDatabaseFileName="..\..\out\release7\build\libnettest_static_plugins_CRYSTAL\nettest_static_plugins_CRYSTAL-1.4-vc7.pdb"
PreprocessorDefinitions="NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;PACKAGE_NAME=CEL;_WINDOWS;WIN32;CS_BUILD_SHARED_LIBS;CEL_BUILD_SHARED_LIBS"
OptimizeForProcessor="1"
AdditionalOptions="/D CS_HAVE_CAL3D "
@@ -122,9 +122,9 @@
EnableCOMDATFolding="2"
GenerateDebugInformation="TRUE"
IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD"
- OutputFile="..\..\nettest_static_plugins_CRYSTAL-1.9-vc7.dll"
+ OutputFile="..\..\nettest_static_plugins_CRYSTAL-1.4-vc7.dll"
ImportLibrary="..\..\out\release7\libs\libnettest_static_plugins_CRYSTAL.lib"
- ProgramDatabaseFile="..\..\out\release7\build\libnettest_static_plugins_CRYSTAL\nettest_static_plugins_CRYSTAL-1.9-vc7.pdb"
+ ProgramDatabaseFile="..\..\out\release7\build\libnettest_static_plugins_CRYSTAL\nettest_static_plugins_CRYSTAL-1.4-vc7.pdb"
AdditionalOptions="libjpeg.lib libpng.lib cal3d-vc7.lib cg.lib cgGL.lib libcrystalspace_windows.lib libcrystalspace_opengl.lib opengl32.lib version.lib libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib "
AdditionalDependencies=""
SuppressStartupBanner="TRUE"
@@ -244,7 +244,7 @@
RuntimeLibrary="3"
- ProgramDatabaseFileName="..\..\out\debug7\build\libnettest_static_plugins_CRYSTAL\nettest_static_plugins_CRYSTAL-1.9-vc7_d.pdb"
+ ProgramDatabaseFileName="..\..\out\debug7\build\libnettest_static_plugins_CRYSTAL\nettest_static_plugins_CRYSTAL-1.4-vc7_d.pdb"
PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;PACKAGE_NAME=CEL;_WINDOWS;WIN32;CS_BUILD_SHARED_LIBS;CEL_BUILD_SHARED_LIBS"
OptimizeForProcessor="1"
AdditionalOptions="/D CS_HAVE_CAL3D "
@@ -265,9 +265,9 @@
LinkIncremental="2"
GenerateDebugInformation="TRUE"
IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD,MSVCRT"
- OutputFile="..\..\nettest_static_plugins_CRYSTAL-1.9-vc7_d.dll"
+ OutputFile="..\..\nettest_static_plugins_CRYSTAL-1.4-vc7_d.dll"
ImportLibrary="..\..\out\debug7\libs\libnettest_static_plugins_CRYSTAL_d.lib"
- ProgramDatabaseFile="..\..\out\debug7\build\libnettest_static_plugins_CRYSTAL\nettest_static_plugins_CRYSTAL-1.9-vc7_d.pdb"
+ ProgramDatabaseFile="..\..\out\debug7\build\libnettest_static_plugins_CRYSTAL\nettest_static_plugins_CRYSTAL-1.4-vc7_d.pdb"
AdditionalOptions="libjpeg.lib libpng.lib cal3d-vc7_d.lib cg.lib cgGL.lib libcrystalspace_windows_d.lib libcrystalspace_opengl_d.lib opengl32.lib version.lib libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib "
AdditionalDependencies=""
SuppressStartupBanner="TRUE"
@@ -313,6 +313,13 @@
RelativePath="..\..\msvc\appnettest_static_staticuse_CRYSTAL.cpp">
+
+
+
+
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/7/libnettest_static_plugins.vcproj /tmp/IB0bHXT4Oc/cel-1.4/msvc/7/libnettest_static_plugins.vcproj
--- cel-1.9+svn3615/msvc/7/libnettest_static_plugins.vcproj 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/msvc/7/libnettest_static_plugins.vcproj 2009-11-28 16:47:19.000000000 +0000
@@ -99,7 +99,7 @@
RuntimeLibrary="2"
DebugInformationFormat="3"
BufferSecurityCheck="FALSE"
- ProgramDatabaseFileName="..\..\out\release7\build\libnettest_static_plugins\nettest_static_plugins-1.9-vc7.pdb"
+ ProgramDatabaseFileName="..\..\out\release7\build\libnettest_static_plugins\nettest_static_plugins-1.4-vc7.pdb"
PreprocessorDefinitions="NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;PACKAGE_NAME=CEL;_WINDOWS;WIN32;CS_BUILD_SHARED_LIBS;CEL_BUILD_SHARED_LIBS"
OptimizeForProcessor="1"
AdditionalOptions=" "
@@ -122,9 +122,9 @@
EnableCOMDATFolding="2"
GenerateDebugInformation="TRUE"
IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD"
- OutputFile="..\..\nettest_static_plugins-1.9-vc7.dll"
+ OutputFile="..\..\nettest_static_plugins-1.4-vc7.dll"
ImportLibrary="..\..\out\release7\libs\libnettest_static_plugins.lib"
- ProgramDatabaseFile="..\..\out\release7\build\libnettest_static_plugins\nettest_static_plugins-1.9-vc7.pdb"
+ ProgramDatabaseFile="..\..\out\release7\build\libnettest_static_plugins\nettest_static_plugins-1.4-vc7.pdb"
AdditionalOptions=" "
AdditionalDependencies="libcrystalspace.lib"
SuppressStartupBanner="TRUE"
@@ -244,7 +244,7 @@
RuntimeLibrary="3"
- ProgramDatabaseFileName="..\..\out\debug7\build\libnettest_static_plugins\nettest_static_plugins-1.9-vc7_d.pdb"
+ ProgramDatabaseFileName="..\..\out\debug7\build\libnettest_static_plugins\nettest_static_plugins-1.4-vc7_d.pdb"
PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;PACKAGE_NAME=CEL;_WINDOWS;WIN32;CS_BUILD_SHARED_LIBS;CEL_BUILD_SHARED_LIBS"
OptimizeForProcessor="1"
AdditionalOptions=" "
@@ -265,9 +265,9 @@
LinkIncremental="2"
GenerateDebugInformation="TRUE"
IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD,MSVCRT"
- OutputFile="..\..\nettest_static_plugins-1.9-vc7_d.dll"
+ OutputFile="..\..\nettest_static_plugins-1.4-vc7_d.dll"
ImportLibrary="..\..\out\debug7\libs\libnettest_static_plugins_d.lib"
- ProgramDatabaseFile="..\..\out\debug7\build\libnettest_static_plugins\nettest_static_plugins-1.9-vc7_d.pdb"
+ ProgramDatabaseFile="..\..\out\debug7\build\libnettest_static_plugins\nettest_static_plugins-1.4-vc7_d.pdb"
AdditionalOptions=" "
AdditionalDependencies="libcrystalspace_d.lib"
SuppressStartupBanner="TRUE"
@@ -313,6 +313,13 @@
RelativePath="..\..\msvc\appnettest_static_staticuse.cpp">
+
+
+
+
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/7/plgaddon_ledges.vcproj /tmp/IB0bHXT4Oc/cel-1.4/msvc/7/plgaddon_ledges.vcproj
--- cel-1.9+svn3615/msvc/7/plgaddon_ledges.vcproj 2008-07-28 04:02:17.000000000 +0100
+++ cel-1.4/msvc/7/plgaddon_ledges.vcproj 1970-01-01 01:00:00.000000000 +0100
@@ -1,345 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/7/plgledges.vcproj /tmp/IB0bHXT4Oc/cel-1.4/msvc/7/plgledges.vcproj
--- cel-1.9+svn3615/msvc/7/plgledges.vcproj 2008-07-28 04:02:17.000000000 +0100
+++ cel-1.4/msvc/7/plgledges.vcproj 1970-01-01 01:00:00.000000000 +0100
@@ -1,345 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/7/plgpfactoranalog.vcproj /tmp/IB0bHXT4Oc/cel-1.4/msvc/7/plgpfactoranalog.vcproj
--- cel-1.9+svn3615/msvc/7/plgpfactoranalog.vcproj 1970-01-01 01:00:00.000000000 +0100
+++ cel-1.4/msvc/7/plgpfactoranalog.vcproj 2009-11-28 16:46:55.000000000 +0000
@@ -0,0 +1,345 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/7/plgpfanalogmotion.vcproj /tmp/IB0bHXT4Oc/cel-1.4/msvc/7/plgpfanalogmotion.vcproj
--- cel-1.9+svn3615/msvc/7/plgpfanalogmotion.vcproj 2008-06-23 04:02:10.000000000 +0100
+++ cel-1.4/msvc/7/plgpfanalogmotion.vcproj 1970-01-01 01:00:00.000000000 +0100
@@ -1,345 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/7/plgpfgrab.vcproj /tmp/IB0bHXT4Oc/cel-1.4/msvc/7/plgpfgrab.vcproj
--- cel-1.9+svn3615/msvc/7/plgpfgrab.vcproj 2008-07-04 04:04:39.000000000 +0100
+++ cel-1.4/msvc/7/plgpfgrab.vcproj 1970-01-01 01:00:00.000000000 +0100
@@ -1,345 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/7/plgpfjump.vcproj /tmp/IB0bHXT4Oc/cel-1.4/msvc/7/plgpfjump.vcproj
--- cel-1.9+svn3615/msvc/7/plgpfjump.vcproj 2008-06-23 04:02:10.000000000 +0100
+++ cel-1.4/msvc/7/plgpfjump.vcproj 1970-01-01 01:00:00.000000000 +0100
@@ -1,345 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/7/wkscel.sln /tmp/IB0bHXT4Oc/cel-1.4/msvc/7/wkscel.sln
--- cel-1.9+svn3615/msvc/7/wkscel.sln 2008-07-28 04:02:17.000000000 +0100
+++ cel-1.4/msvc/7/wkscel.sln 2009-11-28 16:47:19.000000000 +0000
@@ -36,8 +36,6 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plgaddon_celgraph", "plgaddon_celgraph.vcproj", "{504CB6C0-4303-C53C-C345-AA750CD1A59D}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plgaddon_ledges", "plgaddon_ledges.vcproj", "{88DF53AC-1338-547B-6989-1C8B78DE542B}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plgaddon_questdef", "plgaddon_questdef.vcproj", "{D55BE37F-A3CE-2CF1-7474-6961CF055BC0}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plgaddon_ruledef", "plgaddon_ruledef.vcproj", "{A8B80D52-CD56-437D-0DF3-3798C9279FE4}"
@@ -54,15 +52,13 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plgcpersist", "plgcpersist.vcproj", "{403E853A-59C3-FBA1-AF01-2BF89B0DA2F7}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plgledges", "plgledges.vcproj", "{58918459-7FD8-C582-569D-A58038ABE9D1}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plgmgr_billboard", "plgmgr_billboard.vcproj", "{32B86666-15E0-F234-58EC-50D3CC10AD59}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plgmgr_quests", "plgmgr_quests.vcproj", "{96C3E65A-7CC9-961B-0681-395F51BC9CE2}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plgpfactormove", "plgpfactormove.vcproj", "{8EBBE255-F364-3793-8E84-4ACE0FB487A1}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plgpfactoranalog", "plgpfactoranalog.vcproj", "{26C0690C-CDA5-5C37-87AC-D0C18C4F7064}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plgpfanalogmotion", "plgpfanalogmotion.vcproj", "{EF50101E-0BAC-395C-42F9-378D37DA03CE}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plgpfactormove", "plgpfactormove.vcproj", "{8EBBE255-F364-3793-8E84-4ACE0FB487A1}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plgpfbillboard", "plgpfbillboard.vcproj", "{8E2C61D0-0DDE-9AC3-AB7E-8EE3B4EE09D4}"
EndProject
@@ -76,16 +72,12 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plgpfevolve", "plgpfevolve.vcproj", "{73CFB4EB-077E-9A27-E4D4-145EA219E262}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plgpfgrab", "plgpfgrab.vcproj", "{98DD5582-CDDE-F076-F9C8-D6603B15A78E}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plgpfhover", "plgpfhover.vcproj", "{47A9A513-F45E-728E-D930-72B622AE538C}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plgpfinput", "plgpfinput.vcproj", "{5281C5BB-2394-E384-DEDF-73F9F661705D}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plgpfinv", "plgpfinv.vcproj", "{CB5A4EF1-E092-959D-EFD1-E0442F3119F1}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plgpfjump", "plgpfjump.vcproj", "{4F4A2447-5243-2EF5-BE00-701BB9473BA1}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plgpflight", "plgpflight.vcproj", "{23D61ADF-182D-DD0F-43F2-2E474EE1FB00}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plgpfmechanics", "plgpfmechanics.vcproj", "{89822485-8A94-469B-7CA5-A2839C03D271}"
@@ -168,56 +160,52 @@
{36C62D61-808A-D8D0-D561-3EE6C506C350}.11 = {3EF52631-4486-D72B-BB17-DB8FCF36DDBA}
{36C62D61-808A-D8D0-D561-3EE6C506C350}.12 = {EEC493BE-2745-954F-FA24-45447359FCDC}
{36C62D61-808A-D8D0-D561-3EE6C506C350}.13 = {504CB6C0-4303-C53C-C345-AA750CD1A59D}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.14 = {88DF53AC-1338-547B-6989-1C8B78DE542B}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.15 = {D55BE37F-A3CE-2CF1-7474-6961CF055BC0}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.16 = {A8B80D52-CD56-437D-0DF3-3798C9279FE4}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.17 = {BA7BEDE4-D74D-62E9-2A70-F3E2461698BB}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.18 = {E15D3136-619B-861B-D8FF-561A1F846B6C}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.19 = {D4C2A921-6257-1D72-592F-450E19AA3E20}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.20 = {98B5AC91-D6B1-1C99-9FEC-D1EEA525ED3B}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.21 = {8BBC74D9-616A-F075-D8FC-8B101A6C5730}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.22 = {403E853A-59C3-FBA1-AF01-2BF89B0DA2F7}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.23 = {58918459-7FD8-C582-569D-A58038ABE9D1}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.24 = {32B86666-15E0-F234-58EC-50D3CC10AD59}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.25 = {96C3E65A-7CC9-961B-0681-395F51BC9CE2}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.26 = {8EBBE255-F364-3793-8E84-4ACE0FB487A1}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.27 = {EF50101E-0BAC-395C-42F9-378D37DA03CE}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.28 = {8E2C61D0-0DDE-9AC3-AB7E-8EE3B4EE09D4}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.29 = {26CDBAC0-9A46-F31F-B6F7-A729CF22B97D}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.30 = {10B1A9B3-DB3C-98CB-62C9-DB10F9F43396}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.31 = {0E134A9B-0448-2CD4-954B-9F3ECBD81534}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.32 = {F523A3D9-0D90-E985-CA29-10E441393BAE}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.33 = {73CFB4EB-077E-9A27-E4D4-145EA219E262}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.34 = {98DD5582-CDDE-F076-F9C8-D6603B15A78E}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.35 = {47A9A513-F45E-728E-D930-72B622AE538C}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.36 = {5281C5BB-2394-E384-DEDF-73F9F661705D}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.37 = {CB5A4EF1-E092-959D-EFD1-E0442F3119F1}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.38 = {4F4A2447-5243-2EF5-BE00-701BB9473BA1}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.39 = {23D61ADF-182D-DD0F-43F2-2E474EE1FB00}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.40 = {89822485-8A94-469B-7CA5-A2839C03D271}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.41 = {7577CC57-FF93-6E33-EC99-846E898BED29}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.42 = {754F06CF-F576-93C5-BE95-3EC4998D9E20}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.43 = {E167BD33-4E68-2BB7-C568-09FC289A2E9A}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.44 = {6AE42D83-4035-6C15-089B-D65BCF171A11}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.45 = {D7782591-5481-74E6-62CC-265E30D63A91}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.46 = {097814E8-8395-28B7-6CCF-374BA0D10503}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.47 = {4AA16ABE-76D3-AB92-ED64-43A057F4E5D0}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.48 = {E4F5830C-8CAF-CBC0-C5E5-B189CECF556A}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.49 = {F50BC0A1-DB47-BA5A-5C9A-A12E1C81241D}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.50 = {3AB21594-2130-A5AE-9E11-272637C9F9B6}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.51 = {D3852DD2-8840-44C9-AA7A-469FA8445DF3}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.52 = {967105F5-9828-18D8-0AB3-AB33A96DF792}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.53 = {E91FEE10-2BA4-53FC-07FA-0A5B3649595F}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.54 = {7453777E-C823-EFB7-31C1-FDF756EBAEBC}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.55 = {6452026D-0C54-4DCD-DA11-047FAC2224D7}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.56 = {058AAD6E-A940-FA17-F583-B3676E4DAC6C}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.57 = {83E8AB22-CED2-2646-3A5A-73EA46D8959F}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.58 = {7819CFB4-1D16-C2CA-3B58-319C41E552DF}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.59 = {99CE9F68-96D7-1FAF-65BF-DEEF6E5085B8}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.60 = {9B942FB3-91A0-9E4F-1514-1286B4872502}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.61 = {E1C134D4-C658-E321-DBBE-7D11200B882E}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.62 = {66C683AA-084B-50DD-3B04-ED38799342BA}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.63 = {274174A0-7101-29E3-D06A-6C0B009A3DDD}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.14 = {D55BE37F-A3CE-2CF1-7474-6961CF055BC0}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.15 = {A8B80D52-CD56-437D-0DF3-3798C9279FE4}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.16 = {BA7BEDE4-D74D-62E9-2A70-F3E2461698BB}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.17 = {E15D3136-619B-861B-D8FF-561A1F846B6C}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.18 = {D4C2A921-6257-1D72-592F-450E19AA3E20}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.19 = {98B5AC91-D6B1-1C99-9FEC-D1EEA525ED3B}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.20 = {8BBC74D9-616A-F075-D8FC-8B101A6C5730}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.21 = {403E853A-59C3-FBA1-AF01-2BF89B0DA2F7}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.22 = {32B86666-15E0-F234-58EC-50D3CC10AD59}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.23 = {96C3E65A-7CC9-961B-0681-395F51BC9CE2}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.24 = {26C0690C-CDA5-5C37-87AC-D0C18C4F7064}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.25 = {8EBBE255-F364-3793-8E84-4ACE0FB487A1}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.26 = {8E2C61D0-0DDE-9AC3-AB7E-8EE3B4EE09D4}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.27 = {26CDBAC0-9A46-F31F-B6F7-A729CF22B97D}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.28 = {10B1A9B3-DB3C-98CB-62C9-DB10F9F43396}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.29 = {0E134A9B-0448-2CD4-954B-9F3ECBD81534}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.30 = {F523A3D9-0D90-E985-CA29-10E441393BAE}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.31 = {73CFB4EB-077E-9A27-E4D4-145EA219E262}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.32 = {47A9A513-F45E-728E-D930-72B622AE538C}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.33 = {5281C5BB-2394-E384-DEDF-73F9F661705D}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.34 = {CB5A4EF1-E092-959D-EFD1-E0442F3119F1}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.35 = {23D61ADF-182D-DD0F-43F2-2E474EE1FB00}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.36 = {89822485-8A94-469B-7CA5-A2839C03D271}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.37 = {7577CC57-FF93-6E33-EC99-846E898BED29}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.38 = {754F06CF-F576-93C5-BE95-3EC4998D9E20}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.39 = {E167BD33-4E68-2BB7-C568-09FC289A2E9A}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.40 = {6AE42D83-4035-6C15-089B-D65BCF171A11}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.41 = {D7782591-5481-74E6-62CC-265E30D63A91}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.42 = {097814E8-8395-28B7-6CCF-374BA0D10503}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.43 = {4AA16ABE-76D3-AB92-ED64-43A057F4E5D0}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.44 = {E4F5830C-8CAF-CBC0-C5E5-B189CECF556A}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.45 = {F50BC0A1-DB47-BA5A-5C9A-A12E1C81241D}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.46 = {3AB21594-2130-A5AE-9E11-272637C9F9B6}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.47 = {D3852DD2-8840-44C9-AA7A-469FA8445DF3}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.48 = {967105F5-9828-18D8-0AB3-AB33A96DF792}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.49 = {E91FEE10-2BA4-53FC-07FA-0A5B3649595F}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.50 = {7453777E-C823-EFB7-31C1-FDF756EBAEBC}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.51 = {6452026D-0C54-4DCD-DA11-047FAC2224D7}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.52 = {058AAD6E-A940-FA17-F583-B3676E4DAC6C}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.53 = {83E8AB22-CED2-2646-3A5A-73EA46D8959F}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.54 = {7819CFB4-1D16-C2CA-3B58-319C41E552DF}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.55 = {99CE9F68-96D7-1FAF-65BF-DEEF6E5085B8}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.56 = {9B942FB3-91A0-9E4F-1514-1286B4872502}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.57 = {E1C134D4-C658-E321-DBBE-7D11200B882E}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.58 = {66C683AA-084B-50DD-3B04-ED38799342BA}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.59 = {274174A0-7101-29E3-D06A-6C0B009A3DDD}
{E2ECEB01-C66F-C40A-F57D-14B5700CED7A}.0 = {FF4C7AD7-84CA-8A2F-7EBF-2B1FA775848F}
{E2ECEB01-C66F-C40A-F57D-14B5700CED7A}.1 = {AE89B23E-625D-8AD6-F293-EA999B1F3026}
{E2ECEB01-C66F-C40A-F57D-14B5700CED7A}.2 = {E7FA7509-300D-FB19-912A-61D2694C9BD0}
@@ -232,76 +220,69 @@
{866C2A26-400D-A8C9-8F7B-B780A879B604}.0 = {3EF52631-4486-D72B-BB17-DB8FCF36DDBA}
{866C2A26-400D-A8C9-8F7B-B780A879B604}.1 = {EEC493BE-2745-954F-FA24-45447359FCDC}
{866C2A26-400D-A8C9-8F7B-B780A879B604}.2 = {504CB6C0-4303-C53C-C345-AA750CD1A59D}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.3 = {88DF53AC-1338-547B-6989-1C8B78DE542B}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.4 = {D55BE37F-A3CE-2CF1-7474-6961CF055BC0}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.5 = {A8B80D52-CD56-437D-0DF3-3798C9279FE4}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.6 = {BA7BEDE4-D74D-62E9-2A70-F3E2461698BB}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.7 = {E15D3136-619B-861B-D8FF-561A1F846B6C}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.8 = {D4C2A921-6257-1D72-592F-450E19AA3E20}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.9 = {98B5AC91-D6B1-1C99-9FEC-D1EEA525ED3B}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.10 = {8BBC74D9-616A-F075-D8FC-8B101A6C5730}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.11 = {403E853A-59C3-FBA1-AF01-2BF89B0DA2F7}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.12 = {58918459-7FD8-C582-569D-A58038ABE9D1}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.13 = {32B86666-15E0-F234-58EC-50D3CC10AD59}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.14 = {96C3E65A-7CC9-961B-0681-395F51BC9CE2}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.15 = {8EBBE255-F364-3793-8E84-4ACE0FB487A1}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.16 = {EF50101E-0BAC-395C-42F9-378D37DA03CE}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.17 = {8E2C61D0-0DDE-9AC3-AB7E-8EE3B4EE09D4}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.18 = {26CDBAC0-9A46-F31F-B6F7-A729CF22B97D}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.19 = {10B1A9B3-DB3C-98CB-62C9-DB10F9F43396}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.20 = {0E134A9B-0448-2CD4-954B-9F3ECBD81534}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.21 = {F523A3D9-0D90-E985-CA29-10E441393BAE}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.22 = {73CFB4EB-077E-9A27-E4D4-145EA219E262}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.23 = {98DD5582-CDDE-F076-F9C8-D6603B15A78E}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.24 = {47A9A513-F45E-728E-D930-72B622AE538C}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.25 = {5281C5BB-2394-E384-DEDF-73F9F661705D}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.26 = {CB5A4EF1-E092-959D-EFD1-E0442F3119F1}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.27 = {4F4A2447-5243-2EF5-BE00-701BB9473BA1}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.28 = {23D61ADF-182D-DD0F-43F2-2E474EE1FB00}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.29 = {89822485-8A94-469B-7CA5-A2839C03D271}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.30 = {7577CC57-FF93-6E33-EC99-846E898BED29}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.31 = {754F06CF-F576-93C5-BE95-3EC4998D9E20}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.32 = {E167BD33-4E68-2BB7-C568-09FC289A2E9A}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.33 = {6AE42D83-4035-6C15-089B-D65BCF171A11}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.34 = {D7782591-5481-74E6-62CC-265E30D63A91}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.35 = {097814E8-8395-28B7-6CCF-374BA0D10503}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.36 = {4AA16ABE-76D3-AB92-ED64-43A057F4E5D0}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.37 = {E4F5830C-8CAF-CBC0-C5E5-B189CECF556A}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.38 = {F50BC0A1-DB47-BA5A-5C9A-A12E1C81241D}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.39 = {3AB21594-2130-A5AE-9E11-272637C9F9B6}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.40 = {D3852DD2-8840-44C9-AA7A-469FA8445DF3}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.41 = {967105F5-9828-18D8-0AB3-AB33A96DF792}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.42 = {E91FEE10-2BA4-53FC-07FA-0A5B3649595F}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.43 = {7453777E-C823-EFB7-31C1-FDF756EBAEBC}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.44 = {6452026D-0C54-4DCD-DA11-047FAC2224D7}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.45 = {058AAD6E-A940-FA17-F583-B3676E4DAC6C}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.46 = {83E8AB22-CED2-2646-3A5A-73EA46D8959F}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.47 = {7819CFB4-1D16-C2CA-3B58-319C41E552DF}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.48 = {99CE9F68-96D7-1FAF-65BF-DEEF6E5085B8}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.49 = {9B942FB3-91A0-9E4F-1514-1286B4872502}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.50 = {E1C134D4-C658-E321-DBBE-7D11200B882E}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.51 = {66C683AA-084B-50DD-3B04-ED38799342BA}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.52 = {274174A0-7101-29E3-D06A-6C0B009A3DDD}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.3 = {D55BE37F-A3CE-2CF1-7474-6961CF055BC0}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.4 = {A8B80D52-CD56-437D-0DF3-3798C9279FE4}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.5 = {BA7BEDE4-D74D-62E9-2A70-F3E2461698BB}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.6 = {E15D3136-619B-861B-D8FF-561A1F846B6C}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.7 = {D4C2A921-6257-1D72-592F-450E19AA3E20}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.8 = {98B5AC91-D6B1-1C99-9FEC-D1EEA525ED3B}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.9 = {8BBC74D9-616A-F075-D8FC-8B101A6C5730}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.10 = {403E853A-59C3-FBA1-AF01-2BF89B0DA2F7}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.11 = {32B86666-15E0-F234-58EC-50D3CC10AD59}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.12 = {96C3E65A-7CC9-961B-0681-395F51BC9CE2}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.13 = {26C0690C-CDA5-5C37-87AC-D0C18C4F7064}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.14 = {8EBBE255-F364-3793-8E84-4ACE0FB487A1}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.15 = {8E2C61D0-0DDE-9AC3-AB7E-8EE3B4EE09D4}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.16 = {26CDBAC0-9A46-F31F-B6F7-A729CF22B97D}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.17 = {10B1A9B3-DB3C-98CB-62C9-DB10F9F43396}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.18 = {0E134A9B-0448-2CD4-954B-9F3ECBD81534}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.19 = {F523A3D9-0D90-E985-CA29-10E441393BAE}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.20 = {73CFB4EB-077E-9A27-E4D4-145EA219E262}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.21 = {47A9A513-F45E-728E-D930-72B622AE538C}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.22 = {5281C5BB-2394-E384-DEDF-73F9F661705D}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.23 = {CB5A4EF1-E092-959D-EFD1-E0442F3119F1}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.24 = {23D61ADF-182D-DD0F-43F2-2E474EE1FB00}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.25 = {89822485-8A94-469B-7CA5-A2839C03D271}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.26 = {7577CC57-FF93-6E33-EC99-846E898BED29}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.27 = {754F06CF-F576-93C5-BE95-3EC4998D9E20}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.28 = {E167BD33-4E68-2BB7-C568-09FC289A2E9A}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.29 = {6AE42D83-4035-6C15-089B-D65BCF171A11}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.30 = {D7782591-5481-74E6-62CC-265E30D63A91}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.31 = {097814E8-8395-28B7-6CCF-374BA0D10503}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.32 = {4AA16ABE-76D3-AB92-ED64-43A057F4E5D0}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.33 = {E4F5830C-8CAF-CBC0-C5E5-B189CECF556A}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.34 = {F50BC0A1-DB47-BA5A-5C9A-A12E1C81241D}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.35 = {3AB21594-2130-A5AE-9E11-272637C9F9B6}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.36 = {D3852DD2-8840-44C9-AA7A-469FA8445DF3}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.37 = {967105F5-9828-18D8-0AB3-AB33A96DF792}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.38 = {E91FEE10-2BA4-53FC-07FA-0A5B3649595F}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.39 = {7453777E-C823-EFB7-31C1-FDF756EBAEBC}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.40 = {6452026D-0C54-4DCD-DA11-047FAC2224D7}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.41 = {058AAD6E-A940-FA17-F583-B3676E4DAC6C}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.42 = {83E8AB22-CED2-2646-3A5A-73EA46D8959F}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.43 = {7819CFB4-1D16-C2CA-3B58-319C41E552DF}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.44 = {99CE9F68-96D7-1FAF-65BF-DEEF6E5085B8}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.45 = {9B942FB3-91A0-9E4F-1514-1286B4872502}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.46 = {E1C134D4-C658-E321-DBBE-7D11200B882E}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.47 = {66C683AA-084B-50DD-3B04-ED38799342BA}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.48 = {274174A0-7101-29E3-D06A-6C0B009A3DDD}
{3EF52631-4486-D72B-BB17-DB8FCF36DDBA}.0 = {FE8C31C7-8C7C-B982-16AE-C6CA39940D52}
{EEC493BE-2745-954F-FA24-45447359FCDC}.0 = {FE8C31C7-8C7C-B982-16AE-C6CA39940D52}
{504CB6C0-4303-C53C-C345-AA750CD1A59D}.0 = {FE8C31C7-8C7C-B982-16AE-C6CA39940D52}
- {88DF53AC-1338-547B-6989-1C8B78DE542B}.0 = {FE8C31C7-8C7C-B982-16AE-C6CA39940D52}
{D55BE37F-A3CE-2CF1-7474-6961CF055BC0}.0 = {FE8C31C7-8C7C-B982-16AE-C6CA39940D52}
{D4C2A921-6257-1D72-592F-450E19AA3E20}.0 = {FE8C31C7-8C7C-B982-16AE-C6CA39940D52}
{96C3E65A-7CC9-961B-0681-395F51BC9CE2}.0 = {FE8C31C7-8C7C-B982-16AE-C6CA39940D52}
+ {26C0690C-CDA5-5C37-87AC-D0C18C4F7064}.0 = {FE8C31C7-8C7C-B982-16AE-C6CA39940D52}
{8EBBE255-F364-3793-8E84-4ACE0FB487A1}.0 = {FE8C31C7-8C7C-B982-16AE-C6CA39940D52}
- {EF50101E-0BAC-395C-42F9-378D37DA03CE}.0 = {FE8C31C7-8C7C-B982-16AE-C6CA39940D52}
{8E2C61D0-0DDE-9AC3-AB7E-8EE3B4EE09D4}.0 = {FE8C31C7-8C7C-B982-16AE-C6CA39940D52}
{26CDBAC0-9A46-F31F-B6F7-A729CF22B97D}.0 = {FE8C31C7-8C7C-B982-16AE-C6CA39940D52}
{10B1A9B3-DB3C-98CB-62C9-DB10F9F43396}.0 = {FE8C31C7-8C7C-B982-16AE-C6CA39940D52}
{0E134A9B-0448-2CD4-954B-9F3ECBD81534}.0 = {FE8C31C7-8C7C-B982-16AE-C6CA39940D52}
{F523A3D9-0D90-E985-CA29-10E441393BAE}.0 = {FE8C31C7-8C7C-B982-16AE-C6CA39940D52}
{73CFB4EB-077E-9A27-E4D4-145EA219E262}.0 = {FE8C31C7-8C7C-B982-16AE-C6CA39940D52}
- {98DD5582-CDDE-F076-F9C8-D6603B15A78E}.0 = {FE8C31C7-8C7C-B982-16AE-C6CA39940D52}
{47A9A513-F45E-728E-D930-72B622AE538C}.0 = {FE8C31C7-8C7C-B982-16AE-C6CA39940D52}
{5281C5BB-2394-E384-DEDF-73F9F661705D}.0 = {FE8C31C7-8C7C-B982-16AE-C6CA39940D52}
{CB5A4EF1-E092-959D-EFD1-E0442F3119F1}.0 = {FE8C31C7-8C7C-B982-16AE-C6CA39940D52}
- {4F4A2447-5243-2EF5-BE00-701BB9473BA1}.0 = {FE8C31C7-8C7C-B982-16AE-C6CA39940D52}
{23D61ADF-182D-DD0F-43F2-2E474EE1FB00}.0 = {FE8C31C7-8C7C-B982-16AE-C6CA39940D52}
{89822485-8A94-469B-7CA5-A2839C03D271}.0 = {FE8C31C7-8C7C-B982-16AE-C6CA39940D52}
{7577CC57-FF93-6E33-EC99-846E898BED29}.0 = {FE8C31C7-8C7C-B982-16AE-C6CA39940D52}
@@ -471,14 +452,6 @@
{504CB6C0-4303-C53C-C345-AA750CD1A59D}.Debug (with static libs).Build.0 = Debug (with static libs)|Win32
{504CB6C0-4303-C53C-C345-AA750CD1A59D}.Debug (with DLLs).ActiveCfg = Debug (with DLLs)|Win32
{504CB6C0-4303-C53C-C345-AA750CD1A59D}.Debug (with DLLs).Build.0 = Debug (with DLLs)|Win32
- {88DF53AC-1338-547B-6989-1C8B78DE542B}.Release (with static libs).ActiveCfg = Release (with static libs)|Win32
- {88DF53AC-1338-547B-6989-1C8B78DE542B}.Release (with static libs).Build.0 = Release (with static libs)|Win32
- {88DF53AC-1338-547B-6989-1C8B78DE542B}.Release (with DLLs).ActiveCfg = Release (with DLLs)|Win32
- {88DF53AC-1338-547B-6989-1C8B78DE542B}.Release (with DLLs).Build.0 = Release (with DLLs)|Win32
- {88DF53AC-1338-547B-6989-1C8B78DE542B}.Debug (with static libs).ActiveCfg = Debug (with static libs)|Win32
- {88DF53AC-1338-547B-6989-1C8B78DE542B}.Debug (with static libs).Build.0 = Debug (with static libs)|Win32
- {88DF53AC-1338-547B-6989-1C8B78DE542B}.Debug (with DLLs).ActiveCfg = Debug (with DLLs)|Win32
- {88DF53AC-1338-547B-6989-1C8B78DE542B}.Debug (with DLLs).Build.0 = Debug (with DLLs)|Win32
{D55BE37F-A3CE-2CF1-7474-6961CF055BC0}.Release (with static libs).ActiveCfg = Release (with static libs)|Win32
{D55BE37F-A3CE-2CF1-7474-6961CF055BC0}.Release (with static libs).Build.0 = Release (with static libs)|Win32
{D55BE37F-A3CE-2CF1-7474-6961CF055BC0}.Release (with DLLs).ActiveCfg = Release (with DLLs)|Win32
@@ -543,14 +516,6 @@
{403E853A-59C3-FBA1-AF01-2BF89B0DA2F7}.Debug (with static libs).Build.0 = Debug (with static libs)|Win32
{403E853A-59C3-FBA1-AF01-2BF89B0DA2F7}.Debug (with DLLs).ActiveCfg = Debug (with DLLs)|Win32
{403E853A-59C3-FBA1-AF01-2BF89B0DA2F7}.Debug (with DLLs).Build.0 = Debug (with DLLs)|Win32
- {58918459-7FD8-C582-569D-A58038ABE9D1}.Release (with static libs).ActiveCfg = Release (with static libs)|Win32
- {58918459-7FD8-C582-569D-A58038ABE9D1}.Release (with static libs).Build.0 = Release (with static libs)|Win32
- {58918459-7FD8-C582-569D-A58038ABE9D1}.Release (with DLLs).ActiveCfg = Release (with DLLs)|Win32
- {58918459-7FD8-C582-569D-A58038ABE9D1}.Release (with DLLs).Build.0 = Release (with DLLs)|Win32
- {58918459-7FD8-C582-569D-A58038ABE9D1}.Debug (with static libs).ActiveCfg = Debug (with static libs)|Win32
- {58918459-7FD8-C582-569D-A58038ABE9D1}.Debug (with static libs).Build.0 = Debug (with static libs)|Win32
- {58918459-7FD8-C582-569D-A58038ABE9D1}.Debug (with DLLs).ActiveCfg = Debug (with DLLs)|Win32
- {58918459-7FD8-C582-569D-A58038ABE9D1}.Debug (with DLLs).Build.0 = Debug (with DLLs)|Win32
{32B86666-15E0-F234-58EC-50D3CC10AD59}.Release (with static libs).ActiveCfg = Release (with static libs)|Win32
{32B86666-15E0-F234-58EC-50D3CC10AD59}.Release (with static libs).Build.0 = Release (with static libs)|Win32
{32B86666-15E0-F234-58EC-50D3CC10AD59}.Release (with DLLs).ActiveCfg = Release (with DLLs)|Win32
@@ -567,6 +532,14 @@
{96C3E65A-7CC9-961B-0681-395F51BC9CE2}.Debug (with static libs).Build.0 = Debug (with static libs)|Win32
{96C3E65A-7CC9-961B-0681-395F51BC9CE2}.Debug (with DLLs).ActiveCfg = Debug (with DLLs)|Win32
{96C3E65A-7CC9-961B-0681-395F51BC9CE2}.Debug (with DLLs).Build.0 = Debug (with DLLs)|Win32
+ {26C0690C-CDA5-5C37-87AC-D0C18C4F7064}.Release (with static libs).ActiveCfg = Release (with static libs)|Win32
+ {26C0690C-CDA5-5C37-87AC-D0C18C4F7064}.Release (with static libs).Build.0 = Release (with static libs)|Win32
+ {26C0690C-CDA5-5C37-87AC-D0C18C4F7064}.Release (with DLLs).ActiveCfg = Release (with DLLs)|Win32
+ {26C0690C-CDA5-5C37-87AC-D0C18C4F7064}.Release (with DLLs).Build.0 = Release (with DLLs)|Win32
+ {26C0690C-CDA5-5C37-87AC-D0C18C4F7064}.Debug (with static libs).ActiveCfg = Debug (with static libs)|Win32
+ {26C0690C-CDA5-5C37-87AC-D0C18C4F7064}.Debug (with static libs).Build.0 = Debug (with static libs)|Win32
+ {26C0690C-CDA5-5C37-87AC-D0C18C4F7064}.Debug (with DLLs).ActiveCfg = Debug (with DLLs)|Win32
+ {26C0690C-CDA5-5C37-87AC-D0C18C4F7064}.Debug (with DLLs).Build.0 = Debug (with DLLs)|Win32
{8EBBE255-F364-3793-8E84-4ACE0FB487A1}.Release (with static libs).ActiveCfg = Release (with static libs)|Win32
{8EBBE255-F364-3793-8E84-4ACE0FB487A1}.Release (with static libs).Build.0 = Release (with static libs)|Win32
{8EBBE255-F364-3793-8E84-4ACE0FB487A1}.Release (with DLLs).ActiveCfg = Release (with DLLs)|Win32
@@ -575,14 +548,6 @@
{8EBBE255-F364-3793-8E84-4ACE0FB487A1}.Debug (with static libs).Build.0 = Debug (with static libs)|Win32
{8EBBE255-F364-3793-8E84-4ACE0FB487A1}.Debug (with DLLs).ActiveCfg = Debug (with DLLs)|Win32
{8EBBE255-F364-3793-8E84-4ACE0FB487A1}.Debug (with DLLs).Build.0 = Debug (with DLLs)|Win32
- {EF50101E-0BAC-395C-42F9-378D37DA03CE}.Release (with static libs).ActiveCfg = Release (with static libs)|Win32
- {EF50101E-0BAC-395C-42F9-378D37DA03CE}.Release (with static libs).Build.0 = Release (with static libs)|Win32
- {EF50101E-0BAC-395C-42F9-378D37DA03CE}.Release (with DLLs).ActiveCfg = Release (with DLLs)|Win32
- {EF50101E-0BAC-395C-42F9-378D37DA03CE}.Release (with DLLs).Build.0 = Release (with DLLs)|Win32
- {EF50101E-0BAC-395C-42F9-378D37DA03CE}.Debug (with static libs).ActiveCfg = Debug (with static libs)|Win32
- {EF50101E-0BAC-395C-42F9-378D37DA03CE}.Debug (with static libs).Build.0 = Debug (with static libs)|Win32
- {EF50101E-0BAC-395C-42F9-378D37DA03CE}.Debug (with DLLs).ActiveCfg = Debug (with DLLs)|Win32
- {EF50101E-0BAC-395C-42F9-378D37DA03CE}.Debug (with DLLs).Build.0 = Debug (with DLLs)|Win32
{8E2C61D0-0DDE-9AC3-AB7E-8EE3B4EE09D4}.Release (with static libs).ActiveCfg = Release (with static libs)|Win32
{8E2C61D0-0DDE-9AC3-AB7E-8EE3B4EE09D4}.Release (with static libs).Build.0 = Release (with static libs)|Win32
{8E2C61D0-0DDE-9AC3-AB7E-8EE3B4EE09D4}.Release (with DLLs).ActiveCfg = Release (with DLLs)|Win32
@@ -631,14 +596,6 @@
{73CFB4EB-077E-9A27-E4D4-145EA219E262}.Debug (with static libs).Build.0 = Debug (with static libs)|Win32
{73CFB4EB-077E-9A27-E4D4-145EA219E262}.Debug (with DLLs).ActiveCfg = Debug (with DLLs)|Win32
{73CFB4EB-077E-9A27-E4D4-145EA219E262}.Debug (with DLLs).Build.0 = Debug (with DLLs)|Win32
- {98DD5582-CDDE-F076-F9C8-D6603B15A78E}.Release (with static libs).ActiveCfg = Release (with static libs)|Win32
- {98DD5582-CDDE-F076-F9C8-D6603B15A78E}.Release (with static libs).Build.0 = Release (with static libs)|Win32
- {98DD5582-CDDE-F076-F9C8-D6603B15A78E}.Release (with DLLs).ActiveCfg = Release (with DLLs)|Win32
- {98DD5582-CDDE-F076-F9C8-D6603B15A78E}.Release (with DLLs).Build.0 = Release (with DLLs)|Win32
- {98DD5582-CDDE-F076-F9C8-D6603B15A78E}.Debug (with static libs).ActiveCfg = Debug (with static libs)|Win32
- {98DD5582-CDDE-F076-F9C8-D6603B15A78E}.Debug (with static libs).Build.0 = Debug (with static libs)|Win32
- {98DD5582-CDDE-F076-F9C8-D6603B15A78E}.Debug (with DLLs).ActiveCfg = Debug (with DLLs)|Win32
- {98DD5582-CDDE-F076-F9C8-D6603B15A78E}.Debug (with DLLs).Build.0 = Debug (with DLLs)|Win32
{47A9A513-F45E-728E-D930-72B622AE538C}.Release (with static libs).ActiveCfg = Release (with static libs)|Win32
{47A9A513-F45E-728E-D930-72B622AE538C}.Release (with static libs).Build.0 = Release (with static libs)|Win32
{47A9A513-F45E-728E-D930-72B622AE538C}.Release (with DLLs).ActiveCfg = Release (with DLLs)|Win32
@@ -663,14 +620,6 @@
{CB5A4EF1-E092-959D-EFD1-E0442F3119F1}.Debug (with static libs).Build.0 = Debug (with static libs)|Win32
{CB5A4EF1-E092-959D-EFD1-E0442F3119F1}.Debug (with DLLs).ActiveCfg = Debug (with DLLs)|Win32
{CB5A4EF1-E092-959D-EFD1-E0442F3119F1}.Debug (with DLLs).Build.0 = Debug (with DLLs)|Win32
- {4F4A2447-5243-2EF5-BE00-701BB9473BA1}.Release (with static libs).ActiveCfg = Release (with static libs)|Win32
- {4F4A2447-5243-2EF5-BE00-701BB9473BA1}.Release (with static libs).Build.0 = Release (with static libs)|Win32
- {4F4A2447-5243-2EF5-BE00-701BB9473BA1}.Release (with DLLs).ActiveCfg = Release (with DLLs)|Win32
- {4F4A2447-5243-2EF5-BE00-701BB9473BA1}.Release (with DLLs).Build.0 = Release (with DLLs)|Win32
- {4F4A2447-5243-2EF5-BE00-701BB9473BA1}.Debug (with static libs).ActiveCfg = Debug (with static libs)|Win32
- {4F4A2447-5243-2EF5-BE00-701BB9473BA1}.Debug (with static libs).Build.0 = Debug (with static libs)|Win32
- {4F4A2447-5243-2EF5-BE00-701BB9473BA1}.Debug (with DLLs).ActiveCfg = Debug (with DLLs)|Win32
- {4F4A2447-5243-2EF5-BE00-701BB9473BA1}.Debug (with DLLs).Build.0 = Debug (with DLLs)|Win32
{23D61ADF-182D-DD0F-43F2-2E474EE1FB00}.Release (with static libs).ActiveCfg = Release (with static libs)|Win32
{23D61ADF-182D-DD0F-43F2-2E474EE1FB00}.Release (with static libs).Build.0 = Release (with static libs)|Win32
{23D61ADF-182D-DD0F-43F2-2E474EE1FB00}.Release (with DLLs).ActiveCfg = Release (with DLLs)|Win32
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/71/appbootstrap_static.vcproj /tmp/IB0bHXT4Oc/cel-1.4/msvc/71/appbootstrap_static.vcproj
--- cel-1.9+svn3615/msvc/71/appbootstrap_static.vcproj 2008-06-26 04:12:22.000000000 +0100
+++ cel-1.4/msvc/71/appbootstrap_static.vcproj 2009-11-28 16:47:20.000000000 +0000
@@ -54,7 +54,7 @@
OutputFile="..\..\bootstrap_static.exe"
ProgramDatabaseFile="..\..\out\release71\build\appbootstrap_static\bootstrap_static.pdb"
SubSystem="2"
- AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib ode.lib libcrystalspace_windows.lib version.lib libcrystalspace_directx.lib dsound.lib ddraw.lib dinput.lib libcrystalspace_opengl.lib cg.lib cgGL.lib opengl32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib "
+ AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib ode.lib libcrystalspace_windows.lib libcrystalspace_opengl.lib version.lib libcrystalspace_directx.lib dsound.lib ddraw.lib dinput.lib cg.lib cgGL.lib opengl32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib "
AdditionalDependencies="libcrystalspace.lib"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\..\CS\out\release71\libs;..\..\..\CS\libs\csutil\win32\libs;$(CRYSTAL)\out\release71\libs;$(CRYSTAL)\libs\csutil\win32\libs"
@@ -130,7 +130,7 @@
OutputFile="..\..\bootstrap_static.exe"
ProgramDatabaseFile="..\..\out\release71\build\appbootstrap_static\bootstrap_static.pdb"
SubSystem="2"
- AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib ode.lib libcrystalspace_windows.lib version.lib libcrystalspace_directx.lib dsound.lib ddraw.lib dinput.lib libcrystalspace_opengl.lib cg.lib cgGL.lib opengl32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib "
+ AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib ode.lib libcrystalspace_windows.lib libcrystalspace_opengl.lib version.lib libcrystalspace_directx.lib dsound.lib ddraw.lib dinput.lib cg.lib cgGL.lib opengl32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib "
AdditionalDependencies="libcrystalspace.lib"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\..\CS\out\release71\libs;..\..\..\CS\libs\csutil\win32\libs;$(CRYSTAL)\out\release71\libs;$(CRYSTAL)\libs\csutil\win32\libs"
@@ -203,7 +203,7 @@
OutputFile="..\..\bootstrap_static.exe"
ProgramDatabaseFile="..\..\out\debug71\build\appbootstrap_static\bootstrap_static.pdb"
SubSystem="1"
- AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib ode.lib libcrystalspace_windows_d.lib version.lib libcrystalspace_directx_d.lib dsound.lib ddraw.lib dinput.lib libcrystalspace_opengl_d.lib cg.lib cgGL.lib opengl32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib "
+ AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib ode.lib libcrystalspace_windows_d.lib libcrystalspace_opengl_d.lib version.lib libcrystalspace_directx_d.lib dsound.lib ddraw.lib dinput.lib cg.lib cgGL.lib opengl32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib "
AdditionalDependencies="libcrystalspace_d.lib"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\..\CS\out\debug71\libs;..\..\..\CS\libs\csutil\win32\libs;$(CRYSTAL)\out\debug71\libs;$(CRYSTAL)\libs\csutil\win32\libs"
@@ -276,7 +276,7 @@
OutputFile="..\..\bootstrap_static.exe"
ProgramDatabaseFile="..\..\out\debug71\build\appbootstrap_static\bootstrap_static.pdb"
SubSystem="1"
- AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib ode.lib libcrystalspace_windows_d.lib version.lib libcrystalspace_directx_d.lib dsound.lib ddraw.lib dinput.lib libcrystalspace_opengl_d.lib cg.lib cgGL.lib opengl32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib "
+ AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib ode.lib libcrystalspace_windows_d.lib libcrystalspace_opengl_d.lib version.lib libcrystalspace_directx_d.lib dsound.lib ddraw.lib dinput.lib cg.lib cgGL.lib opengl32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib "
AdditionalDependencies="libcrystalspace_d.lib"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\..\CS\out\debug71\libs;..\..\..\CS\libs\csutil\win32\libs;$(CRYSTAL)\out\debug71\libs;$(CRYSTAL)\libs\csutil\win32\libs"
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/71/appcelstart_static.vcproj /tmp/IB0bHXT4Oc/cel-1.4/msvc/71/appcelstart_static.vcproj
--- cel-1.9+svn3615/msvc/71/appcelstart_static.vcproj 2008-08-01 04:11:53.000000000 +0100
+++ cel-1.4/msvc/71/appcelstart_static.vcproj 2009-11-28 16:47:20.000000000 +0000
@@ -54,7 +54,7 @@
OutputFile="..\..\celstart_static.exe"
ProgramDatabaseFile="..\..\out\release71\build\appcelstart_static\celstart_static.pdb"
SubSystem="2"
- AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib cal3d-vc71.lib libcrystalspace_windows.lib version.lib libcrystalspace_directx.lib dsound.lib ddraw.lib dinput.lib bulletcollision-vc71.lib bulletdynamics-vc71.lib bulletmath-vc71.lib libcrystalspace_opengl.lib cg.lib cgGL.lib opengl32.lib ode.lib openal32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib "
+ AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib cal3d-vc71.lib libcrystalspace_windows.lib libcrystalspace_opengl.lib version.lib libcrystalspace_directx.lib dsound.lib ddraw.lib dinput.lib bulletcollision-vc71.lib bulletdynamics-vc71.lib bulletmath-vc71.lib CEGUIBase-vc71.lib cg.lib cgGL.lib opengl32.lib ode.lib openal32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib "
AdditionalDependencies="libcrystalspace.lib"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\..\CS\out\release71\libs;..\..\..\CS\libs\csutil\win32\libs;$(CRYSTAL)\out\release71\libs;$(CRYSTAL)\libs\csutil\win32\libs"
@@ -130,7 +130,7 @@
OutputFile="..\..\celstart_static.exe"
ProgramDatabaseFile="..\..\out\release71\build\appcelstart_static\celstart_static.pdb"
SubSystem="2"
- AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib cal3d-vc71.lib libcrystalspace_windows.lib version.lib libcrystalspace_directx.lib dsound.lib ddraw.lib dinput.lib bulletcollision-vc71.lib bulletdynamics-vc71.lib bulletmath-vc71.lib libcrystalspace_opengl.lib cg.lib cgGL.lib opengl32.lib ode.lib openal32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib "
+ AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib cal3d-vc71.lib libcrystalspace_windows.lib libcrystalspace_opengl.lib version.lib libcrystalspace_directx.lib dsound.lib ddraw.lib dinput.lib bulletcollision-vc71.lib bulletdynamics-vc71.lib bulletmath-vc71.lib CEGUIBase-vc71.lib cg.lib cgGL.lib opengl32.lib ode.lib openal32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib "
AdditionalDependencies="libcrystalspace.lib"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\..\CS\out\release71\libs;..\..\..\CS\libs\csutil\win32\libs;$(CRYSTAL)\out\release71\libs;$(CRYSTAL)\libs\csutil\win32\libs"
@@ -203,7 +203,7 @@
OutputFile="..\..\celstart_static.exe"
ProgramDatabaseFile="..\..\out\debug71\build\appcelstart_static\celstart_static.pdb"
SubSystem="1"
- AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib cal3d-vc71_d.lib libcrystalspace_windows_d.lib version.lib libcrystalspace_directx_d.lib dsound.lib ddraw.lib dinput.lib bulletcollision-vc71_d.lib bulletdynamics-vc71_d.lib bulletmath-vc71_d.lib libcrystalspace_opengl_d.lib cg.lib cgGL.lib opengl32.lib ode.lib openal32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib "
+ AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib cal3d-vc71_d.lib libcrystalspace_windows_d.lib libcrystalspace_opengl_d.lib version.lib libcrystalspace_directx_d.lib dsound.lib ddraw.lib dinput.lib bulletcollision-vc71_d.lib bulletdynamics-vc71_d.lib bulletmath-vc71_d.lib CEGUIBase-vc71_d.lib cg.lib cgGL.lib opengl32.lib ode.lib openal32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib "
AdditionalDependencies="libcrystalspace_d.lib"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\..\CS\out\debug71\libs;..\..\..\CS\libs\csutil\win32\libs;$(CRYSTAL)\out\debug71\libs;$(CRYSTAL)\libs\csutil\win32\libs"
@@ -276,7 +276,7 @@
OutputFile="..\..\celstart_static.exe"
ProgramDatabaseFile="..\..\out\debug71\build\appcelstart_static\celstart_static.pdb"
SubSystem="1"
- AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib cal3d-vc71_d.lib libcrystalspace_windows_d.lib version.lib libcrystalspace_directx_d.lib dsound.lib ddraw.lib dinput.lib bulletcollision-vc71_d.lib bulletdynamics-vc71_d.lib bulletmath-vc71_d.lib libcrystalspace_opengl_d.lib cg.lib cgGL.lib opengl32.lib ode.lib openal32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib "
+ AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib cal3d-vc71_d.lib libcrystalspace_windows_d.lib libcrystalspace_opengl_d.lib version.lib libcrystalspace_directx_d.lib dsound.lib ddraw.lib dinput.lib bulletcollision-vc71_d.lib bulletdynamics-vc71_d.lib bulletmath-vc71_d.lib CEGUIBase-vc71_d.lib cg.lib cgGL.lib opengl32.lib ode.lib openal32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib "
AdditionalDependencies="libcrystalspace_d.lib"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\..\CS\out\debug71\libs;..\..\..\CS\libs\csutil\win32\libs;$(CRYSTAL)\out\debug71\libs;$(CRYSTAL)\libs\csutil\win32\libs"
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/71/libbootstrap_static_plugins_CRYSTAL.vcproj /tmp/IB0bHXT4Oc/cel-1.4/msvc/71/libbootstrap_static_plugins_CRYSTAL.vcproj
--- cel-1.9+svn3615/msvc/71/libbootstrap_static_plugins_CRYSTAL.vcproj 2008-06-26 04:12:22.000000000 +0100
+++ cel-1.4/msvc/71/libbootstrap_static_plugins_CRYSTAL.vcproj 2009-11-28 16:47:21.000000000 +0000
@@ -49,7 +49,7 @@
EnableCOMDATFolding="2"
GenerateDebugInformation="TRUE"
IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD"
- AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib ode.lib libcrystalspace_windows.lib version.lib libcrystalspace_directx.lib dsound.lib ddraw.lib dinput.lib libcrystalspace_opengl.lib cg.lib cgGL.lib opengl32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib "
+ AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib ode.lib libcrystalspace_windows.lib libcrystalspace_opengl.lib version.lib libcrystalspace_directx.lib dsound.lib ddraw.lib dinput.lib cg.lib cgGL.lib opengl32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib "
AdditionalDependencies=""
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=""
@@ -99,7 +99,7 @@
RuntimeLibrary="2"
DebugInformationFormat="3"
BufferSecurityCheck="FALSE"
- ProgramDatabaseFileName="..\..\out\release71\build\libbootstrap_static_plugins_CRYSTAL\bootstrap_static_plugins_CRYSTAL-1.9-vc71.pdb"
+ ProgramDatabaseFileName="..\..\out\release71\build\libbootstrap_static_plugins_CRYSTAL\bootstrap_static_plugins_CRYSTAL-1.4-vc71.pdb"
PreprocessorDefinitions="NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;PACKAGE_NAME=CEL;_WINDOWS;WIN32;CS_BUILD_SHARED_LIBS;CEL_BUILD_SHARED_LIBS"
OptimizeForProcessor="1"
AdditionalOptions=" "
@@ -122,10 +122,10 @@
EnableCOMDATFolding="2"
GenerateDebugInformation="TRUE"
IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD"
- OutputFile="..\..\bootstrap_static_plugins_CRYSTAL-1.9-vc71.dll"
+ OutputFile="..\..\bootstrap_static_plugins_CRYSTAL-1.4-vc71.dll"
ImportLibrary="..\..\out\release71\libs\libbootstrap_static_plugins_CRYSTAL.lib"
- ProgramDatabaseFile="..\..\out\release71\build\libbootstrap_static_plugins_CRYSTAL\bootstrap_static_plugins_CRYSTAL-1.9-vc71.pdb"
- AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib ode.lib libcrystalspace_windows.lib version.lib libcrystalspace_directx.lib dsound.lib ddraw.lib dinput.lib libcrystalspace_opengl.lib cg.lib cgGL.lib opengl32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib "
+ ProgramDatabaseFile="..\..\out\release71\build\libbootstrap_static_plugins_CRYSTAL\bootstrap_static_plugins_CRYSTAL-1.4-vc71.pdb"
+ AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib ode.lib libcrystalspace_windows.lib libcrystalspace_opengl.lib version.lib libcrystalspace_directx.lib dsound.lib ddraw.lib dinput.lib cg.lib cgGL.lib opengl32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib "
AdditionalDependencies=""
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=""
@@ -194,7 +194,7 @@
LinkIncremental="2"
GenerateDebugInformation="TRUE"
IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD,MSVCRT"
- AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib ode.lib libcrystalspace_windows_d.lib version.lib libcrystalspace_directx_d.lib dsound.lib ddraw.lib dinput.lib libcrystalspace_opengl_d.lib cg.lib cgGL.lib opengl32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib "
+ AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib ode.lib libcrystalspace_windows_d.lib libcrystalspace_opengl_d.lib version.lib libcrystalspace_directx_d.lib dsound.lib ddraw.lib dinput.lib cg.lib cgGL.lib opengl32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib "
AdditionalDependencies=""
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=""
@@ -244,7 +244,7 @@
RuntimeLibrary="3"
- ProgramDatabaseFileName="..\..\out\debug71\build\libbootstrap_static_plugins_CRYSTAL\bootstrap_static_plugins_CRYSTAL-1.9-vc71_d.pdb"
+ ProgramDatabaseFileName="..\..\out\debug71\build\libbootstrap_static_plugins_CRYSTAL\bootstrap_static_plugins_CRYSTAL-1.4-vc71_d.pdb"
PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;PACKAGE_NAME=CEL;_WINDOWS;WIN32;CS_BUILD_SHARED_LIBS;CEL_BUILD_SHARED_LIBS"
OptimizeForProcessor="1"
AdditionalOptions=" "
@@ -265,10 +265,10 @@
LinkIncremental="2"
GenerateDebugInformation="TRUE"
IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD,MSVCRT"
- OutputFile="..\..\bootstrap_static_plugins_CRYSTAL-1.9-vc71_d.dll"
+ OutputFile="..\..\bootstrap_static_plugins_CRYSTAL-1.4-vc71_d.dll"
ImportLibrary="..\..\out\debug71\libs\libbootstrap_static_plugins_CRYSTAL_d.lib"
- ProgramDatabaseFile="..\..\out\debug71\build\libbootstrap_static_plugins_CRYSTAL\bootstrap_static_plugins_CRYSTAL-1.9-vc71_d.pdb"
- AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib ode.lib libcrystalspace_windows_d.lib version.lib libcrystalspace_directx_d.lib dsound.lib ddraw.lib dinput.lib libcrystalspace_opengl_d.lib cg.lib cgGL.lib opengl32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib "
+ ProgramDatabaseFile="..\..\out\debug71\build\libbootstrap_static_plugins_CRYSTAL\bootstrap_static_plugins_CRYSTAL-1.4-vc71_d.pdb"
+ AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib ode.lib libcrystalspace_windows_d.lib libcrystalspace_opengl_d.lib version.lib libcrystalspace_directx_d.lib dsound.lib ddraw.lib dinput.lib cg.lib cgGL.lib opengl32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib "
AdditionalDependencies=""
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=""
@@ -313,6 +313,13 @@
RelativePath="..\..\msvc\appbootstrap_static_staticuse_CRYSTAL.cpp">
+
+
+
+
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/71/libbootstrap_static_plugins.vcproj /tmp/IB0bHXT4Oc/cel-1.4/msvc/71/libbootstrap_static_plugins.vcproj
--- cel-1.9+svn3615/msvc/71/libbootstrap_static_plugins.vcproj 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/msvc/71/libbootstrap_static_plugins.vcproj 2009-11-28 16:47:21.000000000 +0000
@@ -99,7 +99,7 @@
RuntimeLibrary="2"
DebugInformationFormat="3"
BufferSecurityCheck="FALSE"
- ProgramDatabaseFileName="..\..\out\release71\build\libbootstrap_static_plugins\bootstrap_static_plugins-1.9-vc71.pdb"
+ ProgramDatabaseFileName="..\..\out\release71\build\libbootstrap_static_plugins\bootstrap_static_plugins-1.4-vc71.pdb"
PreprocessorDefinitions="NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;PACKAGE_NAME=CEL;_WINDOWS;WIN32;CS_BUILD_SHARED_LIBS;CEL_BUILD_SHARED_LIBS"
OptimizeForProcessor="1"
AdditionalOptions=" "
@@ -122,9 +122,9 @@
EnableCOMDATFolding="2"
GenerateDebugInformation="TRUE"
IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD"
- OutputFile="..\..\bootstrap_static_plugins-1.9-vc71.dll"
+ OutputFile="..\..\bootstrap_static_plugins-1.4-vc71.dll"
ImportLibrary="..\..\out\release71\libs\libbootstrap_static_plugins.lib"
- ProgramDatabaseFile="..\..\out\release71\build\libbootstrap_static_plugins\bootstrap_static_plugins-1.9-vc71.pdb"
+ ProgramDatabaseFile="..\..\out\release71\build\libbootstrap_static_plugins\bootstrap_static_plugins-1.4-vc71.pdb"
AdditionalOptions=" "
AdditionalDependencies="libcrystalspace.lib"
SuppressStartupBanner="TRUE"
@@ -244,7 +244,7 @@
RuntimeLibrary="3"
- ProgramDatabaseFileName="..\..\out\debug71\build\libbootstrap_static_plugins\bootstrap_static_plugins-1.9-vc71_d.pdb"
+ ProgramDatabaseFileName="..\..\out\debug71\build\libbootstrap_static_plugins\bootstrap_static_plugins-1.4-vc71_d.pdb"
PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;PACKAGE_NAME=CEL;_WINDOWS;WIN32;CS_BUILD_SHARED_LIBS;CEL_BUILD_SHARED_LIBS"
OptimizeForProcessor="1"
AdditionalOptions=" "
@@ -265,9 +265,9 @@
LinkIncremental="2"
GenerateDebugInformation="TRUE"
IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD,MSVCRT"
- OutputFile="..\..\bootstrap_static_plugins-1.9-vc71_d.dll"
+ OutputFile="..\..\bootstrap_static_plugins-1.4-vc71_d.dll"
ImportLibrary="..\..\out\debug71\libs\libbootstrap_static_plugins_d.lib"
- ProgramDatabaseFile="..\..\out\debug71\build\libbootstrap_static_plugins\bootstrap_static_plugins-1.9-vc71_d.pdb"
+ ProgramDatabaseFile="..\..\out\debug71\build\libbootstrap_static_plugins\bootstrap_static_plugins-1.4-vc71_d.pdb"
AdditionalOptions=" "
AdditionalDependencies="libcrystalspace_d.lib"
SuppressStartupBanner="TRUE"
@@ -313,6 +313,13 @@
RelativePath="..\..\msvc\appbootstrap_static_staticuse.cpp">
+
+
+
+
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/71/libcelstart_static_plugins_CRYSTAL.vcproj /tmp/IB0bHXT4Oc/cel-1.4/msvc/71/libcelstart_static_plugins_CRYSTAL.vcproj
--- cel-1.9+svn3615/msvc/71/libcelstart_static_plugins_CRYSTAL.vcproj 2008-08-01 04:11:53.000000000 +0100
+++ cel-1.4/msvc/71/libcelstart_static_plugins_CRYSTAL.vcproj 2009-11-28 16:47:21.000000000 +0000
@@ -49,7 +49,7 @@
EnableCOMDATFolding="2"
GenerateDebugInformation="TRUE"
IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD"
- AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib cal3d-vc71.lib libcrystalspace_windows.lib version.lib libcrystalspace_directx.lib dsound.lib ddraw.lib dinput.lib bulletcollision-vc71.lib bulletdynamics-vc71.lib bulletmath-vc71.lib libcrystalspace_opengl.lib cg.lib cgGL.lib opengl32.lib ode.lib openal32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib "
+ AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib cal3d-vc71.lib libcrystalspace_windows.lib libcrystalspace_opengl.lib version.lib libcrystalspace_directx.lib dsound.lib ddraw.lib dinput.lib bulletcollision-vc71.lib bulletdynamics-vc71.lib bulletmath-vc71.lib CEGUIBase-vc71.lib cg.lib cgGL.lib opengl32.lib ode.lib openal32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib "
AdditionalDependencies=""
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=""
@@ -99,7 +99,7 @@
RuntimeLibrary="2"
DebugInformationFormat="3"
BufferSecurityCheck="FALSE"
- ProgramDatabaseFileName="..\..\out\release71\build\libcelstart_static_plugins_CRYSTAL\celstart_static_plugins_CRYSTAL-1.9-vc71.pdb"
+ ProgramDatabaseFileName="..\..\out\release71\build\libcelstart_static_plugins_CRYSTAL\celstart_static_plugins_CRYSTAL-1.4-vc71.pdb"
PreprocessorDefinitions="NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;PACKAGE_NAME=CEL;_WINDOWS;WIN32;CS_BUILD_SHARED_LIBS;CEL_BUILD_SHARED_LIBS"
OptimizeForProcessor="1"
AdditionalOptions="/D CS_HAVE_CAL3D "
@@ -122,10 +122,10 @@
EnableCOMDATFolding="2"
GenerateDebugInformation="TRUE"
IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD"
- OutputFile="..\..\celstart_static_plugins_CRYSTAL-1.9-vc71.dll"
+ OutputFile="..\..\celstart_static_plugins_CRYSTAL-1.4-vc71.dll"
ImportLibrary="..\..\out\release71\libs\libcelstart_static_plugins_CRYSTAL.lib"
- ProgramDatabaseFile="..\..\out\release71\build\libcelstart_static_plugins_CRYSTAL\celstart_static_plugins_CRYSTAL-1.9-vc71.pdb"
- AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib cal3d-vc71.lib libcrystalspace_windows.lib version.lib libcrystalspace_directx.lib dsound.lib ddraw.lib dinput.lib bulletcollision-vc71.lib bulletdynamics-vc71.lib bulletmath-vc71.lib libcrystalspace_opengl.lib cg.lib cgGL.lib opengl32.lib ode.lib openal32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib "
+ ProgramDatabaseFile="..\..\out\release71\build\libcelstart_static_plugins_CRYSTAL\celstart_static_plugins_CRYSTAL-1.4-vc71.pdb"
+ AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib cal3d-vc71.lib libcrystalspace_windows.lib libcrystalspace_opengl.lib version.lib libcrystalspace_directx.lib dsound.lib ddraw.lib dinput.lib bulletcollision-vc71.lib bulletdynamics-vc71.lib bulletmath-vc71.lib CEGUIBase-vc71.lib cg.lib cgGL.lib opengl32.lib ode.lib openal32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib "
AdditionalDependencies=""
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=""
@@ -194,7 +194,7 @@
LinkIncremental="2"
GenerateDebugInformation="TRUE"
IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD,MSVCRT"
- AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib cal3d-vc71_d.lib libcrystalspace_windows_d.lib version.lib libcrystalspace_directx_d.lib dsound.lib ddraw.lib dinput.lib bulletcollision-vc71_d.lib bulletdynamics-vc71_d.lib bulletmath-vc71_d.lib libcrystalspace_opengl_d.lib cg.lib cgGL.lib opengl32.lib ode.lib openal32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib "
+ AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib cal3d-vc71_d.lib libcrystalspace_windows_d.lib libcrystalspace_opengl_d.lib version.lib libcrystalspace_directx_d.lib dsound.lib ddraw.lib dinput.lib bulletcollision-vc71_d.lib bulletdynamics-vc71_d.lib bulletmath-vc71_d.lib CEGUIBase-vc71_d.lib cg.lib cgGL.lib opengl32.lib ode.lib openal32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib "
AdditionalDependencies=""
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=""
@@ -244,7 +244,7 @@
RuntimeLibrary="3"
- ProgramDatabaseFileName="..\..\out\debug71\build\libcelstart_static_plugins_CRYSTAL\celstart_static_plugins_CRYSTAL-1.9-vc71_d.pdb"
+ ProgramDatabaseFileName="..\..\out\debug71\build\libcelstart_static_plugins_CRYSTAL\celstart_static_plugins_CRYSTAL-1.4-vc71_d.pdb"
PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;PACKAGE_NAME=CEL;_WINDOWS;WIN32;CS_BUILD_SHARED_LIBS;CEL_BUILD_SHARED_LIBS"
OptimizeForProcessor="1"
AdditionalOptions="/D CS_HAVE_CAL3D "
@@ -265,10 +265,10 @@
LinkIncremental="2"
GenerateDebugInformation="TRUE"
IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD,MSVCRT"
- OutputFile="..\..\celstart_static_plugins_CRYSTAL-1.9-vc71_d.dll"
+ OutputFile="..\..\celstart_static_plugins_CRYSTAL-1.4-vc71_d.dll"
ImportLibrary="..\..\out\debug71\libs\libcelstart_static_plugins_CRYSTAL_d.lib"
- ProgramDatabaseFile="..\..\out\debug71\build\libcelstart_static_plugins_CRYSTAL\celstart_static_plugins_CRYSTAL-1.9-vc71_d.pdb"
- AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib cal3d-vc71_d.lib libcrystalspace_windows_d.lib version.lib libcrystalspace_directx_d.lib dsound.lib ddraw.lib dinput.lib bulletcollision-vc71_d.lib bulletdynamics-vc71_d.lib bulletmath-vc71_d.lib libcrystalspace_opengl_d.lib cg.lib cgGL.lib opengl32.lib ode.lib openal32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib "
+ ProgramDatabaseFile="..\..\out\debug71\build\libcelstart_static_plugins_CRYSTAL\celstart_static_plugins_CRYSTAL-1.4-vc71_d.pdb"
+ AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib cal3d-vc71_d.lib libcrystalspace_windows_d.lib libcrystalspace_opengl_d.lib version.lib libcrystalspace_directx_d.lib dsound.lib ddraw.lib dinput.lib bulletcollision-vc71_d.lib bulletdynamics-vc71_d.lib bulletmath-vc71_d.lib CEGUIBase-vc71_d.lib cg.lib cgGL.lib opengl32.lib ode.lib openal32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib "
AdditionalDependencies=""
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=""
@@ -313,6 +313,13 @@
RelativePath="..\..\msvc\appcelstart_static_staticuse_CRYSTAL.cpp">
+
+
+
+
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/71/libcelstart_static_plugins.vcproj /tmp/IB0bHXT4Oc/cel-1.4/msvc/71/libcelstart_static_plugins.vcproj
--- cel-1.9+svn3615/msvc/71/libcelstart_static_plugins.vcproj 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/msvc/71/libcelstart_static_plugins.vcproj 2009-11-28 16:47:21.000000000 +0000
@@ -99,7 +99,7 @@
RuntimeLibrary="2"
DebugInformationFormat="3"
BufferSecurityCheck="FALSE"
- ProgramDatabaseFileName="..\..\out\release71\build\libcelstart_static_plugins\celstart_static_plugins-1.9-vc71.pdb"
+ ProgramDatabaseFileName="..\..\out\release71\build\libcelstart_static_plugins\celstart_static_plugins-1.4-vc71.pdb"
PreprocessorDefinitions="NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;PACKAGE_NAME=CEL;_WINDOWS;WIN32;CS_BUILD_SHARED_LIBS;CEL_BUILD_SHARED_LIBS"
OptimizeForProcessor="1"
AdditionalOptions=" "
@@ -122,9 +122,9 @@
EnableCOMDATFolding="2"
GenerateDebugInformation="TRUE"
IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD"
- OutputFile="..\..\celstart_static_plugins-1.9-vc71.dll"
+ OutputFile="..\..\celstart_static_plugins-1.4-vc71.dll"
ImportLibrary="..\..\out\release71\libs\libcelstart_static_plugins.lib"
- ProgramDatabaseFile="..\..\out\release71\build\libcelstart_static_plugins\celstart_static_plugins-1.9-vc71.pdb"
+ ProgramDatabaseFile="..\..\out\release71\build\libcelstart_static_plugins\celstart_static_plugins-1.4-vc71.pdb"
AdditionalOptions=" "
AdditionalDependencies="libcrystalspace.lib"
SuppressStartupBanner="TRUE"
@@ -244,7 +244,7 @@
RuntimeLibrary="3"
- ProgramDatabaseFileName="..\..\out\debug71\build\libcelstart_static_plugins\celstart_static_plugins-1.9-vc71_d.pdb"
+ ProgramDatabaseFileName="..\..\out\debug71\build\libcelstart_static_plugins\celstart_static_plugins-1.4-vc71_d.pdb"
PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;PACKAGE_NAME=CEL;_WINDOWS;WIN32;CS_BUILD_SHARED_LIBS;CEL_BUILD_SHARED_LIBS"
OptimizeForProcessor="1"
AdditionalOptions=" "
@@ -265,9 +265,9 @@
LinkIncremental="2"
GenerateDebugInformation="TRUE"
IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD,MSVCRT"
- OutputFile="..\..\celstart_static_plugins-1.9-vc71_d.dll"
+ OutputFile="..\..\celstart_static_plugins-1.4-vc71_d.dll"
ImportLibrary="..\..\out\debug71\libs\libcelstart_static_plugins_d.lib"
- ProgramDatabaseFile="..\..\out\debug71\build\libcelstart_static_plugins\celstart_static_plugins-1.9-vc71_d.pdb"
+ ProgramDatabaseFile="..\..\out\debug71\build\libcelstart_static_plugins\celstart_static_plugins-1.4-vc71_d.pdb"
AdditionalOptions=" "
AdditionalDependencies="libcrystalspace_d.lib"
SuppressStartupBanner="TRUE"
@@ -313,6 +313,13 @@
RelativePath="..\..\msvc\appcelstart_static_staticuse.cpp">
+
+
+
+
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/71/libcel_staticplugins.vcproj /tmp/IB0bHXT4Oc/cel-1.4/msvc/71/libcel_staticplugins.vcproj
--- cel-1.9+svn3615/msvc/71/libcel_staticplugins.vcproj 2008-07-28 04:02:17.000000000 +0100
+++ cel-1.4/msvc/71/libcel_staticplugins.vcproj 2009-11-28 16:47:21.000000000 +0000
@@ -376,31 +376,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
@@ -601,31 +576,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
@@ -676,53 +626,53 @@
+ RelativePath="..\..\msvc\libpfactoranalog_staticreg.cpp">
+ ObjectFile="..\..\out\release71\build\libcel_staticplugins\msvc_libpfactoranalog_staticreg.cpp.obj"/>
+ ObjectFile="..\..\out\release71\build\libcel_staticplugins\msvc_libpfactoranalog_staticreg.cpp.obj"/>
+ ObjectFile="..\..\out\debug71\build\libcel_staticplugins\msvc_libpfactoranalog_staticreg.cpp.obj"/>
+ ObjectFile="..\..\out\debug71\build\libcel_staticplugins\msvc_libpfactoranalog_staticreg.cpp.obj"/>
+ RelativePath="..\..\msvc\libpfactormove_staticreg.cpp">
+ ObjectFile="..\..\out\release71\build\libcel_staticplugins\msvc_libpfactormove_staticreg.cpp.obj"/>
+ ObjectFile="..\..\out\release71\build\libcel_staticplugins\msvc_libpfactormove_staticreg.cpp.obj"/>
+ ObjectFile="..\..\out\debug71\build\libcel_staticplugins\msvc_libpfactormove_staticreg.cpp.obj"/>
+ ObjectFile="..\..\out\debug71\build\libcel_staticplugins\msvc_libpfactormove_staticreg.cpp.obj"/>
-
-
-
-
-
-
-
-
-
-
-
-
@@ -976,31 +901,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1701,31 +1601,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
@@ -2001,78 +1876,78 @@
+ RelativePath="..\..\plugins\propclass\actoranalog\actoranalog.cpp">
+ ObjectFile="..\..\out\release71\build\libcel_staticplugins\plugins_propclass_actoranalog_actoranalog.cpp.obj"/>
+ ObjectFile="..\..\out\release71\build\libcel_staticplugins\plugins_propclass_actoranalog_actoranalog.cpp.obj"/>
+ ObjectFile="..\..\out\debug71\build\libcel_staticplugins\plugins_propclass_actoranalog_actoranalog.cpp.obj"/>
+ ObjectFile="..\..\out\debug71\build\libcel_staticplugins\plugins_propclass_actoranalog_actoranalog.cpp.obj"/>
+ RelativePath="..\..\plugins\propclass\actormove\actormove.cpp">
+ ObjectFile="..\..\out\release71\build\libcel_staticplugins\plugins_propclass_actormove_actormove.cpp.obj"/>
+ ObjectFile="..\..\out\release71\build\libcel_staticplugins\plugins_propclass_actormove_actormove.cpp.obj"/>
+ ObjectFile="..\..\out\debug71\build\libcel_staticplugins\plugins_propclass_actormove_actormove.cpp.obj"/>
+ ObjectFile="..\..\out\debug71\build\libcel_staticplugins\plugins_propclass_actormove_actormove.cpp.obj"/>
+ RelativePath="..\..\plugins\propclass\actormove\npcmove.cpp">
+ ObjectFile="..\..\out\release71\build\libcel_staticplugins\plugins_propclass_actormove_npcmove.cpp.obj"/>
+ ObjectFile="..\..\out\release71\build\libcel_staticplugins\plugins_propclass_actormove_npcmove.cpp.obj"/>
+ ObjectFile="..\..\out\debug71\build\libcel_staticplugins\plugins_propclass_actormove_npcmove.cpp.obj"/>
+ ObjectFile="..\..\out\debug71\build\libcel_staticplugins\plugins_propclass_actormove_npcmove.cpp.obj"/>
-
-
-
-
-
-
-
-
-
-
-
-
@@ -2376,31 +2226,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
@@ -3551,31 +3376,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
@@ -4314,9 +4114,6 @@
RelativePath="..\..\plugins\addons\celgraph\celgraph.h">
-
-
+ RelativePath="..\..\plugins\propclass\actoranalog\actoranalog.h">
+ RelativePath="..\..\plugins\propclass\actormove\actormove.h">
+ RelativePath="..\..\plugins\propclass\actormove\npcmove.h">
@@ -4380,9 +4177,6 @@
RelativePath="..\..\plugins\propclass\evolve\evolve.h">
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/71/libceltst_static_plugins_CRYSTAL.vcproj /tmp/IB0bHXT4Oc/cel-1.4/msvc/71/libceltst_static_plugins_CRYSTAL.vcproj
--- cel-1.9+svn3615/msvc/71/libceltst_static_plugins_CRYSTAL.vcproj 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/msvc/71/libceltst_static_plugins_CRYSTAL.vcproj 2009-11-28 16:47:21.000000000 +0000
@@ -99,7 +99,7 @@
RuntimeLibrary="2"
DebugInformationFormat="3"
BufferSecurityCheck="FALSE"
- ProgramDatabaseFileName="..\..\out\release71\build\libceltst_static_plugins_CRYSTAL\celtst_static_plugins_CRYSTAL-1.9-vc71.pdb"
+ ProgramDatabaseFileName="..\..\out\release71\build\libceltst_static_plugins_CRYSTAL\celtst_static_plugins_CRYSTAL-1.4-vc71.pdb"
PreprocessorDefinitions="NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;PACKAGE_NAME=CEL;_WINDOWS;WIN32;CS_BUILD_SHARED_LIBS;CEL_BUILD_SHARED_LIBS"
OptimizeForProcessor="1"
AdditionalOptions="/D CS_HAVE_CAL3D "
@@ -122,9 +122,9 @@
EnableCOMDATFolding="2"
GenerateDebugInformation="TRUE"
IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD"
- OutputFile="..\..\celtst_static_plugins_CRYSTAL-1.9-vc71.dll"
+ OutputFile="..\..\celtst_static_plugins_CRYSTAL-1.4-vc71.dll"
ImportLibrary="..\..\out\release71\libs\libceltst_static_plugins_CRYSTAL.lib"
- ProgramDatabaseFile="..\..\out\release71\build\libceltst_static_plugins_CRYSTAL\celtst_static_plugins_CRYSTAL-1.9-vc71.pdb"
+ ProgramDatabaseFile="..\..\out\release71\build\libceltst_static_plugins_CRYSTAL\celtst_static_plugins_CRYSTAL-1.4-vc71.pdb"
AdditionalOptions="libjpeg.lib libpng.lib cg.lib cgGL.lib cal3d-vc71.lib libcrystalspace_windows.lib libcrystalspace_opengl.lib opengl32.lib version.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins.lib libcrystalspace.lib libcrystalspace_directx.lib zlib.lib dsound.lib ddraw.lib dinput.lib "
AdditionalDependencies=""
SuppressStartupBanner="TRUE"
@@ -244,7 +244,7 @@
RuntimeLibrary="3"
- ProgramDatabaseFileName="..\..\out\debug71\build\libceltst_static_plugins_CRYSTAL\celtst_static_plugins_CRYSTAL-1.9-vc71_d.pdb"
+ ProgramDatabaseFileName="..\..\out\debug71\build\libceltst_static_plugins_CRYSTAL\celtst_static_plugins_CRYSTAL-1.4-vc71_d.pdb"
PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;PACKAGE_NAME=CEL;_WINDOWS;WIN32;CS_BUILD_SHARED_LIBS;CEL_BUILD_SHARED_LIBS"
OptimizeForProcessor="1"
AdditionalOptions="/D CS_HAVE_CAL3D "
@@ -265,9 +265,9 @@
LinkIncremental="2"
GenerateDebugInformation="TRUE"
IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD,MSVCRT"
- OutputFile="..\..\celtst_static_plugins_CRYSTAL-1.9-vc71_d.dll"
+ OutputFile="..\..\celtst_static_plugins_CRYSTAL-1.4-vc71_d.dll"
ImportLibrary="..\..\out\debug71\libs\libceltst_static_plugins_CRYSTAL_d.lib"
- ProgramDatabaseFile="..\..\out\debug71\build\libceltst_static_plugins_CRYSTAL\celtst_static_plugins_CRYSTAL-1.9-vc71_d.pdb"
+ ProgramDatabaseFile="..\..\out\debug71\build\libceltst_static_plugins_CRYSTAL\celtst_static_plugins_CRYSTAL-1.4-vc71_d.pdb"
AdditionalOptions="libjpeg.lib libpng.lib cg.lib cgGL.lib cal3d-vc71_d.lib libcrystalspace_windows_d.lib libcrystalspace_opengl_d.lib opengl32.lib version.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib libcrystalspace_directx_d.lib zlib.lib dsound.lib ddraw.lib dinput.lib "
AdditionalDependencies=""
SuppressStartupBanner="TRUE"
@@ -313,6 +313,13 @@
RelativePath="..\..\msvc\appceltst_static_staticuse_CRYSTAL.cpp">
+
+
+
+
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/71/libceltst_static_plugins.vcproj /tmp/IB0bHXT4Oc/cel-1.4/msvc/71/libceltst_static_plugins.vcproj
--- cel-1.9+svn3615/msvc/71/libceltst_static_plugins.vcproj 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/msvc/71/libceltst_static_plugins.vcproj 2009-11-28 16:47:21.000000000 +0000
@@ -99,7 +99,7 @@
RuntimeLibrary="2"
DebugInformationFormat="3"
BufferSecurityCheck="FALSE"
- ProgramDatabaseFileName="..\..\out\release71\build\libceltst_static_plugins\celtst_static_plugins-1.9-vc71.pdb"
+ ProgramDatabaseFileName="..\..\out\release71\build\libceltst_static_plugins\celtst_static_plugins-1.4-vc71.pdb"
PreprocessorDefinitions="NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;PACKAGE_NAME=CEL;_WINDOWS;WIN32;CS_BUILD_SHARED_LIBS;CEL_BUILD_SHARED_LIBS"
OptimizeForProcessor="1"
AdditionalOptions=" "
@@ -122,9 +122,9 @@
EnableCOMDATFolding="2"
GenerateDebugInformation="TRUE"
IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD"
- OutputFile="..\..\celtst_static_plugins-1.9-vc71.dll"
+ OutputFile="..\..\celtst_static_plugins-1.4-vc71.dll"
ImportLibrary="..\..\out\release71\libs\libceltst_static_plugins.lib"
- ProgramDatabaseFile="..\..\out\release71\build\libceltst_static_plugins\celtst_static_plugins-1.9-vc71.pdb"
+ ProgramDatabaseFile="..\..\out\release71\build\libceltst_static_plugins\celtst_static_plugins-1.4-vc71.pdb"
AdditionalOptions=" "
AdditionalDependencies="libcrystalspace.lib"
SuppressStartupBanner="TRUE"
@@ -244,7 +244,7 @@
RuntimeLibrary="3"
- ProgramDatabaseFileName="..\..\out\debug71\build\libceltst_static_plugins\celtst_static_plugins-1.9-vc71_d.pdb"
+ ProgramDatabaseFileName="..\..\out\debug71\build\libceltst_static_plugins\celtst_static_plugins-1.4-vc71_d.pdb"
PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;PACKAGE_NAME=CEL;_WINDOWS;WIN32;CS_BUILD_SHARED_LIBS;CEL_BUILD_SHARED_LIBS"
OptimizeForProcessor="1"
AdditionalOptions=" "
@@ -265,9 +265,9 @@
LinkIncremental="2"
GenerateDebugInformation="TRUE"
IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD,MSVCRT"
- OutputFile="..\..\celtst_static_plugins-1.9-vc71_d.dll"
+ OutputFile="..\..\celtst_static_plugins-1.4-vc71_d.dll"
ImportLibrary="..\..\out\debug71\libs\libceltst_static_plugins_d.lib"
- ProgramDatabaseFile="..\..\out\debug71\build\libceltst_static_plugins\celtst_static_plugins-1.9-vc71_d.pdb"
+ ProgramDatabaseFile="..\..\out\debug71\build\libceltst_static_plugins\celtst_static_plugins-1.4-vc71_d.pdb"
AdditionalOptions=" "
AdditionalDependencies="libcrystalspace_d.lib"
SuppressStartupBanner="TRUE"
@@ -313,6 +313,13 @@
RelativePath="..\..\msvc\appceltst_static_staticuse.cpp">
+
+
+
+
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/71/libnettest_static_plugins_CRYSTAL.vcproj /tmp/IB0bHXT4Oc/cel-1.4/msvc/71/libnettest_static_plugins_CRYSTAL.vcproj
--- cel-1.9+svn3615/msvc/71/libnettest_static_plugins_CRYSTAL.vcproj 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/msvc/71/libnettest_static_plugins_CRYSTAL.vcproj 2009-11-28 16:47:21.000000000 +0000
@@ -99,7 +99,7 @@
RuntimeLibrary="2"
DebugInformationFormat="3"
BufferSecurityCheck="FALSE"
- ProgramDatabaseFileName="..\..\out\release71\build\libnettest_static_plugins_CRYSTAL\nettest_static_plugins_CRYSTAL-1.9-vc71.pdb"
+ ProgramDatabaseFileName="..\..\out\release71\build\libnettest_static_plugins_CRYSTAL\nettest_static_plugins_CRYSTAL-1.4-vc71.pdb"
PreprocessorDefinitions="NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;PACKAGE_NAME=CEL;_WINDOWS;WIN32;CS_BUILD_SHARED_LIBS;CEL_BUILD_SHARED_LIBS"
OptimizeForProcessor="1"
AdditionalOptions="/D CS_HAVE_CAL3D "
@@ -122,9 +122,9 @@
EnableCOMDATFolding="2"
GenerateDebugInformation="TRUE"
IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD"
- OutputFile="..\..\nettest_static_plugins_CRYSTAL-1.9-vc71.dll"
+ OutputFile="..\..\nettest_static_plugins_CRYSTAL-1.4-vc71.dll"
ImportLibrary="..\..\out\release71\libs\libnettest_static_plugins_CRYSTAL.lib"
- ProgramDatabaseFile="..\..\out\release71\build\libnettest_static_plugins_CRYSTAL\nettest_static_plugins_CRYSTAL-1.9-vc71.pdb"
+ ProgramDatabaseFile="..\..\out\release71\build\libnettest_static_plugins_CRYSTAL\nettest_static_plugins_CRYSTAL-1.4-vc71.pdb"
AdditionalOptions="libjpeg.lib libpng.lib cal3d-vc71.lib cg.lib cgGL.lib libcrystalspace_windows.lib libcrystalspace_opengl.lib opengl32.lib version.lib libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib "
AdditionalDependencies=""
SuppressStartupBanner="TRUE"
@@ -244,7 +244,7 @@
RuntimeLibrary="3"
- ProgramDatabaseFileName="..\..\out\debug71\build\libnettest_static_plugins_CRYSTAL\nettest_static_plugins_CRYSTAL-1.9-vc71_d.pdb"
+ ProgramDatabaseFileName="..\..\out\debug71\build\libnettest_static_plugins_CRYSTAL\nettest_static_plugins_CRYSTAL-1.4-vc71_d.pdb"
PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;PACKAGE_NAME=CEL;_WINDOWS;WIN32;CS_BUILD_SHARED_LIBS;CEL_BUILD_SHARED_LIBS"
OptimizeForProcessor="1"
AdditionalOptions="/D CS_HAVE_CAL3D "
@@ -265,9 +265,9 @@
LinkIncremental="2"
GenerateDebugInformation="TRUE"
IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD,MSVCRT"
- OutputFile="..\..\nettest_static_plugins_CRYSTAL-1.9-vc71_d.dll"
+ OutputFile="..\..\nettest_static_plugins_CRYSTAL-1.4-vc71_d.dll"
ImportLibrary="..\..\out\debug71\libs\libnettest_static_plugins_CRYSTAL_d.lib"
- ProgramDatabaseFile="..\..\out\debug71\build\libnettest_static_plugins_CRYSTAL\nettest_static_plugins_CRYSTAL-1.9-vc71_d.pdb"
+ ProgramDatabaseFile="..\..\out\debug71\build\libnettest_static_plugins_CRYSTAL\nettest_static_plugins_CRYSTAL-1.4-vc71_d.pdb"
AdditionalOptions="libjpeg.lib libpng.lib cal3d-vc71_d.lib cg.lib cgGL.lib libcrystalspace_windows_d.lib libcrystalspace_opengl_d.lib opengl32.lib version.lib libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib "
AdditionalDependencies=""
SuppressStartupBanner="TRUE"
@@ -313,6 +313,13 @@
RelativePath="..\..\msvc\appnettest_static_staticuse_CRYSTAL.cpp">
+
+
+
+
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/71/libnettest_static_plugins.vcproj /tmp/IB0bHXT4Oc/cel-1.4/msvc/71/libnettest_static_plugins.vcproj
--- cel-1.9+svn3615/msvc/71/libnettest_static_plugins.vcproj 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/msvc/71/libnettest_static_plugins.vcproj 2009-11-28 16:47:21.000000000 +0000
@@ -99,7 +99,7 @@
RuntimeLibrary="2"
DebugInformationFormat="3"
BufferSecurityCheck="FALSE"
- ProgramDatabaseFileName="..\..\out\release71\build\libnettest_static_plugins\nettest_static_plugins-1.9-vc71.pdb"
+ ProgramDatabaseFileName="..\..\out\release71\build\libnettest_static_plugins\nettest_static_plugins-1.4-vc71.pdb"
PreprocessorDefinitions="NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;PACKAGE_NAME=CEL;_WINDOWS;WIN32;CS_BUILD_SHARED_LIBS;CEL_BUILD_SHARED_LIBS"
OptimizeForProcessor="1"
AdditionalOptions=" "
@@ -122,9 +122,9 @@
EnableCOMDATFolding="2"
GenerateDebugInformation="TRUE"
IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD"
- OutputFile="..\..\nettest_static_plugins-1.9-vc71.dll"
+ OutputFile="..\..\nettest_static_plugins-1.4-vc71.dll"
ImportLibrary="..\..\out\release71\libs\libnettest_static_plugins.lib"
- ProgramDatabaseFile="..\..\out\release71\build\libnettest_static_plugins\nettest_static_plugins-1.9-vc71.pdb"
+ ProgramDatabaseFile="..\..\out\release71\build\libnettest_static_plugins\nettest_static_plugins-1.4-vc71.pdb"
AdditionalOptions=" "
AdditionalDependencies="libcrystalspace.lib"
SuppressStartupBanner="TRUE"
@@ -244,7 +244,7 @@
RuntimeLibrary="3"
- ProgramDatabaseFileName="..\..\out\debug71\build\libnettest_static_plugins\nettest_static_plugins-1.9-vc71_d.pdb"
+ ProgramDatabaseFileName="..\..\out\debug71\build\libnettest_static_plugins\nettest_static_plugins-1.4-vc71_d.pdb"
PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;PACKAGE_NAME=CEL;_WINDOWS;WIN32;CS_BUILD_SHARED_LIBS;CEL_BUILD_SHARED_LIBS"
OptimizeForProcessor="1"
AdditionalOptions=" "
@@ -265,9 +265,9 @@
LinkIncremental="2"
GenerateDebugInformation="TRUE"
IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD,MSVCRT"
- OutputFile="..\..\nettest_static_plugins-1.9-vc71_d.dll"
+ OutputFile="..\..\nettest_static_plugins-1.4-vc71_d.dll"
ImportLibrary="..\..\out\debug71\libs\libnettest_static_plugins_d.lib"
- ProgramDatabaseFile="..\..\out\debug71\build\libnettest_static_plugins\nettest_static_plugins-1.9-vc71_d.pdb"
+ ProgramDatabaseFile="..\..\out\debug71\build\libnettest_static_plugins\nettest_static_plugins-1.4-vc71_d.pdb"
AdditionalOptions=" "
AdditionalDependencies="libcrystalspace_d.lib"
SuppressStartupBanner="TRUE"
@@ -313,6 +313,13 @@
RelativePath="..\..\msvc\appnettest_static_staticuse.cpp">
+
+
+
+
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/71/plgaddon_ledges.vcproj /tmp/IB0bHXT4Oc/cel-1.4/msvc/71/plgaddon_ledges.vcproj
--- cel-1.9+svn3615/msvc/71/plgaddon_ledges.vcproj 2008-07-28 04:02:17.000000000 +0100
+++ cel-1.4/msvc/71/plgaddon_ledges.vcproj 1970-01-01 01:00:00.000000000 +0100
@@ -1,345 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/71/plgledges.vcproj /tmp/IB0bHXT4Oc/cel-1.4/msvc/71/plgledges.vcproj
--- cel-1.9+svn3615/msvc/71/plgledges.vcproj 2008-07-28 04:02:17.000000000 +0100
+++ cel-1.4/msvc/71/plgledges.vcproj 1970-01-01 01:00:00.000000000 +0100
@@ -1,345 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/71/plgpfactoranalog.vcproj /tmp/IB0bHXT4Oc/cel-1.4/msvc/71/plgpfactoranalog.vcproj
--- cel-1.9+svn3615/msvc/71/plgpfactoranalog.vcproj 1970-01-01 01:00:00.000000000 +0100
+++ cel-1.4/msvc/71/plgpfactoranalog.vcproj 2009-11-28 16:47:20.000000000 +0000
@@ -0,0 +1,345 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/71/plgpfanalogmotion.vcproj /tmp/IB0bHXT4Oc/cel-1.4/msvc/71/plgpfanalogmotion.vcproj
--- cel-1.9+svn3615/msvc/71/plgpfanalogmotion.vcproj 2008-06-23 04:02:10.000000000 +0100
+++ cel-1.4/msvc/71/plgpfanalogmotion.vcproj 1970-01-01 01:00:00.000000000 +0100
@@ -1,345 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/71/plgpfgrab.vcproj /tmp/IB0bHXT4Oc/cel-1.4/msvc/71/plgpfgrab.vcproj
--- cel-1.9+svn3615/msvc/71/plgpfgrab.vcproj 2008-07-04 04:04:39.000000000 +0100
+++ cel-1.4/msvc/71/plgpfgrab.vcproj 1970-01-01 01:00:00.000000000 +0100
@@ -1,345 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/71/plgpfjump.vcproj /tmp/IB0bHXT4Oc/cel-1.4/msvc/71/plgpfjump.vcproj
--- cel-1.9+svn3615/msvc/71/plgpfjump.vcproj 2008-06-23 04:02:10.000000000 +0100
+++ cel-1.4/msvc/71/plgpfjump.vcproj 1970-01-01 01:00:00.000000000 +0100
@@ -1,345 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/71/wkscel.sln /tmp/IB0bHXT4Oc/cel-1.4/msvc/71/wkscel.sln
--- cel-1.9+svn3615/msvc/71/wkscel.sln 2008-07-28 04:02:17.000000000 +0100
+++ cel-1.4/msvc/71/wkscel.sln 2009-11-28 16:47:21.000000000 +0000
@@ -36,8 +36,6 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plgaddon_celgraph", "plgaddon_celgraph.vcproj", "{504CB6C0-4303-C53C-C345-AA750CD1A59D}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plgaddon_ledges", "plgaddon_ledges.vcproj", "{88DF53AC-1338-547B-6989-1C8B78DE542B}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plgaddon_questdef", "plgaddon_questdef.vcproj", "{D55BE37F-A3CE-2CF1-7474-6961CF055BC0}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plgaddon_ruledef", "plgaddon_ruledef.vcproj", "{A8B80D52-CD56-437D-0DF3-3798C9279FE4}"
@@ -54,15 +52,13 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plgcpersist", "plgcpersist.vcproj", "{403E853A-59C3-FBA1-AF01-2BF89B0DA2F7}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plgledges", "plgledges.vcproj", "{58918459-7FD8-C582-569D-A58038ABE9D1}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plgmgr_billboard", "plgmgr_billboard.vcproj", "{32B86666-15E0-F234-58EC-50D3CC10AD59}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plgmgr_quests", "plgmgr_quests.vcproj", "{96C3E65A-7CC9-961B-0681-395F51BC9CE2}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plgpfactormove", "plgpfactormove.vcproj", "{8EBBE255-F364-3793-8E84-4ACE0FB487A1}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plgpfactoranalog", "plgpfactoranalog.vcproj", "{26C0690C-CDA5-5C37-87AC-D0C18C4F7064}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plgpfanalogmotion", "plgpfanalogmotion.vcproj", "{EF50101E-0BAC-395C-42F9-378D37DA03CE}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plgpfactormove", "plgpfactormove.vcproj", "{8EBBE255-F364-3793-8E84-4ACE0FB487A1}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plgpfbillboard", "plgpfbillboard.vcproj", "{8E2C61D0-0DDE-9AC3-AB7E-8EE3B4EE09D4}"
EndProject
@@ -76,16 +72,12 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plgpfevolve", "plgpfevolve.vcproj", "{73CFB4EB-077E-9A27-E4D4-145EA219E262}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plgpfgrab", "plgpfgrab.vcproj", "{98DD5582-CDDE-F076-F9C8-D6603B15A78E}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plgpfhover", "plgpfhover.vcproj", "{47A9A513-F45E-728E-D930-72B622AE538C}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plgpfinput", "plgpfinput.vcproj", "{5281C5BB-2394-E384-DEDF-73F9F661705D}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plgpfinv", "plgpfinv.vcproj", "{CB5A4EF1-E092-959D-EFD1-E0442F3119F1}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plgpfjump", "plgpfjump.vcproj", "{4F4A2447-5243-2EF5-BE00-701BB9473BA1}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plgpflight", "plgpflight.vcproj", "{23D61ADF-182D-DD0F-43F2-2E474EE1FB00}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plgpfmechanics", "plgpfmechanics.vcproj", "{89822485-8A94-469B-7CA5-A2839C03D271}"
@@ -168,56 +160,52 @@
{36C62D61-808A-D8D0-D561-3EE6C506C350}.11 = {3EF52631-4486-D72B-BB17-DB8FCF36DDBA}
{36C62D61-808A-D8D0-D561-3EE6C506C350}.12 = {EEC493BE-2745-954F-FA24-45447359FCDC}
{36C62D61-808A-D8D0-D561-3EE6C506C350}.13 = {504CB6C0-4303-C53C-C345-AA750CD1A59D}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.14 = {88DF53AC-1338-547B-6989-1C8B78DE542B}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.15 = {D55BE37F-A3CE-2CF1-7474-6961CF055BC0}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.16 = {A8B80D52-CD56-437D-0DF3-3798C9279FE4}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.17 = {BA7BEDE4-D74D-62E9-2A70-F3E2461698BB}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.18 = {E15D3136-619B-861B-D8FF-561A1F846B6C}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.19 = {D4C2A921-6257-1D72-592F-450E19AA3E20}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.20 = {98B5AC91-D6B1-1C99-9FEC-D1EEA525ED3B}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.21 = {8BBC74D9-616A-F075-D8FC-8B101A6C5730}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.22 = {403E853A-59C3-FBA1-AF01-2BF89B0DA2F7}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.23 = {58918459-7FD8-C582-569D-A58038ABE9D1}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.24 = {32B86666-15E0-F234-58EC-50D3CC10AD59}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.25 = {96C3E65A-7CC9-961B-0681-395F51BC9CE2}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.26 = {8EBBE255-F364-3793-8E84-4ACE0FB487A1}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.27 = {EF50101E-0BAC-395C-42F9-378D37DA03CE}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.28 = {8E2C61D0-0DDE-9AC3-AB7E-8EE3B4EE09D4}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.29 = {26CDBAC0-9A46-F31F-B6F7-A729CF22B97D}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.30 = {10B1A9B3-DB3C-98CB-62C9-DB10F9F43396}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.31 = {0E134A9B-0448-2CD4-954B-9F3ECBD81534}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.32 = {F523A3D9-0D90-E985-CA29-10E441393BAE}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.33 = {73CFB4EB-077E-9A27-E4D4-145EA219E262}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.34 = {98DD5582-CDDE-F076-F9C8-D6603B15A78E}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.35 = {47A9A513-F45E-728E-D930-72B622AE538C}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.36 = {5281C5BB-2394-E384-DEDF-73F9F661705D}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.37 = {CB5A4EF1-E092-959D-EFD1-E0442F3119F1}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.38 = {4F4A2447-5243-2EF5-BE00-701BB9473BA1}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.39 = {23D61ADF-182D-DD0F-43F2-2E474EE1FB00}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.40 = {89822485-8A94-469B-7CA5-A2839C03D271}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.41 = {7577CC57-FF93-6E33-EC99-846E898BED29}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.42 = {754F06CF-F576-93C5-BE95-3EC4998D9E20}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.43 = {E167BD33-4E68-2BB7-C568-09FC289A2E9A}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.44 = {6AE42D83-4035-6C15-089B-D65BCF171A11}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.45 = {D7782591-5481-74E6-62CC-265E30D63A91}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.46 = {097814E8-8395-28B7-6CCF-374BA0D10503}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.47 = {4AA16ABE-76D3-AB92-ED64-43A057F4E5D0}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.48 = {E4F5830C-8CAF-CBC0-C5E5-B189CECF556A}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.49 = {F50BC0A1-DB47-BA5A-5C9A-A12E1C81241D}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.50 = {3AB21594-2130-A5AE-9E11-272637C9F9B6}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.51 = {D3852DD2-8840-44C9-AA7A-469FA8445DF3}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.52 = {967105F5-9828-18D8-0AB3-AB33A96DF792}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.53 = {E91FEE10-2BA4-53FC-07FA-0A5B3649595F}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.54 = {7453777E-C823-EFB7-31C1-FDF756EBAEBC}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.55 = {6452026D-0C54-4DCD-DA11-047FAC2224D7}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.56 = {058AAD6E-A940-FA17-F583-B3676E4DAC6C}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.57 = {83E8AB22-CED2-2646-3A5A-73EA46D8959F}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.58 = {7819CFB4-1D16-C2CA-3B58-319C41E552DF}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.59 = {99CE9F68-96D7-1FAF-65BF-DEEF6E5085B8}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.60 = {9B942FB3-91A0-9E4F-1514-1286B4872502}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.61 = {E1C134D4-C658-E321-DBBE-7D11200B882E}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.62 = {66C683AA-084B-50DD-3B04-ED38799342BA}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.63 = {274174A0-7101-29E3-D06A-6C0B009A3DDD}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.14 = {D55BE37F-A3CE-2CF1-7474-6961CF055BC0}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.15 = {A8B80D52-CD56-437D-0DF3-3798C9279FE4}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.16 = {BA7BEDE4-D74D-62E9-2A70-F3E2461698BB}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.17 = {E15D3136-619B-861B-D8FF-561A1F846B6C}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.18 = {D4C2A921-6257-1D72-592F-450E19AA3E20}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.19 = {98B5AC91-D6B1-1C99-9FEC-D1EEA525ED3B}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.20 = {8BBC74D9-616A-F075-D8FC-8B101A6C5730}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.21 = {403E853A-59C3-FBA1-AF01-2BF89B0DA2F7}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.22 = {32B86666-15E0-F234-58EC-50D3CC10AD59}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.23 = {96C3E65A-7CC9-961B-0681-395F51BC9CE2}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.24 = {26C0690C-CDA5-5C37-87AC-D0C18C4F7064}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.25 = {8EBBE255-F364-3793-8E84-4ACE0FB487A1}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.26 = {8E2C61D0-0DDE-9AC3-AB7E-8EE3B4EE09D4}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.27 = {26CDBAC0-9A46-F31F-B6F7-A729CF22B97D}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.28 = {10B1A9B3-DB3C-98CB-62C9-DB10F9F43396}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.29 = {0E134A9B-0448-2CD4-954B-9F3ECBD81534}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.30 = {F523A3D9-0D90-E985-CA29-10E441393BAE}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.31 = {73CFB4EB-077E-9A27-E4D4-145EA219E262}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.32 = {47A9A513-F45E-728E-D930-72B622AE538C}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.33 = {5281C5BB-2394-E384-DEDF-73F9F661705D}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.34 = {CB5A4EF1-E092-959D-EFD1-E0442F3119F1}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.35 = {23D61ADF-182D-DD0F-43F2-2E474EE1FB00}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.36 = {89822485-8A94-469B-7CA5-A2839C03D271}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.37 = {7577CC57-FF93-6E33-EC99-846E898BED29}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.38 = {754F06CF-F576-93C5-BE95-3EC4998D9E20}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.39 = {E167BD33-4E68-2BB7-C568-09FC289A2E9A}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.40 = {6AE42D83-4035-6C15-089B-D65BCF171A11}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.41 = {D7782591-5481-74E6-62CC-265E30D63A91}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.42 = {097814E8-8395-28B7-6CCF-374BA0D10503}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.43 = {4AA16ABE-76D3-AB92-ED64-43A057F4E5D0}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.44 = {E4F5830C-8CAF-CBC0-C5E5-B189CECF556A}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.45 = {F50BC0A1-DB47-BA5A-5C9A-A12E1C81241D}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.46 = {3AB21594-2130-A5AE-9E11-272637C9F9B6}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.47 = {D3852DD2-8840-44C9-AA7A-469FA8445DF3}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.48 = {967105F5-9828-18D8-0AB3-AB33A96DF792}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.49 = {E91FEE10-2BA4-53FC-07FA-0A5B3649595F}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.50 = {7453777E-C823-EFB7-31C1-FDF756EBAEBC}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.51 = {6452026D-0C54-4DCD-DA11-047FAC2224D7}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.52 = {058AAD6E-A940-FA17-F583-B3676E4DAC6C}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.53 = {83E8AB22-CED2-2646-3A5A-73EA46D8959F}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.54 = {7819CFB4-1D16-C2CA-3B58-319C41E552DF}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.55 = {99CE9F68-96D7-1FAF-65BF-DEEF6E5085B8}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.56 = {9B942FB3-91A0-9E4F-1514-1286B4872502}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.57 = {E1C134D4-C658-E321-DBBE-7D11200B882E}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.58 = {66C683AA-084B-50DD-3B04-ED38799342BA}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.59 = {274174A0-7101-29E3-D06A-6C0B009A3DDD}
{E2ECEB01-C66F-C40A-F57D-14B5700CED7A}.0 = {FF4C7AD7-84CA-8A2F-7EBF-2B1FA775848F}
{E2ECEB01-C66F-C40A-F57D-14B5700CED7A}.1 = {AE89B23E-625D-8AD6-F293-EA999B1F3026}
{E2ECEB01-C66F-C40A-F57D-14B5700CED7A}.2 = {E7FA7509-300D-FB19-912A-61D2694C9BD0}
@@ -232,76 +220,69 @@
{866C2A26-400D-A8C9-8F7B-B780A879B604}.0 = {3EF52631-4486-D72B-BB17-DB8FCF36DDBA}
{866C2A26-400D-A8C9-8F7B-B780A879B604}.1 = {EEC493BE-2745-954F-FA24-45447359FCDC}
{866C2A26-400D-A8C9-8F7B-B780A879B604}.2 = {504CB6C0-4303-C53C-C345-AA750CD1A59D}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.3 = {88DF53AC-1338-547B-6989-1C8B78DE542B}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.4 = {D55BE37F-A3CE-2CF1-7474-6961CF055BC0}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.5 = {A8B80D52-CD56-437D-0DF3-3798C9279FE4}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.6 = {BA7BEDE4-D74D-62E9-2A70-F3E2461698BB}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.7 = {E15D3136-619B-861B-D8FF-561A1F846B6C}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.8 = {D4C2A921-6257-1D72-592F-450E19AA3E20}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.9 = {98B5AC91-D6B1-1C99-9FEC-D1EEA525ED3B}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.10 = {8BBC74D9-616A-F075-D8FC-8B101A6C5730}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.11 = {403E853A-59C3-FBA1-AF01-2BF89B0DA2F7}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.12 = {58918459-7FD8-C582-569D-A58038ABE9D1}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.13 = {32B86666-15E0-F234-58EC-50D3CC10AD59}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.14 = {96C3E65A-7CC9-961B-0681-395F51BC9CE2}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.15 = {8EBBE255-F364-3793-8E84-4ACE0FB487A1}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.16 = {EF50101E-0BAC-395C-42F9-378D37DA03CE}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.17 = {8E2C61D0-0DDE-9AC3-AB7E-8EE3B4EE09D4}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.18 = {26CDBAC0-9A46-F31F-B6F7-A729CF22B97D}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.19 = {10B1A9B3-DB3C-98CB-62C9-DB10F9F43396}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.20 = {0E134A9B-0448-2CD4-954B-9F3ECBD81534}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.21 = {F523A3D9-0D90-E985-CA29-10E441393BAE}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.22 = {73CFB4EB-077E-9A27-E4D4-145EA219E262}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.23 = {98DD5582-CDDE-F076-F9C8-D6603B15A78E}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.24 = {47A9A513-F45E-728E-D930-72B622AE538C}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.25 = {5281C5BB-2394-E384-DEDF-73F9F661705D}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.26 = {CB5A4EF1-E092-959D-EFD1-E0442F3119F1}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.27 = {4F4A2447-5243-2EF5-BE00-701BB9473BA1}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.28 = {23D61ADF-182D-DD0F-43F2-2E474EE1FB00}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.29 = {89822485-8A94-469B-7CA5-A2839C03D271}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.30 = {7577CC57-FF93-6E33-EC99-846E898BED29}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.31 = {754F06CF-F576-93C5-BE95-3EC4998D9E20}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.32 = {E167BD33-4E68-2BB7-C568-09FC289A2E9A}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.33 = {6AE42D83-4035-6C15-089B-D65BCF171A11}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.34 = {D7782591-5481-74E6-62CC-265E30D63A91}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.35 = {097814E8-8395-28B7-6CCF-374BA0D10503}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.36 = {4AA16ABE-76D3-AB92-ED64-43A057F4E5D0}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.37 = {E4F5830C-8CAF-CBC0-C5E5-B189CECF556A}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.38 = {F50BC0A1-DB47-BA5A-5C9A-A12E1C81241D}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.39 = {3AB21594-2130-A5AE-9E11-272637C9F9B6}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.40 = {D3852DD2-8840-44C9-AA7A-469FA8445DF3}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.41 = {967105F5-9828-18D8-0AB3-AB33A96DF792}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.42 = {E91FEE10-2BA4-53FC-07FA-0A5B3649595F}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.43 = {7453777E-C823-EFB7-31C1-FDF756EBAEBC}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.44 = {6452026D-0C54-4DCD-DA11-047FAC2224D7}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.45 = {058AAD6E-A940-FA17-F583-B3676E4DAC6C}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.46 = {83E8AB22-CED2-2646-3A5A-73EA46D8959F}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.47 = {7819CFB4-1D16-C2CA-3B58-319C41E552DF}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.48 = {99CE9F68-96D7-1FAF-65BF-DEEF6E5085B8}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.49 = {9B942FB3-91A0-9E4F-1514-1286B4872502}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.50 = {E1C134D4-C658-E321-DBBE-7D11200B882E}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.51 = {66C683AA-084B-50DD-3B04-ED38799342BA}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.52 = {274174A0-7101-29E3-D06A-6C0B009A3DDD}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.3 = {D55BE37F-A3CE-2CF1-7474-6961CF055BC0}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.4 = {A8B80D52-CD56-437D-0DF3-3798C9279FE4}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.5 = {BA7BEDE4-D74D-62E9-2A70-F3E2461698BB}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.6 = {E15D3136-619B-861B-D8FF-561A1F846B6C}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.7 = {D4C2A921-6257-1D72-592F-450E19AA3E20}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.8 = {98B5AC91-D6B1-1C99-9FEC-D1EEA525ED3B}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.9 = {8BBC74D9-616A-F075-D8FC-8B101A6C5730}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.10 = {403E853A-59C3-FBA1-AF01-2BF89B0DA2F7}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.11 = {32B86666-15E0-F234-58EC-50D3CC10AD59}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.12 = {96C3E65A-7CC9-961B-0681-395F51BC9CE2}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.13 = {26C0690C-CDA5-5C37-87AC-D0C18C4F7064}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.14 = {8EBBE255-F364-3793-8E84-4ACE0FB487A1}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.15 = {8E2C61D0-0DDE-9AC3-AB7E-8EE3B4EE09D4}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.16 = {26CDBAC0-9A46-F31F-B6F7-A729CF22B97D}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.17 = {10B1A9B3-DB3C-98CB-62C9-DB10F9F43396}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.18 = {0E134A9B-0448-2CD4-954B-9F3ECBD81534}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.19 = {F523A3D9-0D90-E985-CA29-10E441393BAE}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.20 = {73CFB4EB-077E-9A27-E4D4-145EA219E262}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.21 = {47A9A513-F45E-728E-D930-72B622AE538C}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.22 = {5281C5BB-2394-E384-DEDF-73F9F661705D}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.23 = {CB5A4EF1-E092-959D-EFD1-E0442F3119F1}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.24 = {23D61ADF-182D-DD0F-43F2-2E474EE1FB00}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.25 = {89822485-8A94-469B-7CA5-A2839C03D271}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.26 = {7577CC57-FF93-6E33-EC99-846E898BED29}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.27 = {754F06CF-F576-93C5-BE95-3EC4998D9E20}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.28 = {E167BD33-4E68-2BB7-C568-09FC289A2E9A}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.29 = {6AE42D83-4035-6C15-089B-D65BCF171A11}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.30 = {D7782591-5481-74E6-62CC-265E30D63A91}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.31 = {097814E8-8395-28B7-6CCF-374BA0D10503}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.32 = {4AA16ABE-76D3-AB92-ED64-43A057F4E5D0}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.33 = {E4F5830C-8CAF-CBC0-C5E5-B189CECF556A}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.34 = {F50BC0A1-DB47-BA5A-5C9A-A12E1C81241D}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.35 = {3AB21594-2130-A5AE-9E11-272637C9F9B6}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.36 = {D3852DD2-8840-44C9-AA7A-469FA8445DF3}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.37 = {967105F5-9828-18D8-0AB3-AB33A96DF792}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.38 = {E91FEE10-2BA4-53FC-07FA-0A5B3649595F}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.39 = {7453777E-C823-EFB7-31C1-FDF756EBAEBC}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.40 = {6452026D-0C54-4DCD-DA11-047FAC2224D7}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.41 = {058AAD6E-A940-FA17-F583-B3676E4DAC6C}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.42 = {83E8AB22-CED2-2646-3A5A-73EA46D8959F}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.43 = {7819CFB4-1D16-C2CA-3B58-319C41E552DF}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.44 = {99CE9F68-96D7-1FAF-65BF-DEEF6E5085B8}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.45 = {9B942FB3-91A0-9E4F-1514-1286B4872502}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.46 = {E1C134D4-C658-E321-DBBE-7D11200B882E}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.47 = {66C683AA-084B-50DD-3B04-ED38799342BA}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.48 = {274174A0-7101-29E3-D06A-6C0B009A3DDD}
{3EF52631-4486-D72B-BB17-DB8FCF36DDBA}.0 = {FE8C31C7-8C7C-B982-16AE-C6CA39940D52}
{EEC493BE-2745-954F-FA24-45447359FCDC}.0 = {FE8C31C7-8C7C-B982-16AE-C6CA39940D52}
{504CB6C0-4303-C53C-C345-AA750CD1A59D}.0 = {FE8C31C7-8C7C-B982-16AE-C6CA39940D52}
- {88DF53AC-1338-547B-6989-1C8B78DE542B}.0 = {FE8C31C7-8C7C-B982-16AE-C6CA39940D52}
{D55BE37F-A3CE-2CF1-7474-6961CF055BC0}.0 = {FE8C31C7-8C7C-B982-16AE-C6CA39940D52}
{D4C2A921-6257-1D72-592F-450E19AA3E20}.0 = {FE8C31C7-8C7C-B982-16AE-C6CA39940D52}
{96C3E65A-7CC9-961B-0681-395F51BC9CE2}.0 = {FE8C31C7-8C7C-B982-16AE-C6CA39940D52}
+ {26C0690C-CDA5-5C37-87AC-D0C18C4F7064}.0 = {FE8C31C7-8C7C-B982-16AE-C6CA39940D52}
{8EBBE255-F364-3793-8E84-4ACE0FB487A1}.0 = {FE8C31C7-8C7C-B982-16AE-C6CA39940D52}
- {EF50101E-0BAC-395C-42F9-378D37DA03CE}.0 = {FE8C31C7-8C7C-B982-16AE-C6CA39940D52}
{8E2C61D0-0DDE-9AC3-AB7E-8EE3B4EE09D4}.0 = {FE8C31C7-8C7C-B982-16AE-C6CA39940D52}
{26CDBAC0-9A46-F31F-B6F7-A729CF22B97D}.0 = {FE8C31C7-8C7C-B982-16AE-C6CA39940D52}
{10B1A9B3-DB3C-98CB-62C9-DB10F9F43396}.0 = {FE8C31C7-8C7C-B982-16AE-C6CA39940D52}
{0E134A9B-0448-2CD4-954B-9F3ECBD81534}.0 = {FE8C31C7-8C7C-B982-16AE-C6CA39940D52}
{F523A3D9-0D90-E985-CA29-10E441393BAE}.0 = {FE8C31C7-8C7C-B982-16AE-C6CA39940D52}
{73CFB4EB-077E-9A27-E4D4-145EA219E262}.0 = {FE8C31C7-8C7C-B982-16AE-C6CA39940D52}
- {98DD5582-CDDE-F076-F9C8-D6603B15A78E}.0 = {FE8C31C7-8C7C-B982-16AE-C6CA39940D52}
{47A9A513-F45E-728E-D930-72B622AE538C}.0 = {FE8C31C7-8C7C-B982-16AE-C6CA39940D52}
{5281C5BB-2394-E384-DEDF-73F9F661705D}.0 = {FE8C31C7-8C7C-B982-16AE-C6CA39940D52}
{CB5A4EF1-E092-959D-EFD1-E0442F3119F1}.0 = {FE8C31C7-8C7C-B982-16AE-C6CA39940D52}
- {4F4A2447-5243-2EF5-BE00-701BB9473BA1}.0 = {FE8C31C7-8C7C-B982-16AE-C6CA39940D52}
{23D61ADF-182D-DD0F-43F2-2E474EE1FB00}.0 = {FE8C31C7-8C7C-B982-16AE-C6CA39940D52}
{89822485-8A94-469B-7CA5-A2839C03D271}.0 = {FE8C31C7-8C7C-B982-16AE-C6CA39940D52}
{7577CC57-FF93-6E33-EC99-846E898BED29}.0 = {FE8C31C7-8C7C-B982-16AE-C6CA39940D52}
@@ -471,14 +452,6 @@
{504CB6C0-4303-C53C-C345-AA750CD1A59D}.Debug (with static libs).Build.0 = Debug (with static libs)|Win32
{504CB6C0-4303-C53C-C345-AA750CD1A59D}.Debug (with DLLs).ActiveCfg = Debug (with DLLs)|Win32
{504CB6C0-4303-C53C-C345-AA750CD1A59D}.Debug (with DLLs).Build.0 = Debug (with DLLs)|Win32
- {88DF53AC-1338-547B-6989-1C8B78DE542B}.Release (with static libs).ActiveCfg = Release (with static libs)|Win32
- {88DF53AC-1338-547B-6989-1C8B78DE542B}.Release (with static libs).Build.0 = Release (with static libs)|Win32
- {88DF53AC-1338-547B-6989-1C8B78DE542B}.Release (with DLLs).ActiveCfg = Release (with DLLs)|Win32
- {88DF53AC-1338-547B-6989-1C8B78DE542B}.Release (with DLLs).Build.0 = Release (with DLLs)|Win32
- {88DF53AC-1338-547B-6989-1C8B78DE542B}.Debug (with static libs).ActiveCfg = Debug (with static libs)|Win32
- {88DF53AC-1338-547B-6989-1C8B78DE542B}.Debug (with static libs).Build.0 = Debug (with static libs)|Win32
- {88DF53AC-1338-547B-6989-1C8B78DE542B}.Debug (with DLLs).ActiveCfg = Debug (with DLLs)|Win32
- {88DF53AC-1338-547B-6989-1C8B78DE542B}.Debug (with DLLs).Build.0 = Debug (with DLLs)|Win32
{D55BE37F-A3CE-2CF1-7474-6961CF055BC0}.Release (with static libs).ActiveCfg = Release (with static libs)|Win32
{D55BE37F-A3CE-2CF1-7474-6961CF055BC0}.Release (with static libs).Build.0 = Release (with static libs)|Win32
{D55BE37F-A3CE-2CF1-7474-6961CF055BC0}.Release (with DLLs).ActiveCfg = Release (with DLLs)|Win32
@@ -543,14 +516,6 @@
{403E853A-59C3-FBA1-AF01-2BF89B0DA2F7}.Debug (with static libs).Build.0 = Debug (with static libs)|Win32
{403E853A-59C3-FBA1-AF01-2BF89B0DA2F7}.Debug (with DLLs).ActiveCfg = Debug (with DLLs)|Win32
{403E853A-59C3-FBA1-AF01-2BF89B0DA2F7}.Debug (with DLLs).Build.0 = Debug (with DLLs)|Win32
- {58918459-7FD8-C582-569D-A58038ABE9D1}.Release (with static libs).ActiveCfg = Release (with static libs)|Win32
- {58918459-7FD8-C582-569D-A58038ABE9D1}.Release (with static libs).Build.0 = Release (with static libs)|Win32
- {58918459-7FD8-C582-569D-A58038ABE9D1}.Release (with DLLs).ActiveCfg = Release (with DLLs)|Win32
- {58918459-7FD8-C582-569D-A58038ABE9D1}.Release (with DLLs).Build.0 = Release (with DLLs)|Win32
- {58918459-7FD8-C582-569D-A58038ABE9D1}.Debug (with static libs).ActiveCfg = Debug (with static libs)|Win32
- {58918459-7FD8-C582-569D-A58038ABE9D1}.Debug (with static libs).Build.0 = Debug (with static libs)|Win32
- {58918459-7FD8-C582-569D-A58038ABE9D1}.Debug (with DLLs).ActiveCfg = Debug (with DLLs)|Win32
- {58918459-7FD8-C582-569D-A58038ABE9D1}.Debug (with DLLs).Build.0 = Debug (with DLLs)|Win32
{32B86666-15E0-F234-58EC-50D3CC10AD59}.Release (with static libs).ActiveCfg = Release (with static libs)|Win32
{32B86666-15E0-F234-58EC-50D3CC10AD59}.Release (with static libs).Build.0 = Release (with static libs)|Win32
{32B86666-15E0-F234-58EC-50D3CC10AD59}.Release (with DLLs).ActiveCfg = Release (with DLLs)|Win32
@@ -567,6 +532,14 @@
{96C3E65A-7CC9-961B-0681-395F51BC9CE2}.Debug (with static libs).Build.0 = Debug (with static libs)|Win32
{96C3E65A-7CC9-961B-0681-395F51BC9CE2}.Debug (with DLLs).ActiveCfg = Debug (with DLLs)|Win32
{96C3E65A-7CC9-961B-0681-395F51BC9CE2}.Debug (with DLLs).Build.0 = Debug (with DLLs)|Win32
+ {26C0690C-CDA5-5C37-87AC-D0C18C4F7064}.Release (with static libs).ActiveCfg = Release (with static libs)|Win32
+ {26C0690C-CDA5-5C37-87AC-D0C18C4F7064}.Release (with static libs).Build.0 = Release (with static libs)|Win32
+ {26C0690C-CDA5-5C37-87AC-D0C18C4F7064}.Release (with DLLs).ActiveCfg = Release (with DLLs)|Win32
+ {26C0690C-CDA5-5C37-87AC-D0C18C4F7064}.Release (with DLLs).Build.0 = Release (with DLLs)|Win32
+ {26C0690C-CDA5-5C37-87AC-D0C18C4F7064}.Debug (with static libs).ActiveCfg = Debug (with static libs)|Win32
+ {26C0690C-CDA5-5C37-87AC-D0C18C4F7064}.Debug (with static libs).Build.0 = Debug (with static libs)|Win32
+ {26C0690C-CDA5-5C37-87AC-D0C18C4F7064}.Debug (with DLLs).ActiveCfg = Debug (with DLLs)|Win32
+ {26C0690C-CDA5-5C37-87AC-D0C18C4F7064}.Debug (with DLLs).Build.0 = Debug (with DLLs)|Win32
{8EBBE255-F364-3793-8E84-4ACE0FB487A1}.Release (with static libs).ActiveCfg = Release (with static libs)|Win32
{8EBBE255-F364-3793-8E84-4ACE0FB487A1}.Release (with static libs).Build.0 = Release (with static libs)|Win32
{8EBBE255-F364-3793-8E84-4ACE0FB487A1}.Release (with DLLs).ActiveCfg = Release (with DLLs)|Win32
@@ -575,14 +548,6 @@
{8EBBE255-F364-3793-8E84-4ACE0FB487A1}.Debug (with static libs).Build.0 = Debug (with static libs)|Win32
{8EBBE255-F364-3793-8E84-4ACE0FB487A1}.Debug (with DLLs).ActiveCfg = Debug (with DLLs)|Win32
{8EBBE255-F364-3793-8E84-4ACE0FB487A1}.Debug (with DLLs).Build.0 = Debug (with DLLs)|Win32
- {EF50101E-0BAC-395C-42F9-378D37DA03CE}.Release (with static libs).ActiveCfg = Release (with static libs)|Win32
- {EF50101E-0BAC-395C-42F9-378D37DA03CE}.Release (with static libs).Build.0 = Release (with static libs)|Win32
- {EF50101E-0BAC-395C-42F9-378D37DA03CE}.Release (with DLLs).ActiveCfg = Release (with DLLs)|Win32
- {EF50101E-0BAC-395C-42F9-378D37DA03CE}.Release (with DLLs).Build.0 = Release (with DLLs)|Win32
- {EF50101E-0BAC-395C-42F9-378D37DA03CE}.Debug (with static libs).ActiveCfg = Debug (with static libs)|Win32
- {EF50101E-0BAC-395C-42F9-378D37DA03CE}.Debug (with static libs).Build.0 = Debug (with static libs)|Win32
- {EF50101E-0BAC-395C-42F9-378D37DA03CE}.Debug (with DLLs).ActiveCfg = Debug (with DLLs)|Win32
- {EF50101E-0BAC-395C-42F9-378D37DA03CE}.Debug (with DLLs).Build.0 = Debug (with DLLs)|Win32
{8E2C61D0-0DDE-9AC3-AB7E-8EE3B4EE09D4}.Release (with static libs).ActiveCfg = Release (with static libs)|Win32
{8E2C61D0-0DDE-9AC3-AB7E-8EE3B4EE09D4}.Release (with static libs).Build.0 = Release (with static libs)|Win32
{8E2C61D0-0DDE-9AC3-AB7E-8EE3B4EE09D4}.Release (with DLLs).ActiveCfg = Release (with DLLs)|Win32
@@ -631,14 +596,6 @@
{73CFB4EB-077E-9A27-E4D4-145EA219E262}.Debug (with static libs).Build.0 = Debug (with static libs)|Win32
{73CFB4EB-077E-9A27-E4D4-145EA219E262}.Debug (with DLLs).ActiveCfg = Debug (with DLLs)|Win32
{73CFB4EB-077E-9A27-E4D4-145EA219E262}.Debug (with DLLs).Build.0 = Debug (with DLLs)|Win32
- {98DD5582-CDDE-F076-F9C8-D6603B15A78E}.Release (with static libs).ActiveCfg = Release (with static libs)|Win32
- {98DD5582-CDDE-F076-F9C8-D6603B15A78E}.Release (with static libs).Build.0 = Release (with static libs)|Win32
- {98DD5582-CDDE-F076-F9C8-D6603B15A78E}.Release (with DLLs).ActiveCfg = Release (with DLLs)|Win32
- {98DD5582-CDDE-F076-F9C8-D6603B15A78E}.Release (with DLLs).Build.0 = Release (with DLLs)|Win32
- {98DD5582-CDDE-F076-F9C8-D6603B15A78E}.Debug (with static libs).ActiveCfg = Debug (with static libs)|Win32
- {98DD5582-CDDE-F076-F9C8-D6603B15A78E}.Debug (with static libs).Build.0 = Debug (with static libs)|Win32
- {98DD5582-CDDE-F076-F9C8-D6603B15A78E}.Debug (with DLLs).ActiveCfg = Debug (with DLLs)|Win32
- {98DD5582-CDDE-F076-F9C8-D6603B15A78E}.Debug (with DLLs).Build.0 = Debug (with DLLs)|Win32
{47A9A513-F45E-728E-D930-72B622AE538C}.Release (with static libs).ActiveCfg = Release (with static libs)|Win32
{47A9A513-F45E-728E-D930-72B622AE538C}.Release (with static libs).Build.0 = Release (with static libs)|Win32
{47A9A513-F45E-728E-D930-72B622AE538C}.Release (with DLLs).ActiveCfg = Release (with DLLs)|Win32
@@ -663,14 +620,6 @@
{CB5A4EF1-E092-959D-EFD1-E0442F3119F1}.Debug (with static libs).Build.0 = Debug (with static libs)|Win32
{CB5A4EF1-E092-959D-EFD1-E0442F3119F1}.Debug (with DLLs).ActiveCfg = Debug (with DLLs)|Win32
{CB5A4EF1-E092-959D-EFD1-E0442F3119F1}.Debug (with DLLs).Build.0 = Debug (with DLLs)|Win32
- {4F4A2447-5243-2EF5-BE00-701BB9473BA1}.Release (with static libs).ActiveCfg = Release (with static libs)|Win32
- {4F4A2447-5243-2EF5-BE00-701BB9473BA1}.Release (with static libs).Build.0 = Release (with static libs)|Win32
- {4F4A2447-5243-2EF5-BE00-701BB9473BA1}.Release (with DLLs).ActiveCfg = Release (with DLLs)|Win32
- {4F4A2447-5243-2EF5-BE00-701BB9473BA1}.Release (with DLLs).Build.0 = Release (with DLLs)|Win32
- {4F4A2447-5243-2EF5-BE00-701BB9473BA1}.Debug (with static libs).ActiveCfg = Debug (with static libs)|Win32
- {4F4A2447-5243-2EF5-BE00-701BB9473BA1}.Debug (with static libs).Build.0 = Debug (with static libs)|Win32
- {4F4A2447-5243-2EF5-BE00-701BB9473BA1}.Debug (with DLLs).ActiveCfg = Debug (with DLLs)|Win32
- {4F4A2447-5243-2EF5-BE00-701BB9473BA1}.Debug (with DLLs).Build.0 = Debug (with DLLs)|Win32
{23D61ADF-182D-DD0F-43F2-2E474EE1FB00}.Release (with static libs).ActiveCfg = Release (with static libs)|Win32
{23D61ADF-182D-DD0F-43F2-2E474EE1FB00}.Release (with static libs).Build.0 = Release (with static libs)|Win32
{23D61ADF-182D-DD0F-43F2-2E474EE1FB00}.Release (with DLLs).ActiveCfg = Release (with DLLs)|Win32
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/8/appbootstrap_static.vcproj /tmp/IB0bHXT4Oc/cel-1.4/msvc/8/appbootstrap_static.vcproj
--- cel-1.9+svn3615/msvc/8/appbootstrap_static.vcproj 2008-06-26 04:12:22.000000000 +0100
+++ cel-1.4/msvc/8/appbootstrap_static.vcproj 2009-11-28 16:47:23.000000000 +0000
@@ -54,7 +54,7 @@
OutputFile="..\..\bootstrap_static.exe"
ProgramDatabaseFile="..\..\out\release8\build\appbootstrap_static\bootstrap_static.pdb"
SubSystem="2"
- AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib ode.lib libcrystalspace_windows.lib version.lib libcrystalspace_directx.lib dsound.lib ddraw.lib dinput.lib libcrystalspace_opengl.lib cg.lib cgGL.lib opengl32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib "
+ AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib ode.lib libcrystalspace_windows.lib libcrystalspace_opengl.lib version.lib libcrystalspace_directx.lib dsound.lib ddraw.lib dinput.lib cg.lib cgGL.lib opengl32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib "
AdditionalDependencies="libcrystalspace.lib"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\..\CS\out\release8\libs;..\..\..\CS\libs\csutil\win32\libs;$(CRYSTAL)\out\release8\libs;$(CRYSTAL)\libs\csutil\win32\libs"
@@ -130,7 +130,7 @@
OutputFile="..\..\bootstrap_static.exe"
ProgramDatabaseFile="..\..\out\release8\build\appbootstrap_static\bootstrap_static.pdb"
SubSystem="2"
- AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib ode.lib libcrystalspace_windows.lib version.lib libcrystalspace_directx.lib dsound.lib ddraw.lib dinput.lib libcrystalspace_opengl.lib cg.lib cgGL.lib opengl32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib "
+ AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib ode.lib libcrystalspace_windows.lib libcrystalspace_opengl.lib version.lib libcrystalspace_directx.lib dsound.lib ddraw.lib dinput.lib cg.lib cgGL.lib opengl32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib "
AdditionalDependencies="libcrystalspace.lib"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\..\CS\out\release8\libs;..\..\..\CS\libs\csutil\win32\libs;$(CRYSTAL)\out\release8\libs;$(CRYSTAL)\libs\csutil\win32\libs"
@@ -203,7 +203,7 @@
OutputFile="..\..\bootstrap_static.exe"
ProgramDatabaseFile="..\..\out\debug8\build\appbootstrap_static\bootstrap_static.pdb"
SubSystem="1"
- AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib ode.lib libcrystalspace_windows_d.lib version.lib libcrystalspace_directx_d.lib dsound.lib ddraw.lib dinput.lib libcrystalspace_opengl_d.lib cg.lib cgGL.lib opengl32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib "
+ AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib ode.lib libcrystalspace_windows_d.lib libcrystalspace_opengl_d.lib version.lib libcrystalspace_directx_d.lib dsound.lib ddraw.lib dinput.lib cg.lib cgGL.lib opengl32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib "
AdditionalDependencies="libcrystalspace_d.lib"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\..\CS\out\debug8\libs;..\..\..\CS\libs\csutil\win32\libs;$(CRYSTAL)\out\debug8\libs;$(CRYSTAL)\libs\csutil\win32\libs"
@@ -276,7 +276,7 @@
OutputFile="..\..\bootstrap_static.exe"
ProgramDatabaseFile="..\..\out\debug8\build\appbootstrap_static\bootstrap_static.pdb"
SubSystem="1"
- AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib ode.lib libcrystalspace_windows_d.lib version.lib libcrystalspace_directx_d.lib dsound.lib ddraw.lib dinput.lib libcrystalspace_opengl_d.lib cg.lib cgGL.lib opengl32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib "
+ AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib ode.lib libcrystalspace_windows_d.lib libcrystalspace_opengl_d.lib version.lib libcrystalspace_directx_d.lib dsound.lib ddraw.lib dinput.lib cg.lib cgGL.lib opengl32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib "
AdditionalDependencies="libcrystalspace_d.lib"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\..\CS\out\debug8\libs;..\..\..\CS\libs\csutil\win32\libs;$(CRYSTAL)\out\debug8\libs;$(CRYSTAL)\libs\csutil\win32\libs"
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/8/appcelstart_static.vcproj /tmp/IB0bHXT4Oc/cel-1.4/msvc/8/appcelstart_static.vcproj
--- cel-1.9+svn3615/msvc/8/appcelstart_static.vcproj 2008-08-01 04:11:53.000000000 +0100
+++ cel-1.4/msvc/8/appcelstart_static.vcproj 2009-11-28 16:47:23.000000000 +0000
@@ -54,7 +54,7 @@
OutputFile="..\..\celstart_static.exe"
ProgramDatabaseFile="..\..\out\release8\build\appcelstart_static\celstart_static.pdb"
SubSystem="2"
- AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib cal3d-vc8.lib libcrystalspace_windows.lib version.lib libcrystalspace_directx.lib dsound.lib ddraw.lib dinput.lib bulletcollision-vc8.lib bulletdynamics-vc8.lib bulletmath-vc8.lib libcrystalspace_opengl.lib cg.lib cgGL.lib opengl32.lib ode.lib openal32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib "
+ AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib cal3d-vc8.lib libcrystalspace_windows.lib libcrystalspace_opengl.lib version.lib libcrystalspace_directx.lib dsound.lib ddraw.lib dinput.lib bulletcollision-vc8.lib bulletdynamics-vc8.lib bulletmath-vc8.lib CEGUIBase-vc8.lib cg.lib cgGL.lib opengl32.lib ode.lib openal32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib "
AdditionalDependencies="libcrystalspace.lib"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\..\CS\out\release8\libs;..\..\..\CS\libs\csutil\win32\libs;$(CRYSTAL)\out\release8\libs;$(CRYSTAL)\libs\csutil\win32\libs"
@@ -130,7 +130,7 @@
OutputFile="..\..\celstart_static.exe"
ProgramDatabaseFile="..\..\out\release8\build\appcelstart_static\celstart_static.pdb"
SubSystem="2"
- AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib cal3d-vc8.lib libcrystalspace_windows.lib version.lib libcrystalspace_directx.lib dsound.lib ddraw.lib dinput.lib bulletcollision-vc8.lib bulletdynamics-vc8.lib bulletmath-vc8.lib libcrystalspace_opengl.lib cg.lib cgGL.lib opengl32.lib ode.lib openal32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib "
+ AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib cal3d-vc8.lib libcrystalspace_windows.lib libcrystalspace_opengl.lib version.lib libcrystalspace_directx.lib dsound.lib ddraw.lib dinput.lib bulletcollision-vc8.lib bulletdynamics-vc8.lib bulletmath-vc8.lib CEGUIBase-vc8.lib cg.lib cgGL.lib opengl32.lib ode.lib openal32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib "
AdditionalDependencies="libcrystalspace.lib"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\..\CS\out\release8\libs;..\..\..\CS\libs\csutil\win32\libs;$(CRYSTAL)\out\release8\libs;$(CRYSTAL)\libs\csutil\win32\libs"
@@ -203,7 +203,7 @@
OutputFile="..\..\celstart_static.exe"
ProgramDatabaseFile="..\..\out\debug8\build\appcelstart_static\celstart_static.pdb"
SubSystem="1"
- AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib cal3d-vc8_d.lib libcrystalspace_windows_d.lib version.lib libcrystalspace_directx_d.lib dsound.lib ddraw.lib dinput.lib bulletcollision-vc8_d.lib bulletdynamics-vc8_d.lib bulletmath-vc8_d.lib libcrystalspace_opengl_d.lib cg.lib cgGL.lib opengl32.lib ode.lib openal32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib "
+ AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib cal3d-vc8_d.lib libcrystalspace_windows_d.lib libcrystalspace_opengl_d.lib version.lib libcrystalspace_directx_d.lib dsound.lib ddraw.lib dinput.lib bulletcollision-vc8_d.lib bulletdynamics-vc8_d.lib bulletmath-vc8_d.lib CEGUIBase-vc8_d.lib cg.lib cgGL.lib opengl32.lib ode.lib openal32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib "
AdditionalDependencies="libcrystalspace_d.lib"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\..\CS\out\debug8\libs;..\..\..\CS\libs\csutil\win32\libs;$(CRYSTAL)\out\debug8\libs;$(CRYSTAL)\libs\csutil\win32\libs"
@@ -276,7 +276,7 @@
OutputFile="..\..\celstart_static.exe"
ProgramDatabaseFile="..\..\out\debug8\build\appcelstart_static\celstart_static.pdb"
SubSystem="1"
- AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib cal3d-vc8_d.lib libcrystalspace_windows_d.lib version.lib libcrystalspace_directx_d.lib dsound.lib ddraw.lib dinput.lib bulletcollision-vc8_d.lib bulletdynamics-vc8_d.lib bulletmath-vc8_d.lib libcrystalspace_opengl_d.lib cg.lib cgGL.lib opengl32.lib ode.lib openal32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib "
+ AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib cal3d-vc8_d.lib libcrystalspace_windows_d.lib libcrystalspace_opengl_d.lib version.lib libcrystalspace_directx_d.lib dsound.lib ddraw.lib dinput.lib bulletcollision-vc8_d.lib bulletdynamics-vc8_d.lib bulletmath-vc8_d.lib CEGUIBase-vc8_d.lib cg.lib cgGL.lib opengl32.lib ode.lib openal32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib "
AdditionalDependencies="libcrystalspace_d.lib"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\..\CS\out\debug8\libs;..\..\..\CS\libs\csutil\win32\libs;$(CRYSTAL)\out\debug8\libs;$(CRYSTAL)\libs\csutil\win32\libs"
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/8/libbootstrap_static_plugins_CRYSTAL.vcproj /tmp/IB0bHXT4Oc/cel-1.4/msvc/8/libbootstrap_static_plugins_CRYSTAL.vcproj
--- cel-1.9+svn3615/msvc/8/libbootstrap_static_plugins_CRYSTAL.vcproj 2008-06-26 04:12:22.000000000 +0100
+++ cel-1.4/msvc/8/libbootstrap_static_plugins_CRYSTAL.vcproj 2009-11-28 16:47:23.000000000 +0000
@@ -49,7 +49,7 @@
EnableCOMDATFolding="2"
GenerateDebugInformation="TRUE"
IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD"
- AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib ode.lib libcrystalspace_windows.lib version.lib libcrystalspace_directx.lib dsound.lib ddraw.lib dinput.lib libcrystalspace_opengl.lib cg.lib cgGL.lib opengl32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib "
+ AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib ode.lib libcrystalspace_windows.lib libcrystalspace_opengl.lib version.lib libcrystalspace_directx.lib dsound.lib ddraw.lib dinput.lib cg.lib cgGL.lib opengl32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib "
AdditionalDependencies=""
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=""
@@ -99,7 +99,7 @@
RuntimeLibrary="2"
DebugInformationFormat="3"
BufferSecurityCheck="FALSE"
- ProgramDatabaseFileName="..\..\out\release8\build\libbootstrap_static_plugins_CRYSTAL\bootstrap_static_plugins_CRYSTAL-1.9-vc8.pdb"
+ ProgramDatabaseFileName="..\..\out\release8\build\libbootstrap_static_plugins_CRYSTAL\bootstrap_static_plugins_CRYSTAL-1.4-vc8.pdb"
PreprocessorDefinitions="NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;PACKAGE_NAME=CEL;_WINDOWS;WIN32;CS_BUILD_SHARED_LIBS;CEL_BUILD_SHARED_LIBS"
OptimizeForProcessor="1"
AdditionalOptions=" "
@@ -122,10 +122,10 @@
EnableCOMDATFolding="2"
GenerateDebugInformation="TRUE"
IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD"
- OutputFile="..\..\bootstrap_static_plugins_CRYSTAL-1.9-vc8.dll"
+ OutputFile="..\..\bootstrap_static_plugins_CRYSTAL-1.4-vc8.dll"
ImportLibrary="..\..\out\release8\libs\libbootstrap_static_plugins_CRYSTAL.lib"
- ProgramDatabaseFile="..\..\out\release8\build\libbootstrap_static_plugins_CRYSTAL\bootstrap_static_plugins_CRYSTAL-1.9-vc8.pdb"
- AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib ode.lib libcrystalspace_windows.lib version.lib libcrystalspace_directx.lib dsound.lib ddraw.lib dinput.lib libcrystalspace_opengl.lib cg.lib cgGL.lib opengl32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib "
+ ProgramDatabaseFile="..\..\out\release8\build\libbootstrap_static_plugins_CRYSTAL\bootstrap_static_plugins_CRYSTAL-1.4-vc8.pdb"
+ AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib ode.lib libcrystalspace_windows.lib libcrystalspace_opengl.lib version.lib libcrystalspace_directx.lib dsound.lib ddraw.lib dinput.lib cg.lib cgGL.lib opengl32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib "
AdditionalDependencies=""
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=""
@@ -194,7 +194,7 @@
LinkIncremental="2"
GenerateDebugInformation="TRUE"
IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD,MSVCRT"
- AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib ode.lib libcrystalspace_windows_d.lib version.lib libcrystalspace_directx_d.lib dsound.lib ddraw.lib dinput.lib libcrystalspace_opengl_d.lib cg.lib cgGL.lib opengl32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib "
+ AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib ode.lib libcrystalspace_windows_d.lib libcrystalspace_opengl_d.lib version.lib libcrystalspace_directx_d.lib dsound.lib ddraw.lib dinput.lib cg.lib cgGL.lib opengl32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib "
AdditionalDependencies=""
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=""
@@ -244,7 +244,7 @@
RuntimeLibrary="3"
- ProgramDatabaseFileName="..\..\out\debug8\build\libbootstrap_static_plugins_CRYSTAL\bootstrap_static_plugins_CRYSTAL-1.9-vc8_d.pdb"
+ ProgramDatabaseFileName="..\..\out\debug8\build\libbootstrap_static_plugins_CRYSTAL\bootstrap_static_plugins_CRYSTAL-1.4-vc8_d.pdb"
PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;PACKAGE_NAME=CEL;_WINDOWS;WIN32;CS_BUILD_SHARED_LIBS;CEL_BUILD_SHARED_LIBS"
OptimizeForProcessor="1"
AdditionalOptions=" "
@@ -265,10 +265,10 @@
LinkIncremental="2"
GenerateDebugInformation="TRUE"
IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD,MSVCRT"
- OutputFile="..\..\bootstrap_static_plugins_CRYSTAL-1.9-vc8_d.dll"
+ OutputFile="..\..\bootstrap_static_plugins_CRYSTAL-1.4-vc8_d.dll"
ImportLibrary="..\..\out\debug8\libs\libbootstrap_static_plugins_CRYSTAL_d.lib"
- ProgramDatabaseFile="..\..\out\debug8\build\libbootstrap_static_plugins_CRYSTAL\bootstrap_static_plugins_CRYSTAL-1.9-vc8_d.pdb"
- AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib ode.lib libcrystalspace_windows_d.lib version.lib libcrystalspace_directx_d.lib dsound.lib ddraw.lib dinput.lib libcrystalspace_opengl_d.lib cg.lib cgGL.lib opengl32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib "
+ ProgramDatabaseFile="..\..\out\debug8\build\libbootstrap_static_plugins_CRYSTAL\bootstrap_static_plugins_CRYSTAL-1.4-vc8_d.pdb"
+ AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib ode.lib libcrystalspace_windows_d.lib libcrystalspace_opengl_d.lib version.lib libcrystalspace_directx_d.lib dsound.lib ddraw.lib dinput.lib cg.lib cgGL.lib opengl32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib "
AdditionalDependencies=""
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=""
@@ -313,6 +313,13 @@
RelativePath="..\..\msvc\appbootstrap_static_staticuse_CRYSTAL.cpp">
+
+
+
+
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/8/libbootstrap_static_plugins.vcproj /tmp/IB0bHXT4Oc/cel-1.4/msvc/8/libbootstrap_static_plugins.vcproj
--- cel-1.9+svn3615/msvc/8/libbootstrap_static_plugins.vcproj 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/msvc/8/libbootstrap_static_plugins.vcproj 2009-11-28 16:47:23.000000000 +0000
@@ -99,7 +99,7 @@
RuntimeLibrary="2"
DebugInformationFormat="3"
BufferSecurityCheck="FALSE"
- ProgramDatabaseFileName="..\..\out\release8\build\libbootstrap_static_plugins\bootstrap_static_plugins-1.9-vc8.pdb"
+ ProgramDatabaseFileName="..\..\out\release8\build\libbootstrap_static_plugins\bootstrap_static_plugins-1.4-vc8.pdb"
PreprocessorDefinitions="NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;PACKAGE_NAME=CEL;_WINDOWS;WIN32;CS_BUILD_SHARED_LIBS;CEL_BUILD_SHARED_LIBS"
OptimizeForProcessor="1"
AdditionalOptions=" "
@@ -122,9 +122,9 @@
EnableCOMDATFolding="2"
GenerateDebugInformation="TRUE"
IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD"
- OutputFile="..\..\bootstrap_static_plugins-1.9-vc8.dll"
+ OutputFile="..\..\bootstrap_static_plugins-1.4-vc8.dll"
ImportLibrary="..\..\out\release8\libs\libbootstrap_static_plugins.lib"
- ProgramDatabaseFile="..\..\out\release8\build\libbootstrap_static_plugins\bootstrap_static_plugins-1.9-vc8.pdb"
+ ProgramDatabaseFile="..\..\out\release8\build\libbootstrap_static_plugins\bootstrap_static_plugins-1.4-vc8.pdb"
AdditionalOptions=" "
AdditionalDependencies="libcrystalspace.lib"
SuppressStartupBanner="TRUE"
@@ -244,7 +244,7 @@
RuntimeLibrary="3"
- ProgramDatabaseFileName="..\..\out\debug8\build\libbootstrap_static_plugins\bootstrap_static_plugins-1.9-vc8_d.pdb"
+ ProgramDatabaseFileName="..\..\out\debug8\build\libbootstrap_static_plugins\bootstrap_static_plugins-1.4-vc8_d.pdb"
PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;PACKAGE_NAME=CEL;_WINDOWS;WIN32;CS_BUILD_SHARED_LIBS;CEL_BUILD_SHARED_LIBS"
OptimizeForProcessor="1"
AdditionalOptions=" "
@@ -265,9 +265,9 @@
LinkIncremental="2"
GenerateDebugInformation="TRUE"
IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD,MSVCRT"
- OutputFile="..\..\bootstrap_static_plugins-1.9-vc8_d.dll"
+ OutputFile="..\..\bootstrap_static_plugins-1.4-vc8_d.dll"
ImportLibrary="..\..\out\debug8\libs\libbootstrap_static_plugins_d.lib"
- ProgramDatabaseFile="..\..\out\debug8\build\libbootstrap_static_plugins\bootstrap_static_plugins-1.9-vc8_d.pdb"
+ ProgramDatabaseFile="..\..\out\debug8\build\libbootstrap_static_plugins\bootstrap_static_plugins-1.4-vc8_d.pdb"
AdditionalOptions=" "
AdditionalDependencies="libcrystalspace_d.lib"
SuppressStartupBanner="TRUE"
@@ -313,6 +313,13 @@
RelativePath="..\..\msvc\appbootstrap_static_staticuse.cpp">
+
+
+
+
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/8/libcelstart_static_plugins_CRYSTAL.vcproj /tmp/IB0bHXT4Oc/cel-1.4/msvc/8/libcelstart_static_plugins_CRYSTAL.vcproj
--- cel-1.9+svn3615/msvc/8/libcelstart_static_plugins_CRYSTAL.vcproj 2008-08-01 04:11:53.000000000 +0100
+++ cel-1.4/msvc/8/libcelstart_static_plugins_CRYSTAL.vcproj 2009-11-28 16:47:23.000000000 +0000
@@ -49,7 +49,7 @@
EnableCOMDATFolding="2"
GenerateDebugInformation="TRUE"
IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD"
- AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib cal3d-vc8.lib libcrystalspace_windows.lib version.lib libcrystalspace_directx.lib dsound.lib ddraw.lib dinput.lib bulletcollision-vc8.lib bulletdynamics-vc8.lib bulletmath-vc8.lib libcrystalspace_opengl.lib cg.lib cgGL.lib opengl32.lib ode.lib openal32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib "
+ AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib cal3d-vc8.lib libcrystalspace_windows.lib libcrystalspace_opengl.lib version.lib libcrystalspace_directx.lib dsound.lib ddraw.lib dinput.lib bulletcollision-vc8.lib bulletdynamics-vc8.lib bulletmath-vc8.lib CEGUIBase-vc8.lib cg.lib cgGL.lib opengl32.lib ode.lib openal32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib "
AdditionalDependencies=""
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=""
@@ -99,7 +99,7 @@
RuntimeLibrary="2"
DebugInformationFormat="3"
BufferSecurityCheck="FALSE"
- ProgramDatabaseFileName="..\..\out\release8\build\libcelstart_static_plugins_CRYSTAL\celstart_static_plugins_CRYSTAL-1.9-vc8.pdb"
+ ProgramDatabaseFileName="..\..\out\release8\build\libcelstart_static_plugins_CRYSTAL\celstart_static_plugins_CRYSTAL-1.4-vc8.pdb"
PreprocessorDefinitions="NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;PACKAGE_NAME=CEL;_WINDOWS;WIN32;CS_BUILD_SHARED_LIBS;CEL_BUILD_SHARED_LIBS"
OptimizeForProcessor="1"
AdditionalOptions="/D CS_HAVE_CAL3D "
@@ -122,10 +122,10 @@
EnableCOMDATFolding="2"
GenerateDebugInformation="TRUE"
IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD"
- OutputFile="..\..\celstart_static_plugins_CRYSTAL-1.9-vc8.dll"
+ OutputFile="..\..\celstart_static_plugins_CRYSTAL-1.4-vc8.dll"
ImportLibrary="..\..\out\release8\libs\libcelstart_static_plugins_CRYSTAL.lib"
- ProgramDatabaseFile="..\..\out\release8\build\libcelstart_static_plugins_CRYSTAL\celstart_static_plugins_CRYSTAL-1.9-vc8.pdb"
- AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib cal3d-vc8.lib libcrystalspace_windows.lib version.lib libcrystalspace_directx.lib dsound.lib ddraw.lib dinput.lib bulletcollision-vc8.lib bulletdynamics-vc8.lib bulletmath-vc8.lib libcrystalspace_opengl.lib cg.lib cgGL.lib opengl32.lib ode.lib openal32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib "
+ ProgramDatabaseFile="..\..\out\release8\build\libcelstart_static_plugins_CRYSTAL\celstart_static_plugins_CRYSTAL-1.4-vc8.pdb"
+ AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib cal3d-vc8.lib libcrystalspace_windows.lib libcrystalspace_opengl.lib version.lib libcrystalspace_directx.lib dsound.lib ddraw.lib dinput.lib bulletcollision-vc8.lib bulletdynamics-vc8.lib bulletmath-vc8.lib CEGUIBase-vc8.lib cg.lib cgGL.lib opengl32.lib ode.lib openal32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib "
AdditionalDependencies=""
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=""
@@ -194,7 +194,7 @@
LinkIncremental="2"
GenerateDebugInformation="TRUE"
IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD,MSVCRT"
- AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib cal3d-vc8_d.lib libcrystalspace_windows_d.lib version.lib libcrystalspace_directx_d.lib dsound.lib ddraw.lib dinput.lib bulletcollision-vc8_d.lib bulletdynamics-vc8_d.lib bulletmath-vc8_d.lib libcrystalspace_opengl_d.lib cg.lib cgGL.lib opengl32.lib ode.lib openal32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib "
+ AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib cal3d-vc8_d.lib libcrystalspace_windows_d.lib libcrystalspace_opengl_d.lib version.lib libcrystalspace_directx_d.lib dsound.lib ddraw.lib dinput.lib bulletcollision-vc8_d.lib bulletdynamics-vc8_d.lib bulletmath-vc8_d.lib CEGUIBase-vc8_d.lib cg.lib cgGL.lib opengl32.lib ode.lib openal32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib "
AdditionalDependencies=""
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=""
@@ -244,7 +244,7 @@
RuntimeLibrary="3"
- ProgramDatabaseFileName="..\..\out\debug8\build\libcelstart_static_plugins_CRYSTAL\celstart_static_plugins_CRYSTAL-1.9-vc8_d.pdb"
+ ProgramDatabaseFileName="..\..\out\debug8\build\libcelstart_static_plugins_CRYSTAL\celstart_static_plugins_CRYSTAL-1.4-vc8_d.pdb"
PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;PACKAGE_NAME=CEL;_WINDOWS;WIN32;CS_BUILD_SHARED_LIBS;CEL_BUILD_SHARED_LIBS"
OptimizeForProcessor="1"
AdditionalOptions="/D CS_HAVE_CAL3D "
@@ -265,10 +265,10 @@
LinkIncremental="2"
GenerateDebugInformation="TRUE"
IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD,MSVCRT"
- OutputFile="..\..\celstart_static_plugins_CRYSTAL-1.9-vc8_d.dll"
+ OutputFile="..\..\celstart_static_plugins_CRYSTAL-1.4-vc8_d.dll"
ImportLibrary="..\..\out\debug8\libs\libcelstart_static_plugins_CRYSTAL_d.lib"
- ProgramDatabaseFile="..\..\out\debug8\build\libcelstart_static_plugins_CRYSTAL\celstart_static_plugins_CRYSTAL-1.9-vc8_d.pdb"
- AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib cal3d-vc8_d.lib libcrystalspace_windows_d.lib version.lib libcrystalspace_directx_d.lib dsound.lib ddraw.lib dinput.lib bulletcollision-vc8_d.lib bulletdynamics-vc8_d.lib bulletmath-vc8_d.lib libcrystalspace_opengl_d.lib cg.lib cgGL.lib opengl32.lib ode.lib openal32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib "
+ ProgramDatabaseFile="..\..\out\debug8\build\libcelstart_static_plugins_CRYSTAL\celstart_static_plugins_CRYSTAL-1.4-vc8_d.pdb"
+ AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib cal3d-vc8_d.lib libcrystalspace_windows_d.lib libcrystalspace_opengl_d.lib version.lib libcrystalspace_directx_d.lib dsound.lib ddraw.lib dinput.lib bulletcollision-vc8_d.lib bulletdynamics-vc8_d.lib bulletmath-vc8_d.lib CEGUIBase-vc8_d.lib cg.lib cgGL.lib opengl32.lib ode.lib openal32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib "
AdditionalDependencies=""
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=""
@@ -313,6 +313,13 @@
RelativePath="..\..\msvc\appcelstart_static_staticuse_CRYSTAL.cpp">
+
+
+
+
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/8/libcelstart_static_plugins.vcproj /tmp/IB0bHXT4Oc/cel-1.4/msvc/8/libcelstart_static_plugins.vcproj
--- cel-1.9+svn3615/msvc/8/libcelstart_static_plugins.vcproj 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/msvc/8/libcelstart_static_plugins.vcproj 2009-11-28 16:47:23.000000000 +0000
@@ -99,7 +99,7 @@
RuntimeLibrary="2"
DebugInformationFormat="3"
BufferSecurityCheck="FALSE"
- ProgramDatabaseFileName="..\..\out\release8\build\libcelstart_static_plugins\celstart_static_plugins-1.9-vc8.pdb"
+ ProgramDatabaseFileName="..\..\out\release8\build\libcelstart_static_plugins\celstart_static_plugins-1.4-vc8.pdb"
PreprocessorDefinitions="NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;PACKAGE_NAME=CEL;_WINDOWS;WIN32;CS_BUILD_SHARED_LIBS;CEL_BUILD_SHARED_LIBS"
OptimizeForProcessor="1"
AdditionalOptions=" "
@@ -122,9 +122,9 @@
EnableCOMDATFolding="2"
GenerateDebugInformation="TRUE"
IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD"
- OutputFile="..\..\celstart_static_plugins-1.9-vc8.dll"
+ OutputFile="..\..\celstart_static_plugins-1.4-vc8.dll"
ImportLibrary="..\..\out\release8\libs\libcelstart_static_plugins.lib"
- ProgramDatabaseFile="..\..\out\release8\build\libcelstart_static_plugins\celstart_static_plugins-1.9-vc8.pdb"
+ ProgramDatabaseFile="..\..\out\release8\build\libcelstart_static_plugins\celstart_static_plugins-1.4-vc8.pdb"
AdditionalOptions=" "
AdditionalDependencies="libcrystalspace.lib"
SuppressStartupBanner="TRUE"
@@ -244,7 +244,7 @@
RuntimeLibrary="3"
- ProgramDatabaseFileName="..\..\out\debug8\build\libcelstart_static_plugins\celstart_static_plugins-1.9-vc8_d.pdb"
+ ProgramDatabaseFileName="..\..\out\debug8\build\libcelstart_static_plugins\celstart_static_plugins-1.4-vc8_d.pdb"
PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;PACKAGE_NAME=CEL;_WINDOWS;WIN32;CS_BUILD_SHARED_LIBS;CEL_BUILD_SHARED_LIBS"
OptimizeForProcessor="1"
AdditionalOptions=" "
@@ -265,9 +265,9 @@
LinkIncremental="2"
GenerateDebugInformation="TRUE"
IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD,MSVCRT"
- OutputFile="..\..\celstart_static_plugins-1.9-vc8_d.dll"
+ OutputFile="..\..\celstart_static_plugins-1.4-vc8_d.dll"
ImportLibrary="..\..\out\debug8\libs\libcelstart_static_plugins_d.lib"
- ProgramDatabaseFile="..\..\out\debug8\build\libcelstart_static_plugins\celstart_static_plugins-1.9-vc8_d.pdb"
+ ProgramDatabaseFile="..\..\out\debug8\build\libcelstart_static_plugins\celstart_static_plugins-1.4-vc8_d.pdb"
AdditionalOptions=" "
AdditionalDependencies="libcrystalspace_d.lib"
SuppressStartupBanner="TRUE"
@@ -313,6 +313,13 @@
RelativePath="..\..\msvc\appcelstart_static_staticuse.cpp">
+
+
+
+
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/8/libcel_staticplugins.vcproj /tmp/IB0bHXT4Oc/cel-1.4/msvc/8/libcel_staticplugins.vcproj
--- cel-1.9+svn3615/msvc/8/libcel_staticplugins.vcproj 2008-07-28 04:02:17.000000000 +0100
+++ cel-1.4/msvc/8/libcel_staticplugins.vcproj 2009-11-28 16:47:23.000000000 +0000
@@ -376,31 +376,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
@@ -601,31 +576,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
@@ -676,53 +626,53 @@
+ RelativePath="..\..\msvc\libpfactoranalog_staticreg.cpp">
+ ObjectFile="..\..\out\release8\build\libcel_staticplugins\msvc_libpfactoranalog_staticreg.cpp.obj"/>
+ ObjectFile="..\..\out\release8\build\libcel_staticplugins\msvc_libpfactoranalog_staticreg.cpp.obj"/>
+ ObjectFile="..\..\out\debug8\build\libcel_staticplugins\msvc_libpfactoranalog_staticreg.cpp.obj"/>
+ ObjectFile="..\..\out\debug8\build\libcel_staticplugins\msvc_libpfactoranalog_staticreg.cpp.obj"/>
+ RelativePath="..\..\msvc\libpfactormove_staticreg.cpp">
+ ObjectFile="..\..\out\release8\build\libcel_staticplugins\msvc_libpfactormove_staticreg.cpp.obj"/>
+ ObjectFile="..\..\out\release8\build\libcel_staticplugins\msvc_libpfactormove_staticreg.cpp.obj"/>
+ ObjectFile="..\..\out\debug8\build\libcel_staticplugins\msvc_libpfactormove_staticreg.cpp.obj"/>
+ ObjectFile="..\..\out\debug8\build\libcel_staticplugins\msvc_libpfactormove_staticreg.cpp.obj"/>
-
-
-
-
-
-
-
-
-
-
-
-
@@ -976,31 +901,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1701,31 +1601,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
@@ -2001,78 +1876,78 @@
+ RelativePath="..\..\plugins\propclass\actoranalog\actoranalog.cpp">
+ ObjectFile="..\..\out\release8\build\libcel_staticplugins\plugins_propclass_actoranalog_actoranalog.cpp.obj"/>
+ ObjectFile="..\..\out\release8\build\libcel_staticplugins\plugins_propclass_actoranalog_actoranalog.cpp.obj"/>
+ ObjectFile="..\..\out\debug8\build\libcel_staticplugins\plugins_propclass_actoranalog_actoranalog.cpp.obj"/>
+ ObjectFile="..\..\out\debug8\build\libcel_staticplugins\plugins_propclass_actoranalog_actoranalog.cpp.obj"/>
+ RelativePath="..\..\plugins\propclass\actormove\actormove.cpp">
+ ObjectFile="..\..\out\release8\build\libcel_staticplugins\plugins_propclass_actormove_actormove.cpp.obj"/>
+ ObjectFile="..\..\out\release8\build\libcel_staticplugins\plugins_propclass_actormove_actormove.cpp.obj"/>
+ ObjectFile="..\..\out\debug8\build\libcel_staticplugins\plugins_propclass_actormove_actormove.cpp.obj"/>
+ ObjectFile="..\..\out\debug8\build\libcel_staticplugins\plugins_propclass_actormove_actormove.cpp.obj"/>
+ RelativePath="..\..\plugins\propclass\actormove\npcmove.cpp">
+ ObjectFile="..\..\out\release8\build\libcel_staticplugins\plugins_propclass_actormove_npcmove.cpp.obj"/>
+ ObjectFile="..\..\out\release8\build\libcel_staticplugins\plugins_propclass_actormove_npcmove.cpp.obj"/>
+ ObjectFile="..\..\out\debug8\build\libcel_staticplugins\plugins_propclass_actormove_npcmove.cpp.obj"/>
+ ObjectFile="..\..\out\debug8\build\libcel_staticplugins\plugins_propclass_actormove_npcmove.cpp.obj"/>
-
-
-
-
-
-
-
-
-
-
-
-
@@ -2376,31 +2226,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
@@ -3551,31 +3376,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
@@ -4314,9 +4114,6 @@
RelativePath="..\..\plugins\addons\celgraph\celgraph.h">
-
-
+ RelativePath="..\..\plugins\propclass\actoranalog\actoranalog.h">
+ RelativePath="..\..\plugins\propclass\actormove\actormove.h">
+ RelativePath="..\..\plugins\propclass\actormove\npcmove.h">
@@ -4380,9 +4177,6 @@
RelativePath="..\..\plugins\propclass\evolve\evolve.h">
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/8/libceltst_static_plugins_CRYSTAL.vcproj /tmp/IB0bHXT4Oc/cel-1.4/msvc/8/libceltst_static_plugins_CRYSTAL.vcproj
--- cel-1.9+svn3615/msvc/8/libceltst_static_plugins_CRYSTAL.vcproj 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/msvc/8/libceltst_static_plugins_CRYSTAL.vcproj 2009-11-28 16:47:23.000000000 +0000
@@ -99,7 +99,7 @@
RuntimeLibrary="2"
DebugInformationFormat="3"
BufferSecurityCheck="FALSE"
- ProgramDatabaseFileName="..\..\out\release8\build\libceltst_static_plugins_CRYSTAL\celtst_static_plugins_CRYSTAL-1.9-vc8.pdb"
+ ProgramDatabaseFileName="..\..\out\release8\build\libceltst_static_plugins_CRYSTAL\celtst_static_plugins_CRYSTAL-1.4-vc8.pdb"
PreprocessorDefinitions="NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;PACKAGE_NAME=CEL;_WINDOWS;WIN32;CS_BUILD_SHARED_LIBS;CEL_BUILD_SHARED_LIBS"
OptimizeForProcessor="1"
AdditionalOptions="/D CS_HAVE_CAL3D "
@@ -122,9 +122,9 @@
EnableCOMDATFolding="2"
GenerateDebugInformation="TRUE"
IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD"
- OutputFile="..\..\celtst_static_plugins_CRYSTAL-1.9-vc8.dll"
+ OutputFile="..\..\celtst_static_plugins_CRYSTAL-1.4-vc8.dll"
ImportLibrary="..\..\out\release8\libs\libceltst_static_plugins_CRYSTAL.lib"
- ProgramDatabaseFile="..\..\out\release8\build\libceltst_static_plugins_CRYSTAL\celtst_static_plugins_CRYSTAL-1.9-vc8.pdb"
+ ProgramDatabaseFile="..\..\out\release8\build\libceltst_static_plugins_CRYSTAL\celtst_static_plugins_CRYSTAL-1.4-vc8.pdb"
AdditionalOptions="libjpeg.lib libpng.lib cg.lib cgGL.lib cal3d-vc8.lib libcrystalspace_windows.lib libcrystalspace_opengl.lib opengl32.lib version.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins.lib libcrystalspace.lib libcrystalspace_directx.lib zlib.lib dsound.lib ddraw.lib dinput.lib "
AdditionalDependencies=""
SuppressStartupBanner="TRUE"
@@ -244,7 +244,7 @@
RuntimeLibrary="3"
- ProgramDatabaseFileName="..\..\out\debug8\build\libceltst_static_plugins_CRYSTAL\celtst_static_plugins_CRYSTAL-1.9-vc8_d.pdb"
+ ProgramDatabaseFileName="..\..\out\debug8\build\libceltst_static_plugins_CRYSTAL\celtst_static_plugins_CRYSTAL-1.4-vc8_d.pdb"
PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;PACKAGE_NAME=CEL;_WINDOWS;WIN32;CS_BUILD_SHARED_LIBS;CEL_BUILD_SHARED_LIBS"
OptimizeForProcessor="1"
AdditionalOptions="/D CS_HAVE_CAL3D "
@@ -265,9 +265,9 @@
LinkIncremental="2"
GenerateDebugInformation="TRUE"
IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD,MSVCRT"
- OutputFile="..\..\celtst_static_plugins_CRYSTAL-1.9-vc8_d.dll"
+ OutputFile="..\..\celtst_static_plugins_CRYSTAL-1.4-vc8_d.dll"
ImportLibrary="..\..\out\debug8\libs\libceltst_static_plugins_CRYSTAL_d.lib"
- ProgramDatabaseFile="..\..\out\debug8\build\libceltst_static_plugins_CRYSTAL\celtst_static_plugins_CRYSTAL-1.9-vc8_d.pdb"
+ ProgramDatabaseFile="..\..\out\debug8\build\libceltst_static_plugins_CRYSTAL\celtst_static_plugins_CRYSTAL-1.4-vc8_d.pdb"
AdditionalOptions="libjpeg.lib libpng.lib cg.lib cgGL.lib cal3d-vc8_d.lib libcrystalspace_windows_d.lib libcrystalspace_opengl_d.lib opengl32.lib version.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib libcrystalspace_directx_d.lib zlib.lib dsound.lib ddraw.lib dinput.lib "
AdditionalDependencies=""
SuppressStartupBanner="TRUE"
@@ -313,6 +313,13 @@
RelativePath="..\..\msvc\appceltst_static_staticuse_CRYSTAL.cpp">
+
+
+
+
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/8/libceltst_static_plugins.vcproj /tmp/IB0bHXT4Oc/cel-1.4/msvc/8/libceltst_static_plugins.vcproj
--- cel-1.9+svn3615/msvc/8/libceltst_static_plugins.vcproj 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/msvc/8/libceltst_static_plugins.vcproj 2009-11-28 16:47:23.000000000 +0000
@@ -99,7 +99,7 @@
RuntimeLibrary="2"
DebugInformationFormat="3"
BufferSecurityCheck="FALSE"
- ProgramDatabaseFileName="..\..\out\release8\build\libceltst_static_plugins\celtst_static_plugins-1.9-vc8.pdb"
+ ProgramDatabaseFileName="..\..\out\release8\build\libceltst_static_plugins\celtst_static_plugins-1.4-vc8.pdb"
PreprocessorDefinitions="NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;PACKAGE_NAME=CEL;_WINDOWS;WIN32;CS_BUILD_SHARED_LIBS;CEL_BUILD_SHARED_LIBS"
OptimizeForProcessor="1"
AdditionalOptions=" "
@@ -122,9 +122,9 @@
EnableCOMDATFolding="2"
GenerateDebugInformation="TRUE"
IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD"
- OutputFile="..\..\celtst_static_plugins-1.9-vc8.dll"
+ OutputFile="..\..\celtst_static_plugins-1.4-vc8.dll"
ImportLibrary="..\..\out\release8\libs\libceltst_static_plugins.lib"
- ProgramDatabaseFile="..\..\out\release8\build\libceltst_static_plugins\celtst_static_plugins-1.9-vc8.pdb"
+ ProgramDatabaseFile="..\..\out\release8\build\libceltst_static_plugins\celtst_static_plugins-1.4-vc8.pdb"
AdditionalOptions=" "
AdditionalDependencies="libcrystalspace.lib"
SuppressStartupBanner="TRUE"
@@ -244,7 +244,7 @@
RuntimeLibrary="3"
- ProgramDatabaseFileName="..\..\out\debug8\build\libceltst_static_plugins\celtst_static_plugins-1.9-vc8_d.pdb"
+ ProgramDatabaseFileName="..\..\out\debug8\build\libceltst_static_plugins\celtst_static_plugins-1.4-vc8_d.pdb"
PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;PACKAGE_NAME=CEL;_WINDOWS;WIN32;CS_BUILD_SHARED_LIBS;CEL_BUILD_SHARED_LIBS"
OptimizeForProcessor="1"
AdditionalOptions=" "
@@ -265,9 +265,9 @@
LinkIncremental="2"
GenerateDebugInformation="TRUE"
IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD,MSVCRT"
- OutputFile="..\..\celtst_static_plugins-1.9-vc8_d.dll"
+ OutputFile="..\..\celtst_static_plugins-1.4-vc8_d.dll"
ImportLibrary="..\..\out\debug8\libs\libceltst_static_plugins_d.lib"
- ProgramDatabaseFile="..\..\out\debug8\build\libceltst_static_plugins\celtst_static_plugins-1.9-vc8_d.pdb"
+ ProgramDatabaseFile="..\..\out\debug8\build\libceltst_static_plugins\celtst_static_plugins-1.4-vc8_d.pdb"
AdditionalOptions=" "
AdditionalDependencies="libcrystalspace_d.lib"
SuppressStartupBanner="TRUE"
@@ -313,6 +313,13 @@
RelativePath="..\..\msvc\appceltst_static_staticuse.cpp">
+
+
+
+
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/8/libnettest_static_plugins_CRYSTAL.vcproj /tmp/IB0bHXT4Oc/cel-1.4/msvc/8/libnettest_static_plugins_CRYSTAL.vcproj
--- cel-1.9+svn3615/msvc/8/libnettest_static_plugins_CRYSTAL.vcproj 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/msvc/8/libnettest_static_plugins_CRYSTAL.vcproj 2009-11-28 16:47:23.000000000 +0000
@@ -99,7 +99,7 @@
RuntimeLibrary="2"
DebugInformationFormat="3"
BufferSecurityCheck="FALSE"
- ProgramDatabaseFileName="..\..\out\release8\build\libnettest_static_plugins_CRYSTAL\nettest_static_plugins_CRYSTAL-1.9-vc8.pdb"
+ ProgramDatabaseFileName="..\..\out\release8\build\libnettest_static_plugins_CRYSTAL\nettest_static_plugins_CRYSTAL-1.4-vc8.pdb"
PreprocessorDefinitions="NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;PACKAGE_NAME=CEL;_WINDOWS;WIN32;CS_BUILD_SHARED_LIBS;CEL_BUILD_SHARED_LIBS"
OptimizeForProcessor="1"
AdditionalOptions="/D CS_HAVE_CAL3D "
@@ -122,9 +122,9 @@
EnableCOMDATFolding="2"
GenerateDebugInformation="TRUE"
IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD"
- OutputFile="..\..\nettest_static_plugins_CRYSTAL-1.9-vc8.dll"
+ OutputFile="..\..\nettest_static_plugins_CRYSTAL-1.4-vc8.dll"
ImportLibrary="..\..\out\release8\libs\libnettest_static_plugins_CRYSTAL.lib"
- ProgramDatabaseFile="..\..\out\release8\build\libnettest_static_plugins_CRYSTAL\nettest_static_plugins_CRYSTAL-1.9-vc8.pdb"
+ ProgramDatabaseFile="..\..\out\release8\build\libnettest_static_plugins_CRYSTAL\nettest_static_plugins_CRYSTAL-1.4-vc8.pdb"
AdditionalOptions="libjpeg.lib libpng.lib cal3d-vc8.lib cg.lib cgGL.lib libcrystalspace_windows.lib libcrystalspace_opengl.lib opengl32.lib version.lib libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib "
AdditionalDependencies=""
SuppressStartupBanner="TRUE"
@@ -244,7 +244,7 @@
RuntimeLibrary="3"
- ProgramDatabaseFileName="..\..\out\debug8\build\libnettest_static_plugins_CRYSTAL\nettest_static_plugins_CRYSTAL-1.9-vc8_d.pdb"
+ ProgramDatabaseFileName="..\..\out\debug8\build\libnettest_static_plugins_CRYSTAL\nettest_static_plugins_CRYSTAL-1.4-vc8_d.pdb"
PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;PACKAGE_NAME=CEL;_WINDOWS;WIN32;CS_BUILD_SHARED_LIBS;CEL_BUILD_SHARED_LIBS"
OptimizeForProcessor="1"
AdditionalOptions="/D CS_HAVE_CAL3D "
@@ -265,9 +265,9 @@
LinkIncremental="2"
GenerateDebugInformation="TRUE"
IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD,MSVCRT"
- OutputFile="..\..\nettest_static_plugins_CRYSTAL-1.9-vc8_d.dll"
+ OutputFile="..\..\nettest_static_plugins_CRYSTAL-1.4-vc8_d.dll"
ImportLibrary="..\..\out\debug8\libs\libnettest_static_plugins_CRYSTAL_d.lib"
- ProgramDatabaseFile="..\..\out\debug8\build\libnettest_static_plugins_CRYSTAL\nettest_static_plugins_CRYSTAL-1.9-vc8_d.pdb"
+ ProgramDatabaseFile="..\..\out\debug8\build\libnettest_static_plugins_CRYSTAL\nettest_static_plugins_CRYSTAL-1.4-vc8_d.pdb"
AdditionalOptions="libjpeg.lib libpng.lib cal3d-vc8_d.lib cg.lib cgGL.lib libcrystalspace_windows_d.lib libcrystalspace_opengl_d.lib opengl32.lib version.lib libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib "
AdditionalDependencies=""
SuppressStartupBanner="TRUE"
@@ -313,6 +313,13 @@
RelativePath="..\..\msvc\appnettest_static_staticuse_CRYSTAL.cpp">
+
+
+
+
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/8/libnettest_static_plugins.vcproj /tmp/IB0bHXT4Oc/cel-1.4/msvc/8/libnettest_static_plugins.vcproj
--- cel-1.9+svn3615/msvc/8/libnettest_static_plugins.vcproj 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/msvc/8/libnettest_static_plugins.vcproj 2009-11-28 16:47:23.000000000 +0000
@@ -99,7 +99,7 @@
RuntimeLibrary="2"
DebugInformationFormat="3"
BufferSecurityCheck="FALSE"
- ProgramDatabaseFileName="..\..\out\release8\build\libnettest_static_plugins\nettest_static_plugins-1.9-vc8.pdb"
+ ProgramDatabaseFileName="..\..\out\release8\build\libnettest_static_plugins\nettest_static_plugins-1.4-vc8.pdb"
PreprocessorDefinitions="NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;PACKAGE_NAME=CEL;_WINDOWS;WIN32;CS_BUILD_SHARED_LIBS;CEL_BUILD_SHARED_LIBS"
OptimizeForProcessor="1"
AdditionalOptions=" "
@@ -122,9 +122,9 @@
EnableCOMDATFolding="2"
GenerateDebugInformation="TRUE"
IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD"
- OutputFile="..\..\nettest_static_plugins-1.9-vc8.dll"
+ OutputFile="..\..\nettest_static_plugins-1.4-vc8.dll"
ImportLibrary="..\..\out\release8\libs\libnettest_static_plugins.lib"
- ProgramDatabaseFile="..\..\out\release8\build\libnettest_static_plugins\nettest_static_plugins-1.9-vc8.pdb"
+ ProgramDatabaseFile="..\..\out\release8\build\libnettest_static_plugins\nettest_static_plugins-1.4-vc8.pdb"
AdditionalOptions=" "
AdditionalDependencies="libcrystalspace.lib"
SuppressStartupBanner="TRUE"
@@ -244,7 +244,7 @@
RuntimeLibrary="3"
- ProgramDatabaseFileName="..\..\out\debug8\build\libnettest_static_plugins\nettest_static_plugins-1.9-vc8_d.pdb"
+ ProgramDatabaseFileName="..\..\out\debug8\build\libnettest_static_plugins\nettest_static_plugins-1.4-vc8_d.pdb"
PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;PACKAGE_NAME=CEL;_WINDOWS;WIN32;CS_BUILD_SHARED_LIBS;CEL_BUILD_SHARED_LIBS"
OptimizeForProcessor="1"
AdditionalOptions=" "
@@ -265,9 +265,9 @@
LinkIncremental="2"
GenerateDebugInformation="TRUE"
IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD,MSVCRT"
- OutputFile="..\..\nettest_static_plugins-1.9-vc8_d.dll"
+ OutputFile="..\..\nettest_static_plugins-1.4-vc8_d.dll"
ImportLibrary="..\..\out\debug8\libs\libnettest_static_plugins_d.lib"
- ProgramDatabaseFile="..\..\out\debug8\build\libnettest_static_plugins\nettest_static_plugins-1.9-vc8_d.pdb"
+ ProgramDatabaseFile="..\..\out\debug8\build\libnettest_static_plugins\nettest_static_plugins-1.4-vc8_d.pdb"
AdditionalOptions=" "
AdditionalDependencies="libcrystalspace_d.lib"
SuppressStartupBanner="TRUE"
@@ -313,6 +313,13 @@
RelativePath="..\..\msvc\appnettest_static_staticuse.cpp">
+
+
+
+
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/8/plgaddon_ledges.vcproj /tmp/IB0bHXT4Oc/cel-1.4/msvc/8/plgaddon_ledges.vcproj
--- cel-1.9+svn3615/msvc/8/plgaddon_ledges.vcproj 2008-07-28 04:02:17.000000000 +0100
+++ cel-1.4/msvc/8/plgaddon_ledges.vcproj 1970-01-01 01:00:00.000000000 +0100
@@ -1,345 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/8/plgledges.vcproj /tmp/IB0bHXT4Oc/cel-1.4/msvc/8/plgledges.vcproj
--- cel-1.9+svn3615/msvc/8/plgledges.vcproj 2008-07-28 04:02:17.000000000 +0100
+++ cel-1.4/msvc/8/plgledges.vcproj 1970-01-01 01:00:00.000000000 +0100
@@ -1,345 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/8/plgpfactoranalog.vcproj /tmp/IB0bHXT4Oc/cel-1.4/msvc/8/plgpfactoranalog.vcproj
--- cel-1.9+svn3615/msvc/8/plgpfactoranalog.vcproj 1970-01-01 01:00:00.000000000 +0100
+++ cel-1.4/msvc/8/plgpfactoranalog.vcproj 2009-11-28 16:47:23.000000000 +0000
@@ -0,0 +1,345 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/8/plgpfanalogmotion.vcproj /tmp/IB0bHXT4Oc/cel-1.4/msvc/8/plgpfanalogmotion.vcproj
--- cel-1.9+svn3615/msvc/8/plgpfanalogmotion.vcproj 2008-06-23 04:02:10.000000000 +0100
+++ cel-1.4/msvc/8/plgpfanalogmotion.vcproj 1970-01-01 01:00:00.000000000 +0100
@@ -1,345 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/8/plgpfgrab.vcproj /tmp/IB0bHXT4Oc/cel-1.4/msvc/8/plgpfgrab.vcproj
--- cel-1.9+svn3615/msvc/8/plgpfgrab.vcproj 2008-07-04 04:04:39.000000000 +0100
+++ cel-1.4/msvc/8/plgpfgrab.vcproj 1970-01-01 01:00:00.000000000 +0100
@@ -1,345 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/8/plgpfjump.vcproj /tmp/IB0bHXT4Oc/cel-1.4/msvc/8/plgpfjump.vcproj
--- cel-1.9+svn3615/msvc/8/plgpfjump.vcproj 2008-06-23 04:02:10.000000000 +0100
+++ cel-1.4/msvc/8/plgpfjump.vcproj 1970-01-01 01:00:00.000000000 +0100
@@ -1,345 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/8/wkscel.sln /tmp/IB0bHXT4Oc/cel-1.4/msvc/8/wkscel.sln
--- cel-1.9+svn3615/msvc/8/wkscel.sln 2008-07-28 04:02:17.000000000 +0100
+++ cel-1.4/msvc/8/wkscel.sln 2009-11-28 16:47:23.000000000 +0000
@@ -36,8 +36,6 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plgaddon_celgraph", "plgaddon_celgraph.vcproj", "{504CB6C0-4303-C53C-C345-AA750CD1A59D}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plgaddon_ledges", "plgaddon_ledges.vcproj", "{88DF53AC-1338-547B-6989-1C8B78DE542B}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plgaddon_questdef", "plgaddon_questdef.vcproj", "{D55BE37F-A3CE-2CF1-7474-6961CF055BC0}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plgaddon_ruledef", "plgaddon_ruledef.vcproj", "{A8B80D52-CD56-437D-0DF3-3798C9279FE4}"
@@ -54,15 +52,13 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plgcpersist", "plgcpersist.vcproj", "{403E853A-59C3-FBA1-AF01-2BF89B0DA2F7}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plgledges", "plgledges.vcproj", "{58918459-7FD8-C582-569D-A58038ABE9D1}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plgmgr_billboard", "plgmgr_billboard.vcproj", "{32B86666-15E0-F234-58EC-50D3CC10AD59}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plgmgr_quests", "plgmgr_quests.vcproj", "{96C3E65A-7CC9-961B-0681-395F51BC9CE2}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plgpfactormove", "plgpfactormove.vcproj", "{8EBBE255-F364-3793-8E84-4ACE0FB487A1}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plgpfactoranalog", "plgpfactoranalog.vcproj", "{26C0690C-CDA5-5C37-87AC-D0C18C4F7064}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plgpfanalogmotion", "plgpfanalogmotion.vcproj", "{EF50101E-0BAC-395C-42F9-378D37DA03CE}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plgpfactormove", "plgpfactormove.vcproj", "{8EBBE255-F364-3793-8E84-4ACE0FB487A1}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plgpfbillboard", "plgpfbillboard.vcproj", "{8E2C61D0-0DDE-9AC3-AB7E-8EE3B4EE09D4}"
EndProject
@@ -76,16 +72,12 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plgpfevolve", "plgpfevolve.vcproj", "{73CFB4EB-077E-9A27-E4D4-145EA219E262}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plgpfgrab", "plgpfgrab.vcproj", "{98DD5582-CDDE-F076-F9C8-D6603B15A78E}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plgpfhover", "plgpfhover.vcproj", "{47A9A513-F45E-728E-D930-72B622AE538C}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plgpfinput", "plgpfinput.vcproj", "{5281C5BB-2394-E384-DEDF-73F9F661705D}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plgpfinv", "plgpfinv.vcproj", "{CB5A4EF1-E092-959D-EFD1-E0442F3119F1}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plgpfjump", "plgpfjump.vcproj", "{4F4A2447-5243-2EF5-BE00-701BB9473BA1}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plgpflight", "plgpflight.vcproj", "{23D61ADF-182D-DD0F-43F2-2E474EE1FB00}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plgpfmechanics", "plgpfmechanics.vcproj", "{89822485-8A94-469B-7CA5-A2839C03D271}"
@@ -168,56 +160,52 @@
{36C62D61-808A-D8D0-D561-3EE6C506C350}.11 = {3EF52631-4486-D72B-BB17-DB8FCF36DDBA}
{36C62D61-808A-D8D0-D561-3EE6C506C350}.12 = {EEC493BE-2745-954F-FA24-45447359FCDC}
{36C62D61-808A-D8D0-D561-3EE6C506C350}.13 = {504CB6C0-4303-C53C-C345-AA750CD1A59D}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.14 = {88DF53AC-1338-547B-6989-1C8B78DE542B}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.15 = {D55BE37F-A3CE-2CF1-7474-6961CF055BC0}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.16 = {A8B80D52-CD56-437D-0DF3-3798C9279FE4}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.17 = {BA7BEDE4-D74D-62E9-2A70-F3E2461698BB}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.18 = {E15D3136-619B-861B-D8FF-561A1F846B6C}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.19 = {D4C2A921-6257-1D72-592F-450E19AA3E20}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.20 = {98B5AC91-D6B1-1C99-9FEC-D1EEA525ED3B}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.21 = {8BBC74D9-616A-F075-D8FC-8B101A6C5730}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.22 = {403E853A-59C3-FBA1-AF01-2BF89B0DA2F7}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.23 = {58918459-7FD8-C582-569D-A58038ABE9D1}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.24 = {32B86666-15E0-F234-58EC-50D3CC10AD59}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.25 = {96C3E65A-7CC9-961B-0681-395F51BC9CE2}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.26 = {8EBBE255-F364-3793-8E84-4ACE0FB487A1}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.27 = {EF50101E-0BAC-395C-42F9-378D37DA03CE}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.28 = {8E2C61D0-0DDE-9AC3-AB7E-8EE3B4EE09D4}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.29 = {26CDBAC0-9A46-F31F-B6F7-A729CF22B97D}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.30 = {10B1A9B3-DB3C-98CB-62C9-DB10F9F43396}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.31 = {0E134A9B-0448-2CD4-954B-9F3ECBD81534}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.32 = {F523A3D9-0D90-E985-CA29-10E441393BAE}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.33 = {73CFB4EB-077E-9A27-E4D4-145EA219E262}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.34 = {98DD5582-CDDE-F076-F9C8-D6603B15A78E}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.35 = {47A9A513-F45E-728E-D930-72B622AE538C}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.36 = {5281C5BB-2394-E384-DEDF-73F9F661705D}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.37 = {CB5A4EF1-E092-959D-EFD1-E0442F3119F1}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.38 = {4F4A2447-5243-2EF5-BE00-701BB9473BA1}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.39 = {23D61ADF-182D-DD0F-43F2-2E474EE1FB00}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.40 = {89822485-8A94-469B-7CA5-A2839C03D271}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.41 = {7577CC57-FF93-6E33-EC99-846E898BED29}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.42 = {754F06CF-F576-93C5-BE95-3EC4998D9E20}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.43 = {E167BD33-4E68-2BB7-C568-09FC289A2E9A}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.44 = {6AE42D83-4035-6C15-089B-D65BCF171A11}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.45 = {D7782591-5481-74E6-62CC-265E30D63A91}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.46 = {097814E8-8395-28B7-6CCF-374BA0D10503}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.47 = {4AA16ABE-76D3-AB92-ED64-43A057F4E5D0}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.48 = {E4F5830C-8CAF-CBC0-C5E5-B189CECF556A}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.49 = {F50BC0A1-DB47-BA5A-5C9A-A12E1C81241D}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.50 = {3AB21594-2130-A5AE-9E11-272637C9F9B6}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.51 = {D3852DD2-8840-44C9-AA7A-469FA8445DF3}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.52 = {967105F5-9828-18D8-0AB3-AB33A96DF792}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.53 = {E91FEE10-2BA4-53FC-07FA-0A5B3649595F}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.54 = {7453777E-C823-EFB7-31C1-FDF756EBAEBC}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.55 = {6452026D-0C54-4DCD-DA11-047FAC2224D7}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.56 = {058AAD6E-A940-FA17-F583-B3676E4DAC6C}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.57 = {83E8AB22-CED2-2646-3A5A-73EA46D8959F}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.58 = {7819CFB4-1D16-C2CA-3B58-319C41E552DF}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.59 = {99CE9F68-96D7-1FAF-65BF-DEEF6E5085B8}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.60 = {9B942FB3-91A0-9E4F-1514-1286B4872502}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.61 = {E1C134D4-C658-E321-DBBE-7D11200B882E}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.62 = {66C683AA-084B-50DD-3B04-ED38799342BA}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.63 = {274174A0-7101-29E3-D06A-6C0B009A3DDD}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.14 = {D55BE37F-A3CE-2CF1-7474-6961CF055BC0}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.15 = {A8B80D52-CD56-437D-0DF3-3798C9279FE4}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.16 = {BA7BEDE4-D74D-62E9-2A70-F3E2461698BB}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.17 = {E15D3136-619B-861B-D8FF-561A1F846B6C}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.18 = {D4C2A921-6257-1D72-592F-450E19AA3E20}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.19 = {98B5AC91-D6B1-1C99-9FEC-D1EEA525ED3B}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.20 = {8BBC74D9-616A-F075-D8FC-8B101A6C5730}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.21 = {403E853A-59C3-FBA1-AF01-2BF89B0DA2F7}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.22 = {32B86666-15E0-F234-58EC-50D3CC10AD59}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.23 = {96C3E65A-7CC9-961B-0681-395F51BC9CE2}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.24 = {26C0690C-CDA5-5C37-87AC-D0C18C4F7064}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.25 = {8EBBE255-F364-3793-8E84-4ACE0FB487A1}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.26 = {8E2C61D0-0DDE-9AC3-AB7E-8EE3B4EE09D4}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.27 = {26CDBAC0-9A46-F31F-B6F7-A729CF22B97D}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.28 = {10B1A9B3-DB3C-98CB-62C9-DB10F9F43396}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.29 = {0E134A9B-0448-2CD4-954B-9F3ECBD81534}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.30 = {F523A3D9-0D90-E985-CA29-10E441393BAE}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.31 = {73CFB4EB-077E-9A27-E4D4-145EA219E262}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.32 = {47A9A513-F45E-728E-D930-72B622AE538C}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.33 = {5281C5BB-2394-E384-DEDF-73F9F661705D}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.34 = {CB5A4EF1-E092-959D-EFD1-E0442F3119F1}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.35 = {23D61ADF-182D-DD0F-43F2-2E474EE1FB00}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.36 = {89822485-8A94-469B-7CA5-A2839C03D271}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.37 = {7577CC57-FF93-6E33-EC99-846E898BED29}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.38 = {754F06CF-F576-93C5-BE95-3EC4998D9E20}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.39 = {E167BD33-4E68-2BB7-C568-09FC289A2E9A}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.40 = {6AE42D83-4035-6C15-089B-D65BCF171A11}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.41 = {D7782591-5481-74E6-62CC-265E30D63A91}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.42 = {097814E8-8395-28B7-6CCF-374BA0D10503}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.43 = {4AA16ABE-76D3-AB92-ED64-43A057F4E5D0}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.44 = {E4F5830C-8CAF-CBC0-C5E5-B189CECF556A}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.45 = {F50BC0A1-DB47-BA5A-5C9A-A12E1C81241D}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.46 = {3AB21594-2130-A5AE-9E11-272637C9F9B6}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.47 = {D3852DD2-8840-44C9-AA7A-469FA8445DF3}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.48 = {967105F5-9828-18D8-0AB3-AB33A96DF792}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.49 = {E91FEE10-2BA4-53FC-07FA-0A5B3649595F}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.50 = {7453777E-C823-EFB7-31C1-FDF756EBAEBC}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.51 = {6452026D-0C54-4DCD-DA11-047FAC2224D7}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.52 = {058AAD6E-A940-FA17-F583-B3676E4DAC6C}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.53 = {83E8AB22-CED2-2646-3A5A-73EA46D8959F}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.54 = {7819CFB4-1D16-C2CA-3B58-319C41E552DF}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.55 = {99CE9F68-96D7-1FAF-65BF-DEEF6E5085B8}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.56 = {9B942FB3-91A0-9E4F-1514-1286B4872502}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.57 = {E1C134D4-C658-E321-DBBE-7D11200B882E}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.58 = {66C683AA-084B-50DD-3B04-ED38799342BA}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.59 = {274174A0-7101-29E3-D06A-6C0B009A3DDD}
{E2ECEB01-C66F-C40A-F57D-14B5700CED7A}.0 = {FF4C7AD7-84CA-8A2F-7EBF-2B1FA775848F}
{E2ECEB01-C66F-C40A-F57D-14B5700CED7A}.1 = {AE89B23E-625D-8AD6-F293-EA999B1F3026}
{E2ECEB01-C66F-C40A-F57D-14B5700CED7A}.2 = {E7FA7509-300D-FB19-912A-61D2694C9BD0}
@@ -232,76 +220,69 @@
{866C2A26-400D-A8C9-8F7B-B780A879B604}.0 = {3EF52631-4486-D72B-BB17-DB8FCF36DDBA}
{866C2A26-400D-A8C9-8F7B-B780A879B604}.1 = {EEC493BE-2745-954F-FA24-45447359FCDC}
{866C2A26-400D-A8C9-8F7B-B780A879B604}.2 = {504CB6C0-4303-C53C-C345-AA750CD1A59D}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.3 = {88DF53AC-1338-547B-6989-1C8B78DE542B}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.4 = {D55BE37F-A3CE-2CF1-7474-6961CF055BC0}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.5 = {A8B80D52-CD56-437D-0DF3-3798C9279FE4}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.6 = {BA7BEDE4-D74D-62E9-2A70-F3E2461698BB}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.7 = {E15D3136-619B-861B-D8FF-561A1F846B6C}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.8 = {D4C2A921-6257-1D72-592F-450E19AA3E20}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.9 = {98B5AC91-D6B1-1C99-9FEC-D1EEA525ED3B}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.10 = {8BBC74D9-616A-F075-D8FC-8B101A6C5730}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.11 = {403E853A-59C3-FBA1-AF01-2BF89B0DA2F7}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.12 = {58918459-7FD8-C582-569D-A58038ABE9D1}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.13 = {32B86666-15E0-F234-58EC-50D3CC10AD59}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.14 = {96C3E65A-7CC9-961B-0681-395F51BC9CE2}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.15 = {8EBBE255-F364-3793-8E84-4ACE0FB487A1}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.16 = {EF50101E-0BAC-395C-42F9-378D37DA03CE}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.17 = {8E2C61D0-0DDE-9AC3-AB7E-8EE3B4EE09D4}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.18 = {26CDBAC0-9A46-F31F-B6F7-A729CF22B97D}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.19 = {10B1A9B3-DB3C-98CB-62C9-DB10F9F43396}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.20 = {0E134A9B-0448-2CD4-954B-9F3ECBD81534}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.21 = {F523A3D9-0D90-E985-CA29-10E441393BAE}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.22 = {73CFB4EB-077E-9A27-E4D4-145EA219E262}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.23 = {98DD5582-CDDE-F076-F9C8-D6603B15A78E}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.24 = {47A9A513-F45E-728E-D930-72B622AE538C}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.25 = {5281C5BB-2394-E384-DEDF-73F9F661705D}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.26 = {CB5A4EF1-E092-959D-EFD1-E0442F3119F1}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.27 = {4F4A2447-5243-2EF5-BE00-701BB9473BA1}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.28 = {23D61ADF-182D-DD0F-43F2-2E474EE1FB00}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.29 = {89822485-8A94-469B-7CA5-A2839C03D271}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.30 = {7577CC57-FF93-6E33-EC99-846E898BED29}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.31 = {754F06CF-F576-93C5-BE95-3EC4998D9E20}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.32 = {E167BD33-4E68-2BB7-C568-09FC289A2E9A}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.33 = {6AE42D83-4035-6C15-089B-D65BCF171A11}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.34 = {D7782591-5481-74E6-62CC-265E30D63A91}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.35 = {097814E8-8395-28B7-6CCF-374BA0D10503}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.36 = {4AA16ABE-76D3-AB92-ED64-43A057F4E5D0}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.37 = {E4F5830C-8CAF-CBC0-C5E5-B189CECF556A}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.38 = {F50BC0A1-DB47-BA5A-5C9A-A12E1C81241D}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.39 = {3AB21594-2130-A5AE-9E11-272637C9F9B6}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.40 = {D3852DD2-8840-44C9-AA7A-469FA8445DF3}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.41 = {967105F5-9828-18D8-0AB3-AB33A96DF792}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.42 = {E91FEE10-2BA4-53FC-07FA-0A5B3649595F}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.43 = {7453777E-C823-EFB7-31C1-FDF756EBAEBC}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.44 = {6452026D-0C54-4DCD-DA11-047FAC2224D7}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.45 = {058AAD6E-A940-FA17-F583-B3676E4DAC6C}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.46 = {83E8AB22-CED2-2646-3A5A-73EA46D8959F}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.47 = {7819CFB4-1D16-C2CA-3B58-319C41E552DF}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.48 = {99CE9F68-96D7-1FAF-65BF-DEEF6E5085B8}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.49 = {9B942FB3-91A0-9E4F-1514-1286B4872502}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.50 = {E1C134D4-C658-E321-DBBE-7D11200B882E}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.51 = {66C683AA-084B-50DD-3B04-ED38799342BA}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.52 = {274174A0-7101-29E3-D06A-6C0B009A3DDD}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.3 = {D55BE37F-A3CE-2CF1-7474-6961CF055BC0}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.4 = {A8B80D52-CD56-437D-0DF3-3798C9279FE4}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.5 = {BA7BEDE4-D74D-62E9-2A70-F3E2461698BB}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.6 = {E15D3136-619B-861B-D8FF-561A1F846B6C}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.7 = {D4C2A921-6257-1D72-592F-450E19AA3E20}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.8 = {98B5AC91-D6B1-1C99-9FEC-D1EEA525ED3B}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.9 = {8BBC74D9-616A-F075-D8FC-8B101A6C5730}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.10 = {403E853A-59C3-FBA1-AF01-2BF89B0DA2F7}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.11 = {32B86666-15E0-F234-58EC-50D3CC10AD59}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.12 = {96C3E65A-7CC9-961B-0681-395F51BC9CE2}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.13 = {26C0690C-CDA5-5C37-87AC-D0C18C4F7064}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.14 = {8EBBE255-F364-3793-8E84-4ACE0FB487A1}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.15 = {8E2C61D0-0DDE-9AC3-AB7E-8EE3B4EE09D4}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.16 = {26CDBAC0-9A46-F31F-B6F7-A729CF22B97D}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.17 = {10B1A9B3-DB3C-98CB-62C9-DB10F9F43396}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.18 = {0E134A9B-0448-2CD4-954B-9F3ECBD81534}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.19 = {F523A3D9-0D90-E985-CA29-10E441393BAE}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.20 = {73CFB4EB-077E-9A27-E4D4-145EA219E262}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.21 = {47A9A513-F45E-728E-D930-72B622AE538C}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.22 = {5281C5BB-2394-E384-DEDF-73F9F661705D}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.23 = {CB5A4EF1-E092-959D-EFD1-E0442F3119F1}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.24 = {23D61ADF-182D-DD0F-43F2-2E474EE1FB00}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.25 = {89822485-8A94-469B-7CA5-A2839C03D271}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.26 = {7577CC57-FF93-6E33-EC99-846E898BED29}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.27 = {754F06CF-F576-93C5-BE95-3EC4998D9E20}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.28 = {E167BD33-4E68-2BB7-C568-09FC289A2E9A}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.29 = {6AE42D83-4035-6C15-089B-D65BCF171A11}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.30 = {D7782591-5481-74E6-62CC-265E30D63A91}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.31 = {097814E8-8395-28B7-6CCF-374BA0D10503}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.32 = {4AA16ABE-76D3-AB92-ED64-43A057F4E5D0}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.33 = {E4F5830C-8CAF-CBC0-C5E5-B189CECF556A}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.34 = {F50BC0A1-DB47-BA5A-5C9A-A12E1C81241D}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.35 = {3AB21594-2130-A5AE-9E11-272637C9F9B6}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.36 = {D3852DD2-8840-44C9-AA7A-469FA8445DF3}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.37 = {967105F5-9828-18D8-0AB3-AB33A96DF792}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.38 = {E91FEE10-2BA4-53FC-07FA-0A5B3649595F}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.39 = {7453777E-C823-EFB7-31C1-FDF756EBAEBC}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.40 = {6452026D-0C54-4DCD-DA11-047FAC2224D7}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.41 = {058AAD6E-A940-FA17-F583-B3676E4DAC6C}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.42 = {83E8AB22-CED2-2646-3A5A-73EA46D8959F}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.43 = {7819CFB4-1D16-C2CA-3B58-319C41E552DF}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.44 = {99CE9F68-96D7-1FAF-65BF-DEEF6E5085B8}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.45 = {9B942FB3-91A0-9E4F-1514-1286B4872502}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.46 = {E1C134D4-C658-E321-DBBE-7D11200B882E}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.47 = {66C683AA-084B-50DD-3B04-ED38799342BA}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.48 = {274174A0-7101-29E3-D06A-6C0B009A3DDD}
{3EF52631-4486-D72B-BB17-DB8FCF36DDBA}.0 = {FE8C31C7-8C7C-B982-16AE-C6CA39940D52}
{EEC493BE-2745-954F-FA24-45447359FCDC}.0 = {FE8C31C7-8C7C-B982-16AE-C6CA39940D52}
{504CB6C0-4303-C53C-C345-AA750CD1A59D}.0 = {FE8C31C7-8C7C-B982-16AE-C6CA39940D52}
- {88DF53AC-1338-547B-6989-1C8B78DE542B}.0 = {FE8C31C7-8C7C-B982-16AE-C6CA39940D52}
{D55BE37F-A3CE-2CF1-7474-6961CF055BC0}.0 = {FE8C31C7-8C7C-B982-16AE-C6CA39940D52}
{D4C2A921-6257-1D72-592F-450E19AA3E20}.0 = {FE8C31C7-8C7C-B982-16AE-C6CA39940D52}
{96C3E65A-7CC9-961B-0681-395F51BC9CE2}.0 = {FE8C31C7-8C7C-B982-16AE-C6CA39940D52}
+ {26C0690C-CDA5-5C37-87AC-D0C18C4F7064}.0 = {FE8C31C7-8C7C-B982-16AE-C6CA39940D52}
{8EBBE255-F364-3793-8E84-4ACE0FB487A1}.0 = {FE8C31C7-8C7C-B982-16AE-C6CA39940D52}
- {EF50101E-0BAC-395C-42F9-378D37DA03CE}.0 = {FE8C31C7-8C7C-B982-16AE-C6CA39940D52}
{8E2C61D0-0DDE-9AC3-AB7E-8EE3B4EE09D4}.0 = {FE8C31C7-8C7C-B982-16AE-C6CA39940D52}
{26CDBAC0-9A46-F31F-B6F7-A729CF22B97D}.0 = {FE8C31C7-8C7C-B982-16AE-C6CA39940D52}
{10B1A9B3-DB3C-98CB-62C9-DB10F9F43396}.0 = {FE8C31C7-8C7C-B982-16AE-C6CA39940D52}
{0E134A9B-0448-2CD4-954B-9F3ECBD81534}.0 = {FE8C31C7-8C7C-B982-16AE-C6CA39940D52}
{F523A3D9-0D90-E985-CA29-10E441393BAE}.0 = {FE8C31C7-8C7C-B982-16AE-C6CA39940D52}
{73CFB4EB-077E-9A27-E4D4-145EA219E262}.0 = {FE8C31C7-8C7C-B982-16AE-C6CA39940D52}
- {98DD5582-CDDE-F076-F9C8-D6603B15A78E}.0 = {FE8C31C7-8C7C-B982-16AE-C6CA39940D52}
{47A9A513-F45E-728E-D930-72B622AE538C}.0 = {FE8C31C7-8C7C-B982-16AE-C6CA39940D52}
{5281C5BB-2394-E384-DEDF-73F9F661705D}.0 = {FE8C31C7-8C7C-B982-16AE-C6CA39940D52}
{CB5A4EF1-E092-959D-EFD1-E0442F3119F1}.0 = {FE8C31C7-8C7C-B982-16AE-C6CA39940D52}
- {4F4A2447-5243-2EF5-BE00-701BB9473BA1}.0 = {FE8C31C7-8C7C-B982-16AE-C6CA39940D52}
{23D61ADF-182D-DD0F-43F2-2E474EE1FB00}.0 = {FE8C31C7-8C7C-B982-16AE-C6CA39940D52}
{89822485-8A94-469B-7CA5-A2839C03D271}.0 = {FE8C31C7-8C7C-B982-16AE-C6CA39940D52}
{7577CC57-FF93-6E33-EC99-846E898BED29}.0 = {FE8C31C7-8C7C-B982-16AE-C6CA39940D52}
@@ -471,14 +452,6 @@
{504CB6C0-4303-C53C-C345-AA750CD1A59D}.Debug (with static libs).Build.0 = Debug (with static libs)|Win32
{504CB6C0-4303-C53C-C345-AA750CD1A59D}.Debug (with DLLs).ActiveCfg = Debug (with DLLs)|Win32
{504CB6C0-4303-C53C-C345-AA750CD1A59D}.Debug (with DLLs).Build.0 = Debug (with DLLs)|Win32
- {88DF53AC-1338-547B-6989-1C8B78DE542B}.Release (with static libs).ActiveCfg = Release (with static libs)|Win32
- {88DF53AC-1338-547B-6989-1C8B78DE542B}.Release (with static libs).Build.0 = Release (with static libs)|Win32
- {88DF53AC-1338-547B-6989-1C8B78DE542B}.Release (with DLLs).ActiveCfg = Release (with DLLs)|Win32
- {88DF53AC-1338-547B-6989-1C8B78DE542B}.Release (with DLLs).Build.0 = Release (with DLLs)|Win32
- {88DF53AC-1338-547B-6989-1C8B78DE542B}.Debug (with static libs).ActiveCfg = Debug (with static libs)|Win32
- {88DF53AC-1338-547B-6989-1C8B78DE542B}.Debug (with static libs).Build.0 = Debug (with static libs)|Win32
- {88DF53AC-1338-547B-6989-1C8B78DE542B}.Debug (with DLLs).ActiveCfg = Debug (with DLLs)|Win32
- {88DF53AC-1338-547B-6989-1C8B78DE542B}.Debug (with DLLs).Build.0 = Debug (with DLLs)|Win32
{D55BE37F-A3CE-2CF1-7474-6961CF055BC0}.Release (with static libs).ActiveCfg = Release (with static libs)|Win32
{D55BE37F-A3CE-2CF1-7474-6961CF055BC0}.Release (with static libs).Build.0 = Release (with static libs)|Win32
{D55BE37F-A3CE-2CF1-7474-6961CF055BC0}.Release (with DLLs).ActiveCfg = Release (with DLLs)|Win32
@@ -543,14 +516,6 @@
{403E853A-59C3-FBA1-AF01-2BF89B0DA2F7}.Debug (with static libs).Build.0 = Debug (with static libs)|Win32
{403E853A-59C3-FBA1-AF01-2BF89B0DA2F7}.Debug (with DLLs).ActiveCfg = Debug (with DLLs)|Win32
{403E853A-59C3-FBA1-AF01-2BF89B0DA2F7}.Debug (with DLLs).Build.0 = Debug (with DLLs)|Win32
- {58918459-7FD8-C582-569D-A58038ABE9D1}.Release (with static libs).ActiveCfg = Release (with static libs)|Win32
- {58918459-7FD8-C582-569D-A58038ABE9D1}.Release (with static libs).Build.0 = Release (with static libs)|Win32
- {58918459-7FD8-C582-569D-A58038ABE9D1}.Release (with DLLs).ActiveCfg = Release (with DLLs)|Win32
- {58918459-7FD8-C582-569D-A58038ABE9D1}.Release (with DLLs).Build.0 = Release (with DLLs)|Win32
- {58918459-7FD8-C582-569D-A58038ABE9D1}.Debug (with static libs).ActiveCfg = Debug (with static libs)|Win32
- {58918459-7FD8-C582-569D-A58038ABE9D1}.Debug (with static libs).Build.0 = Debug (with static libs)|Win32
- {58918459-7FD8-C582-569D-A58038ABE9D1}.Debug (with DLLs).ActiveCfg = Debug (with DLLs)|Win32
- {58918459-7FD8-C582-569D-A58038ABE9D1}.Debug (with DLLs).Build.0 = Debug (with DLLs)|Win32
{32B86666-15E0-F234-58EC-50D3CC10AD59}.Release (with static libs).ActiveCfg = Release (with static libs)|Win32
{32B86666-15E0-F234-58EC-50D3CC10AD59}.Release (with static libs).Build.0 = Release (with static libs)|Win32
{32B86666-15E0-F234-58EC-50D3CC10AD59}.Release (with DLLs).ActiveCfg = Release (with DLLs)|Win32
@@ -567,6 +532,14 @@
{96C3E65A-7CC9-961B-0681-395F51BC9CE2}.Debug (with static libs).Build.0 = Debug (with static libs)|Win32
{96C3E65A-7CC9-961B-0681-395F51BC9CE2}.Debug (with DLLs).ActiveCfg = Debug (with DLLs)|Win32
{96C3E65A-7CC9-961B-0681-395F51BC9CE2}.Debug (with DLLs).Build.0 = Debug (with DLLs)|Win32
+ {26C0690C-CDA5-5C37-87AC-D0C18C4F7064}.Release (with static libs).ActiveCfg = Release (with static libs)|Win32
+ {26C0690C-CDA5-5C37-87AC-D0C18C4F7064}.Release (with static libs).Build.0 = Release (with static libs)|Win32
+ {26C0690C-CDA5-5C37-87AC-D0C18C4F7064}.Release (with DLLs).ActiveCfg = Release (with DLLs)|Win32
+ {26C0690C-CDA5-5C37-87AC-D0C18C4F7064}.Release (with DLLs).Build.0 = Release (with DLLs)|Win32
+ {26C0690C-CDA5-5C37-87AC-D0C18C4F7064}.Debug (with static libs).ActiveCfg = Debug (with static libs)|Win32
+ {26C0690C-CDA5-5C37-87AC-D0C18C4F7064}.Debug (with static libs).Build.0 = Debug (with static libs)|Win32
+ {26C0690C-CDA5-5C37-87AC-D0C18C4F7064}.Debug (with DLLs).ActiveCfg = Debug (with DLLs)|Win32
+ {26C0690C-CDA5-5C37-87AC-D0C18C4F7064}.Debug (with DLLs).Build.0 = Debug (with DLLs)|Win32
{8EBBE255-F364-3793-8E84-4ACE0FB487A1}.Release (with static libs).ActiveCfg = Release (with static libs)|Win32
{8EBBE255-F364-3793-8E84-4ACE0FB487A1}.Release (with static libs).Build.0 = Release (with static libs)|Win32
{8EBBE255-F364-3793-8E84-4ACE0FB487A1}.Release (with DLLs).ActiveCfg = Release (with DLLs)|Win32
@@ -575,14 +548,6 @@
{8EBBE255-F364-3793-8E84-4ACE0FB487A1}.Debug (with static libs).Build.0 = Debug (with static libs)|Win32
{8EBBE255-F364-3793-8E84-4ACE0FB487A1}.Debug (with DLLs).ActiveCfg = Debug (with DLLs)|Win32
{8EBBE255-F364-3793-8E84-4ACE0FB487A1}.Debug (with DLLs).Build.0 = Debug (with DLLs)|Win32
- {EF50101E-0BAC-395C-42F9-378D37DA03CE}.Release (with static libs).ActiveCfg = Release (with static libs)|Win32
- {EF50101E-0BAC-395C-42F9-378D37DA03CE}.Release (with static libs).Build.0 = Release (with static libs)|Win32
- {EF50101E-0BAC-395C-42F9-378D37DA03CE}.Release (with DLLs).ActiveCfg = Release (with DLLs)|Win32
- {EF50101E-0BAC-395C-42F9-378D37DA03CE}.Release (with DLLs).Build.0 = Release (with DLLs)|Win32
- {EF50101E-0BAC-395C-42F9-378D37DA03CE}.Debug (with static libs).ActiveCfg = Debug (with static libs)|Win32
- {EF50101E-0BAC-395C-42F9-378D37DA03CE}.Debug (with static libs).Build.0 = Debug (with static libs)|Win32
- {EF50101E-0BAC-395C-42F9-378D37DA03CE}.Debug (with DLLs).ActiveCfg = Debug (with DLLs)|Win32
- {EF50101E-0BAC-395C-42F9-378D37DA03CE}.Debug (with DLLs).Build.0 = Debug (with DLLs)|Win32
{8E2C61D0-0DDE-9AC3-AB7E-8EE3B4EE09D4}.Release (with static libs).ActiveCfg = Release (with static libs)|Win32
{8E2C61D0-0DDE-9AC3-AB7E-8EE3B4EE09D4}.Release (with static libs).Build.0 = Release (with static libs)|Win32
{8E2C61D0-0DDE-9AC3-AB7E-8EE3B4EE09D4}.Release (with DLLs).ActiveCfg = Release (with DLLs)|Win32
@@ -631,14 +596,6 @@
{73CFB4EB-077E-9A27-E4D4-145EA219E262}.Debug (with static libs).Build.0 = Debug (with static libs)|Win32
{73CFB4EB-077E-9A27-E4D4-145EA219E262}.Debug (with DLLs).ActiveCfg = Debug (with DLLs)|Win32
{73CFB4EB-077E-9A27-E4D4-145EA219E262}.Debug (with DLLs).Build.0 = Debug (with DLLs)|Win32
- {98DD5582-CDDE-F076-F9C8-D6603B15A78E}.Release (with static libs).ActiveCfg = Release (with static libs)|Win32
- {98DD5582-CDDE-F076-F9C8-D6603B15A78E}.Release (with static libs).Build.0 = Release (with static libs)|Win32
- {98DD5582-CDDE-F076-F9C8-D6603B15A78E}.Release (with DLLs).ActiveCfg = Release (with DLLs)|Win32
- {98DD5582-CDDE-F076-F9C8-D6603B15A78E}.Release (with DLLs).Build.0 = Release (with DLLs)|Win32
- {98DD5582-CDDE-F076-F9C8-D6603B15A78E}.Debug (with static libs).ActiveCfg = Debug (with static libs)|Win32
- {98DD5582-CDDE-F076-F9C8-D6603B15A78E}.Debug (with static libs).Build.0 = Debug (with static libs)|Win32
- {98DD5582-CDDE-F076-F9C8-D6603B15A78E}.Debug (with DLLs).ActiveCfg = Debug (with DLLs)|Win32
- {98DD5582-CDDE-F076-F9C8-D6603B15A78E}.Debug (with DLLs).Build.0 = Debug (with DLLs)|Win32
{47A9A513-F45E-728E-D930-72B622AE538C}.Release (with static libs).ActiveCfg = Release (with static libs)|Win32
{47A9A513-F45E-728E-D930-72B622AE538C}.Release (with static libs).Build.0 = Release (with static libs)|Win32
{47A9A513-F45E-728E-D930-72B622AE538C}.Release (with DLLs).ActiveCfg = Release (with DLLs)|Win32
@@ -663,14 +620,6 @@
{CB5A4EF1-E092-959D-EFD1-E0442F3119F1}.Debug (with static libs).Build.0 = Debug (with static libs)|Win32
{CB5A4EF1-E092-959D-EFD1-E0442F3119F1}.Debug (with DLLs).ActiveCfg = Debug (with DLLs)|Win32
{CB5A4EF1-E092-959D-EFD1-E0442F3119F1}.Debug (with DLLs).Build.0 = Debug (with DLLs)|Win32
- {4F4A2447-5243-2EF5-BE00-701BB9473BA1}.Release (with static libs).ActiveCfg = Release (with static libs)|Win32
- {4F4A2447-5243-2EF5-BE00-701BB9473BA1}.Release (with static libs).Build.0 = Release (with static libs)|Win32
- {4F4A2447-5243-2EF5-BE00-701BB9473BA1}.Release (with DLLs).ActiveCfg = Release (with DLLs)|Win32
- {4F4A2447-5243-2EF5-BE00-701BB9473BA1}.Release (with DLLs).Build.0 = Release (with DLLs)|Win32
- {4F4A2447-5243-2EF5-BE00-701BB9473BA1}.Debug (with static libs).ActiveCfg = Debug (with static libs)|Win32
- {4F4A2447-5243-2EF5-BE00-701BB9473BA1}.Debug (with static libs).Build.0 = Debug (with static libs)|Win32
- {4F4A2447-5243-2EF5-BE00-701BB9473BA1}.Debug (with DLLs).ActiveCfg = Debug (with DLLs)|Win32
- {4F4A2447-5243-2EF5-BE00-701BB9473BA1}.Debug (with DLLs).Build.0 = Debug (with DLLs)|Win32
{23D61ADF-182D-DD0F-43F2-2E474EE1FB00}.Release (with static libs).ActiveCfg = Release (with static libs)|Win32
{23D61ADF-182D-DD0F-43F2-2E474EE1FB00}.Release (with static libs).Build.0 = Release (with static libs)|Win32
{23D61ADF-182D-DD0F-43F2-2E474EE1FB00}.Release (with DLLs).ActiveCfg = Release (with DLLs)|Win32
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/9/appbootstrap_static.vcproj /tmp/IB0bHXT4Oc/cel-1.4/msvc/9/appbootstrap_static.vcproj
--- cel-1.9+svn3615/msvc/9/appbootstrap_static.vcproj 2008-06-26 04:12:22.000000000 +0100
+++ cel-1.4/msvc/9/appbootstrap_static.vcproj 2009-11-28 16:47:26.000000000 +0000
@@ -54,7 +54,7 @@
OutputFile="..\..\bootstrap_static.exe"
ProgramDatabaseFile="..\..\out\release9\build\appbootstrap_static\bootstrap_static.pdb"
SubSystem="2"
- AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib ode.lib libcrystalspace_windows.lib version.lib libcrystalspace_directx.lib dsound.lib ddraw.lib dinput.lib libcrystalspace_opengl.lib cg.lib cgGL.lib opengl32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib "
+ AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib ode.lib libcrystalspace_windows.lib libcrystalspace_opengl.lib version.lib libcrystalspace_directx.lib dsound.lib ddraw.lib dinput.lib cg.lib cgGL.lib opengl32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib "
AdditionalDependencies="libcrystalspace.lib"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\..\CS\out\release9\libs;..\..\..\CS\libs\csutil\win32\libs;$(CRYSTAL)\out\release9\libs;$(CRYSTAL)\libs\csutil\win32\libs"
@@ -130,7 +130,7 @@
OutputFile="..\..\bootstrap_static.exe"
ProgramDatabaseFile="..\..\out\release9\build\appbootstrap_static\bootstrap_static.pdb"
SubSystem="2"
- AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib ode.lib libcrystalspace_windows.lib version.lib libcrystalspace_directx.lib dsound.lib ddraw.lib dinput.lib libcrystalspace_opengl.lib cg.lib cgGL.lib opengl32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib "
+ AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib ode.lib libcrystalspace_windows.lib libcrystalspace_opengl.lib version.lib libcrystalspace_directx.lib dsound.lib ddraw.lib dinput.lib cg.lib cgGL.lib opengl32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib "
AdditionalDependencies="libcrystalspace.lib"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\..\CS\out\release9\libs;..\..\..\CS\libs\csutil\win32\libs;$(CRYSTAL)\out\release9\libs;$(CRYSTAL)\libs\csutil\win32\libs"
@@ -203,7 +203,7 @@
OutputFile="..\..\bootstrap_static.exe"
ProgramDatabaseFile="..\..\out\debug9\build\appbootstrap_static\bootstrap_static.pdb"
SubSystem="1"
- AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib ode.lib libcrystalspace_windows_d.lib version.lib libcrystalspace_directx_d.lib dsound.lib ddraw.lib dinput.lib libcrystalspace_opengl_d.lib cg.lib cgGL.lib opengl32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib "
+ AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib ode.lib libcrystalspace_windows_d.lib libcrystalspace_opengl_d.lib version.lib libcrystalspace_directx_d.lib dsound.lib ddraw.lib dinput.lib cg.lib cgGL.lib opengl32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib "
AdditionalDependencies="libcrystalspace_d.lib"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\..\CS\out\debug9\libs;..\..\..\CS\libs\csutil\win32\libs;$(CRYSTAL)\out\debug9\libs;$(CRYSTAL)\libs\csutil\win32\libs"
@@ -276,7 +276,7 @@
OutputFile="..\..\bootstrap_static.exe"
ProgramDatabaseFile="..\..\out\debug9\build\appbootstrap_static\bootstrap_static.pdb"
SubSystem="1"
- AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib ode.lib libcrystalspace_windows_d.lib version.lib libcrystalspace_directx_d.lib dsound.lib ddraw.lib dinput.lib libcrystalspace_opengl_d.lib cg.lib cgGL.lib opengl32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib "
+ AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib ode.lib libcrystalspace_windows_d.lib libcrystalspace_opengl_d.lib version.lib libcrystalspace_directx_d.lib dsound.lib ddraw.lib dinput.lib cg.lib cgGL.lib opengl32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib "
AdditionalDependencies="libcrystalspace_d.lib"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\..\CS\out\debug9\libs;..\..\..\CS\libs\csutil\win32\libs;$(CRYSTAL)\out\debug9\libs;$(CRYSTAL)\libs\csutil\win32\libs"
@@ -335,6 +335,9 @@
Name="Resource Files"
Filter="">
+
+
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/9/appbootstrap.vcproj /tmp/IB0bHXT4Oc/cel-1.4/msvc/9/appbootstrap.vcproj
--- cel-1.9+svn3615/msvc/9/appbootstrap.vcproj 2008-01-09 00:55:24.000000000 +0000
+++ cel-1.4/msvc/9/appbootstrap.vcproj 2009-11-28 16:47:25.000000000 +0000
@@ -329,6 +329,9 @@
Name="Resource Files"
Filter="">
+
+
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/9/appcelstart_static.vcproj /tmp/IB0bHXT4Oc/cel-1.4/msvc/9/appcelstart_static.vcproj
--- cel-1.9+svn3615/msvc/9/appcelstart_static.vcproj 2008-08-01 04:11:53.000000000 +0100
+++ cel-1.4/msvc/9/appcelstart_static.vcproj 2009-11-28 16:47:25.000000000 +0000
@@ -54,7 +54,7 @@
OutputFile="..\..\celstart_static.exe"
ProgramDatabaseFile="..\..\out\release9\build\appcelstart_static\celstart_static.pdb"
SubSystem="2"
- AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib cal3d-vc9.lib libcrystalspace_windows.lib version.lib libcrystalspace_directx.lib dsound.lib ddraw.lib dinput.lib bulletcollision-vc9.lib bulletdynamics-vc9.lib bulletmath-vc9.lib libcrystalspace_opengl.lib cg.lib cgGL.lib opengl32.lib ode.lib openal32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib "
+ AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib cal3d-vc9.lib libcrystalspace_windows.lib libcrystalspace_opengl.lib version.lib libcrystalspace_directx.lib dsound.lib ddraw.lib dinput.lib bulletcollision-vc9.lib bulletdynamics-vc9.lib bulletmath-vc9.lib CEGUIBase-vc9.lib cg.lib cgGL.lib opengl32.lib ode.lib openal32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib "
AdditionalDependencies="libcrystalspace.lib"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\..\CS\out\release9\libs;..\..\..\CS\libs\csutil\win32\libs;$(CRYSTAL)\out\release9\libs;$(CRYSTAL)\libs\csutil\win32\libs"
@@ -130,7 +130,7 @@
OutputFile="..\..\celstart_static.exe"
ProgramDatabaseFile="..\..\out\release9\build\appcelstart_static\celstart_static.pdb"
SubSystem="2"
- AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib cal3d-vc9.lib libcrystalspace_windows.lib version.lib libcrystalspace_directx.lib dsound.lib ddraw.lib dinput.lib bulletcollision-vc9.lib bulletdynamics-vc9.lib bulletmath-vc9.lib libcrystalspace_opengl.lib cg.lib cgGL.lib opengl32.lib ode.lib openal32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib "
+ AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib cal3d-vc9.lib libcrystalspace_windows.lib libcrystalspace_opengl.lib version.lib libcrystalspace_directx.lib dsound.lib ddraw.lib dinput.lib bulletcollision-vc9.lib bulletdynamics-vc9.lib bulletmath-vc9.lib CEGUIBase-vc9.lib cg.lib cgGL.lib opengl32.lib ode.lib openal32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib "
AdditionalDependencies="libcrystalspace.lib"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\..\CS\out\release9\libs;..\..\..\CS\libs\csutil\win32\libs;$(CRYSTAL)\out\release9\libs;$(CRYSTAL)\libs\csutil\win32\libs"
@@ -203,7 +203,7 @@
OutputFile="..\..\celstart_static.exe"
ProgramDatabaseFile="..\..\out\debug9\build\appcelstart_static\celstart_static.pdb"
SubSystem="1"
- AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib cal3d-vc9_d.lib libcrystalspace_windows_d.lib version.lib libcrystalspace_directx_d.lib dsound.lib ddraw.lib dinput.lib bulletcollision-vc9_d.lib bulletdynamics-vc9_d.lib bulletmath-vc9_d.lib libcrystalspace_opengl_d.lib cg.lib cgGL.lib opengl32.lib ode.lib openal32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib "
+ AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib cal3d-vc9_d.lib libcrystalspace_windows_d.lib libcrystalspace_opengl_d.lib version.lib libcrystalspace_directx_d.lib dsound.lib ddraw.lib dinput.lib bulletcollision-vc9_d.lib bulletdynamics-vc9_d.lib bulletmath-vc9_d.lib CEGUIBase-vc9_d.lib cg.lib cgGL.lib opengl32.lib ode.lib openal32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib "
AdditionalDependencies="libcrystalspace_d.lib"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\..\CS\out\debug9\libs;..\..\..\CS\libs\csutil\win32\libs;$(CRYSTAL)\out\debug9\libs;$(CRYSTAL)\libs\csutil\win32\libs"
@@ -276,7 +276,7 @@
OutputFile="..\..\celstart_static.exe"
ProgramDatabaseFile="..\..\out\debug9\build\appcelstart_static\celstart_static.pdb"
SubSystem="1"
- AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib cal3d-vc9_d.lib libcrystalspace_windows_d.lib version.lib libcrystalspace_directx_d.lib dsound.lib ddraw.lib dinput.lib bulletcollision-vc9_d.lib bulletdynamics-vc9_d.lib bulletmath-vc9_d.lib libcrystalspace_opengl_d.lib cg.lib cgGL.lib opengl32.lib ode.lib openal32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib "
+ AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib cal3d-vc9_d.lib libcrystalspace_windows_d.lib libcrystalspace_opengl_d.lib version.lib libcrystalspace_directx_d.lib dsound.lib ddraw.lib dinput.lib bulletcollision-vc9_d.lib bulletdynamics-vc9_d.lib bulletmath-vc9_d.lib CEGUIBase-vc9_d.lib cg.lib cgGL.lib opengl32.lib ode.lib openal32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib "
AdditionalDependencies="libcrystalspace_d.lib"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="..\..\..\CS\out\debug9\libs;..\..\..\CS\libs\csutil\win32\libs;$(CRYSTAL)\out\debug9\libs;$(CRYSTAL)\libs\csutil\win32\libs"
@@ -335,6 +335,9 @@
Name="Resource Files"
Filter="">
+
+
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/9/appcelstart.vcproj /tmp/IB0bHXT4Oc/cel-1.4/msvc/9/appcelstart.vcproj
--- cel-1.9+svn3615/msvc/9/appcelstart.vcproj 2008-01-09 00:55:24.000000000 +0000
+++ cel-1.4/msvc/9/appcelstart.vcproj 2009-11-28 16:47:26.000000000 +0000
@@ -329,6 +329,9 @@
Name="Resource Files"
Filter="">
+
+
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/9/appceltst_static.vcproj /tmp/IB0bHXT4Oc/cel-1.4/msvc/9/appceltst_static.vcproj
--- cel-1.9+svn3615/msvc/9/appceltst_static.vcproj 2008-01-10 00:53:32.000000000 +0000
+++ cel-1.4/msvc/9/appceltst_static.vcproj 2009-11-28 16:47:25.000000000 +0000
@@ -338,6 +338,9 @@
Name="Resource Files"
Filter="">
+
+
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/9/appceltst.vcproj /tmp/IB0bHXT4Oc/cel-1.4/msvc/9/appceltst.vcproj
--- cel-1.9+svn3615/msvc/9/appceltst.vcproj 2008-01-09 00:55:24.000000000 +0000
+++ cel-1.4/msvc/9/appceltst.vcproj 2009-11-28 16:47:26.000000000 +0000
@@ -332,6 +332,9 @@
Name="Resource Files"
Filter="">
+
+
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/9/appevolvecraft.vcproj /tmp/IB0bHXT4Oc/cel-1.4/msvc/9/appevolvecraft.vcproj
--- cel-1.9+svn3615/msvc/9/appevolvecraft.vcproj 2008-01-09 00:55:24.000000000 +0000
+++ cel-1.4/msvc/9/appevolvecraft.vcproj 2009-11-28 16:47:25.000000000 +0000
@@ -344,6 +344,9 @@
Name="Resource Files"
Filter="">
+
+
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/9/appgraph.vcproj /tmp/IB0bHXT4Oc/cel-1.4/msvc/9/appgraph.vcproj
--- cel-1.9+svn3615/msvc/9/appgraph.vcproj 2008-01-09 00:55:24.000000000 +0000
+++ cel-1.4/msvc/9/appgraph.vcproj 2009-11-28 16:47:25.000000000 +0000
@@ -338,6 +338,9 @@
Name="Resource Files"
Filter="">
+
+
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/9/apphovertest.vcproj /tmp/IB0bHXT4Oc/cel-1.4/msvc/9/apphovertest.vcproj
--- cel-1.9+svn3615/msvc/9/apphovertest.vcproj 2008-01-09 00:55:24.000000000 +0000
+++ cel-1.4/msvc/9/apphovertest.vcproj 2009-11-28 16:47:25.000000000 +0000
@@ -344,6 +344,9 @@
Name="Resource Files"
Filter="">
+
+
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/9/appnettest_static.vcproj /tmp/IB0bHXT4Oc/cel-1.4/msvc/9/appnettest_static.vcproj
--- cel-1.9+svn3615/msvc/9/appnettest_static.vcproj 2008-01-10 00:53:32.000000000 +0000
+++ cel-1.4/msvc/9/appnettest_static.vcproj 2009-11-28 16:47:25.000000000 +0000
@@ -347,6 +347,9 @@
Name="Resource Files"
Filter="">
+
+
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/9/appnettest.vcproj /tmp/IB0bHXT4Oc/cel-1.4/msvc/9/appnettest.vcproj
--- cel-1.9+svn3615/msvc/9/appnettest.vcproj 2008-01-09 00:55:24.000000000 +0000
+++ cel-1.4/msvc/9/appnettest.vcproj 2009-11-28 16:47:25.000000000 +0000
@@ -341,6 +341,9 @@
Name="Resource Files"
Filter="">
+
+
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/9/appsteering.vcproj /tmp/IB0bHXT4Oc/cel-1.4/msvc/9/appsteering.vcproj
--- cel-1.9+svn3615/msvc/9/appsteering.vcproj 2008-01-09 00:55:24.000000000 +0000
+++ cel-1.4/msvc/9/appsteering.vcproj 2009-11-28 16:47:25.000000000 +0000
@@ -338,6 +338,9 @@
Name="Resource Files"
Filter="">
+
+
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/9/appwalktut.vcproj /tmp/IB0bHXT4Oc/cel-1.4/msvc/9/appwalktut.vcproj
--- cel-1.9+svn3615/msvc/9/appwalktut.vcproj 2008-01-09 00:55:24.000000000 +0000
+++ cel-1.4/msvc/9/appwalktut.vcproj 2009-11-28 16:47:26.000000000 +0000
@@ -338,6 +338,9 @@
Name="Resource Files"
Filter="">
+
+
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/9/appwheeledtest.vcproj /tmp/IB0bHXT4Oc/cel-1.4/msvc/9/appwheeledtest.vcproj
--- cel-1.9+svn3615/msvc/9/appwheeledtest.vcproj 2008-01-09 00:55:24.000000000 +0000
+++ cel-1.4/msvc/9/appwheeledtest.vcproj 2009-11-28 16:47:26.000000000 +0000
@@ -332,6 +332,9 @@
Name="Resource Files"
Filter="">
+
+
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/9/libbootstrap_static_plugins_CRYSTAL.vcproj /tmp/IB0bHXT4Oc/cel-1.4/msvc/9/libbootstrap_static_plugins_CRYSTAL.vcproj
--- cel-1.9+svn3615/msvc/9/libbootstrap_static_plugins_CRYSTAL.vcproj 2008-06-26 04:12:22.000000000 +0100
+++ cel-1.4/msvc/9/libbootstrap_static_plugins_CRYSTAL.vcproj 2009-11-28 16:47:25.000000000 +0000
@@ -49,7 +49,7 @@
EnableCOMDATFolding="2"
GenerateDebugInformation="TRUE"
IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD"
- AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib ode.lib libcrystalspace_windows.lib version.lib libcrystalspace_directx.lib dsound.lib ddraw.lib dinput.lib libcrystalspace_opengl.lib cg.lib cgGL.lib opengl32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib "
+ AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib ode.lib libcrystalspace_windows.lib libcrystalspace_opengl.lib version.lib libcrystalspace_directx.lib dsound.lib ddraw.lib dinput.lib cg.lib cgGL.lib opengl32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib "
AdditionalDependencies=""
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=""
@@ -99,7 +99,7 @@
RuntimeLibrary="2"
DebugInformationFormat="3"
BufferSecurityCheck="FALSE"
- ProgramDatabaseFileName="..\..\out\release9\build\libbootstrap_static_plugins_CRYSTAL\bootstrap_static_plugins_CRYSTAL-1.9-vc9.pdb"
+ ProgramDatabaseFileName="..\..\out\release9\build\libbootstrap_static_plugins_CRYSTAL\bootstrap_static_plugins_CRYSTAL-1.4-vc9.pdb"
PreprocessorDefinitions="NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;PACKAGE_NAME=CEL;_WINDOWS;WIN32;CS_BUILD_SHARED_LIBS;CEL_BUILD_SHARED_LIBS"
OptimizeForProcessor="1"
AdditionalOptions=" "
@@ -122,10 +122,10 @@
EnableCOMDATFolding="2"
GenerateDebugInformation="TRUE"
IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD"
- OutputFile="..\..\bootstrap_static_plugins_CRYSTAL-1.9-vc9.dll"
+ OutputFile="..\..\bootstrap_static_plugins_CRYSTAL-1.4-vc9.dll"
ImportLibrary="..\..\out\release9\libs\libbootstrap_static_plugins_CRYSTAL.lib"
- ProgramDatabaseFile="..\..\out\release9\build\libbootstrap_static_plugins_CRYSTAL\bootstrap_static_plugins_CRYSTAL-1.9-vc9.pdb"
- AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib ode.lib libcrystalspace_windows.lib version.lib libcrystalspace_directx.lib dsound.lib ddraw.lib dinput.lib libcrystalspace_opengl.lib cg.lib cgGL.lib opengl32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib "
+ ProgramDatabaseFile="..\..\out\release9\build\libbootstrap_static_plugins_CRYSTAL\bootstrap_static_plugins_CRYSTAL-1.4-vc9.pdb"
+ AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib ode.lib libcrystalspace_windows.lib libcrystalspace_opengl.lib version.lib libcrystalspace_directx.lib dsound.lib ddraw.lib dinput.lib cg.lib cgGL.lib opengl32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib "
AdditionalDependencies=""
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=""
@@ -194,7 +194,7 @@
LinkIncremental="2"
GenerateDebugInformation="TRUE"
IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD,MSVCRT"
- AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib ode.lib libcrystalspace_windows_d.lib version.lib libcrystalspace_directx_d.lib dsound.lib ddraw.lib dinput.lib libcrystalspace_opengl_d.lib cg.lib cgGL.lib opengl32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib "
+ AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib ode.lib libcrystalspace_windows_d.lib libcrystalspace_opengl_d.lib version.lib libcrystalspace_directx_d.lib dsound.lib ddraw.lib dinput.lib cg.lib cgGL.lib opengl32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib "
AdditionalDependencies=""
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=""
@@ -244,7 +244,7 @@
RuntimeLibrary="3"
- ProgramDatabaseFileName="..\..\out\debug9\build\libbootstrap_static_plugins_CRYSTAL\bootstrap_static_plugins_CRYSTAL-1.9-vc9_d.pdb"
+ ProgramDatabaseFileName="..\..\out\debug9\build\libbootstrap_static_plugins_CRYSTAL\bootstrap_static_plugins_CRYSTAL-1.4-vc9_d.pdb"
PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;PACKAGE_NAME=CEL;_WINDOWS;WIN32;CS_BUILD_SHARED_LIBS;CEL_BUILD_SHARED_LIBS"
OptimizeForProcessor="1"
AdditionalOptions=" "
@@ -265,10 +265,10 @@
LinkIncremental="2"
GenerateDebugInformation="TRUE"
IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD,MSVCRT"
- OutputFile="..\..\bootstrap_static_plugins_CRYSTAL-1.9-vc9_d.dll"
+ OutputFile="..\..\bootstrap_static_plugins_CRYSTAL-1.4-vc9_d.dll"
ImportLibrary="..\..\out\debug9\libs\libbootstrap_static_plugins_CRYSTAL_d.lib"
- ProgramDatabaseFile="..\..\out\debug9\build\libbootstrap_static_plugins_CRYSTAL\bootstrap_static_plugins_CRYSTAL-1.9-vc9_d.pdb"
- AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib ode.lib libcrystalspace_windows_d.lib version.lib libcrystalspace_directx_d.lib dsound.lib ddraw.lib dinput.lib libcrystalspace_opengl_d.lib cg.lib cgGL.lib opengl32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib "
+ ProgramDatabaseFile="..\..\out\debug9\build\libbootstrap_static_plugins_CRYSTAL\bootstrap_static_plugins_CRYSTAL-1.4-vc9_d.pdb"
+ AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib ode.lib libcrystalspace_windows_d.lib libcrystalspace_opengl_d.lib version.lib libcrystalspace_directx_d.lib dsound.lib ddraw.lib dinput.lib cg.lib cgGL.lib opengl32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib "
AdditionalDependencies=""
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=""
@@ -313,6 +313,13 @@
RelativePath="..\..\msvc\appbootstrap_static_staticuse_CRYSTAL.cpp">
+
+
+
+
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/9/libbootstrap_static_plugins.vcproj /tmp/IB0bHXT4Oc/cel-1.4/msvc/9/libbootstrap_static_plugins.vcproj
--- cel-1.9+svn3615/msvc/9/libbootstrap_static_plugins.vcproj 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/msvc/9/libbootstrap_static_plugins.vcproj 2009-11-28 16:47:26.000000000 +0000
@@ -99,7 +99,7 @@
RuntimeLibrary="2"
DebugInformationFormat="3"
BufferSecurityCheck="FALSE"
- ProgramDatabaseFileName="..\..\out\release9\build\libbootstrap_static_plugins\bootstrap_static_plugins-1.9-vc9.pdb"
+ ProgramDatabaseFileName="..\..\out\release9\build\libbootstrap_static_plugins\bootstrap_static_plugins-1.4-vc9.pdb"
PreprocessorDefinitions="NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;PACKAGE_NAME=CEL;_WINDOWS;WIN32;CS_BUILD_SHARED_LIBS;CEL_BUILD_SHARED_LIBS"
OptimizeForProcessor="1"
AdditionalOptions=" "
@@ -122,9 +122,9 @@
EnableCOMDATFolding="2"
GenerateDebugInformation="TRUE"
IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD"
- OutputFile="..\..\bootstrap_static_plugins-1.9-vc9.dll"
+ OutputFile="..\..\bootstrap_static_plugins-1.4-vc9.dll"
ImportLibrary="..\..\out\release9\libs\libbootstrap_static_plugins.lib"
- ProgramDatabaseFile="..\..\out\release9\build\libbootstrap_static_plugins\bootstrap_static_plugins-1.9-vc9.pdb"
+ ProgramDatabaseFile="..\..\out\release9\build\libbootstrap_static_plugins\bootstrap_static_plugins-1.4-vc9.pdb"
AdditionalOptions=" "
AdditionalDependencies="libcrystalspace.lib"
SuppressStartupBanner="TRUE"
@@ -244,7 +244,7 @@
RuntimeLibrary="3"
- ProgramDatabaseFileName="..\..\out\debug9\build\libbootstrap_static_plugins\bootstrap_static_plugins-1.9-vc9_d.pdb"
+ ProgramDatabaseFileName="..\..\out\debug9\build\libbootstrap_static_plugins\bootstrap_static_plugins-1.4-vc9_d.pdb"
PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;PACKAGE_NAME=CEL;_WINDOWS;WIN32;CS_BUILD_SHARED_LIBS;CEL_BUILD_SHARED_LIBS"
OptimizeForProcessor="1"
AdditionalOptions=" "
@@ -265,9 +265,9 @@
LinkIncremental="2"
GenerateDebugInformation="TRUE"
IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD,MSVCRT"
- OutputFile="..\..\bootstrap_static_plugins-1.9-vc9_d.dll"
+ OutputFile="..\..\bootstrap_static_plugins-1.4-vc9_d.dll"
ImportLibrary="..\..\out\debug9\libs\libbootstrap_static_plugins_d.lib"
- ProgramDatabaseFile="..\..\out\debug9\build\libbootstrap_static_plugins\bootstrap_static_plugins-1.9-vc9_d.pdb"
+ ProgramDatabaseFile="..\..\out\debug9\build\libbootstrap_static_plugins\bootstrap_static_plugins-1.4-vc9_d.pdb"
AdditionalOptions=" "
AdditionalDependencies="libcrystalspace_d.lib"
SuppressStartupBanner="TRUE"
@@ -313,6 +313,13 @@
RelativePath="..\..\msvc\appbootstrap_static_staticuse.cpp">
+
+
+
+
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/9/libcelstart_static_plugins_CRYSTAL.vcproj /tmp/IB0bHXT4Oc/cel-1.4/msvc/9/libcelstart_static_plugins_CRYSTAL.vcproj
--- cel-1.9+svn3615/msvc/9/libcelstart_static_plugins_CRYSTAL.vcproj 2008-08-01 04:11:53.000000000 +0100
+++ cel-1.4/msvc/9/libcelstart_static_plugins_CRYSTAL.vcproj 2009-11-28 16:47:25.000000000 +0000
@@ -49,7 +49,7 @@
EnableCOMDATFolding="2"
GenerateDebugInformation="TRUE"
IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD"
- AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib cal3d-vc9.lib libcrystalspace_windows.lib version.lib libcrystalspace_directx.lib dsound.lib ddraw.lib dinput.lib bulletcollision-vc9.lib bulletdynamics-vc9.lib bulletmath-vc9.lib libcrystalspace_opengl.lib cg.lib cgGL.lib opengl32.lib ode.lib openal32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib "
+ AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib cal3d-vc9.lib libcrystalspace_windows.lib libcrystalspace_opengl.lib version.lib libcrystalspace_directx.lib dsound.lib ddraw.lib dinput.lib bulletcollision-vc9.lib bulletdynamics-vc9.lib bulletmath-vc9.lib CEGUIBase-vc9.lib cg.lib cgGL.lib opengl32.lib ode.lib openal32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib "
AdditionalDependencies=""
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=""
@@ -99,7 +99,7 @@
RuntimeLibrary="2"
DebugInformationFormat="3"
BufferSecurityCheck="FALSE"
- ProgramDatabaseFileName="..\..\out\release9\build\libcelstart_static_plugins_CRYSTAL\celstart_static_plugins_CRYSTAL-1.9-vc9.pdb"
+ ProgramDatabaseFileName="..\..\out\release9\build\libcelstart_static_plugins_CRYSTAL\celstart_static_plugins_CRYSTAL-1.4-vc9.pdb"
PreprocessorDefinitions="NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;PACKAGE_NAME=CEL;_WINDOWS;WIN32;CS_BUILD_SHARED_LIBS;CEL_BUILD_SHARED_LIBS"
OptimizeForProcessor="1"
AdditionalOptions="/D CS_HAVE_CAL3D "
@@ -122,10 +122,10 @@
EnableCOMDATFolding="2"
GenerateDebugInformation="TRUE"
IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD"
- OutputFile="..\..\celstart_static_plugins_CRYSTAL-1.9-vc9.dll"
+ OutputFile="..\..\celstart_static_plugins_CRYSTAL-1.4-vc9.dll"
ImportLibrary="..\..\out\release9\libs\libcelstart_static_plugins_CRYSTAL.lib"
- ProgramDatabaseFile="..\..\out\release9\build\libcelstart_static_plugins_CRYSTAL\celstart_static_plugins_CRYSTAL-1.9-vc9.pdb"
- AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib cal3d-vc9.lib libcrystalspace_windows.lib version.lib libcrystalspace_directx.lib dsound.lib ddraw.lib dinput.lib bulletcollision-vc9.lib bulletdynamics-vc9.lib bulletmath-vc9.lib libcrystalspace_opengl.lib cg.lib cgGL.lib opengl32.lib ode.lib openal32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib "
+ ProgramDatabaseFile="..\..\out\release9\build\libcelstart_static_plugins_CRYSTAL\celstart_static_plugins_CRYSTAL-1.4-vc9.pdb"
+ AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib cal3d-vc9.lib libcrystalspace_windows.lib libcrystalspace_opengl.lib version.lib libcrystalspace_directx.lib dsound.lib ddraw.lib dinput.lib bulletcollision-vc9.lib bulletdynamics-vc9.lib bulletmath-vc9.lib CEGUIBase-vc9.lib cg.lib cgGL.lib opengl32.lib ode.lib openal32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib "
AdditionalDependencies=""
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=""
@@ -194,7 +194,7 @@
LinkIncremental="2"
GenerateDebugInformation="TRUE"
IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD,MSVCRT"
- AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib cal3d-vc9_d.lib libcrystalspace_windows_d.lib version.lib libcrystalspace_directx_d.lib dsound.lib ddraw.lib dinput.lib bulletcollision-vc9_d.lib bulletdynamics-vc9_d.lib bulletmath-vc9_d.lib libcrystalspace_opengl_d.lib cg.lib cgGL.lib opengl32.lib ode.lib openal32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib "
+ AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib cal3d-vc9_d.lib libcrystalspace_windows_d.lib libcrystalspace_opengl_d.lib version.lib libcrystalspace_directx_d.lib dsound.lib ddraw.lib dinput.lib bulletcollision-vc9_d.lib bulletdynamics-vc9_d.lib bulletmath-vc9_d.lib CEGUIBase-vc9_d.lib cg.lib cgGL.lib opengl32.lib ode.lib openal32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib "
AdditionalDependencies=""
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=""
@@ -244,7 +244,7 @@
RuntimeLibrary="3"
- ProgramDatabaseFileName="..\..\out\debug9\build\libcelstart_static_plugins_CRYSTAL\celstart_static_plugins_CRYSTAL-1.9-vc9_d.pdb"
+ ProgramDatabaseFileName="..\..\out\debug9\build\libcelstart_static_plugins_CRYSTAL\celstart_static_plugins_CRYSTAL-1.4-vc9_d.pdb"
PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;PACKAGE_NAME=CEL;_WINDOWS;WIN32;CS_BUILD_SHARED_LIBS;CEL_BUILD_SHARED_LIBS"
OptimizeForProcessor="1"
AdditionalOptions="/D CS_HAVE_CAL3D "
@@ -265,10 +265,10 @@
LinkIncremental="2"
GenerateDebugInformation="TRUE"
IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD,MSVCRT"
- OutputFile="..\..\celstart_static_plugins_CRYSTAL-1.9-vc9_d.dll"
+ OutputFile="..\..\celstart_static_plugins_CRYSTAL-1.4-vc9_d.dll"
ImportLibrary="..\..\out\debug9\libs\libcelstart_static_plugins_CRYSTAL_d.lib"
- ProgramDatabaseFile="..\..\out\debug9\build\libcelstart_static_plugins_CRYSTAL\celstart_static_plugins_CRYSTAL-1.9-vc9_d.pdb"
- AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib cal3d-vc9_d.lib libcrystalspace_windows_d.lib version.lib libcrystalspace_directx_d.lib dsound.lib ddraw.lib dinput.lib bulletcollision-vc9_d.lib bulletdynamics-vc9_d.lib bulletmath-vc9_d.lib libcrystalspace_opengl_d.lib cg.lib cgGL.lib opengl32.lib ode.lib openal32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib "
+ ProgramDatabaseFile="..\..\out\debug9\build\libcelstart_static_plugins_CRYSTAL\celstart_static_plugins_CRYSTAL-1.4-vc9_d.pdb"
+ AdditionalOptions="libmng.lib libjpeg.lib libpng.lib freetype2.lib cal3d-vc9_d.lib libcrystalspace_windows_d.lib libcrystalspace_opengl_d.lib version.lib libcrystalspace_directx_d.lib dsound.lib ddraw.lib dinput.lib bulletcollision-vc9_d.lib bulletdynamics-vc9_d.lib bulletmath-vc9_d.lib CEGUIBase-vc9_d.lib cg.lib cgGL.lib opengl32.lib ode.lib openal32.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib "
AdditionalDependencies=""
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=""
@@ -313,6 +313,13 @@
RelativePath="..\..\msvc\appcelstart_static_staticuse_CRYSTAL.cpp">
+
+
+
+
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/9/libcelstart_static_plugins.vcproj /tmp/IB0bHXT4Oc/cel-1.4/msvc/9/libcelstart_static_plugins.vcproj
--- cel-1.9+svn3615/msvc/9/libcelstart_static_plugins.vcproj 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/msvc/9/libcelstart_static_plugins.vcproj 2009-11-28 16:47:26.000000000 +0000
@@ -99,7 +99,7 @@
RuntimeLibrary="2"
DebugInformationFormat="3"
BufferSecurityCheck="FALSE"
- ProgramDatabaseFileName="..\..\out\release9\build\libcelstart_static_plugins\celstart_static_plugins-1.9-vc9.pdb"
+ ProgramDatabaseFileName="..\..\out\release9\build\libcelstart_static_plugins\celstart_static_plugins-1.4-vc9.pdb"
PreprocessorDefinitions="NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;PACKAGE_NAME=CEL;_WINDOWS;WIN32;CS_BUILD_SHARED_LIBS;CEL_BUILD_SHARED_LIBS"
OptimizeForProcessor="1"
AdditionalOptions=" "
@@ -122,9 +122,9 @@
EnableCOMDATFolding="2"
GenerateDebugInformation="TRUE"
IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD"
- OutputFile="..\..\celstart_static_plugins-1.9-vc9.dll"
+ OutputFile="..\..\celstart_static_plugins-1.4-vc9.dll"
ImportLibrary="..\..\out\release9\libs\libcelstart_static_plugins.lib"
- ProgramDatabaseFile="..\..\out\release9\build\libcelstart_static_plugins\celstart_static_plugins-1.9-vc9.pdb"
+ ProgramDatabaseFile="..\..\out\release9\build\libcelstart_static_plugins\celstart_static_plugins-1.4-vc9.pdb"
AdditionalOptions=" "
AdditionalDependencies="libcrystalspace.lib"
SuppressStartupBanner="TRUE"
@@ -244,7 +244,7 @@
RuntimeLibrary="3"
- ProgramDatabaseFileName="..\..\out\debug9\build\libcelstart_static_plugins\celstart_static_plugins-1.9-vc9_d.pdb"
+ ProgramDatabaseFileName="..\..\out\debug9\build\libcelstart_static_plugins\celstart_static_plugins-1.4-vc9_d.pdb"
PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;PACKAGE_NAME=CEL;_WINDOWS;WIN32;CS_BUILD_SHARED_LIBS;CEL_BUILD_SHARED_LIBS"
OptimizeForProcessor="1"
AdditionalOptions=" "
@@ -265,9 +265,9 @@
LinkIncremental="2"
GenerateDebugInformation="TRUE"
IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD,MSVCRT"
- OutputFile="..\..\celstart_static_plugins-1.9-vc9_d.dll"
+ OutputFile="..\..\celstart_static_plugins-1.4-vc9_d.dll"
ImportLibrary="..\..\out\debug9\libs\libcelstart_static_plugins_d.lib"
- ProgramDatabaseFile="..\..\out\debug9\build\libcelstart_static_plugins\celstart_static_plugins-1.9-vc9_d.pdb"
+ ProgramDatabaseFile="..\..\out\debug9\build\libcelstart_static_plugins\celstart_static_plugins-1.4-vc9_d.pdb"
AdditionalOptions=" "
AdditionalDependencies="libcrystalspace_d.lib"
SuppressStartupBanner="TRUE"
@@ -313,6 +313,13 @@
RelativePath="..\..\msvc\appcelstart_static_staticuse.cpp">
+
+
+
+
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/9/libcel_staticplugins.vcproj /tmp/IB0bHXT4Oc/cel-1.4/msvc/9/libcel_staticplugins.vcproj
--- cel-1.9+svn3615/msvc/9/libcel_staticplugins.vcproj 2008-07-28 04:02:17.000000000 +0100
+++ cel-1.4/msvc/9/libcel_staticplugins.vcproj 2009-11-28 16:47:26.000000000 +0000
@@ -376,31 +376,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
@@ -601,31 +576,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
@@ -676,53 +626,53 @@
+ RelativePath="..\..\msvc\libpfactoranalog_staticreg.cpp">
+ ObjectFile="..\..\out\release9\build\libcel_staticplugins\msvc_libpfactoranalog_staticreg.cpp.obj"/>
+ ObjectFile="..\..\out\release9\build\libcel_staticplugins\msvc_libpfactoranalog_staticreg.cpp.obj"/>
+ ObjectFile="..\..\out\debug9\build\libcel_staticplugins\msvc_libpfactoranalog_staticreg.cpp.obj"/>
+ ObjectFile="..\..\out\debug9\build\libcel_staticplugins\msvc_libpfactoranalog_staticreg.cpp.obj"/>
+ RelativePath="..\..\msvc\libpfactormove_staticreg.cpp">
+ ObjectFile="..\..\out\release9\build\libcel_staticplugins\msvc_libpfactormove_staticreg.cpp.obj"/>
+ ObjectFile="..\..\out\release9\build\libcel_staticplugins\msvc_libpfactormove_staticreg.cpp.obj"/>
+ ObjectFile="..\..\out\debug9\build\libcel_staticplugins\msvc_libpfactormove_staticreg.cpp.obj"/>
+ ObjectFile="..\..\out\debug9\build\libcel_staticplugins\msvc_libpfactormove_staticreg.cpp.obj"/>
-
-
-
-
-
-
-
-
-
-
-
-
@@ -976,31 +901,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1701,31 +1601,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
@@ -2001,78 +1876,78 @@
+ RelativePath="..\..\plugins\propclass\actoranalog\actoranalog.cpp">
+ ObjectFile="..\..\out\release9\build\libcel_staticplugins\plugins_propclass_actoranalog_actoranalog.cpp.obj"/>
+ ObjectFile="..\..\out\release9\build\libcel_staticplugins\plugins_propclass_actoranalog_actoranalog.cpp.obj"/>
+ ObjectFile="..\..\out\debug9\build\libcel_staticplugins\plugins_propclass_actoranalog_actoranalog.cpp.obj"/>
+ ObjectFile="..\..\out\debug9\build\libcel_staticplugins\plugins_propclass_actoranalog_actoranalog.cpp.obj"/>
+ RelativePath="..\..\plugins\propclass\actormove\actormove.cpp">
+ ObjectFile="..\..\out\release9\build\libcel_staticplugins\plugins_propclass_actormove_actormove.cpp.obj"/>
+ ObjectFile="..\..\out\release9\build\libcel_staticplugins\plugins_propclass_actormove_actormove.cpp.obj"/>
+ ObjectFile="..\..\out\debug9\build\libcel_staticplugins\plugins_propclass_actormove_actormove.cpp.obj"/>
+ ObjectFile="..\..\out\debug9\build\libcel_staticplugins\plugins_propclass_actormove_actormove.cpp.obj"/>
+ RelativePath="..\..\plugins\propclass\actormove\npcmove.cpp">
+ ObjectFile="..\..\out\release9\build\libcel_staticplugins\plugins_propclass_actormove_npcmove.cpp.obj"/>
+ ObjectFile="..\..\out\release9\build\libcel_staticplugins\plugins_propclass_actormove_npcmove.cpp.obj"/>
+ ObjectFile="..\..\out\debug9\build\libcel_staticplugins\plugins_propclass_actormove_npcmove.cpp.obj"/>
+ ObjectFile="..\..\out\debug9\build\libcel_staticplugins\plugins_propclass_actormove_npcmove.cpp.obj"/>
-
-
-
-
-
-
-
-
-
-
-
-
@@ -2376,31 +2226,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
@@ -3551,31 +3376,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
@@ -4314,9 +4114,6 @@
RelativePath="..\..\plugins\addons\celgraph\celgraph.h">
-
-
+ RelativePath="..\..\plugins\propclass\actoranalog\actoranalog.h">
+ RelativePath="..\..\plugins\propclass\actormove\actormove.h">
+ RelativePath="..\..\plugins\propclass\actormove\npcmove.h">
@@ -4380,9 +4177,6 @@
RelativePath="..\..\plugins\propclass\evolve\evolve.h">
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/9/libceltst_static_plugins_CRYSTAL.vcproj /tmp/IB0bHXT4Oc/cel-1.4/msvc/9/libceltst_static_plugins_CRYSTAL.vcproj
--- cel-1.9+svn3615/msvc/9/libceltst_static_plugins_CRYSTAL.vcproj 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/msvc/9/libceltst_static_plugins_CRYSTAL.vcproj 2009-11-28 16:47:25.000000000 +0000
@@ -99,7 +99,7 @@
RuntimeLibrary="2"
DebugInformationFormat="3"
BufferSecurityCheck="FALSE"
- ProgramDatabaseFileName="..\..\out\release9\build\libceltst_static_plugins_CRYSTAL\celtst_static_plugins_CRYSTAL-1.9-vc9.pdb"
+ ProgramDatabaseFileName="..\..\out\release9\build\libceltst_static_plugins_CRYSTAL\celtst_static_plugins_CRYSTAL-1.4-vc9.pdb"
PreprocessorDefinitions="NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;PACKAGE_NAME=CEL;_WINDOWS;WIN32;CS_BUILD_SHARED_LIBS;CEL_BUILD_SHARED_LIBS"
OptimizeForProcessor="1"
AdditionalOptions="/D CS_HAVE_CAL3D "
@@ -122,9 +122,9 @@
EnableCOMDATFolding="2"
GenerateDebugInformation="TRUE"
IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD"
- OutputFile="..\..\celtst_static_plugins_CRYSTAL-1.9-vc9.dll"
+ OutputFile="..\..\celtst_static_plugins_CRYSTAL-1.4-vc9.dll"
ImportLibrary="..\..\out\release9\libs\libceltst_static_plugins_CRYSTAL.lib"
- ProgramDatabaseFile="..\..\out\release9\build\libceltst_static_plugins_CRYSTAL\celtst_static_plugins_CRYSTAL-1.9-vc9.pdb"
+ ProgramDatabaseFile="..\..\out\release9\build\libceltst_static_plugins_CRYSTAL\celtst_static_plugins_CRYSTAL-1.4-vc9.pdb"
AdditionalOptions="libjpeg.lib libpng.lib cg.lib cgGL.lib cal3d-vc9.lib libcrystalspace_windows.lib libcrystalspace_opengl.lib opengl32.lib version.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins.lib libcrystalspace.lib libcrystalspace_directx.lib zlib.lib dsound.lib ddraw.lib dinput.lib "
AdditionalDependencies=""
SuppressStartupBanner="TRUE"
@@ -244,7 +244,7 @@
RuntimeLibrary="3"
- ProgramDatabaseFileName="..\..\out\debug9\build\libceltst_static_plugins_CRYSTAL\celtst_static_plugins_CRYSTAL-1.9-vc9_d.pdb"
+ ProgramDatabaseFileName="..\..\out\debug9\build\libceltst_static_plugins_CRYSTAL\celtst_static_plugins_CRYSTAL-1.4-vc9_d.pdb"
PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;PACKAGE_NAME=CEL;_WINDOWS;WIN32;CS_BUILD_SHARED_LIBS;CEL_BUILD_SHARED_LIBS"
OptimizeForProcessor="1"
AdditionalOptions="/D CS_HAVE_CAL3D "
@@ -265,9 +265,9 @@
LinkIncremental="2"
GenerateDebugInformation="TRUE"
IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD,MSVCRT"
- OutputFile="..\..\celtst_static_plugins_CRYSTAL-1.9-vc9_d.dll"
+ OutputFile="..\..\celtst_static_plugins_CRYSTAL-1.4-vc9_d.dll"
ImportLibrary="..\..\out\debug9\libs\libceltst_static_plugins_CRYSTAL_d.lib"
- ProgramDatabaseFile="..\..\out\debug9\build\libceltst_static_plugins_CRYSTAL\celtst_static_plugins_CRYSTAL-1.9-vc9_d.pdb"
+ ProgramDatabaseFile="..\..\out\debug9\build\libceltst_static_plugins_CRYSTAL\celtst_static_plugins_CRYSTAL-1.4-vc9_d.pdb"
AdditionalOptions="libjpeg.lib libpng.lib cg.lib cgGL.lib cal3d-vc9_d.lib libcrystalspace_windows_d.lib libcrystalspace_opengl_d.lib opengl32.lib version.lib vorbisfile.lib vorbis.lib ogg.lib libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib libcrystalspace_directx_d.lib zlib.lib dsound.lib ddraw.lib dinput.lib "
AdditionalDependencies=""
SuppressStartupBanner="TRUE"
@@ -313,6 +313,13 @@
RelativePath="..\..\msvc\appceltst_static_staticuse_CRYSTAL.cpp">
+
+
+
+
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/9/libceltst_static_plugins.vcproj /tmp/IB0bHXT4Oc/cel-1.4/msvc/9/libceltst_static_plugins.vcproj
--- cel-1.9+svn3615/msvc/9/libceltst_static_plugins.vcproj 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/msvc/9/libceltst_static_plugins.vcproj 2009-11-28 16:47:26.000000000 +0000
@@ -99,7 +99,7 @@
RuntimeLibrary="2"
DebugInformationFormat="3"
BufferSecurityCheck="FALSE"
- ProgramDatabaseFileName="..\..\out\release9\build\libceltst_static_plugins\celtst_static_plugins-1.9-vc9.pdb"
+ ProgramDatabaseFileName="..\..\out\release9\build\libceltst_static_plugins\celtst_static_plugins-1.4-vc9.pdb"
PreprocessorDefinitions="NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;PACKAGE_NAME=CEL;_WINDOWS;WIN32;CS_BUILD_SHARED_LIBS;CEL_BUILD_SHARED_LIBS"
OptimizeForProcessor="1"
AdditionalOptions=" "
@@ -122,9 +122,9 @@
EnableCOMDATFolding="2"
GenerateDebugInformation="TRUE"
IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD"
- OutputFile="..\..\celtst_static_plugins-1.9-vc9.dll"
+ OutputFile="..\..\celtst_static_plugins-1.4-vc9.dll"
ImportLibrary="..\..\out\release9\libs\libceltst_static_plugins.lib"
- ProgramDatabaseFile="..\..\out\release9\build\libceltst_static_plugins\celtst_static_plugins-1.9-vc9.pdb"
+ ProgramDatabaseFile="..\..\out\release9\build\libceltst_static_plugins\celtst_static_plugins-1.4-vc9.pdb"
AdditionalOptions=" "
AdditionalDependencies="libcrystalspace.lib"
SuppressStartupBanner="TRUE"
@@ -244,7 +244,7 @@
RuntimeLibrary="3"
- ProgramDatabaseFileName="..\..\out\debug9\build\libceltst_static_plugins\celtst_static_plugins-1.9-vc9_d.pdb"
+ ProgramDatabaseFileName="..\..\out\debug9\build\libceltst_static_plugins\celtst_static_plugins-1.4-vc9_d.pdb"
PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;PACKAGE_NAME=CEL;_WINDOWS;WIN32;CS_BUILD_SHARED_LIBS;CEL_BUILD_SHARED_LIBS"
OptimizeForProcessor="1"
AdditionalOptions=" "
@@ -265,9 +265,9 @@
LinkIncremental="2"
GenerateDebugInformation="TRUE"
IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD,MSVCRT"
- OutputFile="..\..\celtst_static_plugins-1.9-vc9_d.dll"
+ OutputFile="..\..\celtst_static_plugins-1.4-vc9_d.dll"
ImportLibrary="..\..\out\debug9\libs\libceltst_static_plugins_d.lib"
- ProgramDatabaseFile="..\..\out\debug9\build\libceltst_static_plugins\celtst_static_plugins-1.9-vc9_d.pdb"
+ ProgramDatabaseFile="..\..\out\debug9\build\libceltst_static_plugins\celtst_static_plugins-1.4-vc9_d.pdb"
AdditionalOptions=" "
AdditionalDependencies="libcrystalspace_d.lib"
SuppressStartupBanner="TRUE"
@@ -313,6 +313,13 @@
RelativePath="..\..\msvc\appceltst_static_staticuse.cpp">
+
+
+
+
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/9/libnettest_static_plugins_CRYSTAL.vcproj /tmp/IB0bHXT4Oc/cel-1.4/msvc/9/libnettest_static_plugins_CRYSTAL.vcproj
--- cel-1.9+svn3615/msvc/9/libnettest_static_plugins_CRYSTAL.vcproj 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/msvc/9/libnettest_static_plugins_CRYSTAL.vcproj 2009-11-28 16:47:25.000000000 +0000
@@ -99,7 +99,7 @@
RuntimeLibrary="2"
DebugInformationFormat="3"
BufferSecurityCheck="FALSE"
- ProgramDatabaseFileName="..\..\out\release9\build\libnettest_static_plugins_CRYSTAL\nettest_static_plugins_CRYSTAL-1.9-vc9.pdb"
+ ProgramDatabaseFileName="..\..\out\release9\build\libnettest_static_plugins_CRYSTAL\nettest_static_plugins_CRYSTAL-1.4-vc9.pdb"
PreprocessorDefinitions="NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;PACKAGE_NAME=CEL;_WINDOWS;WIN32;CS_BUILD_SHARED_LIBS;CEL_BUILD_SHARED_LIBS"
OptimizeForProcessor="1"
AdditionalOptions="/D CS_HAVE_CAL3D "
@@ -122,9 +122,9 @@
EnableCOMDATFolding="2"
GenerateDebugInformation="TRUE"
IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD"
- OutputFile="..\..\nettest_static_plugins_CRYSTAL-1.9-vc9.dll"
+ OutputFile="..\..\nettest_static_plugins_CRYSTAL-1.4-vc9.dll"
ImportLibrary="..\..\out\release9\libs\libnettest_static_plugins_CRYSTAL.lib"
- ProgramDatabaseFile="..\..\out\release9\build\libnettest_static_plugins_CRYSTAL\nettest_static_plugins_CRYSTAL-1.9-vc9.pdb"
+ ProgramDatabaseFile="..\..\out\release9\build\libnettest_static_plugins_CRYSTAL\nettest_static_plugins_CRYSTAL-1.4-vc9.pdb"
AdditionalOptions="libjpeg.lib libpng.lib cal3d-vc9.lib cg.lib cgGL.lib libcrystalspace_windows.lib libcrystalspace_opengl.lib opengl32.lib version.lib libcrystalspace_staticplugins.lib libcrystalspace.lib zlib.lib "
AdditionalDependencies=""
SuppressStartupBanner="TRUE"
@@ -244,7 +244,7 @@
RuntimeLibrary="3"
- ProgramDatabaseFileName="..\..\out\debug9\build\libnettest_static_plugins_CRYSTAL\nettest_static_plugins_CRYSTAL-1.9-vc9_d.pdb"
+ ProgramDatabaseFileName="..\..\out\debug9\build\libnettest_static_plugins_CRYSTAL\nettest_static_plugins_CRYSTAL-1.4-vc9_d.pdb"
PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;PACKAGE_NAME=CEL;_WINDOWS;WIN32;CS_BUILD_SHARED_LIBS;CEL_BUILD_SHARED_LIBS"
OptimizeForProcessor="1"
AdditionalOptions="/D CS_HAVE_CAL3D "
@@ -265,9 +265,9 @@
LinkIncremental="2"
GenerateDebugInformation="TRUE"
IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD,MSVCRT"
- OutputFile="..\..\nettest_static_plugins_CRYSTAL-1.9-vc9_d.dll"
+ OutputFile="..\..\nettest_static_plugins_CRYSTAL-1.4-vc9_d.dll"
ImportLibrary="..\..\out\debug9\libs\libnettest_static_plugins_CRYSTAL_d.lib"
- ProgramDatabaseFile="..\..\out\debug9\build\libnettest_static_plugins_CRYSTAL\nettest_static_plugins_CRYSTAL-1.9-vc9_d.pdb"
+ ProgramDatabaseFile="..\..\out\debug9\build\libnettest_static_plugins_CRYSTAL\nettest_static_plugins_CRYSTAL-1.4-vc9_d.pdb"
AdditionalOptions="libjpeg.lib libpng.lib cal3d-vc9_d.lib cg.lib cgGL.lib libcrystalspace_windows_d.lib libcrystalspace_opengl_d.lib opengl32.lib version.lib libcrystalspace_staticplugins_d.lib libcrystalspace_d.lib zlib.lib "
AdditionalDependencies=""
SuppressStartupBanner="TRUE"
@@ -313,6 +313,13 @@
RelativePath="..\..\msvc\appnettest_static_staticuse_CRYSTAL.cpp">
+
+
+
+
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/9/libnettest_static_plugins.vcproj /tmp/IB0bHXT4Oc/cel-1.4/msvc/9/libnettest_static_plugins.vcproj
--- cel-1.9+svn3615/msvc/9/libnettest_static_plugins.vcproj 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/msvc/9/libnettest_static_plugins.vcproj 2009-11-28 16:47:26.000000000 +0000
@@ -99,7 +99,7 @@
RuntimeLibrary="2"
DebugInformationFormat="3"
BufferSecurityCheck="FALSE"
- ProgramDatabaseFileName="..\..\out\release9\build\libnettest_static_plugins\nettest_static_plugins-1.9-vc9.pdb"
+ ProgramDatabaseFileName="..\..\out\release9\build\libnettest_static_plugins\nettest_static_plugins-1.4-vc9.pdb"
PreprocessorDefinitions="NDEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;PACKAGE_NAME=CEL;_WINDOWS;WIN32;CS_BUILD_SHARED_LIBS;CEL_BUILD_SHARED_LIBS"
OptimizeForProcessor="1"
AdditionalOptions=" "
@@ -122,9 +122,9 @@
EnableCOMDATFolding="2"
GenerateDebugInformation="TRUE"
IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD"
- OutputFile="..\..\nettest_static_plugins-1.9-vc9.dll"
+ OutputFile="..\..\nettest_static_plugins-1.4-vc9.dll"
ImportLibrary="..\..\out\release9\libs\libnettest_static_plugins.lib"
- ProgramDatabaseFile="..\..\out\release9\build\libnettest_static_plugins\nettest_static_plugins-1.9-vc9.pdb"
+ ProgramDatabaseFile="..\..\out\release9\build\libnettest_static_plugins\nettest_static_plugins-1.4-vc9.pdb"
AdditionalOptions=" "
AdditionalDependencies="libcrystalspace.lib"
SuppressStartupBanner="TRUE"
@@ -244,7 +244,7 @@
RuntimeLibrary="3"
- ProgramDatabaseFileName="..\..\out\debug9\build\libnettest_static_plugins\nettest_static_plugins-1.9-vc9_d.pdb"
+ ProgramDatabaseFileName="..\..\out\debug9\build\libnettest_static_plugins\nettest_static_plugins-1.4-vc9_d.pdb"
PreprocessorDefinitions="_DEBUG;CS_DEBUG;CS_WIN32_CSCONFIG;__CRYSTAL_SPACE__;PACKAGE_NAME=CEL;_WINDOWS;WIN32;CS_BUILD_SHARED_LIBS;CEL_BUILD_SHARED_LIBS"
OptimizeForProcessor="1"
AdditionalOptions=" "
@@ -265,9 +265,9 @@
LinkIncremental="2"
GenerateDebugInformation="TRUE"
IgnoreDefaultLibraryNames="LIBC,LIBCD,LIBCMT,LIBCMTD,MSVCRT"
- OutputFile="..\..\nettest_static_plugins-1.9-vc9_d.dll"
+ OutputFile="..\..\nettest_static_plugins-1.4-vc9_d.dll"
ImportLibrary="..\..\out\debug9\libs\libnettest_static_plugins_d.lib"
- ProgramDatabaseFile="..\..\out\debug9\build\libnettest_static_plugins\nettest_static_plugins-1.9-vc9_d.pdb"
+ ProgramDatabaseFile="..\..\out\debug9\build\libnettest_static_plugins\nettest_static_plugins-1.4-vc9_d.pdb"
AdditionalOptions=" "
AdditionalDependencies="libcrystalspace_d.lib"
SuppressStartupBanner="TRUE"
@@ -313,6 +313,13 @@
RelativePath="..\..\msvc\appnettest_static_staticuse.cpp">
+
+
+
+
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/9/plgaddon_ledges.vcproj /tmp/IB0bHXT4Oc/cel-1.4/msvc/9/plgaddon_ledges.vcproj
--- cel-1.9+svn3615/msvc/9/plgaddon_ledges.vcproj 2008-07-28 04:02:17.000000000 +0100
+++ cel-1.4/msvc/9/plgaddon_ledges.vcproj 1970-01-01 01:00:00.000000000 +0100
@@ -1,345 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/9/plgledges.vcproj /tmp/IB0bHXT4Oc/cel-1.4/msvc/9/plgledges.vcproj
--- cel-1.9+svn3615/msvc/9/plgledges.vcproj 2008-07-28 04:02:17.000000000 +0100
+++ cel-1.4/msvc/9/plgledges.vcproj 1970-01-01 01:00:00.000000000 +0100
@@ -1,345 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/9/plgpfactoranalog.vcproj /tmp/IB0bHXT4Oc/cel-1.4/msvc/9/plgpfactoranalog.vcproj
--- cel-1.9+svn3615/msvc/9/plgpfactoranalog.vcproj 1970-01-01 01:00:00.000000000 +0100
+++ cel-1.4/msvc/9/plgpfactoranalog.vcproj 2009-11-28 16:47:26.000000000 +0000
@@ -0,0 +1,345 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/9/plgpfanalogmotion.vcproj /tmp/IB0bHXT4Oc/cel-1.4/msvc/9/plgpfanalogmotion.vcproj
--- cel-1.9+svn3615/msvc/9/plgpfanalogmotion.vcproj 2008-06-23 04:02:10.000000000 +0100
+++ cel-1.4/msvc/9/plgpfanalogmotion.vcproj 1970-01-01 01:00:00.000000000 +0100
@@ -1,345 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/9/plgpfgrab.vcproj /tmp/IB0bHXT4Oc/cel-1.4/msvc/9/plgpfgrab.vcproj
--- cel-1.9+svn3615/msvc/9/plgpfgrab.vcproj 2008-07-04 04:04:39.000000000 +0100
+++ cel-1.4/msvc/9/plgpfgrab.vcproj 1970-01-01 01:00:00.000000000 +0100
@@ -1,345 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/9/plgpfjump.vcproj /tmp/IB0bHXT4Oc/cel-1.4/msvc/9/plgpfjump.vcproj
--- cel-1.9+svn3615/msvc/9/plgpfjump.vcproj 2008-06-23 04:02:10.000000000 +0100
+++ cel-1.4/msvc/9/plgpfjump.vcproj 1970-01-01 01:00:00.000000000 +0100
@@ -1,345 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/9/wkscel.sln /tmp/IB0bHXT4Oc/cel-1.4/msvc/9/wkscel.sln
--- cel-1.9+svn3615/msvc/9/wkscel.sln 2008-07-28 04:02:17.000000000 +0100
+++ cel-1.4/msvc/9/wkscel.sln 2009-11-28 16:47:26.000000000 +0000
@@ -36,8 +36,6 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plgaddon_celgraph", "plgaddon_celgraph.vcproj", "{504CB6C0-4303-C53C-C345-AA750CD1A59D}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plgaddon_ledges", "plgaddon_ledges.vcproj", "{88DF53AC-1338-547B-6989-1C8B78DE542B}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plgaddon_questdef", "plgaddon_questdef.vcproj", "{D55BE37F-A3CE-2CF1-7474-6961CF055BC0}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plgaddon_ruledef", "plgaddon_ruledef.vcproj", "{A8B80D52-CD56-437D-0DF3-3798C9279FE4}"
@@ -54,15 +52,13 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plgcpersist", "plgcpersist.vcproj", "{403E853A-59C3-FBA1-AF01-2BF89B0DA2F7}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plgledges", "plgledges.vcproj", "{58918459-7FD8-C582-569D-A58038ABE9D1}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plgmgr_billboard", "plgmgr_billboard.vcproj", "{32B86666-15E0-F234-58EC-50D3CC10AD59}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plgmgr_quests", "plgmgr_quests.vcproj", "{96C3E65A-7CC9-961B-0681-395F51BC9CE2}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plgpfactormove", "plgpfactormove.vcproj", "{8EBBE255-F364-3793-8E84-4ACE0FB487A1}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plgpfactoranalog", "plgpfactoranalog.vcproj", "{26C0690C-CDA5-5C37-87AC-D0C18C4F7064}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plgpfanalogmotion", "plgpfanalogmotion.vcproj", "{EF50101E-0BAC-395C-42F9-378D37DA03CE}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plgpfactormove", "plgpfactormove.vcproj", "{8EBBE255-F364-3793-8E84-4ACE0FB487A1}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plgpfbillboard", "plgpfbillboard.vcproj", "{8E2C61D0-0DDE-9AC3-AB7E-8EE3B4EE09D4}"
EndProject
@@ -76,16 +72,12 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plgpfevolve", "plgpfevolve.vcproj", "{73CFB4EB-077E-9A27-E4D4-145EA219E262}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plgpfgrab", "plgpfgrab.vcproj", "{98DD5582-CDDE-F076-F9C8-D6603B15A78E}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plgpfhover", "plgpfhover.vcproj", "{47A9A513-F45E-728E-D930-72B622AE538C}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plgpfinput", "plgpfinput.vcproj", "{5281C5BB-2394-E384-DEDF-73F9F661705D}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plgpfinv", "plgpfinv.vcproj", "{CB5A4EF1-E092-959D-EFD1-E0442F3119F1}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plgpfjump", "plgpfjump.vcproj", "{4F4A2447-5243-2EF5-BE00-701BB9473BA1}"
-EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plgpflight", "plgpflight.vcproj", "{23D61ADF-182D-DD0F-43F2-2E474EE1FB00}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "plgpfmechanics", "plgpfmechanics.vcproj", "{89822485-8A94-469B-7CA5-A2839C03D271}"
@@ -168,56 +160,52 @@
{36C62D61-808A-D8D0-D561-3EE6C506C350}.11 = {3EF52631-4486-D72B-BB17-DB8FCF36DDBA}
{36C62D61-808A-D8D0-D561-3EE6C506C350}.12 = {EEC493BE-2745-954F-FA24-45447359FCDC}
{36C62D61-808A-D8D0-D561-3EE6C506C350}.13 = {504CB6C0-4303-C53C-C345-AA750CD1A59D}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.14 = {88DF53AC-1338-547B-6989-1C8B78DE542B}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.15 = {D55BE37F-A3CE-2CF1-7474-6961CF055BC0}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.16 = {A8B80D52-CD56-437D-0DF3-3798C9279FE4}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.17 = {BA7BEDE4-D74D-62E9-2A70-F3E2461698BB}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.18 = {E15D3136-619B-861B-D8FF-561A1F846B6C}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.19 = {D4C2A921-6257-1D72-592F-450E19AA3E20}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.20 = {98B5AC91-D6B1-1C99-9FEC-D1EEA525ED3B}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.21 = {8BBC74D9-616A-F075-D8FC-8B101A6C5730}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.22 = {403E853A-59C3-FBA1-AF01-2BF89B0DA2F7}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.23 = {58918459-7FD8-C582-569D-A58038ABE9D1}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.24 = {32B86666-15E0-F234-58EC-50D3CC10AD59}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.25 = {96C3E65A-7CC9-961B-0681-395F51BC9CE2}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.26 = {8EBBE255-F364-3793-8E84-4ACE0FB487A1}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.27 = {EF50101E-0BAC-395C-42F9-378D37DA03CE}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.28 = {8E2C61D0-0DDE-9AC3-AB7E-8EE3B4EE09D4}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.29 = {26CDBAC0-9A46-F31F-B6F7-A729CF22B97D}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.30 = {10B1A9B3-DB3C-98CB-62C9-DB10F9F43396}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.31 = {0E134A9B-0448-2CD4-954B-9F3ECBD81534}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.32 = {F523A3D9-0D90-E985-CA29-10E441393BAE}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.33 = {73CFB4EB-077E-9A27-E4D4-145EA219E262}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.34 = {98DD5582-CDDE-F076-F9C8-D6603B15A78E}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.35 = {47A9A513-F45E-728E-D930-72B622AE538C}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.36 = {5281C5BB-2394-E384-DEDF-73F9F661705D}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.37 = {CB5A4EF1-E092-959D-EFD1-E0442F3119F1}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.38 = {4F4A2447-5243-2EF5-BE00-701BB9473BA1}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.39 = {23D61ADF-182D-DD0F-43F2-2E474EE1FB00}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.40 = {89822485-8A94-469B-7CA5-A2839C03D271}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.41 = {7577CC57-FF93-6E33-EC99-846E898BED29}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.42 = {754F06CF-F576-93C5-BE95-3EC4998D9E20}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.43 = {E167BD33-4E68-2BB7-C568-09FC289A2E9A}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.44 = {6AE42D83-4035-6C15-089B-D65BCF171A11}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.45 = {D7782591-5481-74E6-62CC-265E30D63A91}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.46 = {097814E8-8395-28B7-6CCF-374BA0D10503}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.47 = {4AA16ABE-76D3-AB92-ED64-43A057F4E5D0}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.48 = {E4F5830C-8CAF-CBC0-C5E5-B189CECF556A}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.49 = {F50BC0A1-DB47-BA5A-5C9A-A12E1C81241D}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.50 = {3AB21594-2130-A5AE-9E11-272637C9F9B6}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.51 = {D3852DD2-8840-44C9-AA7A-469FA8445DF3}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.52 = {967105F5-9828-18D8-0AB3-AB33A96DF792}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.53 = {E91FEE10-2BA4-53FC-07FA-0A5B3649595F}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.54 = {7453777E-C823-EFB7-31C1-FDF756EBAEBC}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.55 = {6452026D-0C54-4DCD-DA11-047FAC2224D7}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.56 = {058AAD6E-A940-FA17-F583-B3676E4DAC6C}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.57 = {83E8AB22-CED2-2646-3A5A-73EA46D8959F}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.58 = {7819CFB4-1D16-C2CA-3B58-319C41E552DF}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.59 = {99CE9F68-96D7-1FAF-65BF-DEEF6E5085B8}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.60 = {9B942FB3-91A0-9E4F-1514-1286B4872502}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.61 = {E1C134D4-C658-E321-DBBE-7D11200B882E}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.62 = {66C683AA-084B-50DD-3B04-ED38799342BA}
- {36C62D61-808A-D8D0-D561-3EE6C506C350}.63 = {274174A0-7101-29E3-D06A-6C0B009A3DDD}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.14 = {D55BE37F-A3CE-2CF1-7474-6961CF055BC0}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.15 = {A8B80D52-CD56-437D-0DF3-3798C9279FE4}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.16 = {BA7BEDE4-D74D-62E9-2A70-F3E2461698BB}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.17 = {E15D3136-619B-861B-D8FF-561A1F846B6C}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.18 = {D4C2A921-6257-1D72-592F-450E19AA3E20}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.19 = {98B5AC91-D6B1-1C99-9FEC-D1EEA525ED3B}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.20 = {8BBC74D9-616A-F075-D8FC-8B101A6C5730}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.21 = {403E853A-59C3-FBA1-AF01-2BF89B0DA2F7}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.22 = {32B86666-15E0-F234-58EC-50D3CC10AD59}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.23 = {96C3E65A-7CC9-961B-0681-395F51BC9CE2}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.24 = {26C0690C-CDA5-5C37-87AC-D0C18C4F7064}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.25 = {8EBBE255-F364-3793-8E84-4ACE0FB487A1}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.26 = {8E2C61D0-0DDE-9AC3-AB7E-8EE3B4EE09D4}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.27 = {26CDBAC0-9A46-F31F-B6F7-A729CF22B97D}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.28 = {10B1A9B3-DB3C-98CB-62C9-DB10F9F43396}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.29 = {0E134A9B-0448-2CD4-954B-9F3ECBD81534}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.30 = {F523A3D9-0D90-E985-CA29-10E441393BAE}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.31 = {73CFB4EB-077E-9A27-E4D4-145EA219E262}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.32 = {47A9A513-F45E-728E-D930-72B622AE538C}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.33 = {5281C5BB-2394-E384-DEDF-73F9F661705D}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.34 = {CB5A4EF1-E092-959D-EFD1-E0442F3119F1}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.35 = {23D61ADF-182D-DD0F-43F2-2E474EE1FB00}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.36 = {89822485-8A94-469B-7CA5-A2839C03D271}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.37 = {7577CC57-FF93-6E33-EC99-846E898BED29}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.38 = {754F06CF-F576-93C5-BE95-3EC4998D9E20}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.39 = {E167BD33-4E68-2BB7-C568-09FC289A2E9A}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.40 = {6AE42D83-4035-6C15-089B-D65BCF171A11}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.41 = {D7782591-5481-74E6-62CC-265E30D63A91}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.42 = {097814E8-8395-28B7-6CCF-374BA0D10503}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.43 = {4AA16ABE-76D3-AB92-ED64-43A057F4E5D0}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.44 = {E4F5830C-8CAF-CBC0-C5E5-B189CECF556A}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.45 = {F50BC0A1-DB47-BA5A-5C9A-A12E1C81241D}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.46 = {3AB21594-2130-A5AE-9E11-272637C9F9B6}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.47 = {D3852DD2-8840-44C9-AA7A-469FA8445DF3}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.48 = {967105F5-9828-18D8-0AB3-AB33A96DF792}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.49 = {E91FEE10-2BA4-53FC-07FA-0A5B3649595F}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.50 = {7453777E-C823-EFB7-31C1-FDF756EBAEBC}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.51 = {6452026D-0C54-4DCD-DA11-047FAC2224D7}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.52 = {058AAD6E-A940-FA17-F583-B3676E4DAC6C}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.53 = {83E8AB22-CED2-2646-3A5A-73EA46D8959F}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.54 = {7819CFB4-1D16-C2CA-3B58-319C41E552DF}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.55 = {99CE9F68-96D7-1FAF-65BF-DEEF6E5085B8}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.56 = {9B942FB3-91A0-9E4F-1514-1286B4872502}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.57 = {E1C134D4-C658-E321-DBBE-7D11200B882E}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.58 = {66C683AA-084B-50DD-3B04-ED38799342BA}
+ {36C62D61-808A-D8D0-D561-3EE6C506C350}.59 = {274174A0-7101-29E3-D06A-6C0B009A3DDD}
{E2ECEB01-C66F-C40A-F57D-14B5700CED7A}.0 = {FF4C7AD7-84CA-8A2F-7EBF-2B1FA775848F}
{E2ECEB01-C66F-C40A-F57D-14B5700CED7A}.1 = {AE89B23E-625D-8AD6-F293-EA999B1F3026}
{E2ECEB01-C66F-C40A-F57D-14B5700CED7A}.2 = {E7FA7509-300D-FB19-912A-61D2694C9BD0}
@@ -232,76 +220,69 @@
{866C2A26-400D-A8C9-8F7B-B780A879B604}.0 = {3EF52631-4486-D72B-BB17-DB8FCF36DDBA}
{866C2A26-400D-A8C9-8F7B-B780A879B604}.1 = {EEC493BE-2745-954F-FA24-45447359FCDC}
{866C2A26-400D-A8C9-8F7B-B780A879B604}.2 = {504CB6C0-4303-C53C-C345-AA750CD1A59D}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.3 = {88DF53AC-1338-547B-6989-1C8B78DE542B}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.4 = {D55BE37F-A3CE-2CF1-7474-6961CF055BC0}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.5 = {A8B80D52-CD56-437D-0DF3-3798C9279FE4}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.6 = {BA7BEDE4-D74D-62E9-2A70-F3E2461698BB}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.7 = {E15D3136-619B-861B-D8FF-561A1F846B6C}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.8 = {D4C2A921-6257-1D72-592F-450E19AA3E20}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.9 = {98B5AC91-D6B1-1C99-9FEC-D1EEA525ED3B}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.10 = {8BBC74D9-616A-F075-D8FC-8B101A6C5730}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.11 = {403E853A-59C3-FBA1-AF01-2BF89B0DA2F7}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.12 = {58918459-7FD8-C582-569D-A58038ABE9D1}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.13 = {32B86666-15E0-F234-58EC-50D3CC10AD59}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.14 = {96C3E65A-7CC9-961B-0681-395F51BC9CE2}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.15 = {8EBBE255-F364-3793-8E84-4ACE0FB487A1}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.16 = {EF50101E-0BAC-395C-42F9-378D37DA03CE}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.17 = {8E2C61D0-0DDE-9AC3-AB7E-8EE3B4EE09D4}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.18 = {26CDBAC0-9A46-F31F-B6F7-A729CF22B97D}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.19 = {10B1A9B3-DB3C-98CB-62C9-DB10F9F43396}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.20 = {0E134A9B-0448-2CD4-954B-9F3ECBD81534}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.21 = {F523A3D9-0D90-E985-CA29-10E441393BAE}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.22 = {73CFB4EB-077E-9A27-E4D4-145EA219E262}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.23 = {98DD5582-CDDE-F076-F9C8-D6603B15A78E}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.24 = {47A9A513-F45E-728E-D930-72B622AE538C}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.25 = {5281C5BB-2394-E384-DEDF-73F9F661705D}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.26 = {CB5A4EF1-E092-959D-EFD1-E0442F3119F1}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.27 = {4F4A2447-5243-2EF5-BE00-701BB9473BA1}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.28 = {23D61ADF-182D-DD0F-43F2-2E474EE1FB00}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.29 = {89822485-8A94-469B-7CA5-A2839C03D271}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.30 = {7577CC57-FF93-6E33-EC99-846E898BED29}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.31 = {754F06CF-F576-93C5-BE95-3EC4998D9E20}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.32 = {E167BD33-4E68-2BB7-C568-09FC289A2E9A}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.33 = {6AE42D83-4035-6C15-089B-D65BCF171A11}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.34 = {D7782591-5481-74E6-62CC-265E30D63A91}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.35 = {097814E8-8395-28B7-6CCF-374BA0D10503}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.36 = {4AA16ABE-76D3-AB92-ED64-43A057F4E5D0}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.37 = {E4F5830C-8CAF-CBC0-C5E5-B189CECF556A}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.38 = {F50BC0A1-DB47-BA5A-5C9A-A12E1C81241D}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.39 = {3AB21594-2130-A5AE-9E11-272637C9F9B6}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.40 = {D3852DD2-8840-44C9-AA7A-469FA8445DF3}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.41 = {967105F5-9828-18D8-0AB3-AB33A96DF792}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.42 = {E91FEE10-2BA4-53FC-07FA-0A5B3649595F}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.43 = {7453777E-C823-EFB7-31C1-FDF756EBAEBC}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.44 = {6452026D-0C54-4DCD-DA11-047FAC2224D7}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.45 = {058AAD6E-A940-FA17-F583-B3676E4DAC6C}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.46 = {83E8AB22-CED2-2646-3A5A-73EA46D8959F}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.47 = {7819CFB4-1D16-C2CA-3B58-319C41E552DF}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.48 = {99CE9F68-96D7-1FAF-65BF-DEEF6E5085B8}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.49 = {9B942FB3-91A0-9E4F-1514-1286B4872502}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.50 = {E1C134D4-C658-E321-DBBE-7D11200B882E}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.51 = {66C683AA-084B-50DD-3B04-ED38799342BA}
- {866C2A26-400D-A8C9-8F7B-B780A879B604}.52 = {274174A0-7101-29E3-D06A-6C0B009A3DDD}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.3 = {D55BE37F-A3CE-2CF1-7474-6961CF055BC0}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.4 = {A8B80D52-CD56-437D-0DF3-3798C9279FE4}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.5 = {BA7BEDE4-D74D-62E9-2A70-F3E2461698BB}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.6 = {E15D3136-619B-861B-D8FF-561A1F846B6C}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.7 = {D4C2A921-6257-1D72-592F-450E19AA3E20}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.8 = {98B5AC91-D6B1-1C99-9FEC-D1EEA525ED3B}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.9 = {8BBC74D9-616A-F075-D8FC-8B101A6C5730}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.10 = {403E853A-59C3-FBA1-AF01-2BF89B0DA2F7}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.11 = {32B86666-15E0-F234-58EC-50D3CC10AD59}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.12 = {96C3E65A-7CC9-961B-0681-395F51BC9CE2}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.13 = {26C0690C-CDA5-5C37-87AC-D0C18C4F7064}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.14 = {8EBBE255-F364-3793-8E84-4ACE0FB487A1}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.15 = {8E2C61D0-0DDE-9AC3-AB7E-8EE3B4EE09D4}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.16 = {26CDBAC0-9A46-F31F-B6F7-A729CF22B97D}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.17 = {10B1A9B3-DB3C-98CB-62C9-DB10F9F43396}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.18 = {0E134A9B-0448-2CD4-954B-9F3ECBD81534}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.19 = {F523A3D9-0D90-E985-CA29-10E441393BAE}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.20 = {73CFB4EB-077E-9A27-E4D4-145EA219E262}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.21 = {47A9A513-F45E-728E-D930-72B622AE538C}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.22 = {5281C5BB-2394-E384-DEDF-73F9F661705D}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.23 = {CB5A4EF1-E092-959D-EFD1-E0442F3119F1}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.24 = {23D61ADF-182D-DD0F-43F2-2E474EE1FB00}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.25 = {89822485-8A94-469B-7CA5-A2839C03D271}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.26 = {7577CC57-FF93-6E33-EC99-846E898BED29}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.27 = {754F06CF-F576-93C5-BE95-3EC4998D9E20}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.28 = {E167BD33-4E68-2BB7-C568-09FC289A2E9A}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.29 = {6AE42D83-4035-6C15-089B-D65BCF171A11}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.30 = {D7782591-5481-74E6-62CC-265E30D63A91}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.31 = {097814E8-8395-28B7-6CCF-374BA0D10503}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.32 = {4AA16ABE-76D3-AB92-ED64-43A057F4E5D0}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.33 = {E4F5830C-8CAF-CBC0-C5E5-B189CECF556A}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.34 = {F50BC0A1-DB47-BA5A-5C9A-A12E1C81241D}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.35 = {3AB21594-2130-A5AE-9E11-272637C9F9B6}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.36 = {D3852DD2-8840-44C9-AA7A-469FA8445DF3}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.37 = {967105F5-9828-18D8-0AB3-AB33A96DF792}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.38 = {E91FEE10-2BA4-53FC-07FA-0A5B3649595F}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.39 = {7453777E-C823-EFB7-31C1-FDF756EBAEBC}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.40 = {6452026D-0C54-4DCD-DA11-047FAC2224D7}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.41 = {058AAD6E-A940-FA17-F583-B3676E4DAC6C}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.42 = {83E8AB22-CED2-2646-3A5A-73EA46D8959F}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.43 = {7819CFB4-1D16-C2CA-3B58-319C41E552DF}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.44 = {99CE9F68-96D7-1FAF-65BF-DEEF6E5085B8}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.45 = {9B942FB3-91A0-9E4F-1514-1286B4872502}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.46 = {E1C134D4-C658-E321-DBBE-7D11200B882E}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.47 = {66C683AA-084B-50DD-3B04-ED38799342BA}
+ {866C2A26-400D-A8C9-8F7B-B780A879B604}.48 = {274174A0-7101-29E3-D06A-6C0B009A3DDD}
{3EF52631-4486-D72B-BB17-DB8FCF36DDBA}.0 = {FE8C31C7-8C7C-B982-16AE-C6CA39940D52}
{EEC493BE-2745-954F-FA24-45447359FCDC}.0 = {FE8C31C7-8C7C-B982-16AE-C6CA39940D52}
{504CB6C0-4303-C53C-C345-AA750CD1A59D}.0 = {FE8C31C7-8C7C-B982-16AE-C6CA39940D52}
- {88DF53AC-1338-547B-6989-1C8B78DE542B}.0 = {FE8C31C7-8C7C-B982-16AE-C6CA39940D52}
{D55BE37F-A3CE-2CF1-7474-6961CF055BC0}.0 = {FE8C31C7-8C7C-B982-16AE-C6CA39940D52}
{D4C2A921-6257-1D72-592F-450E19AA3E20}.0 = {FE8C31C7-8C7C-B982-16AE-C6CA39940D52}
{96C3E65A-7CC9-961B-0681-395F51BC9CE2}.0 = {FE8C31C7-8C7C-B982-16AE-C6CA39940D52}
+ {26C0690C-CDA5-5C37-87AC-D0C18C4F7064}.0 = {FE8C31C7-8C7C-B982-16AE-C6CA39940D52}
{8EBBE255-F364-3793-8E84-4ACE0FB487A1}.0 = {FE8C31C7-8C7C-B982-16AE-C6CA39940D52}
- {EF50101E-0BAC-395C-42F9-378D37DA03CE}.0 = {FE8C31C7-8C7C-B982-16AE-C6CA39940D52}
{8E2C61D0-0DDE-9AC3-AB7E-8EE3B4EE09D4}.0 = {FE8C31C7-8C7C-B982-16AE-C6CA39940D52}
{26CDBAC0-9A46-F31F-B6F7-A729CF22B97D}.0 = {FE8C31C7-8C7C-B982-16AE-C6CA39940D52}
{10B1A9B3-DB3C-98CB-62C9-DB10F9F43396}.0 = {FE8C31C7-8C7C-B982-16AE-C6CA39940D52}
{0E134A9B-0448-2CD4-954B-9F3ECBD81534}.0 = {FE8C31C7-8C7C-B982-16AE-C6CA39940D52}
{F523A3D9-0D90-E985-CA29-10E441393BAE}.0 = {FE8C31C7-8C7C-B982-16AE-C6CA39940D52}
{73CFB4EB-077E-9A27-E4D4-145EA219E262}.0 = {FE8C31C7-8C7C-B982-16AE-C6CA39940D52}
- {98DD5582-CDDE-F076-F9C8-D6603B15A78E}.0 = {FE8C31C7-8C7C-B982-16AE-C6CA39940D52}
{47A9A513-F45E-728E-D930-72B622AE538C}.0 = {FE8C31C7-8C7C-B982-16AE-C6CA39940D52}
{5281C5BB-2394-E384-DEDF-73F9F661705D}.0 = {FE8C31C7-8C7C-B982-16AE-C6CA39940D52}
{CB5A4EF1-E092-959D-EFD1-E0442F3119F1}.0 = {FE8C31C7-8C7C-B982-16AE-C6CA39940D52}
- {4F4A2447-5243-2EF5-BE00-701BB9473BA1}.0 = {FE8C31C7-8C7C-B982-16AE-C6CA39940D52}
{23D61ADF-182D-DD0F-43F2-2E474EE1FB00}.0 = {FE8C31C7-8C7C-B982-16AE-C6CA39940D52}
{89822485-8A94-469B-7CA5-A2839C03D271}.0 = {FE8C31C7-8C7C-B982-16AE-C6CA39940D52}
{7577CC57-FF93-6E33-EC99-846E898BED29}.0 = {FE8C31C7-8C7C-B982-16AE-C6CA39940D52}
@@ -471,14 +452,6 @@
{504CB6C0-4303-C53C-C345-AA750CD1A59D}.Debug (with static libs).Build.0 = Debug (with static libs)|Win32
{504CB6C0-4303-C53C-C345-AA750CD1A59D}.Debug (with DLLs).ActiveCfg = Debug (with DLLs)|Win32
{504CB6C0-4303-C53C-C345-AA750CD1A59D}.Debug (with DLLs).Build.0 = Debug (with DLLs)|Win32
- {88DF53AC-1338-547B-6989-1C8B78DE542B}.Release (with static libs).ActiveCfg = Release (with static libs)|Win32
- {88DF53AC-1338-547B-6989-1C8B78DE542B}.Release (with static libs).Build.0 = Release (with static libs)|Win32
- {88DF53AC-1338-547B-6989-1C8B78DE542B}.Release (with DLLs).ActiveCfg = Release (with DLLs)|Win32
- {88DF53AC-1338-547B-6989-1C8B78DE542B}.Release (with DLLs).Build.0 = Release (with DLLs)|Win32
- {88DF53AC-1338-547B-6989-1C8B78DE542B}.Debug (with static libs).ActiveCfg = Debug (with static libs)|Win32
- {88DF53AC-1338-547B-6989-1C8B78DE542B}.Debug (with static libs).Build.0 = Debug (with static libs)|Win32
- {88DF53AC-1338-547B-6989-1C8B78DE542B}.Debug (with DLLs).ActiveCfg = Debug (with DLLs)|Win32
- {88DF53AC-1338-547B-6989-1C8B78DE542B}.Debug (with DLLs).Build.0 = Debug (with DLLs)|Win32
{D55BE37F-A3CE-2CF1-7474-6961CF055BC0}.Release (with static libs).ActiveCfg = Release (with static libs)|Win32
{D55BE37F-A3CE-2CF1-7474-6961CF055BC0}.Release (with static libs).Build.0 = Release (with static libs)|Win32
{D55BE37F-A3CE-2CF1-7474-6961CF055BC0}.Release (with DLLs).ActiveCfg = Release (with DLLs)|Win32
@@ -543,14 +516,6 @@
{403E853A-59C3-FBA1-AF01-2BF89B0DA2F7}.Debug (with static libs).Build.0 = Debug (with static libs)|Win32
{403E853A-59C3-FBA1-AF01-2BF89B0DA2F7}.Debug (with DLLs).ActiveCfg = Debug (with DLLs)|Win32
{403E853A-59C3-FBA1-AF01-2BF89B0DA2F7}.Debug (with DLLs).Build.0 = Debug (with DLLs)|Win32
- {58918459-7FD8-C582-569D-A58038ABE9D1}.Release (with static libs).ActiveCfg = Release (with static libs)|Win32
- {58918459-7FD8-C582-569D-A58038ABE9D1}.Release (with static libs).Build.0 = Release (with static libs)|Win32
- {58918459-7FD8-C582-569D-A58038ABE9D1}.Release (with DLLs).ActiveCfg = Release (with DLLs)|Win32
- {58918459-7FD8-C582-569D-A58038ABE9D1}.Release (with DLLs).Build.0 = Release (with DLLs)|Win32
- {58918459-7FD8-C582-569D-A58038ABE9D1}.Debug (with static libs).ActiveCfg = Debug (with static libs)|Win32
- {58918459-7FD8-C582-569D-A58038ABE9D1}.Debug (with static libs).Build.0 = Debug (with static libs)|Win32
- {58918459-7FD8-C582-569D-A58038ABE9D1}.Debug (with DLLs).ActiveCfg = Debug (with DLLs)|Win32
- {58918459-7FD8-C582-569D-A58038ABE9D1}.Debug (with DLLs).Build.0 = Debug (with DLLs)|Win32
{32B86666-15E0-F234-58EC-50D3CC10AD59}.Release (with static libs).ActiveCfg = Release (with static libs)|Win32
{32B86666-15E0-F234-58EC-50D3CC10AD59}.Release (with static libs).Build.0 = Release (with static libs)|Win32
{32B86666-15E0-F234-58EC-50D3CC10AD59}.Release (with DLLs).ActiveCfg = Release (with DLLs)|Win32
@@ -567,6 +532,14 @@
{96C3E65A-7CC9-961B-0681-395F51BC9CE2}.Debug (with static libs).Build.0 = Debug (with static libs)|Win32
{96C3E65A-7CC9-961B-0681-395F51BC9CE2}.Debug (with DLLs).ActiveCfg = Debug (with DLLs)|Win32
{96C3E65A-7CC9-961B-0681-395F51BC9CE2}.Debug (with DLLs).Build.0 = Debug (with DLLs)|Win32
+ {26C0690C-CDA5-5C37-87AC-D0C18C4F7064}.Release (with static libs).ActiveCfg = Release (with static libs)|Win32
+ {26C0690C-CDA5-5C37-87AC-D0C18C4F7064}.Release (with static libs).Build.0 = Release (with static libs)|Win32
+ {26C0690C-CDA5-5C37-87AC-D0C18C4F7064}.Release (with DLLs).ActiveCfg = Release (with DLLs)|Win32
+ {26C0690C-CDA5-5C37-87AC-D0C18C4F7064}.Release (with DLLs).Build.0 = Release (with DLLs)|Win32
+ {26C0690C-CDA5-5C37-87AC-D0C18C4F7064}.Debug (with static libs).ActiveCfg = Debug (with static libs)|Win32
+ {26C0690C-CDA5-5C37-87AC-D0C18C4F7064}.Debug (with static libs).Build.0 = Debug (with static libs)|Win32
+ {26C0690C-CDA5-5C37-87AC-D0C18C4F7064}.Debug (with DLLs).ActiveCfg = Debug (with DLLs)|Win32
+ {26C0690C-CDA5-5C37-87AC-D0C18C4F7064}.Debug (with DLLs).Build.0 = Debug (with DLLs)|Win32
{8EBBE255-F364-3793-8E84-4ACE0FB487A1}.Release (with static libs).ActiveCfg = Release (with static libs)|Win32
{8EBBE255-F364-3793-8E84-4ACE0FB487A1}.Release (with static libs).Build.0 = Release (with static libs)|Win32
{8EBBE255-F364-3793-8E84-4ACE0FB487A1}.Release (with DLLs).ActiveCfg = Release (with DLLs)|Win32
@@ -575,14 +548,6 @@
{8EBBE255-F364-3793-8E84-4ACE0FB487A1}.Debug (with static libs).Build.0 = Debug (with static libs)|Win32
{8EBBE255-F364-3793-8E84-4ACE0FB487A1}.Debug (with DLLs).ActiveCfg = Debug (with DLLs)|Win32
{8EBBE255-F364-3793-8E84-4ACE0FB487A1}.Debug (with DLLs).Build.0 = Debug (with DLLs)|Win32
- {EF50101E-0BAC-395C-42F9-378D37DA03CE}.Release (with static libs).ActiveCfg = Release (with static libs)|Win32
- {EF50101E-0BAC-395C-42F9-378D37DA03CE}.Release (with static libs).Build.0 = Release (with static libs)|Win32
- {EF50101E-0BAC-395C-42F9-378D37DA03CE}.Release (with DLLs).ActiveCfg = Release (with DLLs)|Win32
- {EF50101E-0BAC-395C-42F9-378D37DA03CE}.Release (with DLLs).Build.0 = Release (with DLLs)|Win32
- {EF50101E-0BAC-395C-42F9-378D37DA03CE}.Debug (with static libs).ActiveCfg = Debug (with static libs)|Win32
- {EF50101E-0BAC-395C-42F9-378D37DA03CE}.Debug (with static libs).Build.0 = Debug (with static libs)|Win32
- {EF50101E-0BAC-395C-42F9-378D37DA03CE}.Debug (with DLLs).ActiveCfg = Debug (with DLLs)|Win32
- {EF50101E-0BAC-395C-42F9-378D37DA03CE}.Debug (with DLLs).Build.0 = Debug (with DLLs)|Win32
{8E2C61D0-0DDE-9AC3-AB7E-8EE3B4EE09D4}.Release (with static libs).ActiveCfg = Release (with static libs)|Win32
{8E2C61D0-0DDE-9AC3-AB7E-8EE3B4EE09D4}.Release (with static libs).Build.0 = Release (with static libs)|Win32
{8E2C61D0-0DDE-9AC3-AB7E-8EE3B4EE09D4}.Release (with DLLs).ActiveCfg = Release (with DLLs)|Win32
@@ -631,14 +596,6 @@
{73CFB4EB-077E-9A27-E4D4-145EA219E262}.Debug (with static libs).Build.0 = Debug (with static libs)|Win32
{73CFB4EB-077E-9A27-E4D4-145EA219E262}.Debug (with DLLs).ActiveCfg = Debug (with DLLs)|Win32
{73CFB4EB-077E-9A27-E4D4-145EA219E262}.Debug (with DLLs).Build.0 = Debug (with DLLs)|Win32
- {98DD5582-CDDE-F076-F9C8-D6603B15A78E}.Release (with static libs).ActiveCfg = Release (with static libs)|Win32
- {98DD5582-CDDE-F076-F9C8-D6603B15A78E}.Release (with static libs).Build.0 = Release (with static libs)|Win32
- {98DD5582-CDDE-F076-F9C8-D6603B15A78E}.Release (with DLLs).ActiveCfg = Release (with DLLs)|Win32
- {98DD5582-CDDE-F076-F9C8-D6603B15A78E}.Release (with DLLs).Build.0 = Release (with DLLs)|Win32
- {98DD5582-CDDE-F076-F9C8-D6603B15A78E}.Debug (with static libs).ActiveCfg = Debug (with static libs)|Win32
- {98DD5582-CDDE-F076-F9C8-D6603B15A78E}.Debug (with static libs).Build.0 = Debug (with static libs)|Win32
- {98DD5582-CDDE-F076-F9C8-D6603B15A78E}.Debug (with DLLs).ActiveCfg = Debug (with DLLs)|Win32
- {98DD5582-CDDE-F076-F9C8-D6603B15A78E}.Debug (with DLLs).Build.0 = Debug (with DLLs)|Win32
{47A9A513-F45E-728E-D930-72B622AE538C}.Release (with static libs).ActiveCfg = Release (with static libs)|Win32
{47A9A513-F45E-728E-D930-72B622AE538C}.Release (with static libs).Build.0 = Release (with static libs)|Win32
{47A9A513-F45E-728E-D930-72B622AE538C}.Release (with DLLs).ActiveCfg = Release (with DLLs)|Win32
@@ -663,14 +620,6 @@
{CB5A4EF1-E092-959D-EFD1-E0442F3119F1}.Debug (with static libs).Build.0 = Debug (with static libs)|Win32
{CB5A4EF1-E092-959D-EFD1-E0442F3119F1}.Debug (with DLLs).ActiveCfg = Debug (with DLLs)|Win32
{CB5A4EF1-E092-959D-EFD1-E0442F3119F1}.Debug (with DLLs).Build.0 = Debug (with DLLs)|Win32
- {4F4A2447-5243-2EF5-BE00-701BB9473BA1}.Release (with static libs).ActiveCfg = Release (with static libs)|Win32
- {4F4A2447-5243-2EF5-BE00-701BB9473BA1}.Release (with static libs).Build.0 = Release (with static libs)|Win32
- {4F4A2447-5243-2EF5-BE00-701BB9473BA1}.Release (with DLLs).ActiveCfg = Release (with DLLs)|Win32
- {4F4A2447-5243-2EF5-BE00-701BB9473BA1}.Release (with DLLs).Build.0 = Release (with DLLs)|Win32
- {4F4A2447-5243-2EF5-BE00-701BB9473BA1}.Debug (with static libs).ActiveCfg = Debug (with static libs)|Win32
- {4F4A2447-5243-2EF5-BE00-701BB9473BA1}.Debug (with static libs).Build.0 = Debug (with static libs)|Win32
- {4F4A2447-5243-2EF5-BE00-701BB9473BA1}.Debug (with DLLs).ActiveCfg = Debug (with DLLs)|Win32
- {4F4A2447-5243-2EF5-BE00-701BB9473BA1}.Debug (with DLLs).Build.0 = Debug (with DLLs)|Win32
{23D61ADF-182D-DD0F-43F2-2E474EE1FB00}.Release (with static libs).ActiveCfg = Release (with static libs)|Win32
{23D61ADF-182D-DD0F-43F2-2E474EE1FB00}.Release (with static libs).Build.0 = Release (with static libs)|Win32
{23D61ADF-182D-DD0F-43F2-2E474EE1FB00}.Release (with DLLs).ActiveCfg = Release (with DLLs)|Win32
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/appbootstrap.manifest /tmp/IB0bHXT4Oc/cel-1.4/msvc/appbootstrap.manifest
--- cel-1.9+svn3615/msvc/appbootstrap.manifest 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/msvc/appbootstrap.manifest 2009-11-28 16:47:23.000000000 +0000
@@ -2,7 +2,7 @@
"
-""
-""
-" "
-" "
-" "
-" cel.addons.ledges"
-" celAddOnLedges"
-" CEL AddOn for Ledges"
-" "
-" "
-" "
-""
-;
- #ifndef celAddOnLedges_FACTORY_REGISTER_DEFINED
- #define celAddOnLedges_FACTORY_REGISTER_DEFINED
- SCF_DEFINE_FACTORY_FUNC_REGISTRATION(celAddOnLedges)
- #endif
-
-class addon_ledges
-{
-SCF_REGISTER_STATIC_LIBRARY(addon_ledges,metainfo_addon_ledges)
- #ifndef celAddOnLedges_FACTORY_REGISTERED
- #define celAddOnLedges_FACTORY_REGISTERED
- celAddOnLedges_StaticInit celAddOnLedges_static_init__;
- #endif
-public:
- addon_ledges();
-};
-addon_ledges::addon_ledges() {}
-
-}
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/libbootstrap_static_plugins_CRYSTAL.rc /tmp/IB0bHXT4Oc/cel-1.4/msvc/libbootstrap_static_plugins_CRYSTAL.rc
--- cel-1.9+svn3615/msvc/libbootstrap_static_plugins_CRYSTAL.rc 1970-01-01 01:00:00.000000000 +0100
+++ cel-1.4/msvc/libbootstrap_static_plugins_CRYSTAL.rc 2009-11-28 16:47:27.000000000 +0000
@@ -0,0 +1,35 @@
+// This file is generated automatically.
+
+
+1 VERSIONINFO
+FILEVERSION 1,4,0,0
+PRODUCTVERSION 1,4,0,0
+#ifdef CS_DEBUG
+FILEFLAGS 0x1
+#else
+FILEFLAGS 0x0
+#endif
+{
+ BLOCK "StringFileInfo"
+ {
+ BLOCK "040904E4"
+ {
+ VALUE "ProductName", "Crystal Entity Layer"
+ VALUE "ProductVersion", "1.4.0"
+ VALUE "FileVersion", "1.4.0"
+ VALUE "LegalCopyright", "Copyright (C)2002-2008 Jorrit Tyberghein and others."
+ VALUE "FileDescription", "bootstrap_static_plugins_CRYSTAL"
+#ifdef CS_DEBUG
+ VALUE "Comments", "Debug build"
+#else
+ VALUE "Comments", "Release build"
+#endif
+ VALUE "WWW", "http://www.crystalspace3d.org/main/CEL"
+ }
+ }
+ BLOCK "VarFileInfo"
+ {
+ VALUE "Translation", 0x409, 1200
+ }
+
+}
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/libbootstrap_static_plugins.rc /tmp/IB0bHXT4Oc/cel-1.4/msvc/libbootstrap_static_plugins.rc
--- cel-1.9+svn3615/msvc/libbootstrap_static_plugins.rc 1970-01-01 01:00:00.000000000 +0100
+++ cel-1.4/msvc/libbootstrap_static_plugins.rc 2009-11-28 16:47:27.000000000 +0000
@@ -0,0 +1,35 @@
+// This file is generated automatically.
+
+
+1 VERSIONINFO
+FILEVERSION 1,4,0,0
+PRODUCTVERSION 1,4,0,0
+#ifdef CS_DEBUG
+FILEFLAGS 0x1
+#else
+FILEFLAGS 0x0
+#endif
+{
+ BLOCK "StringFileInfo"
+ {
+ BLOCK "040904E4"
+ {
+ VALUE "ProductName", "Crystal Entity Layer"
+ VALUE "ProductVersion", "1.4.0"
+ VALUE "FileVersion", "1.4.0"
+ VALUE "LegalCopyright", "Copyright (C)2002-2008 Jorrit Tyberghein and others."
+ VALUE "FileDescription", "bootstrap_static_plugins"
+#ifdef CS_DEBUG
+ VALUE "Comments", "Debug build"
+#else
+ VALUE "Comments", "Release build"
+#endif
+ VALUE "WWW", "http://www.crystalspace3d.org/main/CEL"
+ }
+ }
+ BLOCK "VarFileInfo"
+ {
+ VALUE "Translation", 0x409, 1200
+ }
+
+}
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/libcelstart_static_plugins_CRYSTAL.rc /tmp/IB0bHXT4Oc/cel-1.4/msvc/libcelstart_static_plugins_CRYSTAL.rc
--- cel-1.9+svn3615/msvc/libcelstart_static_plugins_CRYSTAL.rc 1970-01-01 01:00:00.000000000 +0100
+++ cel-1.4/msvc/libcelstart_static_plugins_CRYSTAL.rc 2009-11-28 16:47:27.000000000 +0000
@@ -0,0 +1,35 @@
+// This file is generated automatically.
+
+
+1 VERSIONINFO
+FILEVERSION 1,4,0,0
+PRODUCTVERSION 1,4,0,0
+#ifdef CS_DEBUG
+FILEFLAGS 0x1
+#else
+FILEFLAGS 0x0
+#endif
+{
+ BLOCK "StringFileInfo"
+ {
+ BLOCK "040904E4"
+ {
+ VALUE "ProductName", "Crystal Entity Layer"
+ VALUE "ProductVersion", "1.4.0"
+ VALUE "FileVersion", "1.4.0"
+ VALUE "LegalCopyright", "Copyright (C)2002-2008 Jorrit Tyberghein and others."
+ VALUE "FileDescription", "celstart_static_plugins_CRYSTAL"
+#ifdef CS_DEBUG
+ VALUE "Comments", "Debug build"
+#else
+ VALUE "Comments", "Release build"
+#endif
+ VALUE "WWW", "http://www.crystalspace3d.org/main/CEL"
+ }
+ }
+ BLOCK "VarFileInfo"
+ {
+ VALUE "Translation", 0x409, 1200
+ }
+
+}
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/libcelstart_static_plugins.rc /tmp/IB0bHXT4Oc/cel-1.4/msvc/libcelstart_static_plugins.rc
--- cel-1.9+svn3615/msvc/libcelstart_static_plugins.rc 1970-01-01 01:00:00.000000000 +0100
+++ cel-1.4/msvc/libcelstart_static_plugins.rc 2009-11-28 16:47:27.000000000 +0000
@@ -0,0 +1,35 @@
+// This file is generated automatically.
+
+
+1 VERSIONINFO
+FILEVERSION 1,4,0,0
+PRODUCTVERSION 1,4,0,0
+#ifdef CS_DEBUG
+FILEFLAGS 0x1
+#else
+FILEFLAGS 0x0
+#endif
+{
+ BLOCK "StringFileInfo"
+ {
+ BLOCK "040904E4"
+ {
+ VALUE "ProductName", "Crystal Entity Layer"
+ VALUE "ProductVersion", "1.4.0"
+ VALUE "FileVersion", "1.4.0"
+ VALUE "LegalCopyright", "Copyright (C)2002-2008 Jorrit Tyberghein and others."
+ VALUE "FileDescription", "celstart_static_plugins"
+#ifdef CS_DEBUG
+ VALUE "Comments", "Debug build"
+#else
+ VALUE "Comments", "Release build"
+#endif
+ VALUE "WWW", "http://www.crystalspace3d.org/main/CEL"
+ }
+ }
+ BLOCK "VarFileInfo"
+ {
+ VALUE "Translation", 0x409, 1200
+ }
+
+}
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/libceltool.rc /tmp/IB0bHXT4Oc/cel-1.4/msvc/libceltool.rc
--- cel-1.9+svn3615/msvc/libceltool.rc 1970-01-01 01:00:00.000000000 +0100
+++ cel-1.4/msvc/libceltool.rc 2009-11-28 16:47:27.000000000 +0000
@@ -0,0 +1,35 @@
+// This file is generated automatically.
+
+
+1 VERSIONINFO
+FILEVERSION 1,4,0,0
+PRODUCTVERSION 1,4,0,0
+#ifdef CS_DEBUG
+FILEFLAGS 0x1
+#else
+FILEFLAGS 0x0
+#endif
+{
+ BLOCK "StringFileInfo"
+ {
+ BLOCK "040904E4"
+ {
+ VALUE "ProductName", "Crystal Entity Layer"
+ VALUE "ProductVersion", "1.4.0"
+ VALUE "FileVersion", "1.4.0"
+ VALUE "LegalCopyright", "Copyright (C)2002-2008 Jorrit Tyberghein and others."
+ VALUE "FileDescription", "CEL tool library"
+#ifdef CS_DEBUG
+ VALUE "Comments", "Debug build"
+#else
+ VALUE "Comments", "Release build"
+#endif
+ VALUE "WWW", "http://www.crystalspace3d.org/main/CEL"
+ }
+ }
+ BLOCK "VarFileInfo"
+ {
+ VALUE "Translation", 0x409, 1200
+ }
+
+}
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/libceltst_static_plugins_CRYSTAL.rc /tmp/IB0bHXT4Oc/cel-1.4/msvc/libceltst_static_plugins_CRYSTAL.rc
--- cel-1.9+svn3615/msvc/libceltst_static_plugins_CRYSTAL.rc 1970-01-01 01:00:00.000000000 +0100
+++ cel-1.4/msvc/libceltst_static_plugins_CRYSTAL.rc 2009-11-28 16:47:27.000000000 +0000
@@ -0,0 +1,35 @@
+// This file is generated automatically.
+
+
+1 VERSIONINFO
+FILEVERSION 1,4,0,0
+PRODUCTVERSION 1,4,0,0
+#ifdef CS_DEBUG
+FILEFLAGS 0x1
+#else
+FILEFLAGS 0x0
+#endif
+{
+ BLOCK "StringFileInfo"
+ {
+ BLOCK "040904E4"
+ {
+ VALUE "ProductName", "Crystal Entity Layer"
+ VALUE "ProductVersion", "1.4.0"
+ VALUE "FileVersion", "1.4.0"
+ VALUE "LegalCopyright", "Copyright (C)2002-2008 Jorrit Tyberghein and others."
+ VALUE "FileDescription", "celtst_static_plugins_CRYSTAL"
+#ifdef CS_DEBUG
+ VALUE "Comments", "Debug build"
+#else
+ VALUE "Comments", "Release build"
+#endif
+ VALUE "WWW", "http://www.crystalspace3d.org/main/CEL"
+ }
+ }
+ BLOCK "VarFileInfo"
+ {
+ VALUE "Translation", 0x409, 1200
+ }
+
+}
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/libceltst_static_plugins.rc /tmp/IB0bHXT4Oc/cel-1.4/msvc/libceltst_static_plugins.rc
--- cel-1.9+svn3615/msvc/libceltst_static_plugins.rc 1970-01-01 01:00:00.000000000 +0100
+++ cel-1.4/msvc/libceltst_static_plugins.rc 2009-11-28 16:47:27.000000000 +0000
@@ -0,0 +1,35 @@
+// This file is generated automatically.
+
+
+1 VERSIONINFO
+FILEVERSION 1,4,0,0
+PRODUCTVERSION 1,4,0,0
+#ifdef CS_DEBUG
+FILEFLAGS 0x1
+#else
+FILEFLAGS 0x0
+#endif
+{
+ BLOCK "StringFileInfo"
+ {
+ BLOCK "040904E4"
+ {
+ VALUE "ProductName", "Crystal Entity Layer"
+ VALUE "ProductVersion", "1.4.0"
+ VALUE "FileVersion", "1.4.0"
+ VALUE "LegalCopyright", "Copyright (C)2002-2008 Jorrit Tyberghein and others."
+ VALUE "FileDescription", "celtst_static_plugins"
+#ifdef CS_DEBUG
+ VALUE "Comments", "Debug build"
+#else
+ VALUE "Comments", "Release build"
+#endif
+ VALUE "WWW", "http://www.crystalspace3d.org/main/CEL"
+ }
+ }
+ BLOCK "VarFileInfo"
+ {
+ VALUE "Translation", 0x409, 1200
+ }
+
+}
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/libledges_staticreg.cpp /tmp/IB0bHXT4Oc/cel-1.4/msvc/libledges_staticreg.cpp
--- cel-1.9+svn3615/msvc/libledges_staticreg.cpp 2008-07-28 04:02:17.000000000 +0100
+++ cel-1.4/msvc/libledges_staticreg.cpp 1970-01-01 01:00:00.000000000 +0100
@@ -1,50 +0,0 @@
-// This file is automatically generated.
-#include "cssysdef.h"
-#include "csutil/scf.h"
-
-// Put static linking stuff into own section.
-// The idea is that this allows the section to be swapped out but not
-// swapped in again b/c something else in it was needed.
-#if !defined(CS_DEBUG) && defined(CS_COMPILER_MSVC)
-#pragma const_seg(".CSmetai")
-#pragma comment(linker, "/section:.CSmetai,r")
-#pragma code_seg(".CSmeta")
-#pragma comment(linker, "/section:.CSmeta,er")
-#pragma comment(linker, "/merge:.CSmetai=.CSmeta")
-#endif
-
-namespace csStaticPluginInit
-{
-static char const metainfo_ledges[] =
-""
-""
-""
-" "
-" "
-" "
-" cel.ledgegroup"
-" celLedgeGroup"
-" CEL Ledge Group"
-" "
-" "
-" "
-""
-;
- #ifndef celLedgeGroup_FACTORY_REGISTER_DEFINED
- #define celLedgeGroup_FACTORY_REGISTER_DEFINED
- SCF_DEFINE_FACTORY_FUNC_REGISTRATION(celLedgeGroup)
- #endif
-
-class ledges
-{
-SCF_REGISTER_STATIC_LIBRARY(ledges,metainfo_ledges)
- #ifndef celLedgeGroup_FACTORY_REGISTERED
- #define celLedgeGroup_FACTORY_REGISTERED
- celLedgeGroup_StaticInit celLedgeGroup_static_init__;
- #endif
-public:
- ledges();
-};
-ledges::ledges() {}
-
-}
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/libnettest_static_plugins_CRYSTAL.rc /tmp/IB0bHXT4Oc/cel-1.4/msvc/libnettest_static_plugins_CRYSTAL.rc
--- cel-1.9+svn3615/msvc/libnettest_static_plugins_CRYSTAL.rc 1970-01-01 01:00:00.000000000 +0100
+++ cel-1.4/msvc/libnettest_static_plugins_CRYSTAL.rc 2009-11-28 16:47:27.000000000 +0000
@@ -0,0 +1,35 @@
+// This file is generated automatically.
+
+
+1 VERSIONINFO
+FILEVERSION 1,4,0,0
+PRODUCTVERSION 1,4,0,0
+#ifdef CS_DEBUG
+FILEFLAGS 0x1
+#else
+FILEFLAGS 0x0
+#endif
+{
+ BLOCK "StringFileInfo"
+ {
+ BLOCK "040904E4"
+ {
+ VALUE "ProductName", "Crystal Entity Layer"
+ VALUE "ProductVersion", "1.4.0"
+ VALUE "FileVersion", "1.4.0"
+ VALUE "LegalCopyright", "Copyright (C)2002-2008 Jorrit Tyberghein and others."
+ VALUE "FileDescription", "nettest_static_plugins_CRYSTAL"
+#ifdef CS_DEBUG
+ VALUE "Comments", "Debug build"
+#else
+ VALUE "Comments", "Release build"
+#endif
+ VALUE "WWW", "http://www.crystalspace3d.org/main/CEL"
+ }
+ }
+ BLOCK "VarFileInfo"
+ {
+ VALUE "Translation", 0x409, 1200
+ }
+
+}
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/libnettest_static_plugins.rc /tmp/IB0bHXT4Oc/cel-1.4/msvc/libnettest_static_plugins.rc
--- cel-1.9+svn3615/msvc/libnettest_static_plugins.rc 1970-01-01 01:00:00.000000000 +0100
+++ cel-1.4/msvc/libnettest_static_plugins.rc 2009-11-28 16:47:27.000000000 +0000
@@ -0,0 +1,35 @@
+// This file is generated automatically.
+
+
+1 VERSIONINFO
+FILEVERSION 1,4,0,0
+PRODUCTVERSION 1,4,0,0
+#ifdef CS_DEBUG
+FILEFLAGS 0x1
+#else
+FILEFLAGS 0x0
+#endif
+{
+ BLOCK "StringFileInfo"
+ {
+ BLOCK "040904E4"
+ {
+ VALUE "ProductName", "Crystal Entity Layer"
+ VALUE "ProductVersion", "1.4.0"
+ VALUE "FileVersion", "1.4.0"
+ VALUE "LegalCopyright", "Copyright (C)2002-2008 Jorrit Tyberghein and others."
+ VALUE "FileDescription", "nettest_static_plugins"
+#ifdef CS_DEBUG
+ VALUE "Comments", "Debug build"
+#else
+ VALUE "Comments", "Release build"
+#endif
+ VALUE "WWW", "http://www.crystalspace3d.org/main/CEL"
+ }
+ }
+ BLOCK "VarFileInfo"
+ {
+ VALUE "Translation", 0x409, 1200
+ }
+
+}
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/libpfactoranalog_staticreg.cpp /tmp/IB0bHXT4Oc/cel-1.4/msvc/libpfactoranalog_staticreg.cpp
--- cel-1.9+svn3615/msvc/libpfactoranalog_staticreg.cpp 1970-01-01 01:00:00.000000000 +0100
+++ cel-1.4/msvc/libpfactoranalog_staticreg.cpp 2009-11-28 16:47:27.000000000 +0000
@@ -0,0 +1,50 @@
+// This file is automatically generated.
+#include "cssysdef.h"
+#include "csutil/scf.h"
+
+// Put static linking stuff into own section.
+// The idea is that this allows the section to be swapped out but not
+// swapped in again b/c something else in it was needed.
+#if !defined(CS_DEBUG) && defined(CS_COMPILER_MSVC)
+#pragma const_seg(".CSmetai")
+#pragma comment(linker, "/section:.CSmetai,r")
+#pragma code_seg(".CSmeta")
+#pragma comment(linker, "/section:.CSmeta,er")
+#pragma comment(linker, "/merge:.CSmetai=.CSmeta")
+#endif
+
+namespace csStaticPluginInit
+{
+static char const metainfo_pfactoranalog[] =
+""
+""
+""
+" "
+" "
+" "
+" cel.pcfactory.move.actor.analog"
+" celPfActorAnalog"
+" CEL Analog Actor Movement Property Class Factory"
+" "
+" "
+" "
+""
+;
+ #ifndef celPfActorAnalog_FACTORY_REGISTER_DEFINED
+ #define celPfActorAnalog_FACTORY_REGISTER_DEFINED
+ SCF_DEFINE_FACTORY_FUNC_REGISTRATION(celPfActorAnalog)
+ #endif
+
+class pfactoranalog
+{
+SCF_REGISTER_STATIC_LIBRARY(pfactoranalog,metainfo_pfactoranalog)
+ #ifndef celPfActorAnalog_FACTORY_REGISTERED
+ #define celPfActorAnalog_FACTORY_REGISTERED
+ celPfActorAnalog_StaticInit celPfActorAnalog_static_init__;
+ #endif
+public:
+ pfactoranalog();
+};
+pfactoranalog::pfactoranalog() {}
+
+}
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/libpfanalogmotion_staticreg.cpp /tmp/IB0bHXT4Oc/cel-1.4/msvc/libpfanalogmotion_staticreg.cpp
--- cel-1.9+svn3615/msvc/libpfanalogmotion_staticreg.cpp 2008-06-23 04:02:10.000000000 +0100
+++ cel-1.4/msvc/libpfanalogmotion_staticreg.cpp 1970-01-01 01:00:00.000000000 +0100
@@ -1,64 +0,0 @@
-// This file is automatically generated.
-#include "cssysdef.h"
-#include "csutil/scf.h"
-
-// Put static linking stuff into own section.
-// The idea is that this allows the section to be swapped out but not
-// swapped in again b/c something else in it was needed.
-#if !defined(CS_DEBUG) && defined(CS_COMPILER_MSVC)
-#pragma const_seg(".CSmetai")
-#pragma comment(linker, "/section:.CSmetai,r")
-#pragma code_seg(".CSmeta")
-#pragma comment(linker, "/section:.CSmeta,er")
-#pragma comment(linker, "/merge:.CSmetai=.CSmeta")
-#endif
-
-namespace csStaticPluginInit
-{
-static char const metainfo_pfanalogmotion[] =
-""
-""
-""
-" "
-" "
-" "
-" "
-" cel.pcfactory.move.actor.analog"
-" celPfAnalogMotion"
-" CEL Analog Actor Movement Property Class Factory"
-" "
-" "
-" cel.pcfactory.move.analogmotion"
-" celPfAnalogMotion"
-" CEL Analog Actor Movement Property Class Factory"
-" "
-" "
-" "
-""
-;
- #ifndef celPfAnalogMotion_FACTORY_REGISTER_DEFINED
- #define celPfAnalogMotion_FACTORY_REGISTER_DEFINED
- SCF_DEFINE_FACTORY_FUNC_REGISTRATION(celPfAnalogMotion)
- #endif
- #ifndef celPfAnalogMotion_FACTORY_REGISTER_DEFINED
- #define celPfAnalogMotion_FACTORY_REGISTER_DEFINED
- SCF_DEFINE_FACTORY_FUNC_REGISTRATION(celPfAnalogMotion)
- #endif
-
-class pfanalogmotion
-{
-SCF_REGISTER_STATIC_LIBRARY(pfanalogmotion,metainfo_pfanalogmotion)
- #ifndef celPfAnalogMotion_FACTORY_REGISTERED
- #define celPfAnalogMotion_FACTORY_REGISTERED
- celPfAnalogMotion_StaticInit celPfAnalogMotion_static_init__;
- #endif
- #ifndef celPfAnalogMotion_FACTORY_REGISTERED
- #define celPfAnalogMotion_FACTORY_REGISTERED
- celPfAnalogMotion_StaticInit celPfAnalogMotion_static_init__;
- #endif
-public:
- pfanalogmotion();
-};
-pfanalogmotion::pfanalogmotion() {}
-
-}
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/libpfgrab_staticreg.cpp /tmp/IB0bHXT4Oc/cel-1.4/msvc/libpfgrab_staticreg.cpp
--- cel-1.9+svn3615/msvc/libpfgrab_staticreg.cpp 2008-07-04 04:04:39.000000000 +0100
+++ cel-1.4/msvc/libpfgrab_staticreg.cpp 1970-01-01 01:00:00.000000000 +0100
@@ -1,50 +0,0 @@
-// This file is automatically generated.
-#include "cssysdef.h"
-#include "csutil/scf.h"
-
-// Put static linking stuff into own section.
-// The idea is that this allows the section to be swapped out but not
-// swapped in again b/c something else in it was needed.
-#if !defined(CS_DEBUG) && defined(CS_COMPILER_MSVC)
-#pragma const_seg(".CSmetai")
-#pragma comment(linker, "/section:.CSmetai,r")
-#pragma code_seg(".CSmeta")
-#pragma comment(linker, "/section:.CSmeta,er")
-#pragma comment(linker, "/merge:.CSmetai=.CSmeta")
-#endif
-
-namespace csStaticPluginInit
-{
-static char const metainfo_pfgrab[] =
-""
-""
-""
-" "
-" "
-" "
-" cel.pcfactory.move.grab"
-" celPfGrab"
-" CEL Grab Property Class Factory"
-" "
-" "
-" "
-""
-;
- #ifndef celPfGrab_FACTORY_REGISTER_DEFINED
- #define celPfGrab_FACTORY_REGISTER_DEFINED
- SCF_DEFINE_FACTORY_FUNC_REGISTRATION(celPfGrab)
- #endif
-
-class pfgrab
-{
-SCF_REGISTER_STATIC_LIBRARY(pfgrab,metainfo_pfgrab)
- #ifndef celPfGrab_FACTORY_REGISTERED
- #define celPfGrab_FACTORY_REGISTERED
- celPfGrab_StaticInit celPfGrab_static_init__;
- #endif
-public:
- pfgrab();
-};
-pfgrab::pfgrab() {}
-
-}
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/libpfjump_staticreg.cpp /tmp/IB0bHXT4Oc/cel-1.4/msvc/libpfjump_staticreg.cpp
--- cel-1.9+svn3615/msvc/libpfjump_staticreg.cpp 2008-06-23 04:02:10.000000000 +0100
+++ cel-1.4/msvc/libpfjump_staticreg.cpp 1970-01-01 01:00:00.000000000 +0100
@@ -1,50 +0,0 @@
-// This file is automatically generated.
-#include "cssysdef.h"
-#include "csutil/scf.h"
-
-// Put static linking stuff into own section.
-// The idea is that this allows the section to be swapped out but not
-// swapped in again b/c something else in it was needed.
-#if !defined(CS_DEBUG) && defined(CS_COMPILER_MSVC)
-#pragma const_seg(".CSmetai")
-#pragma comment(linker, "/section:.CSmetai,r")
-#pragma code_seg(".CSmeta")
-#pragma comment(linker, "/section:.CSmeta,er")
-#pragma comment(linker, "/merge:.CSmetai=.CSmeta")
-#endif
-
-namespace csStaticPluginInit
-{
-static char const metainfo_pfjump[] =
-""
-""
-""
-" "
-" "
-" "
-" cel.pcfactory.move.jump"
-" celPfJump"
-" CEL Jump Property Class Factory"
-" "
-" "
-" "
-""
-;
- #ifndef celPfJump_FACTORY_REGISTER_DEFINED
- #define celPfJump_FACTORY_REGISTER_DEFINED
- SCF_DEFINE_FACTORY_FUNC_REGISTRATION(celPfJump)
- #endif
-
-class pfjump
-{
-SCF_REGISTER_STATIC_LIBRARY(pfjump,metainfo_pfjump)
- #ifndef celPfJump_FACTORY_REGISTERED
- #define celPfJump_FACTORY_REGISTERED
- celPfJump_StaticInit celPfJump_static_init__;
- #endif
-public:
- pfjump();
-};
-pfjump::pfjump() {}
-
-}
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/plgaddon_celentity.rc /tmp/IB0bHXT4Oc/cel-1.4/msvc/plgaddon_celentity.rc
--- cel-1.9+svn3615/msvc/plgaddon_celentity.rc 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/msvc/plgaddon_celentity.rc 2009-11-28 16:47:24.000000000 +0000
@@ -1,10 +1,9 @@
// This file is generated automatically.
+
1 VERSIONINFO
-FILEVERSION
-1,9,0,0
-PRODUCTVERSION
-1,9,0,0
+FILEVERSION 1,4,0,0
+PRODUCTVERSION 1,4,0,0
#ifdef CS_DEBUG
FILEFLAGS 0x1
#else
@@ -16,8 +15,8 @@
BLOCK "040904E4"
{
VALUE "ProductName", "Crystal Entity Layer"
- VALUE "ProductVersion", "1.9"
- VALUE "FileVersion", "1.9"
+ VALUE "ProductVersion", "1.4.0"
+ VALUE "FileVersion", "1.4.0"
VALUE "LegalCopyright", "Copyright (C)2002-2008 Jorrit Tyberghein and others."
VALUE "FileDescription", "addon_celentity"
#ifdef CS_DEBUG
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/plgaddon_celentitytpl.rc /tmp/IB0bHXT4Oc/cel-1.4/msvc/plgaddon_celentitytpl.rc
--- cel-1.9+svn3615/msvc/plgaddon_celentitytpl.rc 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/msvc/plgaddon_celentitytpl.rc 2009-11-28 16:47:24.000000000 +0000
@@ -1,10 +1,9 @@
// This file is generated automatically.
+
1 VERSIONINFO
-FILEVERSION
-1,9,0,0
-PRODUCTVERSION
-1,9,0,0
+FILEVERSION 1,4,0,0
+PRODUCTVERSION 1,4,0,0
#ifdef CS_DEBUG
FILEFLAGS 0x1
#else
@@ -16,8 +15,8 @@
BLOCK "040904E4"
{
VALUE "ProductName", "Crystal Entity Layer"
- VALUE "ProductVersion", "1.9"
- VALUE "FileVersion", "1.9"
+ VALUE "ProductVersion", "1.4.0"
+ VALUE "FileVersion", "1.4.0"
VALUE "LegalCopyright", "Copyright (C)2002-2008 Jorrit Tyberghein and others."
VALUE "FileDescription", "addon_celentitytpl"
#ifdef CS_DEBUG
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/plgaddon_celgraph.rc /tmp/IB0bHXT4Oc/cel-1.4/msvc/plgaddon_celgraph.rc
--- cel-1.9+svn3615/msvc/plgaddon_celgraph.rc 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/msvc/plgaddon_celgraph.rc 2009-11-28 16:47:27.000000000 +0000
@@ -1,10 +1,9 @@
// This file is generated automatically.
+
1 VERSIONINFO
-FILEVERSION
-1,9,0,0
-PRODUCTVERSION
-1,9,0,0
+FILEVERSION 1,4,0,0
+PRODUCTVERSION 1,4,0,0
#ifdef CS_DEBUG
FILEFLAGS 0x1
#else
@@ -16,8 +15,8 @@
BLOCK "040904E4"
{
VALUE "ProductName", "Crystal Entity Layer"
- VALUE "ProductVersion", "1.9"
- VALUE "FileVersion", "1.9"
+ VALUE "ProductVersion", "1.4.0"
+ VALUE "FileVersion", "1.4.0"
VALUE "LegalCopyright", "Copyright (C)2002-2008 Jorrit Tyberghein and others."
VALUE "FileDescription", "addon_celgraph"
#ifdef CS_DEBUG
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/plgaddon_ledges.rc /tmp/IB0bHXT4Oc/cel-1.4/msvc/plgaddon_ledges.rc
--- cel-1.9+svn3615/msvc/plgaddon_ledges.rc 2008-07-28 04:02:17.000000000 +0100
+++ cel-1.4/msvc/plgaddon_ledges.rc 1970-01-01 01:00:00.000000000 +0100
@@ -1,55 +0,0 @@
-// This file is generated automatically.
-
-1 VERSIONINFO
-FILEVERSION
-1,9,0,0
-PRODUCTVERSION
-1,9,0,0
-#ifdef CS_DEBUG
-FILEFLAGS 0x1
-#else
-FILEFLAGS 0x0
-#endif
-{
- BLOCK "StringFileInfo"
- {
- BLOCK "040904E4"
- {
- VALUE "ProductName", "Crystal Entity Layer"
- VALUE "ProductVersion", "1.9"
- VALUE "FileVersion", "1.9"
- VALUE "LegalCopyright", "Copyright (C)2002-2008 Jorrit Tyberghein and others."
- VALUE "FileDescription", "addon_ledges"
-#ifdef CS_DEBUG
- VALUE "Comments", "Debug build"
-#else
- VALUE "Comments", "Release build"
-#endif
- VALUE "WWW", "http://www.crystalspace3d.org/main/CEL"
- }
- }
- BLOCK "VarFileInfo"
- {
- VALUE "Translation", 0x409, 1200
- }
-
-}
-// This file is automatically generated.
-
-17485 RCDATA
-{
- "",
- "",
- "",
- " ",
- " ",
- " ",
- " cel.addons.ledges",
- " celAddOnLedges",
- " CEL AddOn for Ledges",
- " ",
- " ",
- " ",
- "",
- "\0"
-}
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/plgaddon_questdef.rc /tmp/IB0bHXT4Oc/cel-1.4/msvc/plgaddon_questdef.rc
--- cel-1.9+svn3615/msvc/plgaddon_questdef.rc 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/msvc/plgaddon_questdef.rc 2009-11-28 16:47:24.000000000 +0000
@@ -1,10 +1,9 @@
// This file is generated automatically.
+
1 VERSIONINFO
-FILEVERSION
-1,9,0,0
-PRODUCTVERSION
-1,9,0,0
+FILEVERSION 1,4,0,0
+PRODUCTVERSION 1,4,0,0
#ifdef CS_DEBUG
FILEFLAGS 0x1
#else
@@ -16,8 +15,8 @@
BLOCK "040904E4"
{
VALUE "ProductName", "Crystal Entity Layer"
- VALUE "ProductVersion", "1.9"
- VALUE "FileVersion", "1.9"
+ VALUE "ProductVersion", "1.4.0"
+ VALUE "FileVersion", "1.4.0"
VALUE "LegalCopyright", "Copyright (C)2002-2008 Jorrit Tyberghein and others."
VALUE "FileDescription", "addon_questdef"
#ifdef CS_DEBUG
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/plgaddon_ruledef.rc /tmp/IB0bHXT4Oc/cel-1.4/msvc/plgaddon_ruledef.rc
--- cel-1.9+svn3615/msvc/plgaddon_ruledef.rc 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/msvc/plgaddon_ruledef.rc 2009-11-28 16:47:24.000000000 +0000
@@ -1,10 +1,9 @@
// This file is generated automatically.
+
1 VERSIONINFO
-FILEVERSION
-1,9,0,0
-PRODUCTVERSION
-1,9,0,0
+FILEVERSION 1,4,0,0
+PRODUCTVERSION 1,4,0,0
#ifdef CS_DEBUG
FILEFLAGS 0x1
#else
@@ -16,8 +15,8 @@
BLOCK "040904E4"
{
VALUE "ProductName", "Crystal Entity Layer"
- VALUE "ProductVersion", "1.9"
- VALUE "FileVersion", "1.9"
+ VALUE "ProductVersion", "1.4.0"
+ VALUE "FileVersion", "1.4.0"
VALUE "LegalCopyright", "Copyright (C)2002-2008 Jorrit Tyberghein and others."
VALUE "FileDescription", "addon_ruledef"
#ifdef CS_DEBUG
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/plgaddon_xmlscripts.rc /tmp/IB0bHXT4Oc/cel-1.4/msvc/plgaddon_xmlscripts.rc
--- cel-1.9+svn3615/msvc/plgaddon_xmlscripts.rc 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/msvc/plgaddon_xmlscripts.rc 2009-11-28 16:47:24.000000000 +0000
@@ -1,10 +1,9 @@
// This file is generated automatically.
+
1 VERSIONINFO
-FILEVERSION
-1,9,0,0
-PRODUCTVERSION
-1,9,0,0
+FILEVERSION 1,4,0,0
+PRODUCTVERSION 1,4,0,0
#ifdef CS_DEBUG
FILEFLAGS 0x1
#else
@@ -16,8 +15,8 @@
BLOCK "040904E4"
{
VALUE "ProductName", "Crystal Entity Layer"
- VALUE "ProductVersion", "1.9"
- VALUE "FileVersion", "1.9"
+ VALUE "ProductVersion", "1.4.0"
+ VALUE "FileVersion", "1.4.0"
VALUE "LegalCopyright", "Copyright (C)2002-2008 Jorrit Tyberghein and others."
VALUE "FileDescription", "addon_xmlscripts"
#ifdef CS_DEBUG
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/plgbltest.rc /tmp/IB0bHXT4Oc/cel-1.4/msvc/plgbltest.rc
--- cel-1.9+svn3615/msvc/plgbltest.rc 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/msvc/plgbltest.rc 2009-11-28 16:47:24.000000000 +0000
@@ -1,10 +1,9 @@
// This file is generated automatically.
+
1 VERSIONINFO
-FILEVERSION
-1,9,0,0
-PRODUCTVERSION
-1,9,0,0
+FILEVERSION 1,4,0,0
+PRODUCTVERSION 1,4,0,0
#ifdef CS_DEBUG
FILEFLAGS 0x1
#else
@@ -16,8 +15,8 @@
BLOCK "040904E4"
{
VALUE "ProductName", "Crystal Entity Layer"
- VALUE "ProductVersion", "1.9"
- VALUE "FileVersion", "1.9"
+ VALUE "ProductVersion", "1.4.0"
+ VALUE "FileVersion", "1.4.0"
VALUE "LegalCopyright", "Copyright (C)2002-2008 Jorrit Tyberghein and others."
VALUE "FileDescription", "bltest"
#ifdef CS_DEBUG
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/plgblxml.rc /tmp/IB0bHXT4Oc/cel-1.4/msvc/plgblxml.rc
--- cel-1.9+svn3615/msvc/plgblxml.rc 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/msvc/plgblxml.rc 2009-11-28 16:47:24.000000000 +0000
@@ -1,10 +1,9 @@
// This file is generated automatically.
+
1 VERSIONINFO
-FILEVERSION
-1,9,0,0
-PRODUCTVERSION
-1,9,0,0
+FILEVERSION 1,4,0,0
+PRODUCTVERSION 1,4,0,0
#ifdef CS_DEBUG
FILEFLAGS 0x1
#else
@@ -16,8 +15,8 @@
BLOCK "040904E4"
{
VALUE "ProductName", "Crystal Entity Layer"
- VALUE "ProductVersion", "1.9"
- VALUE "FileVersion", "1.9"
+ VALUE "ProductVersion", "1.4.0"
+ VALUE "FileVersion", "1.4.0"
VALUE "LegalCopyright", "Copyright (C)2002-2008 Jorrit Tyberghein and others."
VALUE "FileDescription", "blxml"
#ifdef CS_DEBUG
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/plgcelconsole.rc /tmp/IB0bHXT4Oc/cel-1.4/msvc/plgcelconsole.rc
--- cel-1.9+svn3615/msvc/plgcelconsole.rc 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/msvc/plgcelconsole.rc 2009-11-28 16:47:24.000000000 +0000
@@ -1,10 +1,9 @@
// This file is generated automatically.
+
1 VERSIONINFO
-FILEVERSION
-1,9,0,0
-PRODUCTVERSION
-1,9,0,0
+FILEVERSION 1,4,0,0
+PRODUCTVERSION 1,4,0,0
#ifdef CS_DEBUG
FILEFLAGS 0x1
#else
@@ -16,8 +15,8 @@
BLOCK "040904E4"
{
VALUE "ProductName", "Crystal Entity Layer"
- VALUE "ProductVersion", "1.9"
- VALUE "FileVersion", "1.9"
+ VALUE "ProductVersion", "1.4.0"
+ VALUE "FileVersion", "1.4.0"
VALUE "LegalCopyright", "Copyright (C)2002-2008 Jorrit Tyberghein and others."
VALUE "FileDescription", "celconsole"
#ifdef CS_DEBUG
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/plgcelgraph.rc /tmp/IB0bHXT4Oc/cel-1.4/msvc/plgcelgraph.rc
--- cel-1.9+svn3615/msvc/plgcelgraph.rc 2008-08-01 04:11:53.000000000 +0100
+++ cel-1.4/msvc/plgcelgraph.rc 2009-11-28 16:47:27.000000000 +0000
@@ -1,10 +1,9 @@
// This file is generated automatically.
+
1 VERSIONINFO
-FILEVERSION
-1,9,0,0
-PRODUCTVERSION
-1,9,0,0
+FILEVERSION 1,4,0,0
+PRODUCTVERSION 1,4,0,0
#ifdef CS_DEBUG
FILEFLAGS 0x1
#else
@@ -16,8 +15,8 @@
BLOCK "040904E4"
{
VALUE "ProductName", "Crystal Entity Layer"
- VALUE "ProductVersion", "1.9"
- VALUE "FileVersion", "1.9"
+ VALUE "ProductVersion", "1.4.0"
+ VALUE "FileVersion", "1.4.0"
VALUE "LegalCopyright", "Copyright (C)2002-2008 Jorrit Tyberghein and others."
VALUE "FileDescription", "celgraph"
#ifdef CS_DEBUG
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/plgcpersist.rc /tmp/IB0bHXT4Oc/cel-1.4/msvc/plgcpersist.rc
--- cel-1.9+svn3615/msvc/plgcpersist.rc 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/msvc/plgcpersist.rc 2009-11-28 16:47:24.000000000 +0000
@@ -1,10 +1,9 @@
// This file is generated automatically.
+
1 VERSIONINFO
-FILEVERSION
-1,9,0,0
-PRODUCTVERSION
-1,9,0,0
+FILEVERSION 1,4,0,0
+PRODUCTVERSION 1,4,0,0
#ifdef CS_DEBUG
FILEFLAGS 0x1
#else
@@ -16,8 +15,8 @@
BLOCK "040904E4"
{
VALUE "ProductName", "Crystal Entity Layer"
- VALUE "ProductVersion", "1.9"
- VALUE "FileVersion", "1.9"
+ VALUE "ProductVersion", "1.4.0"
+ VALUE "FileVersion", "1.4.0"
VALUE "LegalCopyright", "Copyright (C)2002-2008 Jorrit Tyberghein and others."
VALUE "FileDescription", "cpersist"
#ifdef CS_DEBUG
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/plgledges.rc /tmp/IB0bHXT4Oc/cel-1.4/msvc/plgledges.rc
--- cel-1.9+svn3615/msvc/plgledges.rc 2008-07-28 04:02:17.000000000 +0100
+++ cel-1.4/msvc/plgledges.rc 1970-01-01 01:00:00.000000000 +0100
@@ -1,55 +0,0 @@
-// This file is generated automatically.
-
-1 VERSIONINFO
-FILEVERSION
-1,9,0,0
-PRODUCTVERSION
-1,9,0,0
-#ifdef CS_DEBUG
-FILEFLAGS 0x1
-#else
-FILEFLAGS 0x0
-#endif
-{
- BLOCK "StringFileInfo"
- {
- BLOCK "040904E4"
- {
- VALUE "ProductName", "Crystal Entity Layer"
- VALUE "ProductVersion", "1.9"
- VALUE "FileVersion", "1.9"
- VALUE "LegalCopyright", "Copyright (C)2002-2008 Jorrit Tyberghein and others."
- VALUE "FileDescription", "ledges"
-#ifdef CS_DEBUG
- VALUE "Comments", "Debug build"
-#else
- VALUE "Comments", "Release build"
-#endif
- VALUE "WWW", "http://www.crystalspace3d.org/main/CEL"
- }
- }
- BLOCK "VarFileInfo"
- {
- VALUE "Translation", 0x409, 1200
- }
-
-}
-// This file is automatically generated.
-
-17485 RCDATA
-{
- "",
- "",
- "",
- " ",
- " ",
- " ",
- " cel.ledgegroup",
- " celLedgeGroup",
- " CEL Ledge Group",
- " ",
- " ",
- " ",
- "",
- "\0"
-}
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/plgmgr_billboard.rc /tmp/IB0bHXT4Oc/cel-1.4/msvc/plgmgr_billboard.rc
--- cel-1.9+svn3615/msvc/plgmgr_billboard.rc 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/msvc/plgmgr_billboard.rc 2009-11-28 16:47:24.000000000 +0000
@@ -1,10 +1,9 @@
// This file is generated automatically.
+
1 VERSIONINFO
-FILEVERSION
-1,9,0,0
-PRODUCTVERSION
-1,9,0,0
+FILEVERSION 1,4,0,0
+PRODUCTVERSION 1,4,0,0
#ifdef CS_DEBUG
FILEFLAGS 0x1
#else
@@ -16,8 +15,8 @@
BLOCK "040904E4"
{
VALUE "ProductName", "Crystal Entity Layer"
- VALUE "ProductVersion", "1.9"
- VALUE "FileVersion", "1.9"
+ VALUE "ProductVersion", "1.4.0"
+ VALUE "FileVersion", "1.4.0"
VALUE "LegalCopyright", "Copyright (C)2002-2008 Jorrit Tyberghein and others."
VALUE "FileDescription", "mgr_billboard"
#ifdef CS_DEBUG
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/plgmgr_quests.rc /tmp/IB0bHXT4Oc/cel-1.4/msvc/plgmgr_quests.rc
--- cel-1.9+svn3615/msvc/plgmgr_quests.rc 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/msvc/plgmgr_quests.rc 2009-11-28 16:47:24.000000000 +0000
@@ -1,10 +1,9 @@
// This file is generated automatically.
+
1 VERSIONINFO
-FILEVERSION
-1,9,0,0
-PRODUCTVERSION
-1,9,0,0
+FILEVERSION 1,4,0,0
+PRODUCTVERSION 1,4,0,0
#ifdef CS_DEBUG
FILEFLAGS 0x1
#else
@@ -16,8 +15,8 @@
BLOCK "040904E4"
{
VALUE "ProductName", "Crystal Entity Layer"
- VALUE "ProductVersion", "1.9"
- VALUE "FileVersion", "1.9"
+ VALUE "ProductVersion", "1.4.0"
+ VALUE "FileVersion", "1.4.0"
VALUE "LegalCopyright", "Copyright (C)2002-2008 Jorrit Tyberghein and others."
VALUE "FileDescription", "mgr_quests"
#ifdef CS_DEBUG
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/plgpfactoranalog.rc /tmp/IB0bHXT4Oc/cel-1.4/msvc/plgpfactoranalog.rc
--- cel-1.9+svn3615/msvc/plgpfactoranalog.rc 1970-01-01 01:00:00.000000000 +0100
+++ cel-1.4/msvc/plgpfactoranalog.rc 2009-11-28 16:47:27.000000000 +0000
@@ -0,0 +1,54 @@
+// This file is generated automatically.
+
+
+1 VERSIONINFO
+FILEVERSION 1,4,0,0
+PRODUCTVERSION 1,4,0,0
+#ifdef CS_DEBUG
+FILEFLAGS 0x1
+#else
+FILEFLAGS 0x0
+#endif
+{
+ BLOCK "StringFileInfo"
+ {
+ BLOCK "040904E4"
+ {
+ VALUE "ProductName", "Crystal Entity Layer"
+ VALUE "ProductVersion", "1.4.0"
+ VALUE "FileVersion", "1.4.0"
+ VALUE "LegalCopyright", "Copyright (C)2002-2008 Jorrit Tyberghein and others."
+ VALUE "FileDescription", "pfactoranalog"
+#ifdef CS_DEBUG
+ VALUE "Comments", "Debug build"
+#else
+ VALUE "Comments", "Release build"
+#endif
+ VALUE "WWW", "http://www.crystalspace3d.org/main/CEL"
+ }
+ }
+ BLOCK "VarFileInfo"
+ {
+ VALUE "Translation", 0x409, 1200
+ }
+
+}
+// This file is automatically generated.
+
+17485 RCDATA
+{
+ "",
+ "",
+ "",
+ " ",
+ " ",
+ " ",
+ " cel.pcfactory.move.actor.analog",
+ " celPfActorAnalog",
+ " CEL Analog Actor Movement Property Class Factory",
+ " ",
+ " ",
+ " ",
+ "",
+ "\0"
+}
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/plgpfactormove.rc /tmp/IB0bHXT4Oc/cel-1.4/msvc/plgpfactormove.rc
--- cel-1.9+svn3615/msvc/plgpfactormove.rc 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/msvc/plgpfactormove.rc 2009-11-28 16:47:23.000000000 +0000
@@ -1,10 +1,9 @@
// This file is generated automatically.
+
1 VERSIONINFO
-FILEVERSION
-1,9,0,0
-PRODUCTVERSION
-1,9,0,0
+FILEVERSION 1,4,0,0
+PRODUCTVERSION 1,4,0,0
#ifdef CS_DEBUG
FILEFLAGS 0x1
#else
@@ -16,8 +15,8 @@
BLOCK "040904E4"
{
VALUE "ProductName", "Crystal Entity Layer"
- VALUE "ProductVersion", "1.9"
- VALUE "FileVersion", "1.9"
+ VALUE "ProductVersion", "1.4.0"
+ VALUE "FileVersion", "1.4.0"
VALUE "LegalCopyright", "Copyright (C)2002-2008 Jorrit Tyberghein and others."
VALUE "FileDescription", "pfactormove"
#ifdef CS_DEBUG
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/plgpfanalogmotion.rc /tmp/IB0bHXT4Oc/cel-1.4/msvc/plgpfanalogmotion.rc
--- cel-1.9+svn3615/msvc/plgpfanalogmotion.rc 2008-06-23 04:02:10.000000000 +0100
+++ cel-1.4/msvc/plgpfanalogmotion.rc 1970-01-01 01:00:00.000000000 +0100
@@ -1,61 +0,0 @@
-// This file is generated automatically.
-
-1 VERSIONINFO
-FILEVERSION
-1,9,0,0
-PRODUCTVERSION
-1,9,0,0
-#ifdef CS_DEBUG
-FILEFLAGS 0x1
-#else
-FILEFLAGS 0x0
-#endif
-{
- BLOCK "StringFileInfo"
- {
- BLOCK "040904E4"
- {
- VALUE "ProductName", "Crystal Entity Layer"
- VALUE "ProductVersion", "1.9"
- VALUE "FileVersion", "1.9"
- VALUE "LegalCopyright", "Copyright (C)2002-2008 Jorrit Tyberghein and others."
- VALUE "FileDescription", "pfanalogmotion"
-#ifdef CS_DEBUG
- VALUE "Comments", "Debug build"
-#else
- VALUE "Comments", "Release build"
-#endif
- VALUE "WWW", "http://www.crystalspace3d.org/main/CEL"
- }
- }
- BLOCK "VarFileInfo"
- {
- VALUE "Translation", 0x409, 1200
- }
-
-}
-// This file is automatically generated.
-
-17485 RCDATA
-{
- "",
- "",
- "",
- " ",
- " ",
- " ",
- " ",
- " cel.pcfactory.move.actor.analog",
- " celPfAnalogMotion",
- " CEL Analog Actor Movement Property Class Factory",
- " ",
- " ",
- " cel.pcfactory.move.analogmotion",
- " celPfAnalogMotion",
- " CEL Analog Actor Movement Property Class Factory",
- " ",
- " ",
- " ",
- "",
- "\0"
-}
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/plgpfbillboard.rc /tmp/IB0bHXT4Oc/cel-1.4/msvc/plgpfbillboard.rc
--- cel-1.9+svn3615/msvc/plgpfbillboard.rc 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/msvc/plgpfbillboard.rc 2009-11-28 16:47:24.000000000 +0000
@@ -1,10 +1,9 @@
// This file is generated automatically.
+
1 VERSIONINFO
-FILEVERSION
-1,9,0,0
-PRODUCTVERSION
-1,9,0,0
+FILEVERSION 1,4,0,0
+PRODUCTVERSION 1,4,0,0
#ifdef CS_DEBUG
FILEFLAGS 0x1
#else
@@ -16,8 +15,8 @@
BLOCK "040904E4"
{
VALUE "ProductName", "Crystal Entity Layer"
- VALUE "ProductVersion", "1.9"
- VALUE "FileVersion", "1.9"
+ VALUE "ProductVersion", "1.4.0"
+ VALUE "FileVersion", "1.4.0"
VALUE "LegalCopyright", "Copyright (C)2002-2008 Jorrit Tyberghein and others."
VALUE "FileDescription", "pfbillboard"
#ifdef CS_DEBUG
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/plgpfdamage.rc /tmp/IB0bHXT4Oc/cel-1.4/msvc/plgpfdamage.rc
--- cel-1.9+svn3615/msvc/plgpfdamage.rc 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/msvc/plgpfdamage.rc 2009-11-28 16:47:24.000000000 +0000
@@ -1,10 +1,9 @@
// This file is generated automatically.
+
1 VERSIONINFO
-FILEVERSION
-1,9,0,0
-PRODUCTVERSION
-1,9,0,0
+FILEVERSION 1,4,0,0
+PRODUCTVERSION 1,4,0,0
#ifdef CS_DEBUG
FILEFLAGS 0x1
#else
@@ -16,8 +15,8 @@
BLOCK "040904E4"
{
VALUE "ProductName", "Crystal Entity Layer"
- VALUE "ProductVersion", "1.9"
- VALUE "FileVersion", "1.9"
+ VALUE "ProductVersion", "1.4.0"
+ VALUE "FileVersion", "1.4.0"
VALUE "LegalCopyright", "Copyright (C)2002-2008 Jorrit Tyberghein and others."
VALUE "FileDescription", "pfdamage"
#ifdef CS_DEBUG
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/plgpfdefcam.rc /tmp/IB0bHXT4Oc/cel-1.4/msvc/plgpfdefcam.rc
--- cel-1.9+svn3615/msvc/plgpfdefcam.rc 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/msvc/plgpfdefcam.rc 2009-11-28 16:47:24.000000000 +0000
@@ -1,10 +1,9 @@
// This file is generated automatically.
+
1 VERSIONINFO
-FILEVERSION
-1,9,0,0
-PRODUCTVERSION
-1,9,0,0
+FILEVERSION 1,4,0,0
+PRODUCTVERSION 1,4,0,0
#ifdef CS_DEBUG
FILEFLAGS 0x1
#else
@@ -16,8 +15,8 @@
BLOCK "040904E4"
{
VALUE "ProductName", "Crystal Entity Layer"
- VALUE "ProductVersion", "1.9"
- VALUE "FileVersion", "1.9"
+ VALUE "ProductVersion", "1.4.0"
+ VALUE "FileVersion", "1.4.0"
VALUE "LegalCopyright", "Copyright (C)2002-2008 Jorrit Tyberghein and others."
VALUE "FileDescription", "pfdefcam"
#ifdef CS_DEBUG
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/plgpfdelegcam.rc /tmp/IB0bHXT4Oc/cel-1.4/msvc/plgpfdelegcam.rc
--- cel-1.9+svn3615/msvc/plgpfdelegcam.rc 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/msvc/plgpfdelegcam.rc 2009-11-28 16:47:27.000000000 +0000
@@ -1,10 +1,9 @@
// This file is generated automatically.
+
1 VERSIONINFO
-FILEVERSION
-1,9,0,0
-PRODUCTVERSION
-1,9,0,0
+FILEVERSION 1,4,0,0
+PRODUCTVERSION 1,4,0,0
#ifdef CS_DEBUG
FILEFLAGS 0x1
#else
@@ -16,8 +15,8 @@
BLOCK "040904E4"
{
VALUE "ProductName", "Crystal Entity Layer"
- VALUE "ProductVersion", "1.9"
- VALUE "FileVersion", "1.9"
+ VALUE "ProductVersion", "1.4.0"
+ VALUE "FileVersion", "1.4.0"
VALUE "LegalCopyright", "Copyright (C)2002-2008 Jorrit Tyberghein and others."
VALUE "FileDescription", "pfdelegcam"
#ifdef CS_DEBUG
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/plgpfengine.rc /tmp/IB0bHXT4Oc/cel-1.4/msvc/plgpfengine.rc
--- cel-1.9+svn3615/msvc/plgpfengine.rc 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/msvc/plgpfengine.rc 2009-11-28 16:47:26.000000000 +0000
@@ -1,10 +1,9 @@
// This file is generated automatically.
+
1 VERSIONINFO
-FILEVERSION
-1,9,0,0
-PRODUCTVERSION
-1,9,0,0
+FILEVERSION 1,4,0,0
+PRODUCTVERSION 1,4,0,0
#ifdef CS_DEBUG
FILEFLAGS 0x1
#else
@@ -16,8 +15,8 @@
BLOCK "040904E4"
{
VALUE "ProductName", "Crystal Entity Layer"
- VALUE "ProductVersion", "1.9"
- VALUE "FileVersion", "1.9"
+ VALUE "ProductVersion", "1.4.0"
+ VALUE "FileVersion", "1.4.0"
VALUE "LegalCopyright", "Copyright (C)2002-2008 Jorrit Tyberghein and others."
VALUE "FileDescription", "pfengine"
#ifdef CS_DEBUG
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/plgpfevolve.rc /tmp/IB0bHXT4Oc/cel-1.4/msvc/plgpfevolve.rc
--- cel-1.9+svn3615/msvc/plgpfevolve.rc 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/msvc/plgpfevolve.rc 2009-11-28 16:47:26.000000000 +0000
@@ -1,10 +1,9 @@
// This file is generated automatically.
+
1 VERSIONINFO
-FILEVERSION
-1,9,0,0
-PRODUCTVERSION
-1,9,0,0
+FILEVERSION 1,4,0,0
+PRODUCTVERSION 1,4,0,0
#ifdef CS_DEBUG
FILEFLAGS 0x1
#else
@@ -16,8 +15,8 @@
BLOCK "040904E4"
{
VALUE "ProductName", "Crystal Entity Layer"
- VALUE "ProductVersion", "1.9"
- VALUE "FileVersion", "1.9"
+ VALUE "ProductVersion", "1.4.0"
+ VALUE "FileVersion", "1.4.0"
VALUE "LegalCopyright", "Copyright (C)2002-2008 Jorrit Tyberghein and others."
VALUE "FileDescription", "pfevolve"
#ifdef CS_DEBUG
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/plgpfgrab.rc /tmp/IB0bHXT4Oc/cel-1.4/msvc/plgpfgrab.rc
--- cel-1.9+svn3615/msvc/plgpfgrab.rc 2008-07-04 04:04:39.000000000 +0100
+++ cel-1.4/msvc/plgpfgrab.rc 1970-01-01 01:00:00.000000000 +0100
@@ -1,55 +0,0 @@
-// This file is generated automatically.
-
-1 VERSIONINFO
-FILEVERSION
-1,9,0,0
-PRODUCTVERSION
-1,9,0,0
-#ifdef CS_DEBUG
-FILEFLAGS 0x1
-#else
-FILEFLAGS 0x0
-#endif
-{
- BLOCK "StringFileInfo"
- {
- BLOCK "040904E4"
- {
- VALUE "ProductName", "Crystal Entity Layer"
- VALUE "ProductVersion", "1.9"
- VALUE "FileVersion", "1.9"
- VALUE "LegalCopyright", "Copyright (C)2002-2008 Jorrit Tyberghein and others."
- VALUE "FileDescription", "pfgrab"
-#ifdef CS_DEBUG
- VALUE "Comments", "Debug build"
-#else
- VALUE "Comments", "Release build"
-#endif
- VALUE "WWW", "http://www.crystalspace3d.org/main/CEL"
- }
- }
- BLOCK "VarFileInfo"
- {
- VALUE "Translation", 0x409, 1200
- }
-
-}
-// This file is automatically generated.
-
-17485 RCDATA
-{
- "",
- "",
- "",
- " ",
- " ",
- " ",
- " cel.pcfactory.move.grab",
- " celPfGrab",
- " CEL Grab Property Class Factory",
- " ",
- " ",
- " ",
- "",
- "\0"
-}
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/plgpfhover.rc /tmp/IB0bHXT4Oc/cel-1.4/msvc/plgpfhover.rc
--- cel-1.9+svn3615/msvc/plgpfhover.rc 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/msvc/plgpfhover.rc 2009-11-28 16:47:24.000000000 +0000
@@ -1,10 +1,9 @@
// This file is generated automatically.
+
1 VERSIONINFO
-FILEVERSION
-1,9,0,0
-PRODUCTVERSION
-1,9,0,0
+FILEVERSION 1,4,0,0
+PRODUCTVERSION 1,4,0,0
#ifdef CS_DEBUG
FILEFLAGS 0x1
#else
@@ -16,8 +15,8 @@
BLOCK "040904E4"
{
VALUE "ProductName", "Crystal Entity Layer"
- VALUE "ProductVersion", "1.9"
- VALUE "FileVersion", "1.9"
+ VALUE "ProductVersion", "1.4.0"
+ VALUE "FileVersion", "1.4.0"
VALUE "LegalCopyright", "Copyright (C)2002-2008 Jorrit Tyberghein and others."
VALUE "FileDescription", "pfhover"
#ifdef CS_DEBUG
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/plgpfinput.rc /tmp/IB0bHXT4Oc/cel-1.4/msvc/plgpfinput.rc
--- cel-1.9+svn3615/msvc/plgpfinput.rc 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/msvc/plgpfinput.rc 2009-11-28 16:47:24.000000000 +0000
@@ -1,10 +1,9 @@
// This file is generated automatically.
+
1 VERSIONINFO
-FILEVERSION
-1,9,0,0
-PRODUCTVERSION
-1,9,0,0
+FILEVERSION 1,4,0,0
+PRODUCTVERSION 1,4,0,0
#ifdef CS_DEBUG
FILEFLAGS 0x1
#else
@@ -16,8 +15,8 @@
BLOCK "040904E4"
{
VALUE "ProductName", "Crystal Entity Layer"
- VALUE "ProductVersion", "1.9"
- VALUE "FileVersion", "1.9"
+ VALUE "ProductVersion", "1.4.0"
+ VALUE "FileVersion", "1.4.0"
VALUE "LegalCopyright", "Copyright (C)2002-2008 Jorrit Tyberghein and others."
VALUE "FileDescription", "pfinput"
#ifdef CS_DEBUG
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/plgpfinv.rc /tmp/IB0bHXT4Oc/cel-1.4/msvc/plgpfinv.rc
--- cel-1.9+svn3615/msvc/plgpfinv.rc 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/msvc/plgpfinv.rc 2009-11-28 16:47:24.000000000 +0000
@@ -1,10 +1,9 @@
// This file is generated automatically.
+
1 VERSIONINFO
-FILEVERSION
-1,9,0,0
-PRODUCTVERSION
-1,9,0,0
+FILEVERSION 1,4,0,0
+PRODUCTVERSION 1,4,0,0
#ifdef CS_DEBUG
FILEFLAGS 0x1
#else
@@ -16,8 +15,8 @@
BLOCK "040904E4"
{
VALUE "ProductName", "Crystal Entity Layer"
- VALUE "ProductVersion", "1.9"
- VALUE "FileVersion", "1.9"
+ VALUE "ProductVersion", "1.4.0"
+ VALUE "FileVersion", "1.4.0"
VALUE "LegalCopyright", "Copyright (C)2002-2008 Jorrit Tyberghein and others."
VALUE "FileDescription", "pfinv"
#ifdef CS_DEBUG
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/plgpfjump.rc /tmp/IB0bHXT4Oc/cel-1.4/msvc/plgpfjump.rc
--- cel-1.9+svn3615/msvc/plgpfjump.rc 2008-06-23 04:02:10.000000000 +0100
+++ cel-1.4/msvc/plgpfjump.rc 1970-01-01 01:00:00.000000000 +0100
@@ -1,55 +0,0 @@
-// This file is generated automatically.
-
-1 VERSIONINFO
-FILEVERSION
-1,9,0,0
-PRODUCTVERSION
-1,9,0,0
-#ifdef CS_DEBUG
-FILEFLAGS 0x1
-#else
-FILEFLAGS 0x0
-#endif
-{
- BLOCK "StringFileInfo"
- {
- BLOCK "040904E4"
- {
- VALUE "ProductName", "Crystal Entity Layer"
- VALUE "ProductVersion", "1.9"
- VALUE "FileVersion", "1.9"
- VALUE "LegalCopyright", "Copyright (C)2002-2008 Jorrit Tyberghein and others."
- VALUE "FileDescription", "pfjump"
-#ifdef CS_DEBUG
- VALUE "Comments", "Debug build"
-#else
- VALUE "Comments", "Release build"
-#endif
- VALUE "WWW", "http://www.crystalspace3d.org/main/CEL"
- }
- }
- BLOCK "VarFileInfo"
- {
- VALUE "Translation", 0x409, 1200
- }
-
-}
-// This file is automatically generated.
-
-17485 RCDATA
-{
- "",
- "",
- "",
- " ",
- " ",
- " ",
- " cel.pcfactory.move.jump",
- " celPfJump",
- " CEL Jump Property Class Factory",
- " ",
- " ",
- " ",
- "",
- "\0"
-}
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/plgpflight.rc /tmp/IB0bHXT4Oc/cel-1.4/msvc/plgpflight.rc
--- cel-1.9+svn3615/msvc/plgpflight.rc 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/msvc/plgpflight.rc 2009-11-28 16:47:26.000000000 +0000
@@ -1,10 +1,9 @@
// This file is generated automatically.
+
1 VERSIONINFO
-FILEVERSION
-1,9,0,0
-PRODUCTVERSION
-1,9,0,0
+FILEVERSION 1,4,0,0
+PRODUCTVERSION 1,4,0,0
#ifdef CS_DEBUG
FILEFLAGS 0x1
#else
@@ -16,8 +15,8 @@
BLOCK "040904E4"
{
VALUE "ProductName", "Crystal Entity Layer"
- VALUE "ProductVersion", "1.9"
- VALUE "FileVersion", "1.9"
+ VALUE "ProductVersion", "1.4.0"
+ VALUE "FileVersion", "1.4.0"
VALUE "LegalCopyright", "Copyright (C)2002-2008 Jorrit Tyberghein and others."
VALUE "FileDescription", "pflight"
#ifdef CS_DEBUG
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/plgpfmechanics.rc /tmp/IB0bHXT4Oc/cel-1.4/msvc/plgpfmechanics.rc
--- cel-1.9+svn3615/msvc/plgpfmechanics.rc 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/msvc/plgpfmechanics.rc 2009-11-28 16:47:24.000000000 +0000
@@ -1,10 +1,9 @@
// This file is generated automatically.
+
1 VERSIONINFO
-FILEVERSION
-1,9,0,0
-PRODUCTVERSION
-1,9,0,0
+FILEVERSION 1,4,0,0
+PRODUCTVERSION 1,4,0,0
#ifdef CS_DEBUG
FILEFLAGS 0x1
#else
@@ -16,8 +15,8 @@
BLOCK "040904E4"
{
VALUE "ProductName", "Crystal Entity Layer"
- VALUE "ProductVersion", "1.9"
- VALUE "FileVersion", "1.9"
+ VALUE "ProductVersion", "1.4.0"
+ VALUE "FileVersion", "1.4.0"
VALUE "LegalCopyright", "Copyright (C)2002-2008 Jorrit Tyberghein and others."
VALUE "FileDescription", "pfmechanics"
#ifdef CS_DEBUG
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/plgpfmeshdeform.rc /tmp/IB0bHXT4Oc/cel-1.4/msvc/plgpfmeshdeform.rc
--- cel-1.9+svn3615/msvc/plgpfmeshdeform.rc 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/msvc/plgpfmeshdeform.rc 2009-11-28 16:47:26.000000000 +0000
@@ -1,10 +1,9 @@
// This file is generated automatically.
+
1 VERSIONINFO
-FILEVERSION
-1,9,0,0
-PRODUCTVERSION
-1,9,0,0
+FILEVERSION 1,4,0,0
+PRODUCTVERSION 1,4,0,0
#ifdef CS_DEBUG
FILEFLAGS 0x1
#else
@@ -16,8 +15,8 @@
BLOCK "040904E4"
{
VALUE "ProductName", "Crystal Entity Layer"
- VALUE "ProductVersion", "1.9"
- VALUE "FileVersion", "1.9"
+ VALUE "ProductVersion", "1.4.0"
+ VALUE "FileVersion", "1.4.0"
VALUE "LegalCopyright", "Copyright (C)2002-2008 Jorrit Tyberghein and others."
VALUE "FileDescription", "pfmeshdeform"
#ifdef CS_DEBUG
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/plgpfmesh.rc /tmp/IB0bHXT4Oc/cel-1.4/msvc/plgpfmesh.rc
--- cel-1.9+svn3615/msvc/plgpfmesh.rc 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/msvc/plgpfmesh.rc 2009-11-28 16:47:26.000000000 +0000
@@ -1,10 +1,9 @@
// This file is generated automatically.
+
1 VERSIONINFO
-FILEVERSION
-1,9,0,0
-PRODUCTVERSION
-1,9,0,0
+FILEVERSION 1,4,0,0
+PRODUCTVERSION 1,4,0,0
#ifdef CS_DEBUG
FILEFLAGS 0x1
#else
@@ -16,8 +15,8 @@
BLOCK "040904E4"
{
VALUE "ProductName", "Crystal Entity Layer"
- VALUE "ProductVersion", "1.9"
- VALUE "FileVersion", "1.9"
+ VALUE "ProductVersion", "1.4.0"
+ VALUE "FileVersion", "1.4.0"
VALUE "LegalCopyright", "Copyright (C)2002-2008 Jorrit Tyberghein and others."
VALUE "FileDescription", "pfmesh"
#ifdef CS_DEBUG
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/plgpfmove.rc /tmp/IB0bHXT4Oc/cel-1.4/msvc/plgpfmove.rc
--- cel-1.9+svn3615/msvc/plgpfmove.rc 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/msvc/plgpfmove.rc 2009-11-28 16:47:26.000000000 +0000
@@ -1,10 +1,9 @@
// This file is generated automatically.
+
1 VERSIONINFO
-FILEVERSION
-1,9,0,0
-PRODUCTVERSION
-1,9,0,0
+FILEVERSION 1,4,0,0
+PRODUCTVERSION 1,4,0,0
#ifdef CS_DEBUG
FILEFLAGS 0x1
#else
@@ -16,8 +15,8 @@
BLOCK "040904E4"
{
VALUE "ProductName", "Crystal Entity Layer"
- VALUE "ProductVersion", "1.9"
- VALUE "FileVersion", "1.9"
+ VALUE "ProductVersion", "1.4.0"
+ VALUE "FileVersion", "1.4.0"
VALUE "LegalCopyright", "Copyright (C)2002-2008 Jorrit Tyberghein and others."
VALUE "FileDescription", "pfmove"
#ifdef CS_DEBUG
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/plgpfmover.rc /tmp/IB0bHXT4Oc/cel-1.4/msvc/plgpfmover.rc
--- cel-1.9+svn3615/msvc/plgpfmover.rc 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/msvc/plgpfmover.rc 2009-11-28 16:47:26.000000000 +0000
@@ -1,10 +1,9 @@
// This file is generated automatically.
+
1 VERSIONINFO
-FILEVERSION
-1,9,0,0
-PRODUCTVERSION
-1,9,0,0
+FILEVERSION 1,4,0,0
+PRODUCTVERSION 1,4,0,0
#ifdef CS_DEBUG
FILEFLAGS 0x1
#else
@@ -16,8 +15,8 @@
BLOCK "040904E4"
{
VALUE "ProductName", "Crystal Entity Layer"
- VALUE "ProductVersion", "1.9"
- VALUE "FileVersion", "1.9"
+ VALUE "ProductVersion", "1.4.0"
+ VALUE "FileVersion", "1.4.0"
VALUE "LegalCopyright", "Copyright (C)2002-2008 Jorrit Tyberghein and others."
VALUE "FileDescription", "pfmover"
#ifdef CS_DEBUG
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/plgpfneuralnet.rc /tmp/IB0bHXT4Oc/cel-1.4/msvc/plgpfneuralnet.rc
--- cel-1.9+svn3615/msvc/plgpfneuralnet.rc 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/msvc/plgpfneuralnet.rc 2009-11-28 16:47:26.000000000 +0000
@@ -1,10 +1,9 @@
// This file is generated automatically.
+
1 VERSIONINFO
-FILEVERSION
-1,9,0,0
-PRODUCTVERSION
-1,9,0,0
+FILEVERSION 1,4,0,0
+PRODUCTVERSION 1,4,0,0
#ifdef CS_DEBUG
FILEFLAGS 0x1
#else
@@ -16,8 +15,8 @@
BLOCK "040904E4"
{
VALUE "ProductName", "Crystal Entity Layer"
- VALUE "ProductVersion", "1.9"
- VALUE "FileVersion", "1.9"
+ VALUE "ProductVersion", "1.4.0"
+ VALUE "FileVersion", "1.4.0"
VALUE "LegalCopyright", "Copyright (C)2002-2008 Jorrit Tyberghein and others."
VALUE "FileDescription", "pfneuralnet"
#ifdef CS_DEBUG
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/plgpfnewcamera.rc /tmp/IB0bHXT4Oc/cel-1.4/msvc/plgpfnewcamera.rc
--- cel-1.9+svn3615/msvc/plgpfnewcamera.rc 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/msvc/plgpfnewcamera.rc 2009-11-28 16:47:26.000000000 +0000
@@ -1,10 +1,9 @@
// This file is generated automatically.
+
1 VERSIONINFO
-FILEVERSION
-1,9,0,0
-PRODUCTVERSION
-1,9,0,0
+FILEVERSION 1,4,0,0
+PRODUCTVERSION 1,4,0,0
#ifdef CS_DEBUG
FILEFLAGS 0x1
#else
@@ -16,8 +15,8 @@
BLOCK "040904E4"
{
VALUE "ProductName", "Crystal Entity Layer"
- VALUE "ProductVersion", "1.9"
- VALUE "FileVersion", "1.9"
+ VALUE "ProductVersion", "1.4.0"
+ VALUE "FileVersion", "1.4.0"
VALUE "LegalCopyright", "Copyright (C)2002-2008 Jorrit Tyberghein and others."
VALUE "FileDescription", "pfnewcamera"
#ifdef CS_DEBUG
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/plgpfpathfinder.rc /tmp/IB0bHXT4Oc/cel-1.4/msvc/plgpfpathfinder.rc
--- cel-1.9+svn3615/msvc/plgpfpathfinder.rc 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/msvc/plgpfpathfinder.rc 2009-11-28 16:47:27.000000000 +0000
@@ -1,10 +1,9 @@
// This file is generated automatically.
+
1 VERSIONINFO
-FILEVERSION
-1,9,0,0
-PRODUCTVERSION
-1,9,0,0
+FILEVERSION 1,4,0,0
+PRODUCTVERSION 1,4,0,0
#ifdef CS_DEBUG
FILEFLAGS 0x1
#else
@@ -16,8 +15,8 @@
BLOCK "040904E4"
{
VALUE "ProductName", "Crystal Entity Layer"
- VALUE "ProductVersion", "1.9"
- VALUE "FileVersion", "1.9"
+ VALUE "ProductVersion", "1.4.0"
+ VALUE "FileVersion", "1.4.0"
VALUE "LegalCopyright", "Copyright (C)2002-2008 Jorrit Tyberghein and others."
VALUE "FileDescription", "pfpathfinder"
#ifdef CS_DEBUG
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/plgpfportal.rc /tmp/IB0bHXT4Oc/cel-1.4/msvc/plgpfportal.rc
--- cel-1.9+svn3615/msvc/plgpfportal.rc 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/msvc/plgpfportal.rc 2009-11-28 16:47:27.000000000 +0000
@@ -1,10 +1,9 @@
// This file is generated automatically.
+
1 VERSIONINFO
-FILEVERSION
-1,9,0,0
-PRODUCTVERSION
-1,9,0,0
+FILEVERSION 1,4,0,0
+PRODUCTVERSION 1,4,0,0
#ifdef CS_DEBUG
FILEFLAGS 0x1
#else
@@ -16,8 +15,8 @@
BLOCK "040904E4"
{
VALUE "ProductName", "Crystal Entity Layer"
- VALUE "ProductVersion", "1.9"
- VALUE "FileVersion", "1.9"
+ VALUE "ProductVersion", "1.4.0"
+ VALUE "FileVersion", "1.4.0"
VALUE "LegalCopyright", "Copyright (C)2002-2008 Jorrit Tyberghein and others."
VALUE "FileDescription", "pfportal"
#ifdef CS_DEBUG
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/plgpfprojectile.rc /tmp/IB0bHXT4Oc/cel-1.4/msvc/plgpfprojectile.rc
--- cel-1.9+svn3615/msvc/plgpfprojectile.rc 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/msvc/plgpfprojectile.rc 2009-11-28 16:47:27.000000000 +0000
@@ -1,10 +1,9 @@
// This file is generated automatically.
+
1 VERSIONINFO
-FILEVERSION
-1,9,0,0
-PRODUCTVERSION
-1,9,0,0
+FILEVERSION 1,4,0,0
+PRODUCTVERSION 1,4,0,0
#ifdef CS_DEBUG
FILEFLAGS 0x1
#else
@@ -16,8 +15,8 @@
BLOCK "040904E4"
{
VALUE "ProductName", "Crystal Entity Layer"
- VALUE "ProductVersion", "1.9"
- VALUE "FileVersion", "1.9"
+ VALUE "ProductVersion", "1.4.0"
+ VALUE "FileVersion", "1.4.0"
VALUE "LegalCopyright", "Copyright (C)2002-2008 Jorrit Tyberghein and others."
VALUE "FileDescription", "pfprojectile"
#ifdef CS_DEBUG
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/plgpfquest.rc /tmp/IB0bHXT4Oc/cel-1.4/msvc/plgpfquest.rc
--- cel-1.9+svn3615/msvc/plgpfquest.rc 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/msvc/plgpfquest.rc 2009-11-28 16:47:27.000000000 +0000
@@ -1,10 +1,9 @@
// This file is generated automatically.
+
1 VERSIONINFO
-FILEVERSION
-1,9,0,0
-PRODUCTVERSION
-1,9,0,0
+FILEVERSION 1,4,0,0
+PRODUCTVERSION 1,4,0,0
#ifdef CS_DEBUG
FILEFLAGS 0x1
#else
@@ -16,8 +15,8 @@
BLOCK "040904E4"
{
VALUE "ProductName", "Crystal Entity Layer"
- VALUE "ProductVersion", "1.9"
- VALUE "FileVersion", "1.9"
+ VALUE "ProductVersion", "1.4.0"
+ VALUE "FileVersion", "1.4.0"
VALUE "LegalCopyright", "Copyright (C)2002-2008 Jorrit Tyberghein and others."
VALUE "FileDescription", "pfquest"
#ifdef CS_DEBUG
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/plgpfrules.rc /tmp/IB0bHXT4Oc/cel-1.4/msvc/plgpfrules.rc
--- cel-1.9+svn3615/msvc/plgpfrules.rc 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/msvc/plgpfrules.rc 2009-11-28 16:47:27.000000000 +0000
@@ -1,10 +1,9 @@
// This file is generated automatically.
+
1 VERSIONINFO
-FILEVERSION
-1,9,0,0
-PRODUCTVERSION
-1,9,0,0
+FILEVERSION 1,4,0,0
+PRODUCTVERSION 1,4,0,0
#ifdef CS_DEBUG
FILEFLAGS 0x1
#else
@@ -16,8 +15,8 @@
BLOCK "040904E4"
{
VALUE "ProductName", "Crystal Entity Layer"
- VALUE "ProductVersion", "1.9"
- VALUE "FileVersion", "1.9"
+ VALUE "ProductVersion", "1.4.0"
+ VALUE "FileVersion", "1.4.0"
VALUE "LegalCopyright", "Copyright (C)2002-2008 Jorrit Tyberghein and others."
VALUE "FileDescription", "pfrules"
#ifdef CS_DEBUG
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/plgpfsimpcam.rc /tmp/IB0bHXT4Oc/cel-1.4/msvc/plgpfsimpcam.rc
--- cel-1.9+svn3615/msvc/plgpfsimpcam.rc 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/msvc/plgpfsimpcam.rc 2009-11-28 16:47:27.000000000 +0000
@@ -1,10 +1,9 @@
// This file is generated automatically.
+
1 VERSIONINFO
-FILEVERSION
-1,9,0,0
-PRODUCTVERSION
-1,9,0,0
+FILEVERSION 1,4,0,0
+PRODUCTVERSION 1,4,0,0
#ifdef CS_DEBUG
FILEFLAGS 0x1
#else
@@ -16,8 +15,8 @@
BLOCK "040904E4"
{
VALUE "ProductName", "Crystal Entity Layer"
- VALUE "ProductVersion", "1.9"
- VALUE "FileVersion", "1.9"
+ VALUE "ProductVersion", "1.4.0"
+ VALUE "FileVersion", "1.4.0"
VALUE "LegalCopyright", "Copyright (C)2002-2008 Jorrit Tyberghein and others."
VALUE "FileDescription", "pfsimpcam"
#ifdef CS_DEBUG
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/plgpfsound.rc /tmp/IB0bHXT4Oc/cel-1.4/msvc/plgpfsound.rc
--- cel-1.9+svn3615/msvc/plgpfsound.rc 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/msvc/plgpfsound.rc 2009-11-28 16:47:27.000000000 +0000
@@ -1,10 +1,9 @@
// This file is generated automatically.
+
1 VERSIONINFO
-FILEVERSION
-1,9,0,0
-PRODUCTVERSION
-1,9,0,0
+FILEVERSION 1,4,0,0
+PRODUCTVERSION 1,4,0,0
#ifdef CS_DEBUG
FILEFLAGS 0x1
#else
@@ -16,8 +15,8 @@
BLOCK "040904E4"
{
VALUE "ProductName", "Crystal Entity Layer"
- VALUE "ProductVersion", "1.9"
- VALUE "FileVersion", "1.9"
+ VALUE "ProductVersion", "1.4.0"
+ VALUE "FileVersion", "1.4.0"
VALUE "LegalCopyright", "Copyright (C)2002-2008 Jorrit Tyberghein and others."
VALUE "FileDescription", "pfsound"
#ifdef CS_DEBUG
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/plgpfsteer.rc /tmp/IB0bHXT4Oc/cel-1.4/msvc/plgpfsteer.rc
--- cel-1.9+svn3615/msvc/plgpfsteer.rc 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/msvc/plgpfsteer.rc 2009-11-28 16:47:23.000000000 +0000
@@ -1,10 +1,9 @@
// This file is generated automatically.
+
1 VERSIONINFO
-FILEVERSION
-1,9,0,0
-PRODUCTVERSION
-1,9,0,0
+FILEVERSION 1,4,0,0
+PRODUCTVERSION 1,4,0,0
#ifdef CS_DEBUG
FILEFLAGS 0x1
#else
@@ -16,8 +15,8 @@
BLOCK "040904E4"
{
VALUE "ProductName", "Crystal Entity Layer"
- VALUE "ProductVersion", "1.9"
- VALUE "FileVersion", "1.9"
+ VALUE "ProductVersion", "1.4.0"
+ VALUE "FileVersion", "1.4.0"
VALUE "LegalCopyright", "Copyright (C)2002-2008 Jorrit Tyberghein and others."
VALUE "FileDescription", "pfsteer"
#ifdef CS_DEBUG
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/plgpftest.rc /tmp/IB0bHXT4Oc/cel-1.4/msvc/plgpftest.rc
--- cel-1.9+svn3615/msvc/plgpftest.rc 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/msvc/plgpftest.rc 2009-11-28 16:47:27.000000000 +0000
@@ -1,10 +1,9 @@
// This file is generated automatically.
+
1 VERSIONINFO
-FILEVERSION
-1,9,0,0
-PRODUCTVERSION
-1,9,0,0
+FILEVERSION 1,4,0,0
+PRODUCTVERSION 1,4,0,0
#ifdef CS_DEBUG
FILEFLAGS 0x1
#else
@@ -16,8 +15,8 @@
BLOCK "040904E4"
{
VALUE "ProductName", "Crystal Entity Layer"
- VALUE "ProductVersion", "1.9"
- VALUE "FileVersion", "1.9"
+ VALUE "ProductVersion", "1.4.0"
+ VALUE "FileVersion", "1.4.0"
VALUE "LegalCopyright", "Copyright (C)2002-2008 Jorrit Tyberghein and others."
VALUE "FileDescription", "pftest"
#ifdef CS_DEBUG
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/plgpftools.rc /tmp/IB0bHXT4Oc/cel-1.4/msvc/plgpftools.rc
--- cel-1.9+svn3615/msvc/plgpftools.rc 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/msvc/plgpftools.rc 2009-11-28 16:47:27.000000000 +0000
@@ -1,10 +1,9 @@
// This file is generated automatically.
+
1 VERSIONINFO
-FILEVERSION
-1,9,0,0
-PRODUCTVERSION
-1,9,0,0
+FILEVERSION 1,4,0,0
+PRODUCTVERSION 1,4,0,0
#ifdef CS_DEBUG
FILEFLAGS 0x1
#else
@@ -16,8 +15,8 @@
BLOCK "040904E4"
{
VALUE "ProductName", "Crystal Entity Layer"
- VALUE "ProductVersion", "1.9"
- VALUE "FileVersion", "1.9"
+ VALUE "ProductVersion", "1.4.0"
+ VALUE "FileVersion", "1.4.0"
VALUE "LegalCopyright", "Copyright (C)2002-2008 Jorrit Tyberghein and others."
VALUE "FileDescription", "pftools"
#ifdef CS_DEBUG
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/plgpftrackingcam.rc /tmp/IB0bHXT4Oc/cel-1.4/msvc/plgpftrackingcam.rc
--- cel-1.9+svn3615/msvc/plgpftrackingcam.rc 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/msvc/plgpftrackingcam.rc 2009-11-28 16:47:26.000000000 +0000
@@ -1,10 +1,9 @@
// This file is generated automatically.
+
1 VERSIONINFO
-FILEVERSION
-1,9,0,0
-PRODUCTVERSION
-1,9,0,0
+FILEVERSION 1,4,0,0
+PRODUCTVERSION 1,4,0,0
#ifdef CS_DEBUG
FILEFLAGS 0x1
#else
@@ -16,8 +15,8 @@
BLOCK "040904E4"
{
VALUE "ProductName", "Crystal Entity Layer"
- VALUE "ProductVersion", "1.9"
- VALUE "FileVersion", "1.9"
+ VALUE "ProductVersion", "1.4.0"
+ VALUE "FileVersion", "1.4.0"
VALUE "LegalCopyright", "Copyright (C)2002-2008 Jorrit Tyberghein and others."
VALUE "FileDescription", "pftrackingcam"
#ifdef CS_DEBUG
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/plgpftrigger.rc /tmp/IB0bHXT4Oc/cel-1.4/msvc/plgpftrigger.rc
--- cel-1.9+svn3615/msvc/plgpftrigger.rc 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/msvc/plgpftrigger.rc 2009-11-28 16:47:27.000000000 +0000
@@ -1,10 +1,9 @@
// This file is generated automatically.
+
1 VERSIONINFO
-FILEVERSION
-1,9,0,0
-PRODUCTVERSION
-1,9,0,0
+FILEVERSION 1,4,0,0
+PRODUCTVERSION 1,4,0,0
#ifdef CS_DEBUG
FILEFLAGS 0x1
#else
@@ -16,8 +15,8 @@
BLOCK "040904E4"
{
VALUE "ProductName", "Crystal Entity Layer"
- VALUE "ProductVersion", "1.9"
- VALUE "FileVersion", "1.9"
+ VALUE "ProductVersion", "1.4.0"
+ VALUE "FileVersion", "1.4.0"
VALUE "LegalCopyright", "Copyright (C)2002-2008 Jorrit Tyberghein and others."
VALUE "FileDescription", "pftrigger"
#ifdef CS_DEBUG
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/plgpfwheeled.rc /tmp/IB0bHXT4Oc/cel-1.4/msvc/plgpfwheeled.rc
--- cel-1.9+svn3615/msvc/plgpfwheeled.rc 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/msvc/plgpfwheeled.rc 2009-11-28 16:47:27.000000000 +0000
@@ -1,10 +1,9 @@
// This file is generated automatically.
+
1 VERSIONINFO
-FILEVERSION
-1,9,0,0
-PRODUCTVERSION
-1,9,0,0
+FILEVERSION 1,4,0,0
+PRODUCTVERSION 1,4,0,0
#ifdef CS_DEBUG
FILEFLAGS 0x1
#else
@@ -16,8 +15,8 @@
BLOCK "040904E4"
{
VALUE "ProductName", "Crystal Entity Layer"
- VALUE "ProductVersion", "1.9"
- VALUE "FileVersion", "1.9"
+ VALUE "ProductVersion", "1.4.0"
+ VALUE "FileVersion", "1.4.0"
VALUE "LegalCopyright", "Copyright (C)2002-2008 Jorrit Tyberghein and others."
VALUE "FileDescription", "pfwheeled"
#ifdef CS_DEBUG
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/plgpfzone.rc /tmp/IB0bHXT4Oc/cel-1.4/msvc/plgpfzone.rc
--- cel-1.9+svn3615/msvc/plgpfzone.rc 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/msvc/plgpfzone.rc 2009-11-28 16:47:27.000000000 +0000
@@ -1,10 +1,9 @@
// This file is generated automatically.
+
1 VERSIONINFO
-FILEVERSION
-1,9,0,0
-PRODUCTVERSION
-1,9,0,0
+FILEVERSION 1,4,0,0
+PRODUCTVERSION 1,4,0,0
#ifdef CS_DEBUG
FILEFLAGS 0x1
#else
@@ -16,8 +15,8 @@
BLOCK "040904E4"
{
VALUE "ProductName", "Crystal Entity Layer"
- VALUE "ProductVersion", "1.9"
- VALUE "FileVersion", "1.9"
+ VALUE "ProductVersion", "1.4.0"
+ VALUE "FileVersion", "1.4.0"
VALUE "LegalCopyright", "Copyright (C)2002-2008 Jorrit Tyberghein and others."
VALUE "FileDescription", "pfzone"
#ifdef CS_DEBUG
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/plgrulebase.rc /tmp/IB0bHXT4Oc/cel-1.4/msvc/plgrulebase.rc
--- cel-1.9+svn3615/msvc/plgrulebase.rc 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/msvc/plgrulebase.rc 2009-11-28 16:47:27.000000000 +0000
@@ -1,10 +1,9 @@
// This file is generated automatically.
+
1 VERSIONINFO
-FILEVERSION
-1,9,0,0
-PRODUCTVERSION
-1,9,0,0
+FILEVERSION 1,4,0,0
+PRODUCTVERSION 1,4,0,0
#ifdef CS_DEBUG
FILEFLAGS 0x1
#else
@@ -16,8 +15,8 @@
BLOCK "040904E4"
{
VALUE "ProductName", "Crystal Entity Layer"
- VALUE "ProductVersion", "1.9"
- VALUE "FileVersion", "1.9"
+ VALUE "ProductVersion", "1.4.0"
+ VALUE "FileVersion", "1.4.0"
VALUE "LegalCopyright", "Copyright (C)2002-2008 Jorrit Tyberghein and others."
VALUE "FileDescription", "rulebase"
#ifdef CS_DEBUG
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/plgstdphyslayer.rc /tmp/IB0bHXT4Oc/cel-1.4/msvc/plgstdphyslayer.rc
--- cel-1.9+svn3615/msvc/plgstdphyslayer.rc 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/msvc/plgstdphyslayer.rc 2009-11-28 16:47:27.000000000 +0000
@@ -1,10 +1,9 @@
// This file is generated automatically.
+
1 VERSIONINFO
-FILEVERSION
-1,9,0,0
-PRODUCTVERSION
-1,9,0,0
+FILEVERSION 1,4,0,0
+PRODUCTVERSION 1,4,0,0
#ifdef CS_DEBUG
FILEFLAGS 0x1
#else
@@ -16,8 +15,8 @@
BLOCK "040904E4"
{
VALUE "ProductName", "Crystal Entity Layer"
- VALUE "ProductVersion", "1.9"
- VALUE "FileVersion", "1.9"
+ VALUE "ProductVersion", "1.4.0"
+ VALUE "FileVersion", "1.4.0"
VALUE "LegalCopyright", "Copyright (C)2002-2008 Jorrit Tyberghein and others."
VALUE "FileDescription", "stdphyslayer"
#ifdef CS_DEBUG
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/msvc/plgxmlpersist.rc /tmp/IB0bHXT4Oc/cel-1.4/msvc/plgxmlpersist.rc
--- cel-1.9+svn3615/msvc/plgxmlpersist.rc 2008-06-18 04:00:27.000000000 +0100
+++ cel-1.4/msvc/plgxmlpersist.rc 2009-11-28 16:47:27.000000000 +0000
@@ -1,10 +1,9 @@
// This file is generated automatically.
+
1 VERSIONINFO
-FILEVERSION
-1,9,0,0
-PRODUCTVERSION
-1,9,0,0
+FILEVERSION 1,4,0,0
+PRODUCTVERSION 1,4,0,0
#ifdef CS_DEBUG
FILEFLAGS 0x1
#else
@@ -16,8 +15,8 @@
BLOCK "040904E4"
{
VALUE "ProductName", "Crystal Entity Layer"
- VALUE "ProductVersion", "1.9"
- VALUE "FileVersion", "1.9"
+ VALUE "ProductVersion", "1.4.0"
+ VALUE "FileVersion", "1.4.0"
VALUE "LegalCopyright", "Copyright (C)2002-2008 Jorrit Tyberghein and others."
VALUE "FileDescription", "xmlpersist"
#ifdef CS_DEBUG
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/plugins/addons/celentity/celentity.cpp /tmp/IB0bHXT4Oc/cel-1.4/plugins/addons/celentity/celentity.cpp
--- cel-1.9+svn3615/plugins/addons/celentity/celentity.cpp 2008-08-02 21:41:47.000000000 +0100
+++ cel-1.4/plugins/addons/celentity/celentity.cpp 2009-11-28 16:47:27.000000000 +0000
@@ -79,16 +79,16 @@
if (!synldr)
{
csReport (object_reg, CS_REPORTER_SEVERITY_ERROR,
- "cel.addons.celentity",
- "Can't find syntax services!");
+ "cel.addons.celentity",
+ "Can't find syntax services!");
return false;
}
pl = csQueryRegistry (object_reg);
if (!pl)
{
csReport (object_reg, CS_REPORTER_SEVERITY_ERROR,
- "cel.addons.celentity",
- "Can't find physical layer!");
+ "cel.addons.celentity",
+ "Can't find physical layer!");
return false;
}
@@ -112,28 +112,28 @@
}
const char* celAddOnCelEntity::GetAttributeValue (iDocumentNode* child,
- const char* propname)
+ const char* propname)
{
const char* rc = child->GetAttributeValue (propname);
if (!rc)
{
synldr->ReportError (
- "cel.addons.celentity", child,
- "Can't find attribute '%s'!", propname);
+ "cel.addons.celentity", child,
+ "Can't find attribute '%s'!", propname);
return 0;
}
return rc;
}
csStringID celAddOnCelEntity::GetAttributeID (iDocumentNode* child,
- const char* prefix, const char* propname)
+ const char* prefix, const char* propname)
{
const char* rc = child->GetAttributeValue (propname);
if (!rc)
{
synldr->ReportError (
- "cel.addons.celentity", child,
- "Can't find attribute '%s'!", propname);
+ "cel.addons.celentity", child,
+ "Can't find attribute '%s'!", propname);
return csInvalidStringID;
}
csString p (prefix);
@@ -142,7 +142,7 @@
}
csRef celAddOnCelEntity::ParseParameterBlock (
- iDocumentNode* child)
+ iDocumentNode* child)
{
celVariableParameterBlock* params = new celVariableParameterBlock ();
csRef par_it = child->GetNodes ();
@@ -156,78 +156,78 @@
if (par_id == XMLTOKEN_PAR)
{
csStringID parid = GetAttributeID (par_child, "cel.parameter.",
- "name");
+ "name");
if (parid == csInvalidStringID) return 0;
params->SetParameterDef (par_idx, parid,
- par_child->GetAttributeValue ("name"));
+ par_child->GetAttributeValue ("name"));
par_idx++;
const char* str_value = par_child->GetAttributeValue ("string");
if (str_value)
{
params->GetParameter (par_idx-1).Set (str_value);
- continue;
+ continue;
}
const char* vec_value = par_child->GetAttributeValue ("vector");
if (vec_value)
{
- csVector3 v;
- int rc = csScanStr (vec_value, "%f,%f,%f", &v.x, &v.y, &v.z);
- if (rc == 3)
- params->GetParameter (par_idx-1).Set (v);
- else
- {
- csVector2 v2;
- csScanStr (vec_value, "%f,%f", &v2.x, &v2.y);
- params->GetParameter (par_idx-1).Set (v2);
- }
+ csVector3 v;
+ int rc = csScanStr (vec_value, "%f,%f,%f", &v.x, &v.y, &v.z);
+ if (rc == 3)
+ params->GetParameter (par_idx-1).Set (v);
+ else
+ {
+ csVector2 v2;
+ csScanStr (vec_value, "%f,%f", &v2.x, &v2.y);
+ params->GetParameter (par_idx-1).Set (v2);
+ }
continue;
}
const char* vec3_value = par_child->GetAttributeValue ("vector3");
if (vec3_value)
{
- csVector3 v;
- csScanStr (vec3_value, "%f,%f,%f", &v.x, &v.y, &v.z);
- params->GetParameter (par_idx-1).Set (v);
+ csVector3 v;
+ csScanStr (vec3_value, "%f,%f,%f", &v.x, &v.y, &v.z);
+ params->GetParameter (par_idx-1).Set (v);
continue;
}
const char* vec2_value = par_child->GetAttributeValue ("vector2");
if (vec2_value)
{
- csVector2 v;
- csScanStr (vec2_value, "%f,%f", &v.x, &v.y);
- params->GetParameter (par_idx-1).Set (v);
+ csVector2 v;
+ csScanStr (vec2_value, "%f,%f", &v.x, &v.y);
+ params->GetParameter (par_idx-1).Set (v);
continue;
}
const char* col_value = par_child->GetAttributeValue ("color");
if (col_value)
{
- csColor v;
- csScanStr (col_value, "%f,%f,%f", &v.red, &v.green, &v.blue);
- params->GetParameter (par_idx-1).Set (v);
+ csColor v;
+ csScanStr (col_value, "%f,%f,%f", &v.red, &v.green, &v.blue);
+ params->GetParameter (par_idx-1).Set (v);
continue;
}
const char* float_value = par_child->GetAttributeValue ("float");
if (float_value)
{
- float f;
- csScanStr (float_value, "%f", &f);
- params->GetParameter (par_idx-1).Set (f);
+ float f;
+ csScanStr (float_value, "%f", &f);
+ params->GetParameter (par_idx-1).Set (f);
continue;
}
const char* bool_value = par_child->GetAttributeValue ("bool");
if (bool_value)
{
- bool b;
- csScanStr (bool_value, "%b", &b);
- params->GetParameter (par_idx-1).Set (b);
+ bool b;
+ csScanStr (bool_value, "%b", &b);
+ params->GetParameter (par_idx-1).Set (b);
continue;
}
const char* long_value = par_child->GetAttributeValue ("long");
if (long_value)
{
- int32 l;
- csScanStr (long_value, "%d", &l);
- params->GetParameter (par_idx-1).Set (l);
+ int32 l;
+ csScanStr (long_value, "%d", &l);
+ params->GetParameter (par_idx-1).Set (l);
continue;
}
synldr->ReportError (
@@ -245,7 +245,7 @@
}
bool celAddOnCelEntity::ParseProperties (iCelPropertyClass* pc,
- iDocumentNode* node)
+ iDocumentNode* node)
{
csRef it = node->GetNodes ();
while (it->HasNext ())
@@ -258,81 +258,81 @@
{
case XMLTOKEN_PROPERTY:
{
- csStringID propid = GetAttributeID (child, "cel.property.", "name");
- if (propid == csInvalidStringID) return false;
+ csStringID propid = GetAttributeID (child, "cel.property.", "name");
+ if (propid == csInvalidStringID) return false;
- csRef attr_it = child->GetAttributes ();
- while (attr_it->HasNext ())
- {
- csRef attr = attr_it->Next ();
- const char* attr_name = attr->GetName ();
- csStringID attr_id = xmltokens.Request (attr_name);
- switch (attr_id)
- {
- case XMLTOKEN_FLOAT:
- pc->SetProperty (propid, attr->GetValueAsFloat ());
- break;
- case XMLTOKEN_STRING:
- pc->SetProperty (propid, attr->GetValue ());
- break;
- case XMLTOKEN_BOOL:
- {
- const char* v = attr->GetValue ();
- bool b;
- csScanStr (v, "%b", &b);
- pc->SetProperty (propid, b);
- }
- break;
- case XMLTOKEN_LONG:
- pc->SetProperty (propid, (long)attr->GetValueAsInt ());
- break;
- case XMLTOKEN_VECTOR:
- {
- csVector3 v;
- int rc = csScanStr (attr->GetValue (), "%f,%f,%f", &v.x,
- &v.y, &v.z);
- if (rc == 3)
- pc->SetProperty (propid, v);
- else
- {
- csVector2 v2;
- csScanStr (attr->GetValue (), "%f,%f", &v2.x, &v2.y);
- pc->SetProperty (propid, v2);
- }
- }
- break;
- case XMLTOKEN_COLOR:
- {
- csColor v;
- csScanStr (attr->GetValue (), "%f,%f,%f",
- &v.red, &v.green, &v.blue);
- pc->SetProperty (propid, v);
- }
- break;
- }
- }
- }
- break;
+ csRef attr_it = child->GetAttributes ();
+ while (attr_it->HasNext ())
+ {
+ csRef attr = attr_it->Next ();
+ const char* attr_name = attr->GetName ();
+ csStringID attr_id = xmltokens.Request (attr_name);
+ switch (attr_id)
+ {
+ case XMLTOKEN_FLOAT:
+ pc->SetProperty (propid, attr->GetValueAsFloat ());
+ break;
+ case XMLTOKEN_STRING:
+ pc->SetProperty (propid, attr->GetValue ());
+ break;
+ case XMLTOKEN_BOOL:
+ {
+ const char* v = attr->GetValue ();
+ bool b;
+ csScanStr (v, "%b", &b);
+ pc->SetProperty (propid, b);
+ }
+ break;
+ case XMLTOKEN_LONG:
+ pc->SetProperty (propid, (long)attr->GetValueAsInt ());
+ break;
+ case XMLTOKEN_VECTOR:
+ {
+ csVector3 v;
+ int rc = csScanStr (attr->GetValue (), "%f,%f,%f", &v.x,
+ &v.y, &v.z);
+ if (rc == 3)
+ pc->SetProperty (propid, v);
+ else
+ {
+ csVector2 v2;
+ csScanStr (attr->GetValue (), "%f,%f", &v2.x, &v2.y);
+ pc->SetProperty (propid, v2);
+ }
+ }
+ break;
+ case XMLTOKEN_COLOR:
+ {
+ csColor v;
+ csScanStr (attr->GetValue (), "%f,%f,%f",
+ &v.red, &v.green, &v.blue);
+ pc->SetProperty (propid, v);
+ }
+ break;
+ }
+ }
+ }
+ break;
case XMLTOKEN_ACTION:
{
- csStringID propid = GetAttributeID (child, "cel.action.", "name");
- if (propid == csInvalidStringID) return false;
- csRef params = ParseParameterBlock (
- child);
- celData ret;
- pc->PerformAction (propid, params, ret);
- }
- break;
+ csStringID propid = GetAttributeID (child, "cel.action.", "name");
+ if (propid == csInvalidStringID) return false;
+ csRef params = ParseParameterBlock (
+ child);
+ celData ret;
+ pc->PerformAction (propid, params, ret);
+ }
+ break;
default:
synldr->ReportBadToken (child);
- break;
+ break;
}
}
return true;
}
csPtr celAddOnCelEntity::Parse (iDocumentNode* node,
- iStreamSource*, iLoaderContext* ldr_context, iBase* context)
+ iStreamSource*, iLoaderContext* ldr_context, iBase* context)
{
if (pl->IsEntityAddonAllowed ())
{
@@ -367,12 +367,12 @@
{
if (path)
csReport (object_reg, CS_REPORTER_SEVERITY_ERROR,
- "cel.addons.celentity",
- "Can't load file '%s' from '%s'!", file, path);
+ "cel.addons.celentity",
+ "Can't load file '%s' from '%s'!", file, path);
else
csReport (object_reg, CS_REPORTER_SEVERITY_ERROR,
- "cel.addons.celentity",
- "Can't load file '%s'!", file);
+ "cel.addons.celentity",
+ "Can't load file '%s'!", file);
return 0;
}
@@ -383,8 +383,8 @@
if (error != 0)
{
csReport (object_reg, CS_REPORTER_SEVERITY_ERROR,
- "cell.addons.celentity",
- "Document system error for file '%s': %s!", file, error);
+ "cell.addons.celentity",
+ "Document system error for file '%s': %s!", file, error);
return 0;
}
iCelEntity* entity = Load (doc->GetRoot ()->GetNode ("addon"), mesh);
@@ -412,8 +412,8 @@
if (!templ)
{
synldr->ReportError (
- "cel.addons.celentity",
- node, "Can't find entity template '%s'!", templatename);
+ "cel.addons.celentity",
+ node, "Can't find entity template '%s'!", templatename);
return 0;
}
celEntityTemplateParams params;
@@ -424,22 +424,22 @@
csRef par_it = paramsnode->GetNodes ();
while (par_it->HasNext ())
{
- csRef par_child = par_it->Next ();
- if (par_child->GetType () != CS_NODE_ELEMENT) continue;
- const char* par_value = par_child->GetValue ();
- csStringID par_id = xmltokens.Request (par_value);
- if (par_id == XMLTOKEN_PAR)
- {
- const char* name = par_child->GetAttributeValue ("name");
- const char* value = par_child->GetAttributeValue ("value");
- if (name && value)
- params.Put (name, value);
- }
- else
- {
- synldr->ReportBadToken (par_child);
- return 0;
- }
+ csRef par_child = par_it->Next ();
+ if (par_child->GetType () != CS_NODE_ELEMENT) continue;
+ const char* par_value = par_child->GetValue ();
+ csStringID par_id = xmltokens.Request (par_value);
+ if (par_id == XMLTOKEN_PAR)
+ {
+ const char* name = par_child->GetAttributeValue ("name");
+ const char* value = par_child->GetAttributeValue ("value");
+ if (name && value)
+ params.Put (name, value);
+ }
+ else
+ {
+ synldr->ReportBadToken (par_child);
+ return 0;
+ }
}
}
ent = pl->CreateEntity (templ, entityname, params);
@@ -469,140 +469,113 @@
switch (id)
{
case XMLTOKEN_BEHAVIOUR:
- {
- csRef bl;
- const char* blname = child->GetAttributeValue ("layer");
- if (blname)
- {
- bl = csQueryRegistryTagInterface ( object_reg, blname);
- if (!bl) bl = pl->FindBehaviourLayer (blname);
- }
- else
- {
- bl = csQueryRegistry (object_reg);
- }
- if (!bl)
{
- synldr->ReportError (
- "cel.addons.celentity",
- child, "Can't find the needed behaviour layer!");
- return 0;
- }
- const char* behavename = child->GetAttributeValue ("name");
- if (!behavename)
- {
- synldr->ReportError (
- "cel.addons.celentity",
- child, "Name of the behaviour is missing!");
- return 0;
- }
- iCelBehaviour* behave = bl->CreateBehaviour (ent, behavename);
- if (!behave)
- {
- synldr->ReportError (
- "cel.addons.celentity",
- child, "Couldn't create behaviour with name '%s'!",
- behavename);
- return 0;
- }
+ csRef bl;
+ const char* blname = child->GetAttributeValue ("layer");
+ if (blname)
+ {
+ bl = csQueryRegistryTagInterface ( object_reg, blname);
+ if (!bl) bl = pl->FindBehaviourLayer (blname);
+ }
+ else
+ {
+ bl = csQueryRegistry (object_reg);
+ }
+ if (!bl)
+ {
+ synldr->ReportError (
+ "cel.addons.celentity",
+ child, "Can't find the needed behaviour layer!");
+ return 0;
+ }
+ const char* behavename = child->GetAttributeValue ("name");
+ if (!behavename)
+ {
+ synldr->ReportError (
+ "cel.addons.celentity",
+ child, "Name of the behaviour is missing!");
+ return 0;
+ }
+ iCelBehaviour* behave = bl->CreateBehaviour (ent, behavename);
+ if (!behave)
+ {
+ synldr->ReportError (
+ "cel.addons.celentity",
+ child, "Couldn't create behaviour with name '%s'!",
+ behavename);
+ return 0;
+ }
+ }
break;
- }
case XMLTOKEN_PROPCLASS:
- {
- iCelPropertyClass* pc = LoadPropclass (child, ent);
+ {
+ iCelPropertyClass* pc;
+ const char* name = child->GetAttributeValue ("name");
+ if (!name)
+ {
+ synldr->ReportError (
+ "cel.addons.celentity",
+ child, "Name of the property class is missing!");
+ return 0;
+ }
+ const char* tag = child->GetAttributeValue ("tag");
+ iCelPropertyClassList* plist = ent->GetPropertyClassList ();
+ // First check if the pc is already present.
+ pc = plist->FindByNameAndTag (name, tag);
+ if (!pc)
+ pc = pl->CreatePropertyClass (ent, name);
+ if (!pc)
+ {
+ synldr->ReportError (
+ "cel.addons.celentity",
+ child, "Couldn't create property class '%s'!", name);
+ return 0;
+ }
+ if (!ParseProperties (pc, child))
+ return 0;
+ if (tag)
+ pc->SetTag (tag);
+ }
break;
- }
case XMLTOKEN_CLASS:
- {
- csStringID cls = pl->FetchStringID (child->GetContentsValue ());
- ent->AddClass (cls);
- break;
- }
- case XMLTOKEN_CALL:
- {
- if (!ent->GetBehaviour ())
{
- synldr->ReportError (
- "cel.addons.celentity",
- child, "Behaviour is missing for 'call'!");
- return 0;
- }
- csRef params = ParseParameterBlock (child);
- if (!params) return 0;
- const char* msgid = child->GetAttributeValue ("event");
- if (!msgid)
+ csStringID cls = pl->FetchStringID (child->GetContentsValue ());
+ ent->AddClass (cls);
+ }
+ break;
+ case XMLTOKEN_CALL:
{
- synldr->ReportError (
- "cel.addons.celentity",
- child, "'event' name is missing for call!");
- return 0;
- }
- celData ret;
- ent->GetBehaviour ()->SendMessage (msgid, 0, ret, params);
- ent->QueryMessageChannel ()->SendMessage (msgid,
- pl->QueryMessageSender (), params);
+ if (!ent->GetBehaviour ())
+ {
+ synldr->ReportError (
+ "cel.addons.celentity",
+ child, "Behaviour is missing for 'call'!");
+ return 0;
+ }
+ csRef params = ParseParameterBlock (child);
+ if (!params) return 0;
+ const char* msgid = child->GetAttributeValue ("event");
+ if (!msgid)
+ {
+ synldr->ReportError (
+ "cel.addons.celentity",
+ child, "'event' name is missing for call!");
+ return 0;
+ }
+ celData ret;
+ ent->GetBehaviour ()->SendMessage (msgid, 0, ret, params);
+ ent->QueryMessageChannel ()->SendMessage (msgid,
+ pl->QueryMessageSender (), params);
+ }
break;
- }
case XMLTOKEN_PARAMS:
- // Handled above.
+ // Handled above.
break;
default:
synldr->ReportBadToken (child);
- break;
+ break;
}
}
- celData msgret;
- celOneParameterBlock* msgparams = new celOneParameterBlock ();
- msgparams->SetParameterDef (pl->FetchStringID (entityname), "entityname");
- if (ent->GetBehaviour ())
- {
- ent->GetBehaviour ()->SendMessage ("cel.entity.loaded",
- 0, msgret, msgparams);
- }
- ent->QueryMessageChannel ()->SendMessage ("cel.entity.loaded", pl->QueryMessageSender (), msgparams);
return ent;
}
-iCelPropertyClass* celAddOnCelEntity::LoadPropclass (iDocumentNode* node, iCelEntity* ent)
-{
- iCelPropertyClass* pc;
- const char* name = node->GetAttributeValue ("name");
- if (!name)
- {
- synldr->ReportError (
- "cel.addons.celentity",
- node, "Name of the property class is missing!");
- return 0;
- }
- const char* tag = node->GetAttributeValue ("tag");
- iCelPropertyClassList* plist = ent->GetPropertyClassList ();
- // First check if the pc is already present.
- pc = plist->FindByNameAndTag (name, tag);
- if (!pc)
- pc = pl->CreatePropertyClass (ent, name);
- if (!pc)
- {
- synldr->ReportError (
- "cel.addons.celentity",
- node, "Couldn't create property class '%s'!", name);
- return 0;
- }
- if (!ParseProperties (pc, node))
- return 0;
- if (tag)
- pc->SetTag (tag);
- // check for children propclasses
- csRef it = node->GetNodes ();
- while (it->HasNext ())
- {
- csRef child = it->Next ();
- if (child->GetType () != CS_NODE_ELEMENT) continue;
- const char* value = child->GetValue ();
- csStringID id = xmltokens.Request (value);
- if (id == XMLTOKEN_PROPCLASS)
- {
- iCelPropertyClass* childpc = LoadPropclass (child, ent);
- }
- }
- return pc;
-}
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/plugins/addons/celentity/celentity.h /tmp/IB0bHXT4Oc/cel-1.4/plugins/addons/celentity/celentity.h
--- cel-1.9+svn3615/plugins/addons/celentity/celentity.h 2008-07-26 10:25:05.000000000 +0100
+++ cel-1.4/plugins/addons/celentity/celentity.h 2009-11-28 16:47:27.000000000 +0000
@@ -54,8 +54,6 @@
csRef ParseParameterBlock (iDocumentNode* child);
bool ParseProperties (iCelPropertyClass* pc, iDocumentNode* child);
- iCelPropertyClass* LoadPropclass (iDocumentNode* node, iCelEntity* ent);
-
public:
celAddOnCelEntity (iBase* parent);
virtual ~celAddOnCelEntity ();
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/plugins/addons/celgraph/celgraph.cpp /tmp/IB0bHXT4Oc/cel-1.4/plugins/addons/celgraph/celgraph.cpp
--- cel-1.9+svn3615/plugins/addons/celgraph/celgraph.cpp 2008-07-26 06:23:20.000000000 +0100
+++ cel-1.4/plugins/addons/celgraph/celgraph.cpp 2009-11-28 16:47:28.000000000 +0000
@@ -91,7 +91,7 @@
xmltokens.Register ("node", XMLTOKEN_NODE);
xmltokens.Register ("edge", XMLTOKEN_EDGE);
-
+
return true;
}
@@ -132,8 +132,8 @@
if (!sector)
{
synldr->ReportError (
- "cel.addons.celgraph", node,
- "Graph addons must be placed inside sectors!");
+ "cel.addons.celgraph", node,
+ "Graph addons must be placed inside sectors!");
return 0;
}
csRef graph;
@@ -197,6 +197,7 @@
if(!graph)
fprintf(stderr, "Error Loading CelGraph!\n");
+
csRef it = node->GetNodes ();
while (it->HasNext ())
{
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/plugins/addons/Jamfile /tmp/IB0bHXT4Oc/cel-1.4/plugins/addons/Jamfile
--- cel-1.9+svn3615/plugins/addons/Jamfile 2008-07-27 16:40:07.000000000 +0100
+++ cel-1.4/plugins/addons/Jamfile 2009-11-28 16:47:27.000000000 +0000
@@ -4,5 +4,4 @@
SubInclude TOP plugins addons questdef ;
SubInclude TOP plugins addons xmlscripts ;
SubInclude TOP plugins addons ruledef ;
-SubInclude TOP plugins addons celgraph ;
-SubInclude TOP plugins addons ledges ;
+SubInclude TOP plugins addons celgraph ;
\ No newline at end of file
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/plugins/addons/ledges/addon_ledges.csplugin /tmp/IB0bHXT4Oc/cel-1.4/plugins/addons/ledges/addon_ledges.csplugin
--- cel-1.9+svn3615/plugins/addons/ledges/addon_ledges.csplugin 2008-07-27 16:40:07.000000000 +0100
+++ cel-1.4/plugins/addons/ledges/addon_ledges.csplugin 1970-01-01 01:00:00.000000000 +0100
@@ -1,13 +0,0 @@
-
-
-
-
-
-
- cel.addons.ledges
- celAddOnLedges
- CEL AddOn for Ledges
-
-
-
-
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/plugins/addons/ledges/Jamfile /tmp/IB0bHXT4Oc/cel-1.4/plugins/addons/ledges/Jamfile
--- cel-1.9+svn3615/plugins/addons/ledges/Jamfile 2008-07-27 16:40:07.000000000 +0100
+++ cel-1.4/plugins/addons/ledges/Jamfile 1970-01-01 01:00:00.000000000 +0100
@@ -1,7 +0,0 @@
-SubDir TOP plugins addons ledges ;
-
-Plugin addon_ledges
- : ledges.cpp ledges.h
-;
-ExternalLibs addon_ledges : CRYSTAL ;
-LinkWith addon_ledges : celtool ;
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/plugins/addons/ledges/ledges.cpp /tmp/IB0bHXT4Oc/cel-1.4/plugins/addons/ledges/ledges.cpp
--- cel-1.9+svn3615/plugins/addons/ledges/ledges.cpp 2008-07-27 23:04:06.000000000 +0100
+++ cel-1.4/plugins/addons/ledges/ledges.cpp 1970-01-01 01:00:00.000000000 +0100
@@ -1,125 +0,0 @@
-/*
- Crystal Space Entity Layer
- Copyright (C) 2005 by Jorrit Tyberghein
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public
- License along with this library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-*/
-
-#include "cssysdef.h"
-#include "csutil/scanstr.h"
-#include "cstool/initapp.h"
-#include "iutil/objreg.h"
-#include "iutil/document.h"
-#include "iutil/object.h"
-#include "iutil/plugin.h"
-#include "ivaria/reporter.h"
-#include "imap/services.h"
-#include "iengine/mesh.h"
-#include "iengine/sector.h"
-
-#include "physicallayer/pl.h"
-#include "physicallayer/propclas.h"
-#include "physicallayer/entity.h"
-#include "behaviourlayer/bl.h"
-#include "propclass/mesh.h"
-#include "celtool/stdparams.h"
-
-#include "ledges.h"
-
-//---------------------------------------------------------------------------
-
-CS_IMPLEMENT_PLUGIN
-
-SCF_IMPLEMENT_FACTORY (celAddOnLedges)
-
-celAddOnLedges::celAddOnLedges (iBase* parent) :
- scfImplementationType (this, parent)
-{
- object_reg = 0;
-}
-
-celAddOnLedges::~celAddOnLedges ()
-{
-}
-
-bool celAddOnLedges::Initialize (iObjectRegistry* object_reg)
-{
- celAddOnLedges::object_reg = object_reg;
- synldr = csQueryRegistry (object_reg);
- if (!synldr)
- {
- csReport (object_reg, CS_REPORTER_SEVERITY_ERROR,
- "cel.addons.ledges",
- "Can't find syntax services!");
- return false;
- }
- return true;
-}
-
-csPtr celAddOnLedges::Parse (iDocumentNode* node, iStreamSource*, iLoaderContext* ldr_context, iBase* context)
-{
- csRef sector = scfQueryInterface(context);
- if (!sector)
- {
- synldr->ReportError (
- "cel.addons.celgraph", node,
- "Ledges addon must be placed inside sectors!");
- return 0;
- }
- csRef ledges;
- ledges = Load (node);
- csRef ledges_return = scfQueryInterface (ledges);
- iObject* ledges_obj = ledges->QueryObject ();
- ledges_obj->SetName ("cel.ledgegroup");
- sector->QueryObject()->ObjAdd (ledges_obj);
- return csPtr (ledges_return);
-}
-
-csPtr celAddOnLedges::Load (iDocumentNode* node)
-{
- csRef ledges = scfCreateInstance ("cel.ledgegroup");
- csRef it = node->GetNodes ();
- while (it->HasNext ())
- {
- csRef child = it->Next ();
- if (child->GetType () != CS_NODE_ELEMENT) continue;
- const char* value = child->GetValue ();
- if (!strcmp (value, "ledge"))
- {
- LoadLedge (child, ledges);
- }
- }
- return csPtr (ledges);
-}
-
-void celAddOnLedges::LoadLedge (iDocumentNode* node, iLedgeGroup* ledges)
-{
- iLedge* ledge = ledges->CreateLedge ();
- csRef it = node->GetNodes ();
- ledge->SetYPosition (node->GetAttributeValueAsFloat ("y"));
- while (it->HasNext ())
- {
- csRef child = it->Next ();
- if (child->GetType () != CS_NODE_ELEMENT) continue;
- const char* value = child->GetValue ();
- if (!strcmp (value, "p"))
- {
- csVector2 point;
- point.x = child->GetAttributeValueAsFloat ("x");
- point.y = child->GetAttributeValueAsFloat ("z");
- ledge->AddPoint (point);
- }
- }
-}
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/plugins/addons/ledges/ledges.h /tmp/IB0bHXT4Oc/cel-1.4/plugins/addons/ledges/ledges.h
--- cel-1.9+svn3615/plugins/addons/ledges/ledges.h 2008-07-27 16:40:07.000000000 +0100
+++ cel-1.4/plugins/addons/ledges/ledges.h 1970-01-01 01:00:00.000000000 +0100
@@ -1,56 +0,0 @@
-/*
- Crystal Space Entity Layer
- Copyright (C) 2005 by Jorrit Tyberghein
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public
- License along with this library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-*/
-
-#ifndef __CEL_ADDON_LEDGES__
-#define __CEL_ADDON_LEDGES__
-
-#include "iutil/comp.h"
-#include "imap/reader.h"
-#include "csutil/strhash.h"
-#include "csutil/weakref.h"
-#include "tools/ledges.h"
-
-struct iObjectRegistry;
-struct iDocumentNode;
-struct iLoaderContext;
-struct iSyntaxService;
-
-/**
- * This is an add-on to allow loading of ledges through a standard
- * CS map file.
- */
-class celAddOnLedges : public scfImplementation2
-{
-public:
- celAddOnLedges (iBase* parent);
- virtual ~celAddOnLedges ();
-
- bool Initialize (iObjectRegistry* object_reg);
-
- csPtr Parse (iDocumentNode* node, iStreamSource*, iLoaderContext* ldr_context, iBase* context);
- csPtr Load (iDocumentNode* node);
-
-private:
- void LoadLedge (iDocumentNode* node, iLedgeGroup* ledges);
-
- iObjectRegistry* object_reg;
- csWeakRef synldr;
-};
-
-#endif // __CEL_ADDON_LEDGES__
diff -Nru /tmp/GbaWLZOL1f/cel-1.9+svn3615/plugins/behaviourlayer/python/blcel.cpp /tmp/IB0bHXT4Oc/cel-1.4/plugins/behaviourlayer/python/blcel.cpp
--- cel-1.9+svn3615/plugins/behaviourlayer/python/blcel.cpp 2008-08-01 04:11:53.000000000 +0100
+++ cel-1.4/plugins/behaviourlayer/python/blcel.cpp 2009-11-28 16:47:28.000000000 +0000
@@ -1,6 +1,6 @@
/* ----------------------------------------------------------------------------
* This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.31
+ * Version 1.3.33
*
* This file is not intended to be easily readable and contains a number of
* coding conventions designed to improve portability and efficiency. Do not make
@@ -13,7 +13,7 @@
#define SWIG_PYTHON_DIRECTOR_NO_VTABLE
#ifdef __cplusplus
-template class SwigValueWrapper {
+template class SwigValueWrapper {
T *tt;
public:
SwigValueWrapper() : tt(0) { }
@@ -26,6 +26,10 @@
private:
SwigValueWrapper& operator=(const SwigValueWrapper& rhs);
};
+
+template T SwigValueInit() {
+ return T();
+}
#endif
/* -----------------------------------------------------------------------------
@@ -35,14 +39,14 @@
/* template workaround for compilers that cannot correctly implement the C++ standard */
#ifndef SWIGTEMPLATEDISAMBIGUATOR
-# if defined(__SUNPRO_CC)
-# if (__SUNPRO_CC <= 0x560)
-# define SWIGTEMPLATEDISAMBIGUATOR template
-# else
-# define SWIGTEMPLATEDISAMBIGUATOR
-# endif
+# if defined(__SUNPRO_CC) && (__SUNPRO_CC <= 0x560)
+# define SWIGTEMPLATEDISAMBIGUATOR template
+# elif defined(__HP_aCC)
+/* Needed even with `aCC -AA' when `aCC -V' reports HP ANSI C++ B3910B A.03.55 */
+/* If we find a maximum version that requires this, the test would be __HP_aCC <= 35500 for A.03.55 */
+# define SWIGTEMPLATEDISAMBIGUATOR template
# else
-# define SWIGTEMPLATEDISAMBIGUATOR
+# define SWIGTEMPLATEDISAMBIGUATOR
# endif
#endif
@@ -125,6 +129,12 @@
# define _CRT_SECURE_NO_DEPRECATE
#endif
+/* Deal with Microsoft's attempt at deprecating methods in the standard C++ library */
+#if !defined(SWIG_NO_SCL_SECURE_NO_DEPRECATE) && defined(_MSC_VER) && !defined(_SCL_SECURE_NO_DEPRECATE)
+# define _SCL_SECURE_NO_DEPRECATE
+#endif
+
+
/* Python.h has to appear first */
@@ -134,10 +144,19 @@
#ifndef __STDC_LIMIT_MACROS
#define __STDC_LIMIT_MACROS
#endif
- #ifndef DEBUG_PYTHON
+ #ifdef _MSC_VER
+ #include
+ #include
+ #if defined(_DEBUG) && !defined(DEBUG_PYTHON)
#undef _DEBUG
+ #define RESTORE__DEBUG
+ #endif
#endif
#include
+ #ifdef RESTORE__DEBUG
+ #define _DEBUG
+ #undef RESTORE__DEBUG
+ #endif
/* -----------------------------------------------------------------------------
* swigrun.swg
@@ -371,7 +390,7 @@
while ((*f2 == ' ') && (f2 != l2)) ++f2;
if (*f1 != *f2) return (*f1 > *f2) ? 1 : -1;
}
- return (l1 - f1) - (l2 - f2);
+ return (int)((l1 - f1) - (l2 - f2));
}
/*
@@ -1118,14 +1137,14 @@
/* Unpack the argument tuple */
SWIGINTERN int
-SWIG_Python_UnpackTuple(PyObject *args, const char *name, int min, int max, PyObject **objs)
+SWIG_Python_UnpackTuple(PyObject *args, const char *name, Py_ssize_t min, Py_ssize_t max, PyObject **objs)
{
if (!args) {
if (!min && !max) {
return 1;
} else {
PyErr_Format(PyExc_TypeError, "%s expected %s%d arguments, got none",
- name, (min == max ? "" : "at least "), min);
+ name, (min == max ? "" : "at least "), (int)min);
return 0;
}
}
@@ -1133,14 +1152,14 @@
PyErr_SetString(PyExc_SystemError, "UnpackTuple() argument list is not a tuple");
return 0;
} else {
- register int l = PyTuple_GET_SIZE(args);
+ register Py_ssize_t l = PyTuple_GET_SIZE(args);
if (l < min) {
PyErr_Format(PyExc_TypeError, "%s expected %s%d arguments, got %d",
- name, (min == max ? "" : "at least "), min, l);
+ name, (min == max ? "" : "at least "), (int)min, (int)l);
return 0;
} else if (l > max) {
PyErr_Format(PyExc_TypeError, "%s expected %s%d arguments, got %d",
- name, (min == max ? "" : "at most "), max, l);
+ name, (min == max ? "" : "at most "), (int)max, (int)l);
return 0;
} else {
register int i;
@@ -1619,9 +1638,11 @@
(unaryfunc)0, /*nb_float*/
(unaryfunc)PySwigObject_oct, /*nb_oct*/
(unaryfunc)PySwigObject_hex, /*nb_hex*/
-#if PY_VERSION_HEX >= 0x02020000
- 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 /* nb_inplace_add -> nb_inplace_true_divide */
-#elif PY_VERSION_HEX >= 0x02000000
+#if PY_VERSION_HEX >= 0x02050000 /* 2.5.0 */
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 /* nb_inplace_add -> nb_index */
+#elif PY_VERSION_HEX >= 0x02020000 /* 2.2.0 */
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 /* nb_inplace_add -> nb_inplace_true_divide */
+#elif PY_VERSION_HEX >= 0x02000000 /* 2.0.0 */
0,0,0,0,0,0,0,0,0,0,0 /* nb_inplace_add -> nb_inplace_or */
#endif
};
@@ -2687,6 +2708,7 @@
swig_msg += msg;
}
if (!PyErr_Occurred()) {
+ swig_msg.insert(0, ": ");
PyErr_SetString(error, getMessage());
} else {
SWIG_Python_AddErrorMsg(getMessage());
@@ -2781,7 +2803,7 @@
class DirectorMethodException : public Swig::DirectorException {
public:
DirectorMethodException(const char* msg = "")
- : DirectorException(PyExc_RuntimeError, "Swig director method error", msg)
+ : DirectorException(PyExc_RuntimeError, "Swig director method error.", msg)
{
}
@@ -2814,33 +2836,21 @@
# endif
#endif
-/* simple thread abstraction for pthreads on win32 */
#ifdef __THREAD__
-# define __PTHREAD__
-# if defined(_WIN32) || defined(__WIN32__)
-# define pthread_mutex_lock EnterCriticalSection
-# define pthread_mutex_unlock LeaveCriticalSection
-# define pthread_mutex_t CRITICAL_SECTION
-# define SWIG_MUTEX_INIT(var) var
-# else
-# include
-# define SWIG_MUTEX_INIT(var) var = PTHREAD_MUTEX_INITIALIZER
-# endif
-#endif
-
-#ifdef __PTHREAD__
- struct Guard
+# include "pythread.h"
+ class Guard
{
- pthread_mutex_t *_mutex;
+ PyThread_type_lock & mutex_;
- Guard(pthread_mutex_t &mutex) : _mutex(&mutex)
+ public:
+ Guard(PyThread_type_lock & mutex) : mutex_(mutex)
{
- pthread_mutex_lock(_mutex);
+ PyThread_acquire_lock(mutex_, WAIT_LOCK);
}
~Guard()
{
- pthread_mutex_unlock(_mutex);
+ PyThread_release_lock(mutex_);
}
};
# define SWIG_GUARD(mutex) Guard _guard(mutex)
@@ -2911,8 +2921,8 @@
private:
typedef std::map ownership_map;
mutable ownership_map owner;
-#ifdef __PTHREAD__
- static pthread_mutex_t swig_mutex_own;
+#ifdef __THREAD__
+ static PyThread_type_lock swig_mutex_own;
#endif
public:
@@ -2957,8 +2967,8 @@
}
};
-#ifdef __PTHREAD__
- pthread_mutex_t SWIG_MUTEX_INIT(Director::swig_mutex_own);
+#ifdef __THREAD__
+ PyThread_type_lock Director::swig_mutex_own = PyThread_allocate_lock();
#endif
}
@@ -2973,1149 +2983,1137 @@
#define SWIGTYPE_p_CS__Graphics__CoreRenderMesh swig_types[1]
#define SWIGTYPE_p_CS__Graphics__RenderMesh swig_types[2]
#define SWIGTYPE_p_CS__Graphics__RenderMeshModes swig_types[3]
-#define SWIGTYPE_p_CS__Memory__AllocatorMalloc swig_types[4]
-#define SWIGTYPE_p_CS__StringIDTCS__StringSetTag__General_t swig_types[5]
-#define SWIGTYPE_p_CS__StringIDTCS__StringSetTag__ShaderVar_t swig_types[6]
-#define SWIGTYPE_p_CS__Utility__StringSetTCS__StringSetTag__General_t swig_types[7]
-#define SWIGTYPE_p_CapacityHandlerType swig_types[8]
-#define SWIGTYPE_p_ContainedType swig_types[9]
-#define SWIGTYPE_p_ElementHandlerType swig_types[10]
-#define SWIGTYPE_p_FileFormatDescription swig_types[11]
-#define SWIGTYPE_p_HashType swig_types[12]
-#define SWIGTYPE_p_KeyType swig_types[13]
-#define SWIGTYPE_p_PcCommon swig_types[14]
-#define SWIGTYPE_p_PcCommonFactory swig_types[15]
-#define SWIGTYPE_p_Property swig_types[16]
-#define SWIGTYPE_p_PropertyHolder swig_types[17]
-#define SWIGTYPE_p_SndSysFilterLocation swig_types[18]
-#define SWIGTYPE_p_TagType swig_types[19]
-#define SWIGTYPE_p_ThisType swig_types[20]
-#define SWIGTYPE_p_ValueType swig_types[21]
-#define SWIGTYPE_p__1_basetype swig_types[22]
-#define SWIGTYPE_p__csKeyCharType swig_types[23]
-#define SWIGTYPE_p__csKeyEventType swig_types[24]
-#define SWIGTYPE_p__csKeyModifierNumType swig_types[25]
-#define SWIGTYPE_p__csKeyModifierType swig_types[26]
-#define SWIGTYPE_p__csKeyModifiers swig_types[27]
-#define SWIGTYPE_p__csMouseCursorID swig_types[28]
-#define SWIGTYPE_p__csMouseEventType swig_types[29]
-#define SWIGTYPE_p_bool swig_types[30]
-#define SWIGTYPE_p_celCombineParameterBlock swig_types[31]
-#define SWIGTYPE_p_celData swig_types[32]
-#define SWIGTYPE_p_celDataType swig_types[33]
-#define SWIGTYPE_p_celData_value swig_types[34]
-#define SWIGTYPE_p_celData_value_col swig_types[35]
-#define SWIGTYPE_p_celData_value_par swig_types[36]
-#define SWIGTYPE_p_celData_value_v swig_types[37]
-#define SWIGTYPE_p_celGenericParameterBlock swig_types[38]
-#define SWIGTYPE_p_celInitializer swig_types[39]
-#define SWIGTYPE_p_celOneParameterBlock swig_types[40]
-#define SWIGTYPE_p_celParSpec swig_types[41]
-#define SWIGTYPE_p_celPcCommon swig_types[42]
-#define SWIGTYPE_p_celPersistenceResult swig_types[43]
-#define SWIGTYPE_p_celPersistenceType swig_types[44]
-#define SWIGTYPE_p_celVariableParameterBlock swig_types[45]
-#define SWIGTYPE_p_celWrapPtr swig_types[46]
-#define SWIGTYPE_p_char swig_types[47]
-#define SWIGTYPE_p_csArrayCapacityFixedGrowT16_t swig_types[48]
-#define SWIGTYPE_p_csArrayCapacityVariableGrow swig_types[49]
-#define SWIGTYPE_p_csArrayTcelParSpec_csArrayElementHandlerTcelParSpec_t_CS__Memory__AllocatorMalloc_csArrayCapacityFixedGrowT16_t_t swig_types[50]
-#define SWIGTYPE_p_csArrayTcsImageIOFileFormatDescription_const_p_csArrayElementHandlerTcsImageIOFileFormatDescription_const_p_t_CS__Memory__AllocatorMalloc_csArrayCapacityFixedGrowT16_t_t swig_types[51]
-#define SWIGTYPE_p_csArrayTcsPluginRequest_csArrayElementHandlerTcsPluginRequest_t_CS__Memory__AllocatorMalloc_csArrayCapacityFixedGrowT16_t_t swig_types[52]
-#define SWIGTYPE_p_csArrayTcsStringBase_csArrayElementHandlerTcsStringBase_t_CS__Memory__AllocatorMalloc_csArrayCapacityFixedGrowT16_t_t swig_types[53]
-#define SWIGTYPE_p_csArrayTcsStringFastT12_t_csArrayElementHandlerTcsStringFastT12_t_t_CS__Memory__AllocatorMalloc_csArrayCapacityFixedGrowT16_t_t swig_types[54]
-#define SWIGTYPE_p_csArrayTiCelNode_p_csArrayElementHandlerTiCelNode_p_t_CS__Memory__AllocatorMalloc_csArrayCapacityFixedGrowT16_t_t swig_types[55]
-#define SWIGTYPE_p_csBox3 swig_types[56]
-#define SWIGTYPE_p_csColliderWrapper swig_types[57]
-#define SWIGTYPE_p_csColor swig_types[58]
-#define SWIGTYPE_p_csColor4 swig_types[59]
-#define SWIGTYPE_p_csConfigFile swig_types[60]
-#define SWIGTYPE_p_csFlags swig_types[61]
-#define SWIGTYPE_p_csHashTcsStringBase_csStringBase_CS__Memory__AllocatorMalloc_csArrayElementHandlerTCS__Container__HashElementTcsStringBase_csStringBase_t_t_t swig_types[62]
-#define SWIGTYPE_p_csHashTcsStringFastT12_t_csStringFastT12_t_CS__Memory__AllocatorMalloc_csArrayElementHandlerTCS__Container__HashElementTcsStringFastT12_t_csStringFastT12_t_t_t_t swig_types[63]
-#define SWIGTYPE_p_csHashTint_CS__StringIDTCS__StringSetTag__General_t_CS__Memory__AllocatorMalloc_csArrayElementHandlerTCS__Container__HashElementTint_CS__StringIDTCS__StringSetTag__General_t_t_t_t swig_types[64]
-#define SWIGTYPE_p_csImageBase swig_types[65]
-#define SWIGTYPE_p_csImageMemory swig_types[66]
-#define SWIGTYPE_p_csInitializer swig_types[67]
-#define SWIGTYPE_p_csMatrix3 swig_types[68]
-#define SWIGTYPE_p_csOBB swig_types[69]
-#define SWIGTYPE_p_csObject swig_types[70]
-#define SWIGTYPE_p_csOrthoTransform swig_types[71]
-#define SWIGTYPE_p_csPath swig_types[72]
-#define SWIGTYPE_p_csPlane3 swig_types[73]
-#define SWIGTYPE_p_csProcAnimated swig_types[74]
-#define SWIGTYPE_p_csProcTexture swig_types[75]
-#define SWIGTYPE_p_csPtrTcelVariableParameterBlock_t swig_types[76]
-#define SWIGTYPE_p_csPtrTiBase_t swig_types[77]
-#define SWIGTYPE_p_csPtrTiCelDataBuffer_t swig_types[78]
-#define SWIGTYPE_p_csPtrTiCelEntityIterator_t swig_types[79]
-#define SWIGTYPE_p_csPtrTiQuestParameter_t swig_types[80]
-#define SWIGTYPE_p_csPtrTiQuestRewardFactory_t swig_types[81]
-#define SWIGTYPE_p_csPtrTiQuestReward_t swig_types[82]
-#define SWIGTYPE_p_csPtrTiQuestSeqOpFactory_t swig_types[83]
-#define SWIGTYPE_p_csPtrTiQuestSeqOp_t swig_types[84]
-#define SWIGTYPE_p_csPtrTiQuestTriggerFactory_t swig_types[85]
-#define SWIGTYPE_p_csPtrTiQuestTrigger_t swig_types[86]
-#define SWIGTYPE_p_csPtrTiQuest_t swig_types[87]
-#define SWIGTYPE_p_csPtrTiRigidBody_t swig_types[88]
-#define SWIGTYPE_p_csRefArrayTiMaterialWrapper_t swig_types[89]
-#define SWIGTYPE_p_csRefArrayTiObject_t swig_types[90]
-#define SWIGTYPE_p_csRefArrayTiQuestParameter_t swig_types[91]
-#define SWIGTYPE_p_csRefArrayTiQuestTriggerFactory_t swig_types[92]
-#define SWIGTYPE_p_csRefTiBase_t swig_types[93]
-#define SWIGTYPE_p_csReversibleTransform swig_types[94]
-#define SWIGTYPE_p_csSetTCS__StringIDTCS__StringSetTag__General_t_CS__Memory__AllocatorMalloc_t swig_types[95]
-#define SWIGTYPE_p_csString swig_types[96]
-#define SWIGTYPE_p_csStringArray swig_types[97]
-#define SWIGTYPE_p_csStringBase swig_types[98]
-#define SWIGTYPE_p_csStringFastT12_t swig_types[99]
-#define SWIGTYPE_p_csStringFastT36_t swig_types[100]
-#define SWIGTYPE_p_csTriangleMesh swig_types[101]
-#define SWIGTYPE_p_csTriangleMeshBox swig_types[102]
-#define SWIGTYPE_p_csTriangleMeshPointer swig_types[103]
-#define SWIGTYPE_p_csVector2 swig_types[104]
-#define SWIGTYPE_p_csVector3 swig_types[105]
-#define SWIGTYPE_p_csVector4 swig_types[106]
-#define SWIGTYPE_p_csView swig_types[107]
-#define SWIGTYPE_p_csWeakRefArrayTiCelEntity_t swig_types[108]
-#define SWIGTYPE_p_csXRotMatrix3 swig_types[109]
-#define SWIGTYPE_p_csXScaleMatrix3 swig_types[110]
-#define SWIGTYPE_p_csYRotMatrix3 swig_types[111]
-#define SWIGTYPE_p_csYScaleMatrix3 swig_types[112]
-#define SWIGTYPE_p_csZRotMatrix3 swig_types[113]
-#define SWIGTYPE_p_csZScaleMatrix3 swig_types[114]
-#define SWIGTYPE_p_f_p_iMeshWrapper_p_iFrustumView_bool__void swig_types[115]
-#define SWIGTYPE_p_float swig_types[116]
-#define SWIGTYPE_p_iActionQuestRewardFactory swig_types[117]
-#define SWIGTYPE_p_iAnimTimeUpdateHandler swig_types[118]
-#define SWIGTYPE_p_iAnimatedImage swig_types[119]
-#define SWIGTYPE_p_iAnimatedMesh swig_types[120]
-#define SWIGTYPE_p_iAnimatedMeshFactory swig_types[121]
-#define SWIGTYPE_p_iAnimatedMeshFactorySubMesh swig_types[122]
-#define SWIGTYPE_p_iAnimatedMeshMorphTarget swig_types[123]
-#define SWIGTYPE_p_iAnimatedMeshSubMesh swig_types[124]
-#define SWIGTYPE_p_iArrayChangeAllTcelData_t swig_types[125]
-#define SWIGTYPE_p_iArrayChangeAllTcsCollisionPair_t swig_types[126]
-#define SWIGTYPE_p_iArrayChangeAllTcsShaderVariable_p_t swig_types[127]
-#define SWIGTYPE_p_iArrayChangeAllTcsSprite2DVertex_t swig_types[128]
-#define SWIGTYPE_p_iArrayChangeAllTcsVector3_t swig_types[129]
-#define SWIGTYPE_p_iArrayChangeElementsTcelData_t swig_types[130]
-#define SWIGTYPE_p_iArrayChangeElementsTcsCollisionPair_t swig_types[131]
-#define SWIGTYPE_p_iArrayChangeElementsTcsShaderVariable_p_t swig_types[132]
-#define SWIGTYPE_p_iArrayChangeElementsTcsSprite2DVertex_t swig_types[133]
-#define SWIGTYPE_p_iArrayChangeElementsTcsVector3_t swig_types[134]
-#define SWIGTYPE_p_iArrayReadOnlyTcelData_t swig_types[135]
-#define SWIGTYPE_p_iArrayReadOnlyTcsCollisionPair_t swig_types[136]
-#define SWIGTYPE_p_iArrayReadOnlyTcsShaderVariable_p_t swig_types[137]
-#define SWIGTYPE_p_iArrayReadOnlyTcsSprite2DVertex_t swig_types[138]
-#define SWIGTYPE_p_iArrayReadOnlyTcsVector3_t swig_types[139]
-#define SWIGTYPE_p_iArrayReadOnlyTiCollection_p_t swig_types[140]
-#define SWIGTYPE_p_iArrayReadOnlyTiSceneNode_p_t swig_types[141]
-#define SWIGTYPE_p_iBase swig_types[142]
-#define SWIGTYPE_p_iBillboard swig_types[143]
-#define SWIGTYPE_p_iBillboardEventHandler swig_types[144]
-#define SWIGTYPE_p_iBillboardLayer swig_types[145]
-#define SWIGTYPE_p_iBillboardManager swig_types[146]
-#define SWIGTYPE_p_iBinaryLoaderPlugin swig_types[147]
-#define SWIGTYPE_p_iBodyGroup swig_types[148]
-#define SWIGTYPE_p_iBugPlug swig_types[149]
-#define SWIGTYPE_p_iBugPlugRenderObject swig_types[150]
-#define SWIGTYPE_p_iCacheManager swig_types[151]
-#define SWIGTYPE_p_iCamera swig_types[152]
-#define SWIGTYPE_p_iCameraPosition swig_types[153]
-#define SWIGTYPE_p_iCameraPositionList swig_types[154]
-#define SWIGTYPE_p_iCameraSectorListener swig_types[155]
-#define SWIGTYPE_p_iCelBehaviour swig_types[156]
-#define SWIGTYPE_p_iCelBlLayer swig_types[157]
-#define SWIGTYPE_p_iCelConsole swig_types[158]
-#define SWIGTYPE_p_iCelConsoleCommand swig_types[159]
-#define SWIGTYPE_p_iCelDataArray swig_types[160]
-#define SWIGTYPE_p_iCelDataArrayReadOnly swig_types[161]
-#define SWIGTYPE_p_iCelDataBuffer swig_types[162]
-#define SWIGTYPE_p_iCelEdge swig_types[163]
-#define SWIGTYPE_p_iCelEntity swig_types[164]
-#define SWIGTYPE_p_iCelEntityIterator swig_types[165]
-#define SWIGTYPE_p_iCelEntityList swig_types[166]
-#define SWIGTYPE_p_iCelEntityRemoveCallback swig_types[167]
-#define SWIGTYPE_p_iCelEntityTemplate swig_types[168]
-#define SWIGTYPE_p_iCelEntityTracker swig_types[169]
-#define SWIGTYPE_p_iCelGraph swig_types[170]
-#define SWIGTYPE_p_iCelInventorySpace swig_types[171]
-#define SWIGTYPE_p_iCelInventorySpaceSlot swig_types[172]
-#define SWIGTYPE_p_iCelMapFile swig_types[173]
-#define SWIGTYPE_p_iCelNewEntityCallback swig_types[174]
-#define SWIGTYPE_p_iCelNode swig_types[175]
-#define SWIGTYPE_p_iCelParameterBlock swig_types[176]
-#define SWIGTYPE_p_iCelPath swig_types[177]
-#define SWIGTYPE_p_iCelPlLayer swig_types[178]
-#define SWIGTYPE_p_iCelPropertyChangeCallback swig_types[179]
-#define SWIGTYPE_p_iCelPropertyClass swig_types[180]
-#define SWIGTYPE_p_iCelPropertyClassFactory swig_types[181]
-#define SWIGTYPE_p_iCelPropertyClassList swig_types[182]
-#define SWIGTYPE_p_iCelPropertyClassTemplate swig_types[183]
-#define SWIGTYPE_p_iCelRegion swig_types[184]
-#define SWIGTYPE_p_iCelTimerListener swig_types[185]
-#define SWIGTYPE_p_iCelZone swig_types[186]
-#define SWIGTYPE_p_iChangePropertyQuestRewardFactory swig_types[187]
-#define SWIGTYPE_p_iClipper2D swig_types[188]
-#define SWIGTYPE_p_iCollection swig_types[189]
-#define SWIGTYPE_p_iCollideSystem swig_types[190]
-#define SWIGTYPE_p_iCollider swig_types[191]
-#define SWIGTYPE_p_iColoredVertices swig_types[192]
-#define SWIGTYPE_p_iCommandLineParser swig_types[193]
-#define SWIGTYPE_p_iComponent swig_types[194]
-#define SWIGTYPE_p_iConfigFile swig_types[195]
-#define SWIGTYPE_p_iConfigIterator swig_types[196]
-#define SWIGTYPE_p_iConfigManager swig_types[197]
-#define SWIGTYPE_p_iConsoleInput swig_types[198]
-#define SWIGTYPE_p_iConsoleOutput swig_types[199]
-#define SWIGTYPE_p_iConsoleWatcher swig_types[200]
-#define SWIGTYPE_p_iCreateEntityQuestRewardFactory swig_types[201]
-#define SWIGTYPE_p_iCsSequenceQuestRewardFactory swig_types[202]
-#define SWIGTYPE_p_iCustomMatrixCamera swig_types[203]
-#define SWIGTYPE_p_iDataBuffer swig_types[204]
-#define SWIGTYPE_p_iDebugHelper swig_types[205]
-#define SWIGTYPE_p_iDebugPrintQuestRewardFactory swig_types[206]
-#define SWIGTYPE_p_iDebugPrintQuestSeqOpFactory swig_types[207]
-#define SWIGTYPE_p_iDecalManager swig_types[208]
-#define SWIGTYPE_p_iDecalTemplate swig_types[209]
-#define SWIGTYPE_p_iDestroyEntityQuestRewardFactory swig_types[210]
-#define SWIGTYPE_p_iDocument swig_types[211]
-#define SWIGTYPE_p_iDocumentAttribute swig_types[212]
-#define SWIGTYPE_p_iDocumentAttributeIterator swig_types[213]
-#define SWIGTYPE_p_iDocumentNode swig_types[214]
-#define SWIGTYPE_p_iDocumentNodeIterator swig_types[215]
-#define SWIGTYPE_p_iDocumentSystem swig_types[216]
-#define SWIGTYPE_p_iDynamicSystem swig_types[217]
-#define SWIGTYPE_p_iDynamics swig_types[218]
-#define SWIGTYPE_p_iDynamicsColliderCollisionCallback swig_types[219]
-#define SWIGTYPE_p_iDynamicsCollisionCallback swig_types[220]
-#define SWIGTYPE_p_iDynamicsMoveCallback swig_types[221]
-#define SWIGTYPE_p_iDynamicsStepCallback swig_types[222]
-#define SWIGTYPE_p_iDynamicsSystemCollider swig_types[223]
-#define SWIGTYPE_p_iEngine swig_types[224]
-#define SWIGTYPE_p_iEngineFrameCallback swig_types[225]
-#define SWIGTYPE_p_iEngineSectorCallback swig_types[226]
-#define SWIGTYPE_p_iEngineSequenceManager swig_types[227]
-#define SWIGTYPE_p_iEngineSequenceParameters swig_types[228]
-#define SWIGTYPE_p_iEnterSectorQuestTriggerFactory swig_types[229]
-#define SWIGTYPE_p_iEvent swig_types[230]
-#define SWIGTYPE_p_iEventAttributeIterator swig_types[231]
-#define SWIGTYPE_p_iEventCord swig_types[232]
-#define SWIGTYPE_p_iEventHandler swig_types[233]
-#define SWIGTYPE_p_iEventNameRegistry swig_types[234]
-#define SWIGTYPE_p_iEventOutlet swig_types[235]
-#define SWIGTYPE_p_iEventPlug swig_types[236]
-#define SWIGTYPE_p_iEventQueue swig_types[237]
-#define SWIGTYPE_p_iFactory swig_types[238]
-#define SWIGTYPE_p_iFile swig_types[239]
-#define SWIGTYPE_p_iFont swig_types[240]
-#define SWIGTYPE_p_iFontDeleteNotify swig_types[241]
-#define SWIGTYPE_p_iFontServer swig_types[242]
-#define SWIGTYPE_p_iFrustumView swig_types[243]
-#define SWIGTYPE_p_iFrustumViewUserdata swig_types[244]
-#define SWIGTYPE_p_iGenMeshAnimationControl swig_types[245]
-#define SWIGTYPE_p_iGenMeshAnimationControl1_4 swig_types[246]
-#define SWIGTYPE_p_iGenMeshAnimationControlFactory swig_types[247]
-#define SWIGTYPE_p_iGenMeshAnimationControlType swig_types[248]
-#define SWIGTYPE_p_iGenMeshSkeletonControlState swig_types[249]
-#define SWIGTYPE_p_iGeneralFactoryState swig_types[250]
-#define SWIGTYPE_p_iGeneralMeshCommonState swig_types[251]
-#define SWIGTYPE_p_iGeneralMeshState swig_types[252]
-#define SWIGTYPE_p_iGeneralMeshSubMesh swig_types[253]
-#define SWIGTYPE_p_iGraphics2D swig_types[254]
-#define SWIGTYPE_p_iGraphics3D swig_types[255]
-#define SWIGTYPE_p_iHalo swig_types[256]
-#define SWIGTYPE_p_iImage swig_types[257]
-#define SWIGTYPE_p_iImageIO swig_types[258]
-#define SWIGTYPE_p_iInventoryQuestRewardFactory swig_types[259]
-#define SWIGTYPE_p_iInventoryQuestTriggerFactory swig_types[260]
-#define SWIGTYPE_p_iJoint swig_types[261]
-#define SWIGTYPE_p_iJoystickDriver swig_types[262]
-#define SWIGTYPE_p_iKeyComposer swig_types[263]
-#define SWIGTYPE_p_iKeyboardDriver swig_types[264]
-#define SWIGTYPE_p_iLODControl swig_types[265]
-#define SWIGTYPE_p_iLight swig_types[266]
-#define SWIGTYPE_p_iLightCallback swig_types[267]
-#define SWIGTYPE_p_iLightIterator swig_types[268]
-#define SWIGTYPE_p_iLightList swig_types[269]
-#define SWIGTYPE_p_iLightQuestSeqOpFactory swig_types[270]
-#define SWIGTYPE_p_iLightVisibleCallback swig_types[271]
-#define SWIGTYPE_p_iLightingProcessData swig_types[272]
-#define SWIGTYPE_p_iLightingProcessInfo swig_types[273]
-#define SWIGTYPE_p_iLoader swig_types[274]
-#define SWIGTYPE_p_iLoaderPlugin swig_types[275]
-#define SWIGTYPE_p_iMapNode swig_types[276]
-#define SWIGTYPE_p_iMaterial swig_types[277]
-#define SWIGTYPE_p_iMaterialEngine swig_types[278]
-#define SWIGTYPE_p_iMaterialList swig_types[279]
-#define SWIGTYPE_p_iMaterialWrapper swig_types[280]
-#define SWIGTYPE_p_iMeshDrawCallback swig_types[281]
-#define SWIGTYPE_p_iMeshFactoryList swig_types[282]
-#define SWIGTYPE_p_iMeshFactoryWrapper swig_types[283]
-#define SWIGTYPE_p_iMeshList swig_types[284]
-#define SWIGTYPE_p_iMeshObject swig_types[285]
-#define SWIGTYPE_p_iMeshObjectDrawCallback swig_types[286]
-#define SWIGTYPE_p_iMeshObjectFactory swig_types[287]
-#define SWIGTYPE_p_iMeshObjectType swig_types[288]
-#define SWIGTYPE_p_iMeshSelectQuestTriggerFactory swig_types[289]
-#define SWIGTYPE_p_iMeshWrapper swig_types[290]
-#define SWIGTYPE_p_iMeshWrapperIterator swig_types[291]
-#define SWIGTYPE_p_iMessageChannel swig_types[292]
-#define SWIGTYPE_p_iMessageDispatcher swig_types[293]
-#define SWIGTYPE_p_iMessageQuestRewardFactory swig_types[294]
-#define SWIGTYPE_p_iMessageQuestTriggerFactory swig_types[295]
-#define SWIGTYPE_p_iMessageReceiver swig_types[296]
-#define SWIGTYPE_p_iMessageReceiverFilter swig_types[297]
-#define SWIGTYPE_p_iMessageSender swig_types[298]
-#define SWIGTYPE_p_iMissingLoaderData swig_types[299]
-#define SWIGTYPE_p_iMouseDriver swig_types[300]
-#define SWIGTYPE_p_iMovable swig_types[301]
-#define SWIGTYPE_p_iMovableListener swig_types[302]
-#define SWIGTYPE_p_iMovePathQuestSeqOpFactory swig_types[303]
-#define SWIGTYPE_p_iMovieRecorder swig_types[304]
-#define SWIGTYPE_p_iNativeWindow swig_types[305]
-#define SWIGTYPE_p_iNativeWindowManager swig_types[306]
-#define SWIGTYPE_p_iNewStateQuestRewardFactory swig_types[307]
-#define SWIGTYPE_p_iODEAMotorJoint swig_types[308]
-#define SWIGTYPE_p_iODEBallJoint swig_types[309]
-#define SWIGTYPE_p_iODEDynamicState swig_types[310]
-#define SWIGTYPE_p_iODEDynamicSystemState swig_types[311]
-#define SWIGTYPE_p_iODEFrameUpdateCallback swig_types[312]
-#define SWIGTYPE_p_iODEGeneralJointState swig_types[313]
-#define SWIGTYPE_p_iODEHinge2Joint swig_types[314]
-#define SWIGTYPE_p_iODEHingeJoint swig_types[315]
-#define SWIGTYPE_p_iODEJointState swig_types[316]
-#define SWIGTYPE_p_iODESliderJoint swig_types[317]
-#define SWIGTYPE_p_iODEUniversalJoint swig_types[318]
-#define SWIGTYPE_p_iObject swig_types[319]
-#define SWIGTYPE_p_iObjectIterator swig_types[320]
-#define SWIGTYPE_p_iObjectModel swig_types[321]
-#define SWIGTYPE_p_iObjectModelListener swig_types[322]
-#define SWIGTYPE_p_iObjectNameChangeListener swig_types[323]
-#define SWIGTYPE_p_iObjectRegistry swig_types[324]
-#define SWIGTYPE_p_iObjectRegistryIterator swig_types[325]
-#define SWIGTYPE_p_iOffscreenCanvasCallback swig_types[326]
-#define SWIGTYPE_p_iOperationQuestTriggerFactory swig_types[327]
-#define SWIGTYPE_p_iParameterESM swig_types[328]
-#define SWIGTYPE_p_iParticleBuiltinEffectorFactory swig_types[329]
-#define SWIGTYPE_p_iParticleBuiltinEffectorForce swig_types[330]
-#define SWIGTYPE_p_iParticleBuiltinEffectorLinColor swig_types[331]
-#define SWIGTYPE_p_iParticleBuiltinEffectorVelocityField swig_types[332]
-#define SWIGTYPE_p_iParticleBuiltinEmitterBase swig_types[333]
-#define SWIGTYPE_p_iParticleBuiltinEmitterBox swig_types[334]
-#define SWIGTYPE_p_iParticleBuiltinEmitterCone swig_types[335]
-#define SWIGTYPE_p_iParticleBuiltinEmitterCylinder swig_types[336]
-#define SWIGTYPE_p_iParticleBuiltinEmitterFactory swig_types[337]
-#define SWIGTYPE_p_iParticleBuiltinEmitterSphere swig_types[338]
-#define SWIGTYPE_p_iParticleEffector swig_types[339]
-#define SWIGTYPE_p_iParticleEmitter swig_types[340]
-#define SWIGTYPE_p_iParticleSystem swig_types[341]
-#define SWIGTYPE_p_iParticleSystemBase swig_types[342]
-#define SWIGTYPE_p_iParticleSystemFactory swig_types[343]
-#define SWIGTYPE_p_iPath swig_types[344]
-#define SWIGTYPE_p_iPcActorMove swig_types[345]
-#define SWIGTYPE_p_iPcAnalogMotion swig_types[346]
-#define SWIGTYPE_p_iPcBillboard swig_types[347]
-#define SWIGTYPE_p_iPcCamera swig_types[348]
-#define SWIGTYPE_p_iPcCameraMode swig_types[349]
-#define SWIGTYPE_p_iPcCharacteristics swig_types[350]
-#define SWIGTYPE_p_iPcCollisionDetection swig_types[351]
-#define SWIGTYPE_p_iPcCommandInput swig_types[352]
-#define SWIGTYPE_p_iPcCraftController swig_types[353]
-#define SWIGTYPE_p_iPcDamage swig_types[354]
-#define SWIGTYPE_p_iPcDefaultCamera swig_types[355]
-#define SWIGTYPE_p_iPcDelegateCamera swig_types[356]
-#define SWIGTYPE_p_iPcGravity swig_types[357]
-#define SWIGTYPE_p_iPcGravityCallback swig_types[358]
-#define SWIGTYPE_p_iPcHover swig_types[359]
-#define SWIGTYPE_p_iPcInventory swig_types[360]
-#define SWIGTYPE_p_iPcInventoryListener swig_types[361]
-#define SWIGTYPE_p_iPcJump swig_types[362]
-#define SWIGTYPE_p_iPcLight swig_types[363]
-#define SWIGTYPE_p_iPcLinearMovement swig_types[364]
-#define SWIGTYPE_p_iPcMechanicsBalancedGroup swig_types[365]
-#define SWIGTYPE_p_iPcMechanicsJoint swig_types[366]
-#define SWIGTYPE_p_iPcMechanicsObject swig_types[367]
-#define SWIGTYPE_p_iPcMechanicsSystem swig_types[368]
-#define SWIGTYPE_p_iPcMechanicsThruster swig_types[369]
-#define SWIGTYPE_p_iPcMechanicsThrusterController swig_types[370]
-#define SWIGTYPE_p_iPcMesh swig_types[371]
-#define SWIGTYPE_p_iPcMeshDeform swig_types[372]
-#define SWIGTYPE_p_iPcMeshSelect swig_types[373]
-#define SWIGTYPE_p_iPcMeshSelectListener swig_types[374]
-#define SWIGTYPE_p_iPcMovable swig_types[375]
-#define SWIGTYPE_p_iPcMovableConstraint swig_types[376]
-#define SWIGTYPE_p_iPcMover swig_types[377]
-#define SWIGTYPE_p_iPcNewCamera swig_types[378]
-#define SWIGTYPE_p_iPcPathFinder swig_types[379]
-#define SWIGTYPE_p_iPcProjectile swig_types[380]
-#define SWIGTYPE_p_iPcProperties swig_types[381]
-#define SWIGTYPE_p_iPcPropertyListener swig_types[382]
-#define SWIGTYPE_p_iPcPython swig_types[383]
-#define SWIGTYPE_p_iPcQuest swig_types[384]
-#define SWIGTYPE_p_iPcRegion swig_types[385]
-#define SWIGTYPE_p_iPcSimpleCamera swig_types[386]
-#define SWIGTYPE_p_iPcSolid swig_types[387]
-#define SWIGTYPE_p_iPcSoundListener swig_types[388]
-#define SWIGTYPE_p_iPcSoundSource swig_types[389]
-#define SWIGTYPE_p_iPcSpawn swig_types[390]
-#define SWIGTYPE_p_iPcSteer swig_types[391]
-#define SWIGTYPE_p_iPcTimer swig_types[392]
-#define SWIGTYPE_p_iPcTooltip swig_types[393]
-#define SWIGTYPE_p_iPcTrackingCamera swig_types[394]
-#define SWIGTYPE_p_iPcTrigger swig_types[395]
-#define SWIGTYPE_p_iPcTriggerListener swig_types[396]
-#define SWIGTYPE_p_iPcWheeled swig_types[397]
-#define SWIGTYPE_p_iPcZoneManager swig_types[398]
-#define SWIGTYPE_p_iPcmNewCamera__General swig_types[399]
-#define SWIGTYPE_p_iPcmNewCamera__Tracking swig_types[400]
-#define SWIGTYPE_p_iPerspectiveCamera swig_types[401]
-#define SWIGTYPE_p_iPluginIterator swig_types[402]
-#define SWIGTYPE_p_iPluginManager swig_types[403]
-#define SWIGTYPE_p_iPolygonHandle swig_types[404]
-#define SWIGTYPE_p_iPortal swig_types[405]
-#define SWIGTYPE_p_iPortalCallback swig_types[406]
-#define SWIGTYPE_p_iPortalContainer swig_types[407]
-#define SWIGTYPE_p_iProcTexCallback swig_types[408]
-#define SWIGTYPE_p_iProcTexture swig_types[409]
-#define SWIGTYPE_p_iPropertyChangeQuestTriggerFactory swig_types[410]
-#define SWIGTYPE_p_iPropertyQuestSeqOpFactory swig_types[411]
-#define SWIGTYPE_p_iQuest swig_types[412]
-#define SWIGTYPE_p_iQuestFactory swig_types[413]
-#define SWIGTYPE_p_iQuestManager swig_types[414]
-#define SWIGTYPE_p_iQuestParameter swig_types[415]
-#define SWIGTYPE_p_iQuestReward swig_types[416]
-#define SWIGTYPE_p_iQuestRewardFactory swig_types[417]
-#define SWIGTYPE_p_iQuestRewardType swig_types[418]
-#define SWIGTYPE_p_iQuestSeqOp swig_types[419]
-#define SWIGTYPE_p_iQuestSeqOpFactory swig_types[420]
-#define SWIGTYPE_p_iQuestSeqOpType swig_types[421]
-#define SWIGTYPE_p_iQuestSequence swig_types[422]
-#define SWIGTYPE_p_iQuestSequenceCallback swig_types[423]
-#define SWIGTYPE_p_iQuestSequenceFactory swig_types[424]
-#define SWIGTYPE_p_iQuestStateFactory swig_types[425]
-#define SWIGTYPE_p_iQuestTrigger swig_types[426]
-#define SWIGTYPE_p_iQuestTriggerCallback swig_types[427]
-#define SWIGTYPE_p_iQuestTriggerFactory swig_types[428]
-#define SWIGTYPE_p_iQuestTriggerResponseFactory swig_types[429]
-#define SWIGTYPE_p_iQuestTriggerType swig_types[430]
-#define SWIGTYPE_p_iRenderLoop swig_types[431]
-#define SWIGTYPE_p_iRenderLoopManager swig_types[432]
-#define SWIGTYPE_p_iRenderManager swig_types[433]
-#define SWIGTYPE_p_iRenderManagerPostEffects swig_types[434]
-#define SWIGTYPE_p_iRenderManagerTargets swig_types[435]
-#define SWIGTYPE_p_iRenderStepContainer swig_types[436]
-#define SWIGTYPE_p_iRendererLightmap swig_types[437]
-#define SWIGTYPE_p_iReporter swig_types[438]
-#define SWIGTYPE_p_iReporterIterator swig_types[439]
-#define SWIGTYPE_p_iReporterListener swig_types[440]
-#define SWIGTYPE_p_iRigidBody swig_types[441]
-#define SWIGTYPE_p_iSCF swig_types[442]
-#define SWIGTYPE_p_iSaver swig_types[443]
-#define SWIGTYPE_p_iSceneNode swig_types[444]
-#define SWIGTYPE_p_iSceneNodeArray swig_types[445]
-#define SWIGTYPE_p_iScript swig_types[446]
-#define SWIGTYPE_p_iScriptObject swig_types[447]
-#define SWIGTYPE_p_iScriptValue swig_types[448]
-#define SWIGTYPE_p_iSector swig_types[449]
-#define SWIGTYPE_p_iSectorCallback swig_types[450]
-#define SWIGTYPE_p_iSectorIterator swig_types[451]
-#define SWIGTYPE_p_iSectorList swig_types[452]
-#define SWIGTYPE_p_iSectorMeshCallback swig_types[453]
-#define SWIGTYPE_p_iSequence swig_types[454]
-#define SWIGTYPE_p_iSequenceCondition swig_types[455]
-#define SWIGTYPE_p_iSequenceFinishQuestRewardFactory swig_types[456]
-#define SWIGTYPE_p_iSequenceFinishQuestTriggerFactory swig_types[457]
-#define SWIGTYPE_p_iSequenceManager swig_types[458]
-#define SWIGTYPE_p_iSequenceOperation swig_types[459]
-#define SWIGTYPE_p_iSequenceQuestRewardFactory swig_types[460]
-#define SWIGTYPE_p_iSequenceTimedOperation swig_types[461]
-#define SWIGTYPE_p_iSequenceTrigger swig_types[462]
-#define SWIGTYPE_p_iSequenceWrapper swig_types[463]
-#define SWIGTYPE_p_iShader swig_types[464]
-#define SWIGTYPE_p_iShaderCompiler swig_types[465]
-#define SWIGTYPE_p_iShaderManager swig_types[466]
-#define SWIGTYPE_p_iShaderPriorityList swig_types[467]
-#define SWIGTYPE_p_iShaderVarStringSet swig_types[468]
-#define SWIGTYPE_p_iShaderVariableAccessor swig_types[469]
-#define SWIGTYPE_p_iShaderVariableContext swig_types[470]
-#define SWIGTYPE_p_iSimpleFormerState swig_types[471]
-#define SWIGTYPE_p_iSkeleton swig_types[472]
-#define SWIGTYPE_p_iSkeleton2 swig_types[473]
-#define SWIGTYPE_p_iSkeletonAnimCallback2 swig_types[474]
-#define SWIGTYPE_p_iSkeletonAnimNode2 swig_types[475]
-#define SWIGTYPE_p_iSkeletonAnimNodeFactory2 swig_types[476]
-#define SWIGTYPE_p_iSkeletonAnimPacket2 swig_types[477]
-#define SWIGTYPE_p_iSkeletonAnimPacketFactory2 swig_types[478]
-#define SWIGTYPE_p_iSkeletonAnimation swig_types[479]
-#define SWIGTYPE_p_iSkeletonAnimation2 swig_types[480]
-#define SWIGTYPE_p_iSkeletonAnimationCallback swig_types[481]
-#define SWIGTYPE_p_iSkeletonAnimationInstance swig_types[482]
-#define SWIGTYPE_p_iSkeletonAnimationKeyFrame swig_types[483]
-#define SWIGTYPE_p_iSkeletonAnimationNode2 swig_types[484]
-#define SWIGTYPE_p_iSkeletonAnimationNodeFactory2 swig_types[485]
-#define SWIGTYPE_p_iSkeletonBlendNode2 swig_types[486]
-#define SWIGTYPE_p_iSkeletonBlendNodeFactory2 swig_types[487]
-#define SWIGTYPE_p_iSkeletonBone swig_types[488]
-#define SWIGTYPE_p_iSkeletonBoneFactory swig_types[489]
-#define SWIGTYPE_p_iSkeletonBoneRagdollInfo swig_types[490]
-#define SWIGTYPE_p_iSkeletonBoneUpdateCallback swig_types[491]
-#define SWIGTYPE_p_iSkeletonFSMNode2 swig_types[492]
-#define SWIGTYPE_p_iSkeletonFSMNodeFactory2 swig_types[493]
-#define SWIGTYPE_p_iSkeletonFactory swig_types[494]
-#define SWIGTYPE_p_iSkeletonFactory2 swig_types[495]
-#define SWIGTYPE_p_iSkeletonGraveyard swig_types[496]
-#define SWIGTYPE_p_iSkeletonManager2 swig_types[497]
-#define SWIGTYPE_p_iSkeletonPriorityNode2 swig_types[498]
-#define SWIGTYPE_p_iSkeletonPriorityNodeFactory2 swig_types[499]
-#define SWIGTYPE_p_iSkeletonRandomNode2 swig_types[500]
-#define SWIGTYPE_p_iSkeletonRandomNodeFactory2 swig_types[501]
-#define SWIGTYPE_p_iSkeletonSocket swig_types[502]
-#define SWIGTYPE_p_iSkeletonSocketFactory swig_types[503]
-#define SWIGTYPE_p_iSkeletonUpdateCallback swig_types[504]
-#define SWIGTYPE_p_iSndSysData swig_types[505]
-#define SWIGTYPE_p_iSndSysListener swig_types[506]
-#define SWIGTYPE_p_iSndSysListenerDoppler swig_types[507]
-#define SWIGTYPE_p_iSndSysLoader swig_types[508]
-#define SWIGTYPE_p_iSndSysManager swig_types[509]
-#define SWIGTYPE_p_iSndSysRenderer swig_types[510]
-#define SWIGTYPE_p_iSndSysRendererCallback swig_types[511]
-#define SWIGTYPE_p_iSndSysRendererOpenAL swig_types[512]
-#define SWIGTYPE_p_iSndSysRendererSoftware swig_types[513]
-#define SWIGTYPE_p_iSndSysSoftwareDriver swig_types[514]
-#define SWIGTYPE_p_iSndSysSoftwareFilter3D swig_types[515]
-#define SWIGTYPE_p_iSndSysSoftwareOutputFilter swig_types[516]
-#define SWIGTYPE_p_iSndSysSource swig_types[517]
-#define SWIGTYPE_p_iSndSysSource3D swig_types[518]
-#define SWIGTYPE_p_iSndSysSource3DDirectional swig_types[519]
-#define SWIGTYPE_p_iSndSysSource3DDirectionalSimple swig_types[520]
-#define SWIGTYPE_p_iSndSysSource3DDoppler swig_types[521]
-#define SWIGTYPE_p_iSndSysSourceOpenAL swig_types[522]
-#define SWIGTYPE_p_iSndSysSourceSoftware swig_types[523]
-#define SWIGTYPE_p_iSndSysSourceSoftware3D swig_types[524]
-#define SWIGTYPE_p_iSndSysStream swig_types[525]
-#define SWIGTYPE_p_iSndSysStreamCallback swig_types[526]
-#define SWIGTYPE_p_iSndSysWrapper swig_types[527]
-#define SWIGTYPE_p_iSprite2DFactoryState swig_types[528]
-#define SWIGTYPE_p_iSprite2DState swig_types[529]
-#define SWIGTYPE_p_iSprite2DUVAnimation swig_types[530]
-#define SWIGTYPE_p_iSprite2DUVAnimationFrame swig_types[531]
-#define SWIGTYPE_p_iSprite3DFactoryState swig_types[532]
-#define SWIGTYPE_p_iSprite3DState swig_types[533]
-#define SWIGTYPE_p_iSpriteAction swig_types[534]
-#define SWIGTYPE_p_iSpriteCal3DFactoryState swig_types[535]
-#define SWIGTYPE_p_iSpriteCal3DSocket swig_types[536]
-#define SWIGTYPE_p_iSpriteCal3DState swig_types[537]
-#define SWIGTYPE_p_iSpriteFrame swig_types[538]
-#define SWIGTYPE_p_iSpriteSocket swig_types[539]
-#define SWIGTYPE_p_iStandardReporterListener swig_types[540]
-#define SWIGTYPE_p_iString swig_types[541]
-#define SWIGTYPE_p_iStringArray swig_types[542]
-#define SWIGTYPE_p_iStringSet swig_types[543]
-#define SWIGTYPE_p_iStringSetBaseTCS__StringSetTag__General_t swig_types[544]
-#define SWIGTYPE_p_iStringSetBaseTCS__StringSetTag__ShaderVar_t swig_types[545]
-#define SWIGTYPE_p_iSuperLightmap swig_types[546]
-#define SWIGTYPE_p_iTerraFormer swig_types[547]
-#define SWIGTYPE_p_iTerraSampler swig_types[548]
-#define SWIGTYPE_p_iTerrainCell swig_types[549]
-#define SWIGTYPE_p_iTerrainCellCollisionProperties swig_types[550]
-#define SWIGTYPE_p_iTerrainCellFeederProperties swig_types[551]
-#define SWIGTYPE_p_iTerrainCellHeightDataCallback swig_types[552]
-#define SWIGTYPE_p_iTerrainCellLoadCallback swig_types[553]
-#define SWIGTYPE_p_iTerrainCellRenderProperties swig_types[554]
-#define SWIGTYPE_p_iTerrainCollider swig_types[555]
-#define SWIGTYPE_p_iTerrainCollisionPairArray swig_types[556]
-#define SWIGTYPE_p_iTerrainDataFeeder swig_types[557]
-#define SWIGTYPE_p_iTerrainFactory swig_types[558]
-#define SWIGTYPE_p_iTerrainFactoryCell swig_types[559]
-#define SWIGTYPE_p_iTerrainFactoryState swig_types[560]
-#define SWIGTYPE_p_iTerrainObjectState swig_types[561]
-#define SWIGTYPE_p_iTerrainRenderer swig_types[562]
-#define SWIGTYPE_p_iTerrainSystem swig_types[563]
-#define SWIGTYPE_p_iTerrainVector3Array swig_types[564]
-#define SWIGTYPE_p_iTextureCallback swig_types[565]
-#define SWIGTYPE_p_iTextureHandle swig_types[566]
-#define SWIGTYPE_p_iTextureList swig_types[567]
-#define SWIGTYPE_p_iTextureManager swig_types[568]
-#define SWIGTYPE_p_iTextureWrapper swig_types[569]
-#define SWIGTYPE_p_iThingEnvironment swig_types[570]
-#define SWIGTYPE_p_iThingFactoryState swig_types[571]
-#define SWIGTYPE_p_iThingState swig_types[572]
-#define SWIGTYPE_p_iTimeoutQuestTriggerFactory swig_types[573]
-#define SWIGTYPE_p_iTransformQuestSeqOpFactory swig_types[574]
-#define SWIGTYPE_p_iTranslator swig_types[575]
-#define SWIGTYPE_p_iTriangleMesh swig_types[576]
-#define SWIGTYPE_p_iTriangleMeshIterator swig_types[577]
-#define SWIGTYPE_p_iTriggerQuestTriggerFactory swig_types[578]
-#define SWIGTYPE_p_iVFS swig_types[579]
-#define SWIGTYPE_p_iView swig_types[580]
-#define SWIGTYPE_p_iVirtualClock swig_types[581]
-#define SWIGTYPE_p_iVisibilityCuller swig_types[582]
-#define SWIGTYPE_p_iVisibilityCullerListener swig_types[583]
-#define SWIGTYPE_p_iVisibilityObject swig_types[584]
-#define SWIGTYPE_p_iVisibilityObjectIterator swig_types[585]
-#define SWIGTYPE_p_iWatchQuestTriggerFactory swig_types[586]
-#define SWIGTYPE_p_int swig_types[587]
-#define SWIGTYPE_p_int16_t swig_types[588]
-#define SWIGTYPE_p_int64_t swig_types[589]
-#define SWIGTYPE_p_int8_t swig_types[590]
-#define SWIGTYPE_p_int_least64_t swig_types[591]
-#define SWIGTYPE_p_long swig_types[592]
-#define SWIGTYPE_p_p_PcCommon swig_types[593]
-#define SWIGTYPE_p_p_PcCommonFactory swig_types[594]
-#define SWIGTYPE_p_p_celCombineParameterBlock swig_types[595]
-#define SWIGTYPE_p_p_celGenericParameterBlock swig_types[596]
-#define SWIGTYPE_p_p_celOneParameterBlock swig_types[597]
-#define SWIGTYPE_p_p_celPcCommon swig_types[598]
-#define SWIGTYPE_p_p_celVariableParameterBlock swig_types[599]
-#define SWIGTYPE_p_p_csColliderWrapper swig_types[600]
-#define SWIGTYPE_p_p_csConfigFile swig_types[601]
-#define SWIGTYPE_p_p_csImageBase swig_types[602]
-#define SWIGTYPE_p_p_csImageMemory swig_types[603]
-#define SWIGTYPE_p_p_csObject swig_types[604]
-#define SWIGTYPE_p_p_csPath swig_types[605]
-#define SWIGTYPE_p_p_csProcAnimated swig_types[606]
-#define SWIGTYPE_p_p_csProcTexture swig_types[607]
-#define SWIGTYPE_p_p_csTriangleMesh swig_types[608]
-#define SWIGTYPE_p_p_csTriangleMeshBox swig_types[609]
-#define SWIGTYPE_p_p_csTriangleMeshPointer swig_types[610]
-#define SWIGTYPE_p_p_csView swig_types[611]
-#define SWIGTYPE_p_p_iActionQuestRewardFactory swig_types[612]
-#define SWIGTYPE_p_p_iAnimTimeUpdateHandler swig_types[613]
-#define SWIGTYPE_p_p_iAnimatedImage swig_types[614]
-#define SWIGTYPE_p_p_iAnimatedMesh swig_types[615]
-#define SWIGTYPE_p_p_iAnimatedMeshFactory swig_types[616]
-#define SWIGTYPE_p_p_iAnimatedMeshFactorySubMesh swig_types[617]
-#define SWIGTYPE_p_p_iAnimatedMeshMorphTarget swig_types[618]
-#define SWIGTYPE_p_p_iAnimatedMeshSubMesh swig_types[619]
-#define SWIGTYPE_p_p_iArrayChangeAllTcelData_t swig_types[620]
-#define SWIGTYPE_p_p_iArrayChangeAllTcsCollisionPair_t swig_types[621]
-#define SWIGTYPE_p_p_iArrayChangeAllTcsShaderVariable_p_t swig_types[622]
-#define SWIGTYPE_p_p_iArrayChangeAllTcsSprite2DVertex_t swig_types[623]
-#define SWIGTYPE_p_p_iArrayChangeAllTcsVector3_t swig_types[624]
-#define SWIGTYPE_p_p_iArrayChangeElementsTcelData_t swig_types[625]
-#define SWIGTYPE_p_p_iArrayChangeElementsTcsCollisionPair_t swig_types[626]
-#define SWIGTYPE_p_p_iArrayChangeElementsTcsShaderVariable_p_t swig_types[627]
-#define SWIGTYPE_p_p_iArrayChangeElementsTcsSprite2DVertex_t swig_types[628]
-#define SWIGTYPE_p_p_iArrayChangeElementsTcsVector3_t swig_types[629]
-#define SWIGTYPE_p_p_iArrayReadOnlyTcelData_t swig_types[630]
-#define SWIGTYPE_p_p_iArrayReadOnlyTcsCollisionPair_t swig_types[631]
-#define SWIGTYPE_p_p_iArrayReadOnlyTcsShaderVariable_p_t swig_types[632]
-#define SWIGTYPE_p_p_iArrayReadOnlyTcsSprite2DVertex_t swig_types[633]
-#define SWIGTYPE_p_p_iArrayReadOnlyTcsVector3_t swig_types[634]
-#define SWIGTYPE_p_p_iArrayReadOnlyTiCollection_p_t swig_types[635]
-#define SWIGTYPE_p_p_iArrayReadOnlyTiSceneNode_p_t swig_types[636]
-#define SWIGTYPE_p_p_iBase swig_types[637]
-#define SWIGTYPE_p_p_iBillboard swig_types[638]
-#define SWIGTYPE_p_p_iBillboardEventHandler swig_types[639]
-#define SWIGTYPE_p_p_iBillboardLayer swig_types[640]
-#define SWIGTYPE_p_p_iBillboardManager swig_types[641]
-#define SWIGTYPE_p_p_iBinaryLoaderPlugin swig_types[642]
-#define SWIGTYPE_p_p_iBodyGroup swig_types[643]
-#define SWIGTYPE_p_p_iBugPlug swig_types[644]
-#define SWIGTYPE_p_p_iBugPlugRenderObject swig_types[645]
-#define SWIGTYPE_p_p_iCacheManager swig_types[646]
-#define SWIGTYPE_p_p_iCamera swig_types[647]
-#define SWIGTYPE_p_p_iCameraPosition swig_types[648]
-#define SWIGTYPE_p_p_iCameraPositionList swig_types[649]
-#define SWIGTYPE_p_p_iCameraSectorListener swig_types[650]
-#define SWIGTYPE_p_p_iCelBehaviour swig_types[651]
-#define SWIGTYPE_p_p_iCelBlLayer swig_types[652]
-#define SWIGTYPE_p_p_iCelConsole swig_types[653]
-#define SWIGTYPE_p_p_iCelConsoleCommand swig_types[654]
-#define SWIGTYPE_p_p_iCelDataArray swig_types[655]
-#define SWIGTYPE_p_p_iCelDataArrayReadOnly swig_types[656]
-#define SWIGTYPE_p_p_iCelEdge swig_types[657]
-#define SWIGTYPE_p_p_iCelEntity swig_types[658]
-#define SWIGTYPE_p_p_iCelEntityIterator swig_types[659]
-#define SWIGTYPE_p_p_iCelEntityList swig_types[660]
-#define SWIGTYPE_p_p_iCelEntityRemoveCallback swig_types[661]
-#define SWIGTYPE_p_p_iCelEntityTemplate swig_types[662]
-#define SWIGTYPE_p_p_iCelEntityTracker swig_types[663]
-#define SWIGTYPE_p_p_iCelGraph swig_types[664]
-#define SWIGTYPE_p_p_iCelInventorySpace swig_types[665]
-#define SWIGTYPE_p_p_iCelInventorySpaceSlot swig_types[666]
-#define SWIGTYPE_p_p_iCelMapFile swig_types[667]
-#define SWIGTYPE_p_p_iCelNewEntityCallback swig_types[668]
-#define SWIGTYPE_p_p_iCelNode swig_types[669]
-#define SWIGTYPE_p_p_iCelParameterBlock swig_types[670]
-#define SWIGTYPE_p_p_iCelPath swig_types[671]
-#define SWIGTYPE_p_p_iCelPlLayer swig_types[672]
-#define SWIGTYPE_p_p_iCelPropertyClass swig_types[673]
-#define SWIGTYPE_p_p_iCelPropertyClassFactory swig_types[674]
-#define SWIGTYPE_p_p_iCelPropertyClassList swig_types[675]
-#define SWIGTYPE_p_p_iCelPropertyClassTemplate swig_types[676]
-#define SWIGTYPE_p_p_iCelRegion swig_types[677]
-#define SWIGTYPE_p_p_iCelTimerListener swig_types[678]
-#define SWIGTYPE_p_p_iCelZone swig_types[679]
-#define SWIGTYPE_p_p_iChangePropertyQuestRewardFactory swig_types[680]
-#define SWIGTYPE_p_p_iClipper2D swig_types[681]
-#define SWIGTYPE_p_p_iCollection swig_types[682]
-#define SWIGTYPE_p_p_iCollideSystem swig_types[683]
-#define SWIGTYPE_p_p_iCollider swig_types[684]
-#define SWIGTYPE_p_p_iColoredVertices swig_types[685]
-#define SWIGTYPE_p_p_iCommandLineParser swig_types[686]
-#define SWIGTYPE_p_p_iComponent swig_types[687]
-#define SWIGTYPE_p_p_iConfigFile swig_types[688]
-#define SWIGTYPE_p_p_iConfigIterator swig_types[689]
-#define SWIGTYPE_p_p_iConfigManager swig_types[690]
-#define SWIGTYPE_p_p_iConsoleOutput swig_types[691]
-#define SWIGTYPE_p_p_iConsoleWatcher swig_types[692]
-#define SWIGTYPE_p_p_iCreateEntityQuestRewardFactory swig_types[693]
-#define SWIGTYPE_p_p_iCsSequenceQuestRewardFactory swig_types[694]
-#define SWIGTYPE_p_p_iCustomMatrixCamera swig_types[695]
-#define SWIGTYPE_p_p_iDataBuffer swig_types[696]
-#define SWIGTYPE_p_p_iDebugHelper swig_types[697]
-#define SWIGTYPE_p_p_iDebugPrintQuestRewardFactory swig_types[698]
-#define SWIGTYPE_p_p_iDebugPrintQuestSeqOpFactory swig_types[699]
-#define SWIGTYPE_p_p_iDecalManager swig_types[700]
-#define SWIGTYPE_p_p_iDecalTemplate swig_types[701]
-#define SWIGTYPE_p_p_iDestroyEntityQuestRewardFactory swig_types[702]
-#define SWIGTYPE_p_p_iDocument swig_types[703]
-#define SWIGTYPE_p_p_iDocumentAttribute swig_types[704]
-#define SWIGTYPE_p_p_iDocumentAttributeIterator swig_types[705]
-#define SWIGTYPE_p_p_iDocumentNode swig_types[706]
-#define SWIGTYPE_p_p_iDocumentNodeIterator swig_types[707]
-#define SWIGTYPE_p_p_iDocumentSystem swig_types[708]
-#define SWIGTYPE_p_p_iDynamicSystem swig_types[709]
-#define SWIGTYPE_p_p_iDynamics swig_types[710]
-#define SWIGTYPE_p_p_iDynamicsColliderCollisionCallback swig_types[711]
-#define SWIGTYPE_p_p_iDynamicsCollisionCallback swig_types[712]
-#define SWIGTYPE_p_p_iDynamicsMoveCallback swig_types[713]
-#define SWIGTYPE_p_p_iDynamicsStepCallback swig_types[714]
-#define SWIGTYPE_p_p_iDynamicsSystemCollider swig_types[715]
-#define SWIGTYPE_p_p_iEngine swig_types[716]
-#define SWIGTYPE_p_p_iEngineFrameCallback swig_types[717]
-#define SWIGTYPE_p_p_iEngineSectorCallback swig_types[718]
-#define SWIGTYPE_p_p_iEngineSequenceManager swig_types[719]
-#define SWIGTYPE_p_p_iEngineSequenceParameters swig_types[720]
-#define SWIGTYPE_p_p_iEnterSectorQuestTriggerFactory swig_types[721]
-#define SWIGTYPE_p_p_iEvent swig_types[722]
-#define SWIGTYPE_p_p_iEventAttributeIterator swig_types[723]
-#define SWIGTYPE_p_p_iEventCord swig_types[724]
-#define SWIGTYPE_p_p_iEventHandler swig_types[725]
-#define SWIGTYPE_p_p_iEventNameRegistry swig_types[726]
-#define SWIGTYPE_p_p_iEventOutlet swig_types[727]
-#define SWIGTYPE_p_p_iEventPlug swig_types[728]
-#define SWIGTYPE_p_p_iEventQueue swig_types[729]
-#define SWIGTYPE_p_p_iFactory swig_types[730]
-#define SWIGTYPE_p_p_iFile swig_types[731]
-#define SWIGTYPE_p_p_iFont swig_types[732]
-#define SWIGTYPE_p_p_iFontDeleteNotify swig_types[733]
-#define SWIGTYPE_p_p_iFontServer swig_types[734]
-#define SWIGTYPE_p_p_iFrustumView swig_types[735]
-#define SWIGTYPE_p_p_iFrustumViewUserdata swig_types[736]
-#define SWIGTYPE_p_p_iGenMeshAnimationControl swig_types[737]
-#define SWIGTYPE_p_p_iGenMeshAnimationControl1_4 swig_types[738]
-#define SWIGTYPE_p_p_iGenMeshAnimationControlFactory swig_types[739]
-#define SWIGTYPE_p_p_iGenMeshAnimationControlType swig_types[740]
-#define SWIGTYPE_p_p_iGenMeshSkeletonControlState swig_types[741]
-#define SWIGTYPE_p_p_iGeneralFactoryState swig_types[742]
-#define SWIGTYPE_p_p_iGeneralMeshCommonState swig_types[743]
-#define SWIGTYPE_p_p_iGeneralMeshState swig_types[744]
-#define SWIGTYPE_p_p_iGeneralMeshSubMesh swig_types[745]
-#define SWIGTYPE_p_p_iGraphics2D swig_types[746]
-#define SWIGTYPE_p_p_iGraphics3D swig_types[747]
-#define SWIGTYPE_p_p_iHalo swig_types[748]
-#define SWIGTYPE_p_p_iImage swig_types[749]
-#define SWIGTYPE_p_p_iImageIO swig_types[750]
-#define SWIGTYPE_p_p_iInventoryQuestRewardFactory swig_types[751]
-#define SWIGTYPE_p_p_iInventoryQuestTriggerFactory swig_types[752]
-#define SWIGTYPE_p_p_iJoint swig_types[753]
-#define SWIGTYPE_p_p_iJoystickDriver swig_types[754]
-#define SWIGTYPE_p_p_iKeyComposer swig_types[755]
-#define SWIGTYPE_p_p_iKeyboardDriver swig_types[756]
-#define SWIGTYPE_p_p_iLODControl swig_types[757]
-#define SWIGTYPE_p_p_iLight swig_types[758]
-#define SWIGTYPE_p_p_iLightCallback swig_types[759]
-#define SWIGTYPE_p_p_iLightIterator swig_types[760]
-#define SWIGTYPE_p_p_iLightList swig_types[761]
-#define SWIGTYPE_p_p_iLightQuestSeqOpFactory swig_types[762]
-#define SWIGTYPE_p_p_iLightVisibleCallback swig_types[763]
-#define SWIGTYPE_p_p_iLightingProcessData swig_types[764]
-#define SWIGTYPE_p_p_iLightingProcessInfo swig_types[765]
-#define SWIGTYPE_p_p_iLoader swig_types[766]
-#define SWIGTYPE_p_p_iLoaderPlugin swig_types[767]
-#define SWIGTYPE_p_p_iMapNode swig_types[768]
-#define SWIGTYPE_p_p_iMaterial swig_types[769]
-#define SWIGTYPE_p_p_iMaterialEngine swig_types[770]
-#define SWIGTYPE_p_p_iMaterialList swig_types[771]
-#define SWIGTYPE_p_p_iMaterialWrapper swig_types[772]
-#define SWIGTYPE_p_p_iMeshDrawCallback swig_types[773]
-#define SWIGTYPE_p_p_iMeshFactoryList swig_types[774]
-#define SWIGTYPE_p_p_iMeshFactoryWrapper swig_types[775]
-#define SWIGTYPE_p_p_iMeshList swig_types[776]
-#define SWIGTYPE_p_p_iMeshObject swig_types[777]
-#define SWIGTYPE_p_p_iMeshObjectDrawCallback swig_types[778]
-#define SWIGTYPE_p_p_iMeshObjectFactory swig_types[779]
-#define SWIGTYPE_p_p_iMeshObjectType swig_types[780]
-#define SWIGTYPE_p_p_iMeshSelectQuestTriggerFactory swig_types[781]
-#define SWIGTYPE_p_p_iMeshWrapper swig_types[782]
-#define SWIGTYPE_p_p_iMeshWrapperIterator swig_types[783]
-#define SWIGTYPE_p_p_iMessageChannel swig_types[784]
-#define SWIGTYPE_p_p_iMessageDispatcher swig_types[785]
-#define SWIGTYPE_p_p_iMessageQuestRewardFactory swig_types[786]
-#define SWIGTYPE_p_p_iMessageQuestTriggerFactory swig_types[787]
-#define SWIGTYPE_p_p_iMessageReceiver swig_types[788]
-#define SWIGTYPE_p_p_iMessageReceiverFilter swig_types[789]
-#define SWIGTYPE_p_p_iMessageSender swig_types[790]
-#define SWIGTYPE_p_p_iMissingLoaderData swig_types[791]
-#define SWIGTYPE_p_p_iMouseDriver swig_types[792]
-#define SWIGTYPE_p_p_iMovable swig_types[793]
-#define SWIGTYPE_p_p_iMovableListener swig_types[794]
-#define SWIGTYPE_p_p_iMovePathQuestSeqOpFactory swig_types[795]
-#define SWIGTYPE_p_p_iMovieRecorder swig_types[796]
-#define SWIGTYPE_p_p_iNativeWindow swig_types[797]
-#define SWIGTYPE_p_p_iNativeWindowManager swig_types[798]
-#define SWIGTYPE_p_p_iNewStateQuestRewardFactory swig_types[799]
-#define SWIGTYPE_p_p_iODEAMotorJoint swig_types[800]
-#define SWIGTYPE_p_p_iODEBallJoint swig_types[801]
-#define SWIGTYPE_p_p_iODEDynamicState swig_types[802]
-#define SWIGTYPE_p_p_iODEDynamicSystemState swig_types[803]
-#define SWIGTYPE_p_p_iODEFrameUpdateCallback swig_types[804]
-#define SWIGTYPE_p_p_iODEGeneralJointState swig_types[805]
-#define SWIGTYPE_p_p_iODEHinge2Joint swig_types[806]
-#define SWIGTYPE_p_p_iODEHingeJoint swig_types[807]
-#define SWIGTYPE_p_p_iODEJointState swig_types[808]
-#define SWIGTYPE_p_p_iODESliderJoint swig_types[809]
-#define SWIGTYPE_p_p_iODEUniversalJoint swig_types[810]
-#define SWIGTYPE_p_p_iObject swig_types[811]
-#define SWIGTYPE_p_p_iObjectIterator swig_types[812]
-#define SWIGTYPE_p_p_iObjectModel swig_types[813]
-#define SWIGTYPE_p_p_iObjectModelListener swig_types[814]
-#define SWIGTYPE_p_p_iObjectNameChangeListener swig_types[815]
-#define SWIGTYPE_p_p_iObjectRegistry swig_types[816]
-#define SWIGTYPE_p_p_iObjectRegistryIterator swig_types[817]
-#define SWIGTYPE_p_p_iOffscreenCanvasCallback swig_types[818]
-#define SWIGTYPE_p_p_iOperationQuestTriggerFactory swig_types[819]
-#define SWIGTYPE_p_p_iParameterESM swig_types[820]
-#define SWIGTYPE_p_p_iParticleBuiltinEffectorFactory swig_types[821]
-#define SWIGTYPE_p_p_iParticleBuiltinEffectorForce swig_types[822]
-#define SWIGTYPE_p_p_iParticleBuiltinEffectorLinColor swig_types[823]
-#define SWIGTYPE_p_p_iParticleBuiltinEffectorVelocityField swig_types[824]
-#define SWIGTYPE_p_p_iParticleBuiltinEmitterBase swig_types[825]
-#define SWIGTYPE_p_p_iParticleBuiltinEmitterBox swig_types[826]
-#define SWIGTYPE_p_p_iParticleBuiltinEmitterCone swig_types[827]
-#define SWIGTYPE_p_p_iParticleBuiltinEmitterCylinder swig_types[828]
-#define SWIGTYPE_p_p_iParticleBuiltinEmitterFactory swig_types[829]
-#define SWIGTYPE_p_p_iParticleBuiltinEmitterSphere swig_types[830]
-#define SWIGTYPE_p_p_iParticleEffector swig_types[831]
-#define SWIGTYPE_p_p_iParticleEmitter swig_types[832]
-#define SWIGTYPE_p_p_iParticleSystem swig_types[833]
-#define SWIGTYPE_p_p_iParticleSystemBase swig_types[834]
-#define SWIGTYPE_p_p_iParticleSystemFactory swig_types[835]
-#define SWIGTYPE_p_p_iPath swig_types[836]
-#define SWIGTYPE_p_p_iPcActorMove swig_types[837]
-#define SWIGTYPE_p_p_iPcAnalogMotion swig_types[838]
-#define SWIGTYPE_p_p_iPcBillboard swig_types[839]
-#define SWIGTYPE_p_p_iPcCamera swig_types[840]
-#define SWIGTYPE_p_p_iPcCameraMode swig_types[841]
-#define SWIGTYPE_p_p_iPcCharacteristics swig_types[842]
-#define SWIGTYPE_p_p_iPcCollisionDetection swig_types[843]
-#define SWIGTYPE_p_p_iPcCommandInput swig_types[844]
-#define SWIGTYPE_p_p_iPcCraftController swig_types[845]
-#define SWIGTYPE_p_p_iPcDamage swig_types[846]
-#define SWIGTYPE_p_p_iPcDefaultCamera swig_types[847]
-#define SWIGTYPE_p_p_iPcDelegateCamera swig_types[848]
-#define SWIGTYPE_p_p_iPcGravity swig_types[849]
-#define SWIGTYPE_p_p_iPcGravityCallback swig_types[850]
-#define SWIGTYPE_p_p_iPcHover swig_types[851]
-#define SWIGTYPE_p_p_iPcInventory swig_types[852]
-#define SWIGTYPE_p_p_iPcInventoryListener swig_types[853]
-#define SWIGTYPE_p_p_iPcJump swig_types[854]
-#define SWIGTYPE_p_p_iPcLinearMovement swig_types[855]
-#define SWIGTYPE_p_p_iPcMechanicsBalancedGroup swig_types[856]
-#define SWIGTYPE_p_p_iPcMechanicsJoint swig_types[857]
-#define SWIGTYPE_p_p_iPcMechanicsObject swig_types[858]
-#define SWIGTYPE_p_p_iPcMechanicsSystem swig_types[859]
-#define SWIGTYPE_p_p_iPcMechanicsThruster swig_types[860]
-#define SWIGTYPE_p_p_iPcMechanicsThrusterController swig_types[861]
-#define SWIGTYPE_p_p_iPcMesh swig_types[862]
-#define SWIGTYPE_p_p_iPcMeshDeform swig_types[863]
-#define SWIGTYPE_p_p_iPcMeshSelect swig_types[864]
-#define SWIGTYPE_p_p_iPcMeshSelectListener swig_types[865]
-#define SWIGTYPE_p_p_iPcMovable swig_types[866]
-#define SWIGTYPE_p_p_iPcMovableConstraint swig_types[867]
-#define SWIGTYPE_p_p_iPcMover swig_types[868]
-#define SWIGTYPE_p_p_iPcNewCamera swig_types[869]
-#define SWIGTYPE_p_p_iPcPathFinder swig_types[870]
-#define SWIGTYPE_p_p_iPcProjectile swig_types[871]
-#define SWIGTYPE_p_p_iPcProperties swig_types[872]
-#define SWIGTYPE_p_p_iPcPropertyListener swig_types[873]
-#define SWIGTYPE_p_p_iPcPython swig_types[874]
-#define SWIGTYPE_p_p_iPcQuest swig_types[875]
-#define SWIGTYPE_p_p_iPcRegion swig_types[876]
-#define SWIGTYPE_p_p_iPcSimpleCamera swig_types[877]
-#define SWIGTYPE_p_p_iPcSolid swig_types[878]
-#define SWIGTYPE_p_p_iPcSoundListener swig_types[879]
-#define SWIGTYPE_p_p_iPcSoundSource swig_types[880]
-#define SWIGTYPE_p_p_iPcSpawn swig_types[881]
-#define SWIGTYPE_p_p_iPcSteer swig_types[882]
-#define SWIGTYPE_p_p_iPcTimer swig_types[883]
-#define SWIGTYPE_p_p_iPcTooltip swig_types[884]
-#define SWIGTYPE_p_p_iPcTrackingCamera swig_types[885]
-#define SWIGTYPE_p_p_iPcTrigger swig_types[886]
-#define SWIGTYPE_p_p_iPcTriggerListener swig_types[887]
-#define SWIGTYPE_p_p_iPcWheeled swig_types[888]
-#define SWIGTYPE_p_p_iPcZoneManager swig_types[889]
-#define SWIGTYPE_p_p_iPcmNewCamera__General swig_types[890]
-#define SWIGTYPE_p_p_iPcmNewCamera__Tracking swig_types[891]
-#define SWIGTYPE_p_p_iPerspectiveCamera swig_types[892]
-#define SWIGTYPE_p_p_iPluginIterator swig_types[893]
-#define SWIGTYPE_p_p_iPluginManager swig_types[894]
-#define SWIGTYPE_p_p_iPolygonHandle swig_types[895]
-#define SWIGTYPE_p_p_iPortal swig_types[896]
-#define SWIGTYPE_p_p_iPortalCallback swig_types[897]
-#define SWIGTYPE_p_p_iPortalContainer swig_types[898]
-#define SWIGTYPE_p_p_iProcTexCallback swig_types[899]
-#define SWIGTYPE_p_p_iProcTexture swig_types[900]
-#define SWIGTYPE_p_p_iPropertyChangeQuestTriggerFactory swig_types[901]
-#define SWIGTYPE_p_p_iPropertyQuestSeqOpFactory swig_types[902]
-#define SWIGTYPE_p_p_iQuest swig_types[903]
-#define SWIGTYPE_p_p_iQuestFactory swig_types[904]
-#define SWIGTYPE_p_p_iQuestManager swig_types[905]
-#define SWIGTYPE_p_p_iQuestParameter swig_types[906]
-#define SWIGTYPE_p_p_iQuestReward swig_types[907]
-#define SWIGTYPE_p_p_iQuestRewardFactory swig_types[908]
-#define SWIGTYPE_p_p_iQuestRewardType swig_types[909]
-#define SWIGTYPE_p_p_iQuestSeqOp swig_types[910]
-#define SWIGTYPE_p_p_iQuestSeqOpFactory swig_types[911]
-#define SWIGTYPE_p_p_iQuestSeqOpType swig_types[912]
-#define SWIGTYPE_p_p_iQuestSequence swig_types[913]
-#define SWIGTYPE_p_p_iQuestSequenceCallback swig_types[914]
-#define SWIGTYPE_p_p_iQuestSequenceFactory swig_types[915]
-#define SWIGTYPE_p_p_iQuestStateFactory swig_types[916]
-#define SWIGTYPE_p_p_iQuestTrigger swig_types[917]
-#define SWIGTYPE_p_p_iQuestTriggerCallback swig_types[918]
-#define SWIGTYPE_p_p_iQuestTriggerFactory swig_types[919]
-#define SWIGTYPE_p_p_iQuestTriggerResponseFactory swig_types[920]
-#define SWIGTYPE_p_p_iQuestTriggerType swig_types[921]
-#define SWIGTYPE_p_p_iRenderLoop swig_types[922]
-#define SWIGTYPE_p_p_iRenderLoopManager swig_types[923]
-#define SWIGTYPE_p_p_iRenderManager swig_types[924]
-#define SWIGTYPE_p_p_iRenderManagerPostEffects swig_types[925]
-#define SWIGTYPE_p_p_iRenderManagerTargets swig_types[926]
-#define SWIGTYPE_p_p_iRenderStepContainer swig_types[927]
-#define SWIGTYPE_p_p_iRendererLightmap swig_types[928]
-#define SWIGTYPE_p_p_iReporter swig_types[929]
-#define SWIGTYPE_p_p_iReporterIterator swig_types[930]
-#define SWIGTYPE_p_p_iReporterListener swig_types[931]
-#define SWIGTYPE_p_p_iRigidBody swig_types[932]
-#define SWIGTYPE_p_p_iSCF swig_types[933]
-#define SWIGTYPE_p_p_iSaver swig_types[934]
-#define SWIGTYPE_p_p_iSceneNode swig_types[935]
-#define SWIGTYPE_p_p_iSceneNodeArray swig_types[936]
-#define SWIGTYPE_p_p_iScript swig_types[937]
-#define SWIGTYPE_p_p_iScriptObject swig_types[938]
-#define SWIGTYPE_p_p_iScriptValue swig_types[939]
-#define SWIGTYPE_p_p_iSector swig_types[940]
-#define SWIGTYPE_p_p_iSectorCallback swig_types[941]
-#define SWIGTYPE_p_p_iSectorIterator swig_types[942]
-#define SWIGTYPE_p_p_iSectorList swig_types[943]
-#define SWIGTYPE_p_p_iSectorMeshCallback swig_types[944]
-#define SWIGTYPE_p_p_iSequence swig_types[945]
-#define SWIGTYPE_p_p_iSequenceCondition swig_types[946]
-#define SWIGTYPE_p_p_iSequenceFinishQuestRewardFactory swig_types[947]
-#define SWIGTYPE_p_p_iSequenceFinishQuestTriggerFactory swig_types[948]
-#define SWIGTYPE_p_p_iSequenceManager swig_types[949]
-#define SWIGTYPE_p_p_iSequenceOperation swig_types[950]
-#define SWIGTYPE_p_p_iSequenceQuestRewardFactory swig_types[951]
-#define SWIGTYPE_p_p_iSequenceTimedOperation swig_types[952]
-#define SWIGTYPE_p_p_iSequenceTrigger swig_types[953]
-#define SWIGTYPE_p_p_iSequenceWrapper swig_types[954]
-#define SWIGTYPE_p_p_iShader swig_types[955]
-#define SWIGTYPE_p_p_iShaderCompiler swig_types[956]
-#define SWIGTYPE_p_p_iShaderManager swig_types[957]
-#define SWIGTYPE_p_p_iShaderPriorityList swig_types[958]
-#define SWIGTYPE_p_p_iShaderVarStringSet swig_types[959]
-#define SWIGTYPE_p_p_iShaderVariableAccessor swig_types[960]
-#define SWIGTYPE_p_p_iShaderVariableContext swig_types[961]
-#define SWIGTYPE_p_p_iSimpleFormerState swig_types[962]
-#define SWIGTYPE_p_p_iSkeleton swig_types[963]
-#define SWIGTYPE_p_p_iSkeleton2 swig_types[964]
-#define SWIGTYPE_p_p_iSkeletonAnimCallback2 swig_types[965]
-#define SWIGTYPE_p_p_iSkeletonAnimNode2 swig_types[966]
-#define SWIGTYPE_p_p_iSkeletonAnimNodeFactory2 swig_types[967]
-#define SWIGTYPE_p_p_iSkeletonAnimPacket2 swig_types[968]
-#define SWIGTYPE_p_p_iSkeletonAnimPacketFactory2 swig_types[969]
-#define SWIGTYPE_p_p_iSkeletonAnimation swig_types[970]
-#define SWIGTYPE_p_p_iSkeletonAnimation2 swig_types[971]
-#define SWIGTYPE_p_p_iSkeletonAnimationCallback swig_types[972]
-#define SWIGTYPE_p_p_iSkeletonAnimationInstance swig_types[973]
-#define SWIGTYPE_p_p_iSkeletonAnimationKeyFrame swig_types[974]
-#define SWIGTYPE_p_p_iSkeletonAnimationNode2 swig_types[975]
-#define SWIGTYPE_p_p_iSkeletonAnimationNodeFactory2 swig_types[976]
-#define SWIGTYPE_p_p_iSkeletonBlendNode2 swig_types[977]
-#define SWIGTYPE_p_p_iSkeletonBlendNodeFactory2 swig_types[978]
-#define SWIGTYPE_p_p_iSkeletonBone swig_types[979]
-#define SWIGTYPE_p_p_iSkeletonBoneFactory swig_types[980]
-#define SWIGTYPE_p_p_iSkeletonBoneRagdollInfo swig_types[981]
-#define SWIGTYPE_p_p_iSkeletonBoneUpdateCallback swig_types[982]
-#define SWIGTYPE_p_p_iSkeletonFSMNode2 swig_types[983]
-#define SWIGTYPE_p_p_iSkeletonFSMNodeFactory2 swig_types[984]
-#define SWIGTYPE_p_p_iSkeletonFactory swig_types[985]
-#define SWIGTYPE_p_p_iSkeletonFactory2 swig_types[986]
-#define SWIGTYPE_p_p_iSkeletonGraveyard swig_types[987]
-#define SWIGTYPE_p_p_iSkeletonManager2 swig_types[988]
-#define SWIGTYPE_p_p_iSkeletonPriorityNode2 swig_types[989]
-#define SWIGTYPE_p_p_iSkeletonPriorityNodeFactory2 swig_types[990]
-#define SWIGTYPE_p_p_iSkeletonRandomNode2 swig_types[991]
-#define SWIGTYPE_p_p_iSkeletonRandomNodeFactory2 swig_types[992]
-#define SWIGTYPE_p_p_iSkeletonSocket swig_types[993]
-#define SWIGTYPE_p_p_iSkeletonSocketFactory swig_types[994]
-#define SWIGTYPE_p_p_iSkeletonUpdateCallback swig_types[995]
-#define SWIGTYPE_p_p_iSndSysData swig_types[996]
-#define SWIGTYPE_p_p_iSndSysListener swig_types[997]
-#define SWIGTYPE_p_p_iSndSysListenerDoppler swig_types[998]
-#define SWIGTYPE_p_p_iSndSysLoader swig_types[999]
-#define SWIGTYPE_p_p_iSndSysManager swig_types[1000]
-#define SWIGTYPE_p_p_iSndSysRenderer swig_types[1001]
-#define SWIGTYPE_p_p_iSndSysRendererCallback swig_types[1002]
-#define SWIGTYPE_p_p_iSndSysRendererOpenAL swig_types[1003]
-#define SWIGTYPE_p_p_iSndSysRendererSoftware swig_types[1004]
-#define SWIGTYPE_p_p_iSndSysSoftwareDriver swig_types[1005]
-#define SWIGTYPE_p_p_iSndSysSoftwareFilter3D swig_types[1006]
-#define SWIGTYPE_p_p_iSndSysSoftwareOutputFilter swig_types[1007]
-#define SWIGTYPE_p_p_iSndSysSource swig_types[1008]
-#define SWIGTYPE_p_p_iSndSysSource3D swig_types[1009]
-#define SWIGTYPE_p_p_iSndSysSource3DDirectional swig_types[1010]
-#define SWIGTYPE_p_p_iSndSysSource3DDirectionalSimple swig_types[1011]
-#define SWIGTYPE_p_p_iSndSysSource3DDoppler swig_types[1012]
-#define SWIGTYPE_p_p_iSndSysSourceOpenAL swig_types[1013]
-#define SWIGTYPE_p_p_iSndSysSourceSoftware swig_types[1014]
-#define SWIGTYPE_p_p_iSndSysSourceSoftware3D swig_types[1015]
-#define SWIGTYPE_p_p_iSndSysStream swig_types[1016]
-#define SWIGTYPE_p_p_iSndSysStreamCallback swig_types[1017]
-#define SWIGTYPE_p_p_iSndSysWrapper swig_types[1018]
-#define SWIGTYPE_p_p_iSprite2DFactoryState swig_types[1019]
-#define SWIGTYPE_p_p_iSprite2DState swig_types[1020]
-#define SWIGTYPE_p_p_iSprite2DUVAnimation swig_types[1021]
-#define SWIGTYPE_p_p_iSprite2DUVAnimationFrame swig_types[1022]
-#define SWIGTYPE_p_p_iSprite3DFactoryState swig_types[1023]
-#define SWIGTYPE_p_p_iSprite3DState swig_types[1024]
-#define SWIGTYPE_p_p_iSpriteAction swig_types[1025]
-#define SWIGTYPE_p_p_iSpriteCal3DFactoryState swig_types[1026]
-#define SWIGTYPE_p_p_iSpriteCal3DSocket swig_types[1027]
-#define SWIGTYPE_p_p_iSpriteCal3DState swig_types[1028]
-#define SWIGTYPE_p_p_iSpriteFrame swig_types[1029]
-#define SWIGTYPE_p_p_iSpriteSocket swig_types[1030]
-#define SWIGTYPE_p_p_iStandardReporterListener swig_types[1031]
-#define SWIGTYPE_p_p_iString swig_types[1032]
-#define SWIGTYPE_p_p_iStringArray swig_types[1033]
-#define SWIGTYPE_p_p_iStringSet swig_types[1034]
-#define SWIGTYPE_p_p_iStringSetBaseTCS__StringSetTag__General_t swig_types[1035]
-#define SWIGTYPE_p_p_iStringSetBaseTCS__StringSetTag__ShaderVar_t swig_types[1036]
-#define SWIGTYPE_p_p_iSuperLightmap swig_types[1037]
-#define SWIGTYPE_p_p_iTerraFormer swig_types[1038]
-#define SWIGTYPE_p_p_iTerraSampler swig_types[1039]
-#define SWIGTYPE_p_p_iTerrainCell swig_types[1040]
-#define SWIGTYPE_p_p_iTerrainCellCollisionProperties swig_types[1041]
-#define SWIGTYPE_p_p_iTerrainCellFeederProperties swig_types[1042]
-#define SWIGTYPE_p_p_iTerrainCellHeightDataCallback swig_types[1043]
-#define SWIGTYPE_p_p_iTerrainCellLoadCallback swig_types[1044]
-#define SWIGTYPE_p_p_iTerrainCellRenderProperties swig_types[1045]
-#define SWIGTYPE_p_p_iTerrainCollider swig_types[1046]
-#define SWIGTYPE_p_p_iTerrainCollisionPairArray swig_types[1047]
-#define SWIGTYPE_p_p_iTerrainDataFeeder swig_types[1048]
-#define SWIGTYPE_p_p_iTerrainFactory swig_types[1049]
-#define SWIGTYPE_p_p_iTerrainFactoryCell swig_types[1050]
-#define SWIGTYPE_p_p_iTerrainFactoryState swig_types[1051]
-#define SWIGTYPE_p_p_iTerrainObjectState swig_types[1052]
-#define SWIGTYPE_p_p_iTerrainRenderer swig_types[1053]
-#define SWIGTYPE_p_p_iTerrainSystem swig_types[1054]
-#define SWIGTYPE_p_p_iTerrainVector3Array swig_types[1055]
-#define SWIGTYPE_p_p_iTextureCallback swig_types[1056]
-#define SWIGTYPE_p_p_iTextureHandle swig_types[1057]
-#define SWIGTYPE_p_p_iTextureList swig_types[1058]
-#define SWIGTYPE_p_p_iTextureManager swig_types[1059]
-#define SWIGTYPE_p_p_iTextureWrapper swig_types[1060]
-#define SWIGTYPE_p_p_iThingEnvironment swig_types[1061]
-#define SWIGTYPE_p_p_iThingFactoryState swig_types[1062]
-#define SWIGTYPE_p_p_iThingState swig_types[1063]
-#define SWIGTYPE_p_p_iTimeoutQuestTriggerFactory swig_types[1064]
-#define SWIGTYPE_p_p_iTransformQuestSeqOpFactory swig_types[1065]
-#define SWIGTYPE_p_p_iTranslator swig_types[1066]
-#define SWIGTYPE_p_p_iTriangleMesh swig_types[1067]
-#define SWIGTYPE_p_p_iTriangleMeshIterator swig_types[1068]
-#define SWIGTYPE_p_p_iTriggerQuestTriggerFactory swig_types[1069]
-#define SWIGTYPE_p_p_iVFS swig_types[1070]
-#define SWIGTYPE_p_p_iView swig_types[1071]
-#define SWIGTYPE_p_p_iVirtualClock swig_types[1072]
-#define SWIGTYPE_p_p_iVisibilityCuller swig_types[1073]
-#define SWIGTYPE_p_p_iVisibilityCullerListener swig_types[1074]
-#define SWIGTYPE_p_p_iVisibilityObject swig_types[1075]
-#define SWIGTYPE_p_p_iVisibilityObjectIterator swig_types[1076]
-#define SWIGTYPE_p_p_iWatchQuestTriggerFactory swig_types[1077]
-#define SWIGTYPE_p_p_pyMessageReceiver swig_types[1078]
-#define SWIGTYPE_p_p_pyMessageSender swig_types[1079]
-#define SWIGTYPE_p_p_pyPcCommon swig_types[1080]
-#define SWIGTYPE_p_p_pyPcInventoryListener swig_types[1081]
-#define SWIGTYPE_p_p_pyPcPropertyListener swig_types[1082]
-#define SWIGTYPE_p_p_scfImplementation1TPcCommonFactory_iCelPropertyClassFactory_t swig_types[1083]
-#define SWIGTYPE_p_p_scfImplementation1TcelCombineParameterBlock_iCelParameterBlock_t swig_types[1084]
-#define SWIGTYPE_p_p_scfImplementation1TcelGenericParameterBlock_iCelParameterBlock_t swig_types[1085]
-#define SWIGTYPE_p_p_scfImplementation1TcelOneParameterBlock_iCelParameterBlock_t swig_types[1086]
-#define SWIGTYPE_p_p_scfImplementation1TcelVariableParameterBlock_iCelParameterBlock_t swig_types[1087]
-#define SWIGTYPE_p_p_scfImplementation1TcsConfigFile_iConfigFile_t swig_types[1088]
-#define SWIGTYPE_p_p_scfImplementation1TcsImageBase_iImage_t swig_types[1089]
-#define SWIGTYPE_p_p_scfImplementation1TcsObject_iObject_t swig_types[1090]
-#define SWIGTYPE_p_p_scfImplementation1TcsTriangleMeshBox_iTriangleMesh_t swig_types[1091]
-#define SWIGTYPE_p_p_scfImplementation1TcsTriangleMeshPointer_iTriangleMesh_t swig_types[1092]
-#define SWIGTYPE_p_p_scfImplementation1TcsTriangleMesh_iTriangleMesh_t swig_types[1093]
-#define SWIGTYPE_p_p_scfImplementation1TcsView_iView_t swig_types[1094]
-#define SWIGTYPE_p_p_scfImplementation1TpyMessageReceiver_iMessageReceiver_t swig_types[1095]
-#define SWIGTYPE_p_p_scfImplementation1TpyMessageSender_iMessageSender_t swig_types[1096]
-#define SWIGTYPE_p_p_scfImplementation1TpyPcInventoryListener_iPcInventoryListener_t swig_types[1097]
-#define SWIGTYPE_p_p_scfImplementation1TpyPcPropertyListener_iPcPropertyListener_t swig_types[1098]
-#define SWIGTYPE_p_p_scfImplementation3TcelPcCommon_iCelPropertyClass_iCelTimerListener_iMessageSender_t swig_types[1099]
-#define SWIGTYPE_p_p_scfImplementationExt0TPcCommon_celPcCommon_t swig_types[1100]
-#define SWIGTYPE_p_p_scfImplementationExt0TcsImageMemory_csImageBase_t swig_types[1101]
-#define SWIGTYPE_p_p_scfImplementationExt1TcsColliderWrapper_csObject_scfFakeInterfaceTcsColliderWrapper_t_t swig_types[1102]
-#define SWIGTYPE_p_p_scfImplementationExt1TcsPath_csObject_iPath_t swig_types[1103]
-#define SWIGTYPE_p_p_scfImplementationExt1TpyPcCommon_PcCommon_iPcPython_t swig_types[1104]
-#define SWIGTYPE_p_p_scfImplementationExt2TcsProcTexture_csObject_iTextureWrapper_iProcTexture_t swig_types[1105]
-#define SWIGTYPE_p_p_void swig_types[1106]
-#define SWIGTYPE_p_pyMessageReceiver swig_types[1107]
-#define SWIGTYPE_p_pyMessageSender swig_types[1108]
-#define SWIGTYPE_p_pyPcCommon swig_types[1109]
-#define SWIGTYPE_p_pyPcInventoryListener swig_types[1110]
-#define SWIGTYPE_p_pyPcPropertyListener swig_types[1111]
-#define SWIGTYPE_p_scfImplementation1TPcCommonFactory_iCelPropertyClassFactory_t swig_types[1112]
-#define SWIGTYPE_p_scfImplementation1TcelCombineParameterBlock_iCelParameterBlock_t swig_types[1113]
-#define SWIGTYPE_p_scfImplementation1TcelGenericParameterBlock_iCelParameterBlock_t swig_types[1114]
-#define SWIGTYPE_p_scfImplementation1TcelOneParameterBlock_iCelParameterBlock_t swig_types[1115]
-#define SWIGTYPE_p_scfImplementation1TcelVariableParameterBlock_iCelParameterBlock_t swig_types[1116]
-#define SWIGTYPE_p_scfImplementation1TcsConfigFile_iConfigFile_t swig_types[1117]
-#define SWIGTYPE_p_scfImplementation1TcsImageBase_iImage_t swig_types[1118]
-#define SWIGTYPE_p_scfImplementation1TcsObject_iObject_t swig_types[1119]
-#define SWIGTYPE_p_scfImplementation1TcsTriangleMeshBox_iTriangleMesh_t swig_types[1120]
-#define SWIGTYPE_p_scfImplementation1TcsTriangleMeshPointer_iTriangleMesh_t swig_types[1121]
-#define SWIGTYPE_p_scfImplementation1TcsTriangleMesh_iTriangleMesh_t swig_types[1122]
-#define SWIGTYPE_p_scfImplementation1TcsView_iView_t swig_types[1123]
-#define SWIGTYPE_p_scfImplementation1TpyMessageReceiver_iMessageReceiver_t swig_types[1124]
-#define SWIGTYPE_p_scfImplementation1TpyMessageSender_iMessageSender_t swig_types[1125]
-#define SWIGTYPE_p_scfImplementation1TpyPcInventoryListener_iPcInventoryListener_t swig_types[1126]
-#define SWIGTYPE_p_scfImplementation1TpyPcPropertyListener_iPcPropertyListener_t swig_types[1127]
-#define SWIGTYPE_p_scfImplementation3TcelPcCommon_iCelPropertyClass_iCelTimerListener_iMessageSender_t swig_types[1128]
-#define SWIGTYPE_p_scfImplementationExt0TPcCommon_celPcCommon_t swig_types[1129]
-#define SWIGTYPE_p_scfImplementationExt0TcsImageMemory_csImageBase_t swig_types[1130]
-#define SWIGTYPE_p_scfImplementationExt1TcsColliderWrapper_csObject_scfFakeInterfaceTcsColliderWrapper_t_t swig_types[1131]
-#define SWIGTYPE_p_scfImplementationExt1TcsPath_csObject_iPath_t swig_types[1132]
-#define SWIGTYPE_p_scfImplementationExt1TpyPcCommon_PcCommon_iPcPython_t swig_types[1133]
-#define SWIGTYPE_p_scfImplementationExt2TcsProcTexture_csObject_iTextureWrapper_iProcTexture_t swig_types[1134]
-#define SWIGTYPE_p_scfInterfaceMetadataList swig_types[1135]
-#define SWIGTYPE_p_uint16_t swig_types[1136]
-#define SWIGTYPE_p_uint32_t swig_types[1137]
-#define SWIGTYPE_p_uint64_t swig_types[1138]
-#define SWIGTYPE_p_uint_least64_t swig_types[1139]
-#define SWIGTYPE_p_unsigned_char swig_types[1140]
-#define SWIGTYPE_p_unsigned_int swig_types[1141]
-#define SWIGTYPE_p_unsigned_long swig_types[1142]
-#define SWIGTYPE_p_void swig_types[1143]
-#define SWIGTYPE_p_wchar_t swig_types[1144]
-static swig_type_info *swig_types[1146];
-static swig_module_info swig_module = {swig_types, 1145, 0, 0, 0, 0};
+#define SWIGTYPE_p_CapacityHandlerType swig_types[4]
+#define SWIGTYPE_p_ContainedType swig_types[5]
+#define SWIGTYPE_p_ElementHandlerType swig_types[6]
+#define SWIGTYPE_p_FileFormatDescription swig_types[7]
+#define SWIGTYPE_p_HashType swig_types[8]
+#define SWIGTYPE_p_KeyType swig_types[9]
+#define SWIGTYPE_p_PcCommon swig_types[10]
+#define SWIGTYPE_p_PcCommonFactory swig_types[11]
+#define SWIGTYPE_p_Property swig_types[12]
+#define SWIGTYPE_p_PropertyHolder swig_types[13]
+#define SWIGTYPE_p_SndSysFilterLocation swig_types[14]
+#define SWIGTYPE_p_ThisType swig_types[15]
+#define SWIGTYPE_p_ValueType swig_types[16]
+#define SWIGTYPE_p__1_basetype swig_types[17]
+#define SWIGTYPE_p__csKeyCharType swig_types[18]
+#define SWIGTYPE_p__csKeyEventType swig_types[19]
+#define SWIGTYPE_p__csKeyModifierNumType swig_types[20]
+#define SWIGTYPE_p__csKeyModifierType swig_types[21]
+#define SWIGTYPE_p__csKeyModifiers swig_types[22]
+#define SWIGTYPE_p__csMouseCursorID swig_types[23]
+#define SWIGTYPE_p__csMouseEventType swig_types[24]
+#define SWIGTYPE_p_bool swig_types[25]
+#define SWIGTYPE_p_celCombineParameterBlock swig_types[26]
+#define SWIGTYPE_p_celData swig_types[27]
+#define SWIGTYPE_p_celDataType swig_types[28]
+#define SWIGTYPE_p_celData_value swig_types[29]
+#define SWIGTYPE_p_celData_value_col swig_types[30]
+#define SWIGTYPE_p_celData_value_par swig_types[31]
+#define SWIGTYPE_p_celData_value_v swig_types[32]
+#define SWIGTYPE_p_celGenericParameterBlock swig_types[33]
+#define SWIGTYPE_p_celInitializer swig_types[34]
+#define SWIGTYPE_p_celOneParameterBlock swig_types[35]
+#define SWIGTYPE_p_celParSpec swig_types[36]
+#define SWIGTYPE_p_celPcCommon swig_types[37]
+#define SWIGTYPE_p_celPersistenceResult swig_types[38]
+#define SWIGTYPE_p_celPersistenceType swig_types[39]
+#define SWIGTYPE_p_celVariableParameterBlock swig_types[40]
+#define SWIGTYPE_p_celWrapPtr swig_types[41]
+#define SWIGTYPE_p_char swig_types[42]
+#define SWIGTYPE_p_csArrayTcelParSpec_csArrayElementHandlerTcelParSpec_t_CS__Memory__AllocatorMalloc_csArrayCapacityDefault_t swig_types[43]
+#define SWIGTYPE_p_csArrayTcsImageIOFileFormatDescription_const_p_csArrayElementHandlerTcsImageIOFileFormatDescription_const_p_t_CS__Memory__AllocatorMalloc_csArrayCapacityDefault_t swig_types[44]
+#define SWIGTYPE_p_csArrayTcsPluginRequest_csArrayElementHandlerTcsPluginRequest_t_CS__Memory__AllocatorMalloc_csArrayCapacityDefault_t swig_types[45]
+#define SWIGTYPE_p_csArrayTcsShaderVariable_p_csArrayElementHandlerTcsShaderVariable_p_t_CS__Memory__AllocatorMalloc_csArrayCapacityDefault_t swig_types[46]
+#define SWIGTYPE_p_csArrayTcsStringBase_csArrayElementHandlerTcsStringBase_t_CS__Memory__AllocatorMalloc_csArrayCapacityDefault_t swig_types[47]
+#define SWIGTYPE_p_csArrayTcsStringFastT12_t_csArrayElementHandlerTcsStringFastT12_t_t_CS__Memory__AllocatorMalloc_csArrayCapacityDefault_t swig_types[48]
+#define SWIGTYPE_p_csArrayTiCelNode_p_csArrayElementHandlerTiCelNode_p_t_CS__Memory__AllocatorMalloc_csArrayCapacityDefault_t swig_types[49]
+#define SWIGTYPE_p_csBox3 swig_types[50]
+#define SWIGTYPE_p_csColliderWrapper swig_types[51]
+#define SWIGTYPE_p_csColor swig_types[52]
+#define SWIGTYPE_p_csColor4 swig_types[53]
+#define SWIGTYPE_p_csConfigFile swig_types[54]
+#define SWIGTYPE_p_csFlags swig_types[55]
+#define SWIGTYPE_p_csHashTcsStringBase_csStringBase_CS__Memory__AllocatorMalloc_csArrayElementHandlerTCS__Container__HashElementTcsStringBase_csStringBase_t_t_t swig_types[56]
+#define SWIGTYPE_p_csHashTcsStringFastT12_t_csStringFastT12_t_CS__Memory__AllocatorMalloc_csArrayElementHandlerTCS__Container__HashElementTcsStringFastT12_t_csStringFastT12_t_t_t_t swig_types[57]
+#define SWIGTYPE_p_csHashTint_unsigned_long_CS__Memory__AllocatorMalloc_csArrayElementHandlerTCS__Container__HashElementTint_unsigned_long_t_t_t swig_types[58]
+#define SWIGTYPE_p_csImageBase swig_types[59]
+#define SWIGTYPE_p_csImageMemory swig_types[60]
+#define SWIGTYPE_p_csInitializer swig_types[61]
+#define SWIGTYPE_p_csMatrix3 swig_types[62]
+#define SWIGTYPE_p_csOBB swig_types[63]
+#define SWIGTYPE_p_csObject swig_types[64]
+#define SWIGTYPE_p_csOrthoTransform swig_types[65]
+#define SWIGTYPE_p_csPath swig_types[66]
+#define SWIGTYPE_p_csPlane3 swig_types[67]
+#define SWIGTYPE_p_csProcAnimated swig_types[68]
+#define SWIGTYPE_p_csProcTexture swig_types[69]
+#define SWIGTYPE_p_csPtrTcelVariableParameterBlock_t swig_types[70]
+#define SWIGTYPE_p_csPtrTiBase_t swig_types[71]
+#define SWIGTYPE_p_csPtrTiCelDataBuffer_t swig_types[72]
+#define SWIGTYPE_p_csPtrTiCelEntityIterator_t swig_types[73]
+#define SWIGTYPE_p_csPtrTiQuestParameter_t swig_types[74]
+#define SWIGTYPE_p_csPtrTiQuestRewardFactory_t swig_types[75]
+#define SWIGTYPE_p_csPtrTiQuestReward_t swig_types[76]
+#define SWIGTYPE_p_csPtrTiQuestSeqOpFactory_t swig_types[77]
+#define SWIGTYPE_p_csPtrTiQuestSeqOp_t swig_types[78]
+#define SWIGTYPE_p_csPtrTiQuestTriggerFactory_t swig_types[79]
+#define SWIGTYPE_p_csPtrTiQuestTrigger_t swig_types[80]
+#define SWIGTYPE_p_csPtrTiQuest_t swig_types[81]
+#define SWIGTYPE_p_csPtrTiRigidBody_t swig_types[82]
+#define SWIGTYPE_p_csRefArrayTiMaterialWrapper_t swig_types[83]
+#define SWIGTYPE_p_csRefArrayTiObject_t swig_types[84]
+#define SWIGTYPE_p_csRefArrayTiQuestParameter_t swig_types[85]
+#define SWIGTYPE_p_csRefArrayTiQuestTriggerFactory_t swig_types[86]
+#define SWIGTYPE_p_csRefTiBase_t swig_types[87]
+#define SWIGTYPE_p_csReversibleTransform swig_types[88]
+#define SWIGTYPE_p_csSetTunsigned_long_CS__Memory__AllocatorMalloc_t swig_types[89]
+#define SWIGTYPE_p_csString swig_types[90]
+#define SWIGTYPE_p_csStringArray swig_types[91]
+#define SWIGTYPE_p_csStringBase swig_types[92]
+#define SWIGTYPE_p_csStringFastT12_t swig_types[93]
+#define SWIGTYPE_p_csStringFastT36_t swig_types[94]
+#define SWIGTYPE_p_csTriangleMesh swig_types[95]
+#define SWIGTYPE_p_csTriangleMeshBox swig_types[96]
+#define SWIGTYPE_p_csTriangleMeshPointer swig_types[97]
+#define SWIGTYPE_p_csVector2 swig_types[98]
+#define SWIGTYPE_p_csVector3 swig_types[99]
+#define SWIGTYPE_p_csVector4 swig_types[100]
+#define SWIGTYPE_p_csView swig_types[101]
+#define SWIGTYPE_p_csWeakRefArrayTiCelEntity_t swig_types[102]
+#define SWIGTYPE_p_csXRotMatrix3 swig_types[103]
+#define SWIGTYPE_p_csXScaleMatrix3 swig_types[104]
+#define SWIGTYPE_p_csYRotMatrix3 swig_types[105]
+#define SWIGTYPE_p_csYScaleMatrix3 swig_types[106]
+#define SWIGTYPE_p_csZRotMatrix3 swig_types[107]
+#define SWIGTYPE_p_csZScaleMatrix3 swig_types[108]
+#define SWIGTYPE_p_f_p_iMeshWrapper_p_iFrustumView_bool__void swig_types[109]
+#define SWIGTYPE_p_float swig_types[110]
+#define SWIGTYPE_p_iActionQuestRewardFactory swig_types[111]
+#define SWIGTYPE_p_iAnimTimeUpdateHandler swig_types[112]
+#define SWIGTYPE_p_iAnimatedImage swig_types[113]
+#define SWIGTYPE_p_iAnimatedMesh swig_types[114]
+#define SWIGTYPE_p_iAnimatedMeshFactory swig_types[115]
+#define SWIGTYPE_p_iAnimatedMeshFactorySubMesh swig_types[116]
+#define SWIGTYPE_p_iAnimatedMeshMorphTarget swig_types[117]
+#define SWIGTYPE_p_iAnimatedMeshSocket swig_types[118]
+#define SWIGTYPE_p_iAnimatedMeshSocketFactory swig_types[119]
+#define SWIGTYPE_p_iAnimatedMeshSubMesh swig_types[120]
+#define SWIGTYPE_p_iArrayChangeAllTcelData_t swig_types[121]
+#define SWIGTYPE_p_iArrayChangeAllTcsCollisionPair_t swig_types[122]
+#define SWIGTYPE_p_iArrayChangeAllTcsShaderVariable_p_t swig_types[123]
+#define SWIGTYPE_p_iArrayChangeAllTcsSprite2DVertex_t swig_types[124]
+#define SWIGTYPE_p_iArrayChangeAllTcsVector3_t swig_types[125]
+#define SWIGTYPE_p_iArrayChangeElementsTcelData_t swig_types[126]
+#define SWIGTYPE_p_iArrayChangeElementsTcsCollisionPair_t swig_types[127]
+#define SWIGTYPE_p_iArrayChangeElementsTcsShaderVariable_p_t swig_types[128]
+#define SWIGTYPE_p_iArrayChangeElementsTcsSprite2DVertex_t swig_types[129]
+#define SWIGTYPE_p_iArrayChangeElementsTcsVector3_t swig_types[130]
+#define SWIGTYPE_p_iArrayReadOnlyTcelData_t swig_types[131]
+#define SWIGTYPE_p_iArrayReadOnlyTcsCollisionPair_t swig_types[132]
+#define SWIGTYPE_p_iArrayReadOnlyTcsShaderVariable_p_t swig_types[133]
+#define SWIGTYPE_p_iArrayReadOnlyTcsSprite2DVertex_t swig_types[134]
+#define SWIGTYPE_p_iArrayReadOnlyTcsVector3_t swig_types[135]
+#define SWIGTYPE_p_iArrayReadOnlyTiCollection_p_t swig_types[136]
+#define SWIGTYPE_p_iArrayReadOnlyTiSceneNode_p_t swig_types[137]
+#define SWIGTYPE_p_iBase swig_types[138]
+#define SWIGTYPE_p_iBillboard swig_types[139]
+#define SWIGTYPE_p_iBillboardEventHandler swig_types[140]
+#define SWIGTYPE_p_iBillboardLayer swig_types[141]
+#define SWIGTYPE_p_iBillboardManager swig_types[142]
+#define SWIGTYPE_p_iBinaryLoaderPlugin swig_types[143]
+#define SWIGTYPE_p_iBodyGroup swig_types[144]
+#define SWIGTYPE_p_iBugPlug swig_types[145]
+#define SWIGTYPE_p_iBugPlugRenderObject swig_types[146]
+#define SWIGTYPE_p_iCacheManager swig_types[147]
+#define SWIGTYPE_p_iCamera swig_types[148]
+#define SWIGTYPE_p_iCameraPosition swig_types[149]
+#define SWIGTYPE_p_iCameraPositionList swig_types[150]
+#define SWIGTYPE_p_iCameraSectorListener swig_types[151]
+#define SWIGTYPE_p_iCelBehaviour swig_types[152]
+#define SWIGTYPE_p_iCelBlLayer swig_types[153]
+#define SWIGTYPE_p_iCelConsole swig_types[154]
+#define SWIGTYPE_p_iCelConsoleCommand swig_types[155]
+#define SWIGTYPE_p_iCelDataArray swig_types[156]
+#define SWIGTYPE_p_iCelDataArrayReadOnly swig_types[157]
+#define SWIGTYPE_p_iCelDataBuffer swig_types[158]
+#define SWIGTYPE_p_iCelEdge swig_types[159]
+#define SWIGTYPE_p_iCelEntity swig_types[160]
+#define SWIGTYPE_p_iCelEntityIterator swig_types[161]
+#define SWIGTYPE_p_iCelEntityList swig_types[162]
+#define SWIGTYPE_p_iCelEntityRemoveCallback swig_types[163]
+#define SWIGTYPE_p_iCelEntityTemplate swig_types[164]
+#define SWIGTYPE_p_iCelEntityTracker swig_types[165]
+#define SWIGTYPE_p_iCelGraph swig_types[166]
+#define SWIGTYPE_p_iCelInventorySpace swig_types[167]
+#define SWIGTYPE_p_iCelInventorySpaceSlot swig_types[168]
+#define SWIGTYPE_p_iCelMapFile swig_types[169]
+#define SWIGTYPE_p_iCelNewEntityCallback swig_types[170]
+#define SWIGTYPE_p_iCelNode swig_types[171]
+#define SWIGTYPE_p_iCelParameterBlock swig_types[172]
+#define SWIGTYPE_p_iCelPath swig_types[173]
+#define SWIGTYPE_p_iCelPlLayer swig_types[174]
+#define SWIGTYPE_p_iCelPropertyChangeCallback swig_types[175]
+#define SWIGTYPE_p_iCelPropertyClass swig_types[176]
+#define SWIGTYPE_p_iCelPropertyClassFactory swig_types[177]
+#define SWIGTYPE_p_iCelPropertyClassList swig_types[178]
+#define SWIGTYPE_p_iCelPropertyClassTemplate swig_types[179]
+#define SWIGTYPE_p_iCelRegion swig_types[180]
+#define SWIGTYPE_p_iCelTimerListener swig_types[181]
+#define SWIGTYPE_p_iCelZone swig_types[182]
+#define SWIGTYPE_p_iChangePropertyQuestRewardFactory swig_types[183]
+#define SWIGTYPE_p_iClipper2D swig_types[184]
+#define SWIGTYPE_p_iCollection swig_types[185]
+#define SWIGTYPE_p_iCollideSystem swig_types[186]
+#define SWIGTYPE_p_iCollider swig_types[187]
+#define SWIGTYPE_p_iColoredVertices swig_types[188]
+#define SWIGTYPE_p_iCommandLineParser swig_types[189]
+#define SWIGTYPE_p_iComponent swig_types[190]
+#define SWIGTYPE_p_iConfigFile swig_types[191]
+#define SWIGTYPE_p_iConfigIterator swig_types[192]
+#define SWIGTYPE_p_iConfigManager swig_types[193]
+#define SWIGTYPE_p_iConsoleExecCallback swig_types[194]
+#define SWIGTYPE_p_iConsoleInput swig_types[195]
+#define SWIGTYPE_p_iConsoleOutput swig_types[196]
+#define SWIGTYPE_p_iConsoleWatcher swig_types[197]
+#define SWIGTYPE_p_iCreateEntityQuestRewardFactory swig_types[198]
+#define SWIGTYPE_p_iCsSequenceQuestRewardFactory swig_types[199]
+#define SWIGTYPE_p_iDataBuffer swig_types[200]
+#define SWIGTYPE_p_iDebugHelper swig_types[201]
+#define SWIGTYPE_p_iDebugPrintQuestRewardFactory swig_types[202]
+#define SWIGTYPE_p_iDebugPrintQuestSeqOpFactory swig_types[203]
+#define SWIGTYPE_p_iDecalManager swig_types[204]
+#define SWIGTYPE_p_iDecalTemplate swig_types[205]
+#define SWIGTYPE_p_iDestroyEntityQuestRewardFactory swig_types[206]
+#define SWIGTYPE_p_iDocument swig_types[207]
+#define SWIGTYPE_p_iDocumentAttribute swig_types[208]
+#define SWIGTYPE_p_iDocumentAttributeIterator swig_types[209]
+#define SWIGTYPE_p_iDocumentNode swig_types[210]
+#define SWIGTYPE_p_iDocumentNodeIterator swig_types[211]
+#define SWIGTYPE_p_iDocumentSystem swig_types[212]
+#define SWIGTYPE_p_iDynamicSystem swig_types[213]
+#define SWIGTYPE_p_iDynamics swig_types[214]
+#define SWIGTYPE_p_iDynamicsColliderCollisionCallback swig_types[215]
+#define SWIGTYPE_p_iDynamicsCollisionCallback swig_types[216]
+#define SWIGTYPE_p_iDynamicsMoveCallback swig_types[217]
+#define SWIGTYPE_p_iDynamicsStepCallback swig_types[218]
+#define SWIGTYPE_p_iDynamicsSystemCollider swig_types[219]
+#define SWIGTYPE_p_iEngine swig_types[220]
+#define SWIGTYPE_p_iEngineFrameCallback swig_types[221]
+#define SWIGTYPE_p_iEngineSectorCallback swig_types[222]
+#define SWIGTYPE_p_iEngineSequenceManager swig_types[223]
+#define SWIGTYPE_p_iEngineSequenceParameters swig_types[224]
+#define SWIGTYPE_p_iEnterSectorQuestTriggerFactory swig_types[225]
+#define SWIGTYPE_p_iEvent swig_types[226]
+#define SWIGTYPE_p_iEventAttributeIterator swig_types[227]
+#define SWIGTYPE_p_iEventCord swig_types[228]
+#define SWIGTYPE_p_iEventHandler swig_types[229]
+#define SWIGTYPE_p_iEventNameRegistry swig_types[230]
+#define SWIGTYPE_p_iEventOutlet swig_types[231]
+#define SWIGTYPE_p_iEventPlug swig_types[232]
+#define SWIGTYPE_p_iEventQueue swig_types[233]
+#define SWIGTYPE_p_iFactory swig_types[234]
+#define SWIGTYPE_p_iFile swig_types[235]
+#define SWIGTYPE_p_iFont swig_types[236]
+#define SWIGTYPE_p_iFontDeleteNotify swig_types[237]
+#define SWIGTYPE_p_iFontServer swig_types[238]
+#define SWIGTYPE_p_iFrameEventSignpost swig_types[239]
+#define SWIGTYPE_p_iFrustumView swig_types[240]
+#define SWIGTYPE_p_iFrustumViewUserdata swig_types[241]
+#define SWIGTYPE_p_iGenMeshAnimationControl swig_types[242]
+#define SWIGTYPE_p_iGenMeshAnimationControl1_4 swig_types[243]
+#define SWIGTYPE_p_iGenMeshAnimationControlFactory swig_types[244]
+#define SWIGTYPE_p_iGenMeshAnimationControlType swig_types[245]
+#define SWIGTYPE_p_iGenMeshSkeletonControlState swig_types[246]
+#define SWIGTYPE_p_iGeneralFactoryState swig_types[247]
+#define SWIGTYPE_p_iGeneralMeshCommonState swig_types[248]
+#define SWIGTYPE_p_iGeneralMeshState swig_types[249]
+#define SWIGTYPE_p_iGeneralMeshSubMesh swig_types[250]
+#define SWIGTYPE_p_iGraphics2D swig_types[251]
+#define SWIGTYPE_p_iGraphics3D swig_types[252]
+#define SWIGTYPE_p_iHalo swig_types[253]
+#define SWIGTYPE_p_iImage swig_types[254]
+#define SWIGTYPE_p_iImageIO swig_types[255]
+#define SWIGTYPE_p_iInventoryQuestRewardFactory swig_types[256]
+#define SWIGTYPE_p_iInventoryQuestTriggerFactory swig_types[257]
+#define SWIGTYPE_p_iJoint swig_types[258]
+#define SWIGTYPE_p_iJoystickDriver swig_types[259]
+#define SWIGTYPE_p_iKeyComposer swig_types[260]
+#define SWIGTYPE_p_iKeyboardDriver swig_types[261]
+#define SWIGTYPE_p_iLODControl swig_types[262]
+#define SWIGTYPE_p_iLight swig_types[263]
+#define SWIGTYPE_p_iLightCallback swig_types[264]
+#define SWIGTYPE_p_iLightIterator swig_types[265]
+#define SWIGTYPE_p_iLightList swig_types[266]
+#define SWIGTYPE_p_iLightQuestSeqOpFactory swig_types[267]
+#define SWIGTYPE_p_iLightVisibleCallback swig_types[268]
+#define SWIGTYPE_p_iLightingProcessData swig_types[269]
+#define SWIGTYPE_p_iLightingProcessInfo swig_types[270]
+#define SWIGTYPE_p_iLoader swig_types[271]
+#define SWIGTYPE_p_iLoaderPlugin swig_types[272]
+#define SWIGTYPE_p_iMapNode swig_types[273]
+#define SWIGTYPE_p_iMaterial swig_types[274]
+#define SWIGTYPE_p_iMaterialEngine swig_types[275]
+#define SWIGTYPE_p_iMaterialList swig_types[276]
+#define SWIGTYPE_p_iMaterialWrapper swig_types[277]
+#define SWIGTYPE_p_iMeshDrawCallback swig_types[278]
+#define SWIGTYPE_p_iMeshFactoryList swig_types[279]
+#define SWIGTYPE_p_iMeshFactoryWrapper swig_types[280]
+#define SWIGTYPE_p_iMeshList swig_types[281]
+#define SWIGTYPE_p_iMeshObject swig_types[282]
+#define SWIGTYPE_p_iMeshObjectDrawCallback swig_types[283]
+#define SWIGTYPE_p_iMeshObjectFactory swig_types[284]
+#define SWIGTYPE_p_iMeshObjectType swig_types[285]
+#define SWIGTYPE_p_iMeshSelectQuestTriggerFactory swig_types[286]
+#define SWIGTYPE_p_iMeshWrapper swig_types[287]
+#define SWIGTYPE_p_iMeshWrapperIterator swig_types[288]
+#define SWIGTYPE_p_iMessageChannel swig_types[289]
+#define SWIGTYPE_p_iMessageDispatcher swig_types[290]
+#define SWIGTYPE_p_iMessageQuestRewardFactory swig_types[291]
+#define SWIGTYPE_p_iMessageQuestTriggerFactory swig_types[292]
+#define SWIGTYPE_p_iMessageReceiver swig_types[293]
+#define SWIGTYPE_p_iMessageReceiverFilter swig_types[294]
+#define SWIGTYPE_p_iMessageSender swig_types[295]
+#define SWIGTYPE_p_iMissingLoaderData swig_types[296]
+#define SWIGTYPE_p_iMouseDriver swig_types[297]
+#define SWIGTYPE_p_iMovable swig_types[298]
+#define SWIGTYPE_p_iMovableListener swig_types[299]
+#define SWIGTYPE_p_iMovePathQuestSeqOpFactory swig_types[300]
+#define SWIGTYPE_p_iMovieRecorder swig_types[301]
+#define SWIGTYPE_p_iNativeWindow swig_types[302]
+#define SWIGTYPE_p_iNativeWindowManager swig_types[303]
+#define SWIGTYPE_p_iNewStateQuestRewardFactory swig_types[304]
+#define SWIGTYPE_p_iODEAMotorJoint swig_types[305]
+#define SWIGTYPE_p_iODEBallJoint swig_types[306]
+#define SWIGTYPE_p_iODEDynamicState swig_types[307]
+#define SWIGTYPE_p_iODEDynamicSystemState swig_types[308]
+#define SWIGTYPE_p_iODEFrameUpdateCallback swig_types[309]
+#define SWIGTYPE_p_iODEGeneralJointState swig_types[310]
+#define SWIGTYPE_p_iODEHinge2Joint swig_types[311]
+#define SWIGTYPE_p_iODEHingeJoint swig_types[312]
+#define SWIGTYPE_p_iODEJointState swig_types[313]
+#define SWIGTYPE_p_iODESliderJoint swig_types[314]
+#define SWIGTYPE_p_iODEUniversalJoint swig_types[315]
+#define SWIGTYPE_p_iObject swig_types[316]
+#define SWIGTYPE_p_iObjectIterator swig_types[317]
+#define SWIGTYPE_p_iObjectModel swig_types[318]
+#define SWIGTYPE_p_iObjectModelListener swig_types[319]
+#define SWIGTYPE_p_iObjectNameChangeListener swig_types[320]
+#define SWIGTYPE_p_iObjectRegistry swig_types[321]
+#define SWIGTYPE_p_iObjectRegistryIterator swig_types[322]
+#define SWIGTYPE_p_iOffscreenCanvasCallback swig_types[323]
+#define SWIGTYPE_p_iOperationQuestTriggerFactory swig_types[324]
+#define SWIGTYPE_p_iParameterESM swig_types[325]
+#define SWIGTYPE_p_iParticleBuiltinEffectorFactory swig_types[326]
+#define SWIGTYPE_p_iParticleBuiltinEffectorForce swig_types[327]
+#define SWIGTYPE_p_iParticleBuiltinEffectorLinColor swig_types[328]
+#define SWIGTYPE_p_iParticleBuiltinEffectorLinear swig_types[329]
+#define SWIGTYPE_p_iParticleBuiltinEffectorVelocityField swig_types[330]
+#define SWIGTYPE_p_iParticleBuiltinEmitterBase swig_types[331]
+#define SWIGTYPE_p_iParticleBuiltinEmitterBox swig_types[332]
+#define SWIGTYPE_p_iParticleBuiltinEmitterCone swig_types[333]
+#define SWIGTYPE_p_iParticleBuiltinEmitterCylinder swig_types[334]
+#define SWIGTYPE_p_iParticleBuiltinEmitterFactory swig_types[335]
+#define SWIGTYPE_p_iParticleBuiltinEmitterSphere swig_types[336]
+#define SWIGTYPE_p_iParticleEffector swig_types[337]
+#define SWIGTYPE_p_iParticleEmitter swig_types[338]
+#define SWIGTYPE_p_iParticleSystem swig_types[339]
+#define SWIGTYPE_p_iParticleSystemBase swig_types[340]
+#define SWIGTYPE_p_iParticleSystemFactory swig_types[341]
+#define SWIGTYPE_p_iPath swig_types[342]
+#define SWIGTYPE_p_iPcActorAnalog swig_types[343]
+#define SWIGTYPE_p_iPcActorMove swig_types[344]
+#define SWIGTYPE_p_iPcBillboard swig_types[345]
+#define SWIGTYPE_p_iPcCamera swig_types[346]
+#define SWIGTYPE_p_iPcCameraMode swig_types[347]
+#define SWIGTYPE_p_iPcCharacteristics swig_types[348]
+#define SWIGTYPE_p_iPcCollisionDetection swig_types[349]
+#define SWIGTYPE_p_iPcCommandInput swig_types[350]
+#define SWIGTYPE_p_iPcCraftController swig_types[351]
+#define SWIGTYPE_p_iPcDamage swig_types[352]
+#define SWIGTYPE_p_iPcDefaultCamera swig_types[353]
+#define SWIGTYPE_p_iPcDelegateCamera swig_types[354]
+#define SWIGTYPE_p_iPcGravity swig_types[355]
+#define SWIGTYPE_p_iPcGravityCallback swig_types[356]
+#define SWIGTYPE_p_iPcHover swig_types[357]
+#define SWIGTYPE_p_iPcInventory swig_types[358]
+#define SWIGTYPE_p_iPcInventoryListener swig_types[359]
+#define SWIGTYPE_p_iPcLight swig_types[360]
+#define SWIGTYPE_p_iPcLinearMovement swig_types[361]
+#define SWIGTYPE_p_iPcMechanicsBalancedGroup swig_types[362]
+#define SWIGTYPE_p_iPcMechanicsJoint swig_types[363]
+#define SWIGTYPE_p_iPcMechanicsObject swig_types[364]
+#define SWIGTYPE_p_iPcMechanicsSystem swig_types[365]
+#define SWIGTYPE_p_iPcMechanicsThruster swig_types[366]
+#define SWIGTYPE_p_iPcMechanicsThrusterController swig_types[367]
+#define SWIGTYPE_p_iPcMesh swig_types[368]
+#define SWIGTYPE_p_iPcMeshDeform swig_types[369]
+#define SWIGTYPE_p_iPcMeshSelect swig_types[370]
+#define SWIGTYPE_p_iPcMeshSelectListener swig_types[371]
+#define SWIGTYPE_p_iPcMovable swig_types[372]
+#define SWIGTYPE_p_iPcMovableConstraint swig_types[373]
+#define SWIGTYPE_p_iPcMover swig_types[374]
+#define SWIGTYPE_p_iPcNewCamera swig_types[375]
+#define SWIGTYPE_p_iPcPathFinder swig_types[376]
+#define SWIGTYPE_p_iPcProjectile swig_types[377]
+#define SWIGTYPE_p_iPcProperties swig_types[378]
+#define SWIGTYPE_p_iPcPropertyListener swig_types[379]
+#define SWIGTYPE_p_iPcPython swig_types[380]
+#define SWIGTYPE_p_iPcQuest swig_types[381]
+#define SWIGTYPE_p_iPcRegion swig_types[382]
+#define SWIGTYPE_p_iPcSimpleCamera swig_types[383]
+#define SWIGTYPE_p_iPcSolid swig_types[384]
+#define SWIGTYPE_p_iPcSoundListener swig_types[385]
+#define SWIGTYPE_p_iPcSoundSource swig_types[386]
+#define SWIGTYPE_p_iPcSpawn swig_types[387]
+#define SWIGTYPE_p_iPcSteer swig_types[388]
+#define SWIGTYPE_p_iPcTimer swig_types[389]
+#define SWIGTYPE_p_iPcTooltip swig_types[390]
+#define SWIGTYPE_p_iPcTrackingCamera swig_types[391]
+#define SWIGTYPE_p_iPcTrigger swig_types[392]
+#define SWIGTYPE_p_iPcTriggerListener swig_types[393]
+#define SWIGTYPE_p_iPcWheeled swig_types[394]
+#define SWIGTYPE_p_iPcZoneManager swig_types[395]
+#define SWIGTYPE_p_iPcmNewCamera__General swig_types[396]
+#define SWIGTYPE_p_iPcmNewCamera__Tracking swig_types[397]
+#define SWIGTYPE_p_iPluginIterator swig_types[398]
+#define SWIGTYPE_p_iPluginManager swig_types[399]
+#define SWIGTYPE_p_iPolygonHandle swig_types[400]
+#define SWIGTYPE_p_iPortal swig_types[401]
+#define SWIGTYPE_p_iPortalCallback swig_types[402]
+#define SWIGTYPE_p_iPortalContainer swig_types[403]
+#define SWIGTYPE_p_iProcTexCallback swig_types[404]
+#define SWIGTYPE_p_iProcTexture swig_types[405]
+#define SWIGTYPE_p_iPropertyChangeQuestTriggerFactory swig_types[406]
+#define SWIGTYPE_p_iPropertyQuestSeqOpFactory swig_types[407]
+#define SWIGTYPE_p_iQuest swig_types[408]
+#define SWIGTYPE_p_iQuestFactory swig_types[409]
+#define SWIGTYPE_p_iQuestManager swig_types[410]
+#define SWIGTYPE_p_iQuestParameter swig_types[411]
+#define SWIGTYPE_p_iQuestReward swig_types[412]
+#define SWIGTYPE_p_iQuestRewardFactory swig_types[413]
+#define SWIGTYPE_p_iQuestRewardType swig_types[414]
+#define SWIGTYPE_p_iQuestSeqOp swig_types[415]
+#define SWIGTYPE_p_iQuestSeqOpFactory swig_types[416]
+#define SWIGTYPE_p_iQuestSeqOpType swig_types[417]
+#define SWIGTYPE_p_iQuestSequence swig_types[418]
+#define SWIGTYPE_p_iQuestSequenceCallback swig_types[419]
+#define SWIGTYPE_p_iQuestSequenceFactory swig_types[420]
+#define SWIGTYPE_p_iQuestStateFactory swig_types[421]
+#define SWIGTYPE_p_iQuestTrigger swig_types[422]
+#define SWIGTYPE_p_iQuestTriggerCallback swig_types[423]
+#define SWIGTYPE_p_iQuestTriggerFactory swig_types[424]
+#define SWIGTYPE_p_iQuestTriggerResponseFactory swig_types[425]
+#define SWIGTYPE_p_iQuestTriggerType swig_types[426]
+#define SWIGTYPE_p_iRegion swig_types[427]
+#define SWIGTYPE_p_iRegionList swig_types[428]
+#define SWIGTYPE_p_iRenderLoop swig_types[429]
+#define SWIGTYPE_p_iRenderLoopManager swig_types[430]
+#define SWIGTYPE_p_iRenderStepContainer swig_types[431]
+#define SWIGTYPE_p_iRendererLightmap swig_types[432]
+#define SWIGTYPE_p_iReporter swig_types[433]
+#define SWIGTYPE_p_iReporterIterator swig_types[434]
+#define SWIGTYPE_p_iReporterListener swig_types[435]
+#define SWIGTYPE_p_iRigidBody swig_types[436]
+#define SWIGTYPE_p_iSCF swig_types[437]
+#define SWIGTYPE_p_iSaver swig_types[438]
+#define SWIGTYPE_p_iSceneNode swig_types[439]
+#define SWIGTYPE_p_iSceneNodeArray swig_types[440]
+#define SWIGTYPE_p_iScript swig_types[441]
+#define SWIGTYPE_p_iScriptObject swig_types[442]
+#define SWIGTYPE_p_iScriptValue swig_types[443]
+#define SWIGTYPE_p_iSector swig_types[444]
+#define SWIGTYPE_p_iSectorCallback swig_types[445]
+#define SWIGTYPE_p_iSectorIterator swig_types[446]
+#define SWIGTYPE_p_iSectorList swig_types[447]
+#define SWIGTYPE_p_iSectorMeshCallback swig_types[448]
+#define SWIGTYPE_p_iSequence swig_types[449]
+#define SWIGTYPE_p_iSequenceCondition swig_types[450]
+#define SWIGTYPE_p_iSequenceFinishQuestRewardFactory swig_types[451]
+#define SWIGTYPE_p_iSequenceFinishQuestTriggerFactory swig_types[452]
+#define SWIGTYPE_p_iSequenceManager swig_types[453]
+#define SWIGTYPE_p_iSequenceOperation swig_types[454]
+#define SWIGTYPE_p_iSequenceQuestRewardFactory swig_types[455]
+#define SWIGTYPE_p_iSequenceTimedOperation swig_types[456]
+#define SWIGTYPE_p_iSequenceTrigger swig_types[457]
+#define SWIGTYPE_p_iSequenceWrapper swig_types[458]
+#define SWIGTYPE_p_iShader swig_types[459]
+#define SWIGTYPE_p_iShaderCompiler swig_types[460]
+#define SWIGTYPE_p_iShaderManager swig_types[461]
+#define SWIGTYPE_p_iShaderPriorityList swig_types[462]
+#define SWIGTYPE_p_iShaderVarStack swig_types[463]
+#define SWIGTYPE_p_iShaderVariableAccessor swig_types[464]
+#define SWIGTYPE_p_iShaderVariableContext swig_types[465]
+#define SWIGTYPE_p_iSimpleFormerState swig_types[466]
+#define SWIGTYPE_p_iSkeleton swig_types[467]
+#define SWIGTYPE_p_iSkeleton2 swig_types[468]
+#define SWIGTYPE_p_iSkeletonAnimCallback2 swig_types[469]
+#define SWIGTYPE_p_iSkeletonAnimNode2 swig_types[470]
+#define SWIGTYPE_p_iSkeletonAnimNodeFactory2 swig_types[471]
+#define SWIGTYPE_p_iSkeletonAnimPacket2 swig_types[472]
+#define SWIGTYPE_p_iSkeletonAnimPacketFactory2 swig_types[473]
+#define SWIGTYPE_p_iSkeletonAnimation swig_types[474]
+#define SWIGTYPE_p_iSkeletonAnimation2 swig_types[475]
+#define SWIGTYPE_p_iSkeletonAnimationCallback swig_types[476]
+#define SWIGTYPE_p_iSkeletonAnimationInstance swig_types[477]
+#define SWIGTYPE_p_iSkeletonAnimationKeyFrame swig_types[478]
+#define SWIGTYPE_p_iSkeletonAnimationNode2 swig_types[479]
+#define SWIGTYPE_p_iSkeletonAnimationNodeFactory2 swig_types[480]
+#define SWIGTYPE_p_iSkeletonBlendNode2 swig_types[481]
+#define SWIGTYPE_p_iSkeletonBlendNodeFactory2 swig_types[482]
+#define SWIGTYPE_p_iSkeletonBone swig_types[483]
+#define SWIGTYPE_p_iSkeletonBoneFactory swig_types[484]
+#define SWIGTYPE_p_iSkeletonBoneRagdollInfo swig_types[485]
+#define SWIGTYPE_p_iSkeletonBoneUpdateCallback swig_types[486]
+#define SWIGTYPE_p_iSkeletonFSMNode2 swig_types[487]
+#define SWIGTYPE_p_iSkeletonFSMNodeFactory2 swig_types[488]
+#define SWIGTYPE_p_iSkeletonFactory swig_types[489]
+#define SWIGTYPE_p_iSkeletonFactory2 swig_types[490]
+#define SWIGTYPE_p_iSkeletonGraveyard swig_types[491]
+#define SWIGTYPE_p_iSkeletonManager2 swig_types[492]
+#define SWIGTYPE_p_iSkeletonPriorityNode2 swig_types[493]
+#define SWIGTYPE_p_iSkeletonPriorityNodeFactory2 swig_types[494]
+#define SWIGTYPE_p_iSkeletonRandomNode2 swig_types[495]
+#define SWIGTYPE_p_iSkeletonRandomNodeFactory2 swig_types[496]
+#define SWIGTYPE_p_iSkeletonSocket swig_types[497]
+#define SWIGTYPE_p_iSkeletonSocketFactory swig_types[498]
+#define SWIGTYPE_p_iSkeletonUpdateCallback swig_types[499]
+#define SWIGTYPE_p_iSndSysData swig_types[500]
+#define SWIGTYPE_p_iSndSysListener swig_types[501]
+#define SWIGTYPE_p_iSndSysListenerDoppler swig_types[502]
+#define SWIGTYPE_p_iSndSysLoader swig_types[503]
+#define SWIGTYPE_p_iSndSysManager swig_types[504]
+#define SWIGTYPE_p_iSndSysRenderer swig_types[505]
+#define SWIGTYPE_p_iSndSysRendererCallback swig_types[506]
+#define SWIGTYPE_p_iSndSysRendererOpenAL swig_types[507]
+#define SWIGTYPE_p_iSndSysRendererSoftware swig_types[508]
+#define SWIGTYPE_p_iSndSysSoftwareDriver swig_types[509]
+#define SWIGTYPE_p_iSndSysSoftwareFilter3D swig_types[510]
+#define SWIGTYPE_p_iSndSysSoftwareOutputFilter swig_types[511]
+#define SWIGTYPE_p_iSndSysSource swig_types[512]
+#define SWIGTYPE_p_iSndSysSource3D swig_types[513]
+#define SWIGTYPE_p_iSndSysSource3DDirectional swig_types[514]
+#define SWIGTYPE_p_iSndSysSource3DDirectionalSimple swig_types[515]
+#define SWIGTYPE_p_iSndSysSource3DDoppler swig_types[516]
+#define SWIGTYPE_p_iSndSysSourceOpenAL swig_types[517]
+#define SWIGTYPE_p_iSndSysSourceSoftware swig_types[518]
+#define SWIGTYPE_p_iSndSysSourceSoftware3D swig_types[519]
+#define SWIGTYPE_p_iSndSysStream swig_types[520]
+#define SWIGTYPE_p_iSndSysStreamCallback swig_types[521]
+#define SWIGTYPE_p_iSndSysWrapper swig_types[522]
+#define SWIGTYPE_p_iSprite2DFactoryState swig_types[523]
+#define SWIGTYPE_p_iSprite2DState swig_types[524]
+#define SWIGTYPE_p_iSprite2DUVAnimation swig_types[525]
+#define SWIGTYPE_p_iSprite2DUVAnimationFrame swig_types[526]
+#define SWIGTYPE_p_iSprite3DFactoryState swig_types[527]
+#define SWIGTYPE_p_iSprite3DState swig_types[528]
+#define SWIGTYPE_p_iSpriteAction swig_types[529]
+#define SWIGTYPE_p_iSpriteCal3DFactoryState swig_types[530]
+#define SWIGTYPE_p_iSpriteCal3DSocket swig_types[531]
+#define SWIGTYPE_p_iSpriteCal3DState swig_types[532]
+#define SWIGTYPE_p_iSpriteFrame swig_types[533]
+#define SWIGTYPE_p_iSpriteSocket swig_types[534]
+#define SWIGTYPE_p_iStandardReporterListener swig_types[535]
+#define SWIGTYPE_p_iString swig_types[536]
+#define SWIGTYPE_p_iStringArray swig_types[537]
+#define SWIGTYPE_p_iStringSet swig_types[538]
+#define SWIGTYPE_p_iSuperLightmap swig_types[539]
+#define SWIGTYPE_p_iTerraFormer swig_types[540]
+#define SWIGTYPE_p_iTerraSampler swig_types[541]
+#define SWIGTYPE_p_iTerrainCell swig_types[542]
+#define SWIGTYPE_p_iTerrainCellCollisionProperties swig_types[543]
+#define SWIGTYPE_p_iTerrainCellFeederProperties swig_types[544]
+#define SWIGTYPE_p_iTerrainCellHeightDataCallback swig_types[545]
+#define SWIGTYPE_p_iTerrainCellLoadCallback swig_types[546]
+#define SWIGTYPE_p_iTerrainCellRenderProperties swig_types[547]
+#define SWIGTYPE_p_iTerrainCollider swig_types[548]
+#define SWIGTYPE_p_iTerrainCollisionPairArray swig_types[549]
+#define SWIGTYPE_p_iTerrainDataFeeder swig_types[550]
+#define SWIGTYPE_p_iTerrainFactory swig_types[551]
+#define SWIGTYPE_p_iTerrainFactoryCell swig_types[552]
+#define SWIGTYPE_p_iTerrainFactoryState swig_types[553]
+#define SWIGTYPE_p_iTerrainObjectState swig_types[554]
+#define SWIGTYPE_p_iTerrainRenderer swig_types[555]
+#define SWIGTYPE_p_iTerrainSystem swig_types[556]
+#define SWIGTYPE_p_iTerrainVector3Array swig_types[557]
+#define SWIGTYPE_p_iTextureCallback swig_types[558]
+#define SWIGTYPE_p_iTextureHandle swig_types[559]
+#define SWIGTYPE_p_iTextureList swig_types[560]
+#define SWIGTYPE_p_iTextureManager swig_types[561]
+#define SWIGTYPE_p_iTextureWrapper swig_types[562]
+#define SWIGTYPE_p_iThingEnvironment swig_types[563]
+#define SWIGTYPE_p_iThingFactoryState swig_types[564]
+#define SWIGTYPE_p_iThingState swig_types[565]
+#define SWIGTYPE_p_iTimeoutQuestTriggerFactory swig_types[566]
+#define SWIGTYPE_p_iTransformQuestSeqOpFactory swig_types[567]
+#define SWIGTYPE_p_iTranslator swig_types[568]
+#define SWIGTYPE_p_iTriangleMesh swig_types[569]
+#define SWIGTYPE_p_iTriangleMeshIterator swig_types[570]
+#define SWIGTYPE_p_iTriggerQuestTriggerFactory swig_types[571]
+#define SWIGTYPE_p_iVFS swig_types[572]
+#define SWIGTYPE_p_iView swig_types[573]
+#define SWIGTYPE_p_iVirtualClock swig_types[574]
+#define SWIGTYPE_p_iVisibilityCuller swig_types[575]
+#define SWIGTYPE_p_iVisibilityCullerListener swig_types[576]
+#define SWIGTYPE_p_iVisibilityObject swig_types[577]
+#define SWIGTYPE_p_iVisibilityObjectIterator swig_types[578]
+#define SWIGTYPE_p_iWatchQuestTriggerFactory swig_types[579]
+#define SWIGTYPE_p_int swig_types[580]
+#define SWIGTYPE_p_int16_t swig_types[581]
+#define SWIGTYPE_p_int64_t swig_types[582]
+#define SWIGTYPE_p_int8_t swig_types[583]
+#define SWIGTYPE_p_int_least64_t swig_types[584]
+#define SWIGTYPE_p_long swig_types[585]
+#define SWIGTYPE_p_p_PcCommon swig_types[586]
+#define SWIGTYPE_p_p_PcCommonFactory swig_types[587]
+#define SWIGTYPE_p_p_celCombineParameterBlock swig_types[588]
+#define SWIGTYPE_p_p_celGenericParameterBlock swig_types[589]
+#define SWIGTYPE_p_p_celOneParameterBlock swig_types[590]
+#define SWIGTYPE_p_p_celPcCommon swig_types[591]
+#define SWIGTYPE_p_p_celVariableParameterBlock swig_types[592]
+#define SWIGTYPE_p_p_csColliderWrapper swig_types[593]
+#define SWIGTYPE_p_p_csConfigFile swig_types[594]
+#define SWIGTYPE_p_p_csImageBase swig_types[595]
+#define SWIGTYPE_p_p_csImageMemory swig_types[596]
+#define SWIGTYPE_p_p_csObject swig_types[597]
+#define SWIGTYPE_p_p_csPath swig_types[598]
+#define SWIGTYPE_p_p_csProcAnimated swig_types[599]
+#define SWIGTYPE_p_p_csProcTexture swig_types[600]
+#define SWIGTYPE_p_p_csTriangleMesh swig_types[601]
+#define SWIGTYPE_p_p_csTriangleMeshBox swig_types[602]
+#define SWIGTYPE_p_p_csTriangleMeshPointer swig_types[603]
+#define SWIGTYPE_p_p_csView swig_types[604]
+#define SWIGTYPE_p_p_iActionQuestRewardFactory swig_types[605]
+#define SWIGTYPE_p_p_iAnimTimeUpdateHandler swig_types[606]
+#define SWIGTYPE_p_p_iAnimatedImage swig_types[607]
+#define SWIGTYPE_p_p_iAnimatedMesh swig_types[608]
+#define SWIGTYPE_p_p_iAnimatedMeshFactory swig_types[609]
+#define SWIGTYPE_p_p_iAnimatedMeshFactorySubMesh swig_types[610]
+#define SWIGTYPE_p_p_iAnimatedMeshMorphTarget swig_types[611]
+#define SWIGTYPE_p_p_iAnimatedMeshSocket swig_types[612]
+#define SWIGTYPE_p_p_iAnimatedMeshSocketFactory swig_types[613]
+#define SWIGTYPE_p_p_iAnimatedMeshSubMesh swig_types[614]
+#define SWIGTYPE_p_p_iArrayChangeAllTcelData_t swig_types[615]
+#define SWIGTYPE_p_p_iArrayChangeAllTcsCollisionPair_t swig_types[616]
+#define SWIGTYPE_p_p_iArrayChangeAllTcsShaderVariable_p_t swig_types[617]
+#define SWIGTYPE_p_p_iArrayChangeAllTcsSprite2DVertex_t swig_types[618]
+#define SWIGTYPE_p_p_iArrayChangeAllTcsVector3_t swig_types[619]
+#define SWIGTYPE_p_p_iArrayChangeElementsTcelData_t swig_types[620]
+#define SWIGTYPE_p_p_iArrayChangeElementsTcsCollisionPair_t swig_types[621]
+#define SWIGTYPE_p_p_iArrayChangeElementsTcsShaderVariable_p_t swig_types[622]
+#define SWIGTYPE_p_p_iArrayChangeElementsTcsSprite2DVertex_t swig_types[623]
+#define SWIGTYPE_p_p_iArrayChangeElementsTcsVector3_t swig_types[624]
+#define SWIGTYPE_p_p_iArrayReadOnlyTcelData_t swig_types[625]
+#define SWIGTYPE_p_p_iArrayReadOnlyTcsCollisionPair_t swig_types[626]
+#define SWIGTYPE_p_p_iArrayReadOnlyTcsShaderVariable_p_t swig_types[627]
+#define SWIGTYPE_p_p_iArrayReadOnlyTcsSprite2DVertex_t swig_types[628]
+#define SWIGTYPE_p_p_iArrayReadOnlyTcsVector3_t swig_types[629]
+#define SWIGTYPE_p_p_iArrayReadOnlyTiCollection_p_t swig_types[630]
+#define SWIGTYPE_p_p_iArrayReadOnlyTiSceneNode_p_t swig_types[631]
+#define SWIGTYPE_p_p_iBase swig_types[632]
+#define SWIGTYPE_p_p_iBillboard swig_types[633]
+#define SWIGTYPE_p_p_iBillboardEventHandler swig_types[634]
+#define SWIGTYPE_p_p_iBillboardLayer swig_types[635]
+#define SWIGTYPE_p_p_iBillboardManager swig_types[636]
+#define SWIGTYPE_p_p_iBinaryLoaderPlugin swig_types[637]
+#define SWIGTYPE_p_p_iBodyGroup swig_types[638]
+#define SWIGTYPE_p_p_iBugPlug swig_types[639]
+#define SWIGTYPE_p_p_iBugPlugRenderObject swig_types[640]
+#define SWIGTYPE_p_p_iCacheManager swig_types[641]
+#define SWIGTYPE_p_p_iCamera swig_types[642]
+#define SWIGTYPE_p_p_iCameraPosition swig_types[643]
+#define SWIGTYPE_p_p_iCameraPositionList swig_types[644]
+#define SWIGTYPE_p_p_iCameraSectorListener swig_types[645]
+#define SWIGTYPE_p_p_iCelBehaviour swig_types[646]
+#define SWIGTYPE_p_p_iCelBlLayer swig_types[647]
+#define SWIGTYPE_p_p_iCelConsole swig_types[648]
+#define SWIGTYPE_p_p_iCelConsoleCommand swig_types[649]
+#define SWIGTYPE_p_p_iCelDataArray swig_types[650]
+#define SWIGTYPE_p_p_iCelDataArrayReadOnly swig_types[651]
+#define SWIGTYPE_p_p_iCelEdge swig_types[652]
+#define SWIGTYPE_p_p_iCelEntity swig_types[653]
+#define SWIGTYPE_p_p_iCelEntityIterator swig_types[654]
+#define SWIGTYPE_p_p_iCelEntityList swig_types[655]
+#define SWIGTYPE_p_p_iCelEntityRemoveCallback swig_types[656]
+#define SWIGTYPE_p_p_iCelEntityTemplate swig_types[657]
+#define SWIGTYPE_p_p_iCelEntityTracker swig_types[658]
+#define SWIGTYPE_p_p_iCelGraph swig_types[659]
+#define SWIGTYPE_p_p_iCelInventorySpace swig_types[660]
+#define SWIGTYPE_p_p_iCelInventorySpaceSlot swig_types[661]
+#define SWIGTYPE_p_p_iCelMapFile swig_types[662]
+#define SWIGTYPE_p_p_iCelNewEntityCallback swig_types[663]
+#define SWIGTYPE_p_p_iCelNode swig_types[664]
+#define SWIGTYPE_p_p_iCelParameterBlock swig_types[665]
+#define SWIGTYPE_p_p_iCelPath swig_types[666]
+#define SWIGTYPE_p_p_iCelPlLayer swig_types[667]
+#define SWIGTYPE_p_p_iCelPropertyClass swig_types[668]
+#define SWIGTYPE_p_p_iCelPropertyClassFactory swig_types[669]
+#define SWIGTYPE_p_p_iCelPropertyClassList swig_types[670]
+#define SWIGTYPE_p_p_iCelPropertyClassTemplate swig_types[671]
+#define SWIGTYPE_p_p_iCelRegion swig_types[672]
+#define SWIGTYPE_p_p_iCelTimerListener swig_types[673]
+#define SWIGTYPE_p_p_iCelZone swig_types[674]
+#define SWIGTYPE_p_p_iChangePropertyQuestRewardFactory swig_types[675]
+#define SWIGTYPE_p_p_iClipper2D swig_types[676]
+#define SWIGTYPE_p_p_iCollection swig_types[677]
+#define SWIGTYPE_p_p_iCollideSystem swig_types[678]
+#define SWIGTYPE_p_p_iCollider swig_types[679]
+#define SWIGTYPE_p_p_iColoredVertices swig_types[680]
+#define SWIGTYPE_p_p_iCommandLineParser swig_types[681]
+#define SWIGTYPE_p_p_iComponent swig_types[682]
+#define SWIGTYPE_p_p_iConfigFile swig_types[683]
+#define SWIGTYPE_p_p_iConfigIterator swig_types[684]
+#define SWIGTYPE_p_p_iConfigManager swig_types[685]
+#define SWIGTYPE_p_p_iConsoleExecCallback swig_types[686]
+#define SWIGTYPE_p_p_iConsoleInput swig_types[687]
+#define SWIGTYPE_p_p_iConsoleOutput swig_types[688]
+#define SWIGTYPE_p_p_iConsoleWatcher swig_types[689]
+#define SWIGTYPE_p_p_iCreateEntityQuestRewardFactory swig_types[690]
+#define SWIGTYPE_p_p_iCsSequenceQuestRewardFactory swig_types[691]
+#define SWIGTYPE_p_p_iDataBuffer swig_types[692]
+#define SWIGTYPE_p_p_iDebugHelper swig_types[693]
+#define SWIGTYPE_p_p_iDebugPrintQuestRewardFactory swig_types[694]
+#define SWIGTYPE_p_p_iDebugPrintQuestSeqOpFactory swig_types[695]
+#define SWIGTYPE_p_p_iDecalManager swig_types[696]
+#define SWIGTYPE_p_p_iDecalTemplate swig_types[697]
+#define SWIGTYPE_p_p_iDestroyEntityQuestRewardFactory swig_types[698]
+#define SWIGTYPE_p_p_iDocument swig_types[699]
+#define SWIGTYPE_p_p_iDocumentAttribute swig_types[700]
+#define SWIGTYPE_p_p_iDocumentAttributeIterator swig_types[701]
+#define SWIGTYPE_p_p_iDocumentNode swig_types[702]
+#define SWIGTYPE_p_p_iDocumentNodeIterator swig_types[703]
+#define SWIGTYPE_p_p_iDocumentSystem swig_types[704]
+#define SWIGTYPE_p_p_iDynamicSystem swig_types[705]
+#define SWIGTYPE_p_p_iDynamics swig_types[706]
+#define SWIGTYPE_p_p_iDynamicsColliderCollisionCallback swig_types[707]
+#define SWIGTYPE_p_p_iDynamicsCollisionCallback swig_types[708]
+#define SWIGTYPE_p_p_iDynamicsMoveCallback swig_types[709]
+#define SWIGTYPE_p_p_iDynamicsStepCallback swig_types[710]
+#define SWIGTYPE_p_p_iDynamicsSystemCollider swig_types[711]
+#define SWIGTYPE_p_p_iEngine swig_types[712]
+#define SWIGTYPE_p_p_iEngineFrameCallback swig_types[713]
+#define SWIGTYPE_p_p_iEngineSectorCallback swig_types[714]
+#define SWIGTYPE_p_p_iEngineSequenceManager swig_types[715]
+#define SWIGTYPE_p_p_iEngineSequenceParameters swig_types[716]
+#define SWIGTYPE_p_p_iEnterSectorQuestTriggerFactory swig_types[717]
+#define SWIGTYPE_p_p_iEvent swig_types[718]
+#define SWIGTYPE_p_p_iEventAttributeIterator swig_types[719]
+#define SWIGTYPE_p_p_iEventCord swig_types[720]
+#define SWIGTYPE_p_p_iEventHandler swig_types[721]
+#define SWIGTYPE_p_p_iEventNameRegistry swig_types[722]
+#define SWIGTYPE_p_p_iEventOutlet swig_types[723]
+#define SWIGTYPE_p_p_iEventPlug swig_types[724]
+#define SWIGTYPE_p_p_iEventQueue swig_types[725]
+#define SWIGTYPE_p_p_iFactory swig_types[726]
+#define SWIGTYPE_p_p_iFile swig_types[727]
+#define SWIGTYPE_p_p_iFont swig_types[728]
+#define SWIGTYPE_p_p_iFontDeleteNotify swig_types[729]
+#define SWIGTYPE_p_p_iFontServer swig_types[730]
+#define SWIGTYPE_p_p_iFrameEventSignpost swig_types[731]
+#define SWIGTYPE_p_p_iFrustumView swig_types[732]
+#define SWIGTYPE_p_p_iFrustumViewUserdata swig_types[733]
+#define SWIGTYPE_p_p_iGenMeshAnimationControl swig_types[734]
+#define SWIGTYPE_p_p_iGenMeshAnimationControl1_4 swig_types[735]
+#define SWIGTYPE_p_p_iGenMeshAnimationControlFactory swig_types[736]
+#define SWIGTYPE_p_p_iGenMeshAnimationControlType swig_types[737]
+#define SWIGTYPE_p_p_iGenMeshSkeletonControlState swig_types[738]
+#define SWIGTYPE_p_p_iGeneralFactoryState swig_types[739]
+#define SWIGTYPE_p_p_iGeneralMeshCommonState swig_types[740]
+#define SWIGTYPE_p_p_iGeneralMeshState swig_types[741]
+#define SWIGTYPE_p_p_iGeneralMeshSubMesh swig_types[742]
+#define SWIGTYPE_p_p_iGraphics2D swig_types[743]
+#define SWIGTYPE_p_p_iGraphics3D swig_types[744]
+#define SWIGTYPE_p_p_iHalo swig_types[745]
+#define SWIGTYPE_p_p_iImage swig_types[746]
+#define SWIGTYPE_p_p_iImageIO swig_types[747]
+#define SWIGTYPE_p_p_iInventoryQuestRewardFactory swig_types[748]
+#define SWIGTYPE_p_p_iInventoryQuestTriggerFactory swig_types[749]
+#define SWIGTYPE_p_p_iJoint swig_types[750]
+#define SWIGTYPE_p_p_iJoystickDriver swig_types[751]
+#define SWIGTYPE_p_p_iKeyComposer swig_types[752]
+#define SWIGTYPE_p_p_iKeyboardDriver swig_types[753]
+#define SWIGTYPE_p_p_iLODControl swig_types[754]
+#define SWIGTYPE_p_p_iLight swig_types[755]
+#define SWIGTYPE_p_p_iLightCallback swig_types[756]
+#define SWIGTYPE_p_p_iLightIterator swig_types[757]
+#define SWIGTYPE_p_p_iLightList swig_types[758]
+#define SWIGTYPE_p_p_iLightQuestSeqOpFactory swig_types[759]
+#define SWIGTYPE_p_p_iLightVisibleCallback swig_types[760]
+#define SWIGTYPE_p_p_iLightingProcessData swig_types[761]
+#define SWIGTYPE_p_p_iLightingProcessInfo swig_types[762]
+#define SWIGTYPE_p_p_iLoader swig_types[763]
+#define SWIGTYPE_p_p_iLoaderPlugin swig_types[764]
+#define SWIGTYPE_p_p_iMapNode swig_types[765]
+#define SWIGTYPE_p_p_iMaterial swig_types[766]
+#define SWIGTYPE_p_p_iMaterialEngine swig_types[767]
+#define SWIGTYPE_p_p_iMaterialList swig_types[768]
+#define SWIGTYPE_p_p_iMaterialWrapper swig_types[769]
+#define SWIGTYPE_p_p_iMeshDrawCallback swig_types[770]
+#define SWIGTYPE_p_p_iMeshFactoryList swig_types[771]
+#define SWIGTYPE_p_p_iMeshFactoryWrapper swig_types[772]
+#define SWIGTYPE_p_p_iMeshList swig_types[773]
+#define SWIGTYPE_p_p_iMeshObject swig_types[774]
+#define SWIGTYPE_p_p_iMeshObjectDrawCallback swig_types[775]
+#define SWIGTYPE_p_p_iMeshObjectFactory swig_types[776]
+#define SWIGTYPE_p_p_iMeshObjectType swig_types[777]
+#define SWIGTYPE_p_p_iMeshSelectQuestTriggerFactory swig_types[778]
+#define SWIGTYPE_p_p_iMeshWrapper swig_types[779]
+#define SWIGTYPE_p_p_iMeshWrapperIterator swig_types[780]
+#define SWIGTYPE_p_p_iMessageChannel swig_types[781]
+#define SWIGTYPE_p_p_iMessageDispatcher swig_types[782]
+#define SWIGTYPE_p_p_iMessageQuestRewardFactory swig_types[783]
+#define SWIGTYPE_p_p_iMessageQuestTriggerFactory swig_types[784]
+#define SWIGTYPE_p_p_iMessageReceiver swig_types[785]
+#define SWIGTYPE_p_p_iMessageReceiverFilter swig_types[786]
+#define SWIGTYPE_p_p_iMessageSender swig_types[787]
+#define SWIGTYPE_p_p_iMissingLoaderData swig_types[788]
+#define SWIGTYPE_p_p_iMouseDriver swig_types[789]
+#define SWIGTYPE_p_p_iMovable swig_types[790]
+#define SWIGTYPE_p_p_iMovableListener swig_types[791]
+#define SWIGTYPE_p_p_iMovePathQuestSeqOpFactory swig_types[792]
+#define SWIGTYPE_p_p_iMovieRecorder swig_types[793]
+#define SWIGTYPE_p_p_iNativeWindow swig_types[794]
+#define SWIGTYPE_p_p_iNativeWindowManager swig_types[795]
+#define SWIGTYPE_p_p_iNewStateQuestRewardFactory swig_types[796]
+#define SWIGTYPE_p_p_iODEAMotorJoint swig_types[797]
+#define SWIGTYPE_p_p_iODEBallJoint swig_types[798]
+#define SWIGTYPE_p_p_iODEDynamicState swig_types[799]
+#define SWIGTYPE_p_p_iODEDynamicSystemState swig_types[800]
+#define SWIGTYPE_p_p_iODEFrameUpdateCallback swig_types[801]
+#define SWIGTYPE_p_p_iODEGeneralJointState swig_types[802]
+#define SWIGTYPE_p_p_iODEHinge2Joint swig_types[803]
+#define SWIGTYPE_p_p_iODEHingeJoint swig_types[804]
+#define SWIGTYPE_p_p_iODEJointState swig_types[805]
+#define SWIGTYPE_p_p_iODESliderJoint swig_types[806]
+#define SWIGTYPE_p_p_iODEUniversalJoint swig_types[807]
+#define SWIGTYPE_p_p_iObject swig_types[808]
+#define SWIGTYPE_p_p_iObjectIterator swig_types[809]
+#define SWIGTYPE_p_p_iObjectModel swig_types[810]
+#define SWIGTYPE_p_p_iObjectModelListener swig_types[811]
+#define SWIGTYPE_p_p_iObjectNameChangeListener swig_types[812]
+#define SWIGTYPE_p_p_iObjectRegistry swig_types[813]
+#define SWIGTYPE_p_p_iObjectRegistryIterator swig_types[814]
+#define SWIGTYPE_p_p_iOffscreenCanvasCallback swig_types[815]
+#define SWIGTYPE_p_p_iOperationQuestTriggerFactory swig_types[816]
+#define SWIGTYPE_p_p_iParameterESM swig_types[817]
+#define SWIGTYPE_p_p_iParticleBuiltinEffectorFactory swig_types[818]
+#define SWIGTYPE_p_p_iParticleBuiltinEffectorForce swig_types[819]
+#define SWIGTYPE_p_p_iParticleBuiltinEffectorLinColor swig_types[820]
+#define SWIGTYPE_p_p_iParticleBuiltinEffectorLinear swig_types[821]
+#define SWIGTYPE_p_p_iParticleBuiltinEffectorVelocityField swig_types[822]
+#define SWIGTYPE_p_p_iParticleBuiltinEmitterBase swig_types[823]
+#define SWIGTYPE_p_p_iParticleBuiltinEmitterBox swig_types[824]
+#define SWIGTYPE_p_p_iParticleBuiltinEmitterCone swig_types[825]
+#define SWIGTYPE_p_p_iParticleBuiltinEmitterCylinder swig_types[826]
+#define SWIGTYPE_p_p_iParticleBuiltinEmitterFactory swig_types[827]
+#define SWIGTYPE_p_p_iParticleBuiltinEmitterSphere swig_types[828]
+#define SWIGTYPE_p_p_iParticleEffector swig_types[829]
+#define SWIGTYPE_p_p_iParticleEmitter swig_types[830]
+#define SWIGTYPE_p_p_iParticleSystem swig_types[831]
+#define SWIGTYPE_p_p_iParticleSystemBase swig_types[832]
+#define SWIGTYPE_p_p_iParticleSystemFactory swig_types[833]
+#define SWIGTYPE_p_p_iPath swig_types[834]
+#define SWIGTYPE_p_p_iPcActorAnalog swig_types[835]
+#define SWIGTYPE_p_p_iPcActorMove swig_types[836]
+#define SWIGTYPE_p_p_iPcBillboard swig_types[837]
+#define SWIGTYPE_p_p_iPcCamera swig_types[838]
+#define SWIGTYPE_p_p_iPcCameraMode swig_types[839]
+#define SWIGTYPE_p_p_iPcCharacteristics swig_types[840]
+#define SWIGTYPE_p_p_iPcCollisionDetection swig_types[841]
+#define SWIGTYPE_p_p_iPcCommandInput swig_types[842]
+#define SWIGTYPE_p_p_iPcCraftController swig_types[843]
+#define SWIGTYPE_p_p_iPcDamage swig_types[844]
+#define SWIGTYPE_p_p_iPcDefaultCamera swig_types[845]
+#define SWIGTYPE_p_p_iPcDelegateCamera swig_types[846]
+#define SWIGTYPE_p_p_iPcGravity swig_types[847]
+#define SWIGTYPE_p_p_iPcGravityCallback swig_types[848]
+#define SWIGTYPE_p_p_iPcHover swig_types[849]
+#define SWIGTYPE_p_p_iPcInventory swig_types[850]
+#define SWIGTYPE_p_p_iPcInventoryListener swig_types[851]
+#define SWIGTYPE_p_p_iPcLinearMovement swig_types[852]
+#define SWIGTYPE_p_p_iPcMechanicsBalancedGroup swig_types[853]
+#define SWIGTYPE_p_p_iPcMechanicsJoint swig_types[854]
+#define SWIGTYPE_p_p_iPcMechanicsObject swig_types[855]
+#define SWIGTYPE_p_p_iPcMechanicsSystem swig_types[856]
+#define SWIGTYPE_p_p_iPcMechanicsThruster swig_types[857]
+#define SWIGTYPE_p_p_iPcMechanicsThrusterController swig_types[858]
+#define SWIGTYPE_p_p_iPcMesh swig_types[859]
+#define SWIGTYPE_p_p_iPcMeshDeform swig_types[860]
+#define SWIGTYPE_p_p_iPcMeshSelect swig_types[861]
+#define SWIGTYPE_p_p_iPcMeshSelectListener swig_types[862]
+#define SWIGTYPE_p_p_iPcMovable swig_types[863]
+#define SWIGTYPE_p_p_iPcMovableConstraint swig_types[864]
+#define SWIGTYPE_p_p_iPcMover swig_types[865]
+#define SWIGTYPE_p_p_iPcNewCamera swig_types[866]
+#define SWIGTYPE_p_p_iPcPathFinder swig_types[867]
+#define SWIGTYPE_p_p_iPcProjectile swig_types[868]
+#define SWIGTYPE_p_p_iPcProperties swig_types[869]
+#define SWIGTYPE_p_p_iPcPropertyListener swig_types[870]
+#define SWIGTYPE_p_p_iPcPython swig_types[871]
+#define SWIGTYPE_p_p_iPcQuest swig_types[872]
+#define SWIGTYPE_p_p_iPcRegion swig_types[873]
+#define SWIGTYPE_p_p_iPcSimpleCamera swig_types[874]
+#define SWIGTYPE_p_p_iPcSolid swig_types[875]
+#define SWIGTYPE_p_p_iPcSoundListener swig_types[876]
+#define SWIGTYPE_p_p_iPcSoundSource swig_types[877]
+#define SWIGTYPE_p_p_iPcSpawn swig_types[878]
+#define SWIGTYPE_p_p_iPcSteer swig_types[879]
+#define SWIGTYPE_p_p_iPcTimer swig_types[880]
+#define SWIGTYPE_p_p_iPcTooltip swig_types[881]
+#define SWIGTYPE_p_p_iPcTrackingCamera swig_types[882]
+#define SWIGTYPE_p_p_iPcTrigger swig_types[883]
+#define SWIGTYPE_p_p_iPcTriggerListener swig_types[884]
+#define SWIGTYPE_p_p_iPcWheeled swig_types[885]
+#define SWIGTYPE_p_p_iPcZoneManager swig_types[886]
+#define SWIGTYPE_p_p_iPcmNewCamera__General swig_types[887]
+#define SWIGTYPE_p_p_iPcmNewCamera__Tracking swig_types[888]
+#define SWIGTYPE_p_p_iPluginIterator swig_types[889]
+#define SWIGTYPE_p_p_iPluginManager swig_types[890]
+#define SWIGTYPE_p_p_iPolygonHandle swig_types[891]
+#define SWIGTYPE_p_p_iPortal swig_types[892]
+#define SWIGTYPE_p_p_iPortalCallback swig_types[893]
+#define SWIGTYPE_p_p_iPortalContainer swig_types[894]
+#define SWIGTYPE_p_p_iProcTexCallback swig_types[895]
+#define SWIGTYPE_p_p_iProcTexture swig_types[896]
+#define SWIGTYPE_p_p_iPropertyChangeQuestTriggerFactory swig_types[897]
+#define SWIGTYPE_p_p_iPropertyQuestSeqOpFactory swig_types[898]
+#define SWIGTYPE_p_p_iQuest swig_types[899]
+#define SWIGTYPE_p_p_iQuestFactory swig_types[900]
+#define SWIGTYPE_p_p_iQuestManager swig_types[901]
+#define SWIGTYPE_p_p_iQuestParameter swig_types[902]
+#define SWIGTYPE_p_p_iQuestReward swig_types[903]
+#define SWIGTYPE_p_p_iQuestRewardFactory swig_types[904]
+#define SWIGTYPE_p_p_iQuestRewardType swig_types[905]
+#define SWIGTYPE_p_p_iQuestSeqOp swig_types[906]
+#define SWIGTYPE_p_p_iQuestSeqOpFactory swig_types[907]
+#define SWIGTYPE_p_p_iQuestSeqOpType swig_types[908]
+#define SWIGTYPE_p_p_iQuestSequence swig_types[909]
+#define SWIGTYPE_p_p_iQuestSequenceCallback swig_types[910]
+#define SWIGTYPE_p_p_iQuestSequenceFactory swig_types[911]
+#define SWIGTYPE_p_p_iQuestStateFactory swig_types[912]
+#define SWIGTYPE_p_p_iQuestTrigger swig_types[913]
+#define SWIGTYPE_p_p_iQuestTriggerCallback swig_types[914]
+#define SWIGTYPE_p_p_iQuestTriggerFactory swig_types[915]
+#define SWIGTYPE_p_p_iQuestTriggerResponseFactory swig_types[916]
+#define SWIGTYPE_p_p_iQuestTriggerType swig_types[917]
+#define SWIGTYPE_p_p_iRegion swig_types[918]
+#define SWIGTYPE_p_p_iRegionList swig_types[919]
+#define SWIGTYPE_p_p_iRenderLoop swig_types[920]
+#define SWIGTYPE_p_p_iRenderLoopManager swig_types[921]
+#define SWIGTYPE_p_p_iRenderStepContainer swig_types[922]
+#define SWIGTYPE_p_p_iRendererLightmap swig_types[923]
+#define SWIGTYPE_p_p_iReporter swig_types[924]
+#define SWIGTYPE_p_p_iReporterIterator swig_types[925]
+#define SWIGTYPE_p_p_iReporterListener swig_types[926]
+#define SWIGTYPE_p_p_iRigidBody swig_types[927]
+#define SWIGTYPE_p_p_iSCF swig_types[928]
+#define SWIGTYPE_p_p_iSaver swig_types[929]
+#define SWIGTYPE_p_p_iSceneNode swig_types[930]
+#define SWIGTYPE_p_p_iSceneNodeArray swig_types[931]
+#define SWIGTYPE_p_p_iScript swig_types[932]
+#define SWIGTYPE_p_p_iScriptObject swig_types[933]
+#define SWIGTYPE_p_p_iScriptValue swig_types[934]
+#define SWIGTYPE_p_p_iSector swig_types[935]
+#define SWIGTYPE_p_p_iSectorCallback swig_types[936]
+#define SWIGTYPE_p_p_iSectorIterator swig_types[937]
+#define SWIGTYPE_p_p_iSectorList swig_types[938]
+#define SWIGTYPE_p_p_iSectorMeshCallback swig_types[939]
+#define SWIGTYPE_p_p_iSequence swig_types[940]
+#define SWIGTYPE_p_p_iSequenceCondition swig_types[941]
+#define SWIGTYPE_p_p_iSequenceFinishQuestRewardFactory swig_types[942]
+#define SWIGTYPE_p_p_iSequenceFinishQuestTriggerFactory swig_types[943]
+#define SWIGTYPE_p_p_iSequenceManager swig_types[944]
+#define SWIGTYPE_p_p_iSequenceOperation swig_types[945]
+#define SWIGTYPE_p_p_iSequenceQuestRewardFactory swig_types[946]
+#define SWIGTYPE_p_p_iSequenceTimedOperation swig_types[947]
+#define SWIGTYPE_p_p_iSequenceTrigger swig_types[948]
+#define SWIGTYPE_p_p_iSequenceWrapper swig_types[949]
+#define SWIGTYPE_p_p_iShader swig_types[950]
+#define SWIGTYPE_p_p_iShaderCompiler swig_types[951]
+#define SWIGTYPE_p_p_iShaderManager swig_types[952]
+#define SWIGTYPE_p_p_iShaderPriorityList swig_types[953]
+#define SWIGTYPE_p_p_iShaderVarStack swig_types[954]
+#define SWIGTYPE_p_p_iShaderVariableAccessor swig_types[955]
+#define SWIGTYPE_p_p_iShaderVariableContext swig_types[956]
+#define SWIGTYPE_p_p_iSimpleFormerState swig_types[957]
+#define SWIGTYPE_p_p_iSkeleton swig_types[958]
+#define SWIGTYPE_p_p_iSkeleton2 swig_types[959]
+#define SWIGTYPE_p_p_iSkeletonAnimCallback2 swig_types[960]
+#define SWIGTYPE_p_p_iSkeletonAnimNode2 swig_types[961]
+#define SWIGTYPE_p_p_iSkeletonAnimNodeFactory2 swig_types[962]
+#define SWIGTYPE_p_p_iSkeletonAnimPacket2 swig_types[963]
+#define SWIGTYPE_p_p_iSkeletonAnimPacketFactory2 swig_types[964]
+#define SWIGTYPE_p_p_iSkeletonAnimation swig_types[965]
+#define SWIGTYPE_p_p_iSkeletonAnimation2 swig_types[966]
+#define SWIGTYPE_p_p_iSkeletonAnimationCallback swig_types[967]
+#define SWIGTYPE_p_p_iSkeletonAnimationInstance swig_types[968]
+#define SWIGTYPE_p_p_iSkeletonAnimationKeyFrame swig_types[969]
+#define SWIGTYPE_p_p_iSkeletonAnimationNode2 swig_types[970]
+#define SWIGTYPE_p_p_iSkeletonAnimationNodeFactory2 swig_types[971]
+#define SWIGTYPE_p_p_iSkeletonBlendNode2 swig_types[972]
+#define SWIGTYPE_p_p_iSkeletonBlendNodeFactory2 swig_types[973]
+#define SWIGTYPE_p_p_iSkeletonBone swig_types[974]
+#define SWIGTYPE_p_p_iSkeletonBoneFactory swig_types[975]
+#define SWIGTYPE_p_p_iSkeletonBoneRagdollInfo swig_types[976]
+#define SWIGTYPE_p_p_iSkeletonBoneUpdateCallback swig_types[977]
+#define SWIGTYPE_p_p_iSkeletonFSMNode2 swig_types[978]
+#define SWIGTYPE_p_p_iSkeletonFSMNodeFactory2 swig_types[979]
+#define SWIGTYPE_p_p_iSkeletonFactory swig_types[980]
+#define SWIGTYPE_p_p_iSkeletonFactory2 swig_types[981]
+#define SWIGTYPE_p_p_iSkeletonGraveyard swig_types[982]
+#define SWIGTYPE_p_p_iSkeletonManager2 swig_types[983]
+#define SWIGTYPE_p_p_iSkeletonPriorityNode2 swig_types[984]
+#define SWIGTYPE_p_p_iSkeletonPriorityNodeFactory2 swig_types[985]
+#define SWIGTYPE_p_p_iSkeletonRandomNode2 swig_types[986]
+#define SWIGTYPE_p_p_iSkeletonRandomNodeFactory2 swig_types[987]
+#define SWIGTYPE_p_p_iSkeletonSocket swig_types[988]
+#define SWIGTYPE_p_p_iSkeletonSocketFactory swig_types[989]
+#define SWIGTYPE_p_p_iSkeletonUpdateCallback swig_types[990]
+#define SWIGTYPE_p_p_iSndSysData swig_types[991]
+#define SWIGTYPE_p_p_iSndSysListener swig_types[992]
+#define SWIGTYPE_p_p_iSndSysListenerDoppler swig_types[993]
+#define SWIGTYPE_p_p_iSndSysLoader swig_types[994]
+#define SWIGTYPE_p_p_iSndSysManager swig_types[995]
+#define SWIGTYPE_p_p_iSndSysRenderer swig_types[996]
+#define SWIGTYPE_p_p_iSndSysRendererCallback swig_types[997]
+#define SWIGTYPE_p_p_iSndSysRendererOpenAL swig_types[998]
+#define SWIGTYPE_p_p_iSndSysRendererSoftware swig_types[999]
+#define SWIGTYPE_p_p_iSndSysSoftwareDriver swig_types[1000]
+#define SWIGTYPE_p_p_iSndSysSoftwareFilter3D swig_types[1001]
+#define SWIGTYPE_p_p_iSndSysSoftwareOutputFilter swig_types[1002]
+#define SWIGTYPE_p_p_iSndSysSource swig_types[1003]
+#define SWIGTYPE_p_p_iSndSysSource3D swig_types[1004]
+#define SWIGTYPE_p_p_iSndSysSource3DDirectional swig_types[1005]
+#define SWIGTYPE_p_p_iSndSysSource3DDirectionalSimple swig_types[1006]
+#define SWIGTYPE_p_p_iSndSysSource3DDoppler swig_types[1007]
+#define SWIGTYPE_p_p_iSndSysSourceOpenAL swig_types[1008]
+#define SWIGTYPE_p_p_iSndSysSourceSoftware swig_types[1009]
+#define SWIGTYPE_p_p_iSndSysSourceSoftware3D swig_types[1010]
+#define SWIGTYPE_p_p_iSndSysStream swig_types[1011]
+#define SWIGTYPE_p_p_iSndSysStreamCallback swig_types[1012]
+#define SWIGTYPE_p_p_iSndSysWrapper swig_types[1013]
+#define SWIGTYPE_p_p_iSprite2DFactoryState swig_types[1014]
+#define SWIGTYPE_p_p_iSprite2DState swig_types[1015]
+#define SWIGTYPE_p_p_iSprite2DUVAnimation swig_types[1016]
+#define SWIGTYPE_p_p_iSprite2DUVAnimationFrame swig_types[1017]
+#define SWIGTYPE_p_p_iSprite3DFactoryState swig_types[1018]
+#define SWIGTYPE_p_p_iSprite3DState swig_types[1019]
+#define SWIGTYPE_p_p_iSpriteAction swig_types[1020]
+#define SWIGTYPE_p_p_iSpriteCal3DFactoryState swig_types[1021]
+#define SWIGTYPE_p_p_iSpriteCal3DSocket swig_types[1022]
+#define SWIGTYPE_p_p_iSpriteCal3DState swig_types[1023]
+#define SWIGTYPE_p_p_iSpriteFrame swig_types[1024]
+#define SWIGTYPE_p_p_iSpriteSocket swig_types[1025]
+#define SWIGTYPE_p_p_iStandardReporterListener swig_types[1026]
+#define SWIGTYPE_p_p_iString swig_types[1027]
+#define SWIGTYPE_p_p_iStringArray swig_types[1028]
+#define SWIGTYPE_p_p_iStringSet swig_types[1029]
+#define SWIGTYPE_p_p_iSuperLightmap swig_types[1030]
+#define SWIGTYPE_p_p_iTerraFormer swig_types[1031]
+#define SWIGTYPE_p_p_iTerraSampler swig_types[1032]
+#define SWIGTYPE_p_p_iTerrainCell swig_types[1033]
+#define SWIGTYPE_p_p_iTerrainCellCollisionProperties swig_types[1034]
+#define SWIGTYPE_p_p_iTerrainCellFeederProperties swig_types[1035]
+#define SWIGTYPE_p_p_iTerrainCellHeightDataCallback swig_types[1036]
+#define SWIGTYPE_p_p_iTerrainCellLoadCallback swig_types[1037]
+#define SWIGTYPE_p_p_iTerrainCellRenderProperties swig_types[1038]
+#define SWIGTYPE_p_p_iTerrainCollider swig_types[1039]
+#define SWIGTYPE_p_p_iTerrainCollisionPairArray swig_types[1040]
+#define SWIGTYPE_p_p_iTerrainDataFeeder swig_types[1041]
+#define SWIGTYPE_p_p_iTerrainFactory swig_types[1042]
+#define SWIGTYPE_p_p_iTerrainFactoryCell swig_types[1043]
+#define SWIGTYPE_p_p_iTerrainFactoryState swig_types[1044]
+#define SWIGTYPE_p_p_iTerrainObjectState swig_types[1045]
+#define SWIGTYPE_p_p_iTerrainRenderer swig_types[1046]
+#define SWIGTYPE_p_p_iTerrainSystem swig_types[1047]
+#define SWIGTYPE_p_p_iTerrainVector3Array swig_types[1048]
+#define SWIGTYPE_p_p_iTextureCallback swig_types[1049]
+#define SWIGTYPE_p_p_iTextureHandle swig_types[1050]
+#define SWIGTYPE_p_p_iTextureList swig_types[1051]
+#define SWIGTYPE_p_p_iTextureManager swig_types[1052]
+#define SWIGTYPE_p_p_iTextureWrapper swig_types[1053]
+#define SWIGTYPE_p_p_iThingEnvironment swig_types[1054]
+#define SWIGTYPE_p_p_iThingFactoryState swig_types[1055]
+#define SWIGTYPE_p_p_iThingState swig_types[1056]
+#define SWIGTYPE_p_p_iTimeoutQuestTriggerFactory swig_types[1057]
+#define SWIGTYPE_p_p_iTransformQuestSeqOpFactory swig_types[1058]
+#define SWIGTYPE_p_p_iTranslator swig_types[1059]
+#define SWIGTYPE_p_p_iTriangleMesh swig_types[1060]
+#define SWIGTYPE_p_p_iTriangleMeshIterator swig_types[1061]
+#define SWIGTYPE_p_p_iTriggerQuestTriggerFactory swig_types[1062]
+#define SWIGTYPE_p_p_iVFS swig_types[1063]
+#define SWIGTYPE_p_p_iView swig_types[1064]
+#define SWIGTYPE_p_p_iVirtualClock swig_types[1065]
+#define SWIGTYPE_p_p_iVisibilityCuller swig_types[1066]
+#define SWIGTYPE_p_p_iVisibilityCullerListener swig_types[1067]
+#define SWIGTYPE_p_p_iVisibilityObject swig_types[1068]
+#define SWIGTYPE_p_p_iVisibilityObjectIterator swig_types[1069]
+#define SWIGTYPE_p_p_iWatchQuestTriggerFactory swig_types[1070]
+#define SWIGTYPE_p_p_pyMessageReceiver swig_types[1071]
+#define SWIGTYPE_p_p_pyMessageSender swig_types[1072]
+#define SWIGTYPE_p_p_pyPcCommon swig_types[1073]
+#define SWIGTYPE_p_p_pyPcPropertyListener swig_types[1074]
+#define SWIGTYPE_p_p_scfImplementation1TPcCommonFactory_iCelPropertyClassFactory_t swig_types[1075]
+#define SWIGTYPE_p_p_scfImplementation1TcelCombineParameterBlock_iCelParameterBlock_t swig_types[1076]
+#define SWIGTYPE_p_p_scfImplementation1TcelGenericParameterBlock_iCelParameterBlock_t swig_types[1077]
+#define SWIGTYPE_p_p_scfImplementation1TcelOneParameterBlock_iCelParameterBlock_t swig_types[1078]
+#define SWIGTYPE_p_p_scfImplementation1TcelVariableParameterBlock_iCelParameterBlock_t swig_types[1079]
+#define SWIGTYPE_p_p_scfImplementation1TcsConfigFile_iConfigFile_t swig_types[1080]
+#define SWIGTYPE_p_p_scfImplementation1TcsImageBase_iImage_t swig_types[1081]
+#define SWIGTYPE_p_p_scfImplementation1TcsObject_iObject_t swig_types[1082]
+#define SWIGTYPE_p_p_scfImplementation1TcsTriangleMeshBox_iTriangleMesh_t swig_types[1083]
+#define SWIGTYPE_p_p_scfImplementation1TcsTriangleMeshPointer_iTriangleMesh_t swig_types[1084]
+#define SWIGTYPE_p_p_scfImplementation1TcsTriangleMesh_iTriangleMesh_t swig_types[1085]
+#define SWIGTYPE_p_p_scfImplementation1TcsView_iView_t swig_types[1086]
+#define SWIGTYPE_p_p_scfImplementation1TpyMessageReceiver_iMessageReceiver_t swig_types[1087]
+#define SWIGTYPE_p_p_scfImplementation1TpyMessageSender_iMessageSender_t swig_types[1088]
+#define SWIGTYPE_p_p_scfImplementation1TpyPcPropertyListener_iPcPropertyListener_t swig_types[1089]
+#define SWIGTYPE_p_p_scfImplementation3TcelPcCommon_iCelPropertyClass_iCelTimerListener_iMessageSender_t swig_types[1090]
+#define SWIGTYPE_p_p_scfImplementationExt0TPcCommon_celPcCommon_t swig_types[1091]
+#define SWIGTYPE_p_p_scfImplementationExt0TcsImageMemory_csImageBase_t swig_types[1092]
+#define SWIGTYPE_p_p_scfImplementationExt1TcsColliderWrapper_csObject_scfFakeInterfaceTcsColliderWrapper_t_t swig_types[1093]
+#define SWIGTYPE_p_p_scfImplementationExt1TcsPath_csObject_iPath_t swig_types[1094]
+#define SWIGTYPE_p_p_scfImplementationExt1TpyPcCommon_PcCommon_iPcPython_t swig_types[1095]
+#define SWIGTYPE_p_p_scfImplementationExt2TcsProcTexture_csObject_iTextureWrapper_iProcTexture_t swig_types[1096]
+#define SWIGTYPE_p_p_void swig_types[1097]
+#define SWIGTYPE_p_pyMessageReceiver swig_types[1098]
+#define SWIGTYPE_p_pyMessageSender swig_types[1099]
+#define SWIGTYPE_p_pyPcCommon swig_types[1100]
+#define SWIGTYPE_p_pyPcPropertyListener swig_types[1101]
+#define SWIGTYPE_p_scfImplementation1TPcCommonFactory_iCelPropertyClassFactory_t swig_types[1102]
+#define SWIGTYPE_p_scfImplementation1TcelCombineParameterBlock_iCelParameterBlock_t swig_types[1103]
+#define SWIGTYPE_p_scfImplementation1TcelGenericParameterBlock_iCelParameterBlock_t swig_types[1104]
+#define SWIGTYPE_p_scfImplementation1TcelOneParameterBlock_iCelParameterBlock_t swig_types[1105]
+#define SWIGTYPE_p_scfImplementation1TcelVariableParameterBlock_iCelParameterBlock_t swig_types[1106]
+#define SWIGTYPE_p_scfImplementation1TcsConfigFile_iConfigFile_t swig_types[1107]
+#define SWIGTYPE_p_scfImplementation1TcsImageBase_iImage_t swig_types[1108]
+#define SWIGTYPE_p_scfImplementation1TcsObject_iObject_t swig_types[1109]
+#define SWIGTYPE_p_scfImplementation1TcsTriangleMeshBox_iTriangleMesh_t swig_types[1110]
+#define SWIGTYPE_p_scfImplementation1TcsTriangleMeshPointer_iTriangleMesh_t swig_types[1111]
+#define SWIGTYPE_p_scfImplementation1TcsTriangleMesh_iTriangleMesh_t swig_types[1112]
+#define SWIGTYPE_p_scfImplementation1TcsView_iView_t swig_types[1113]
+#define SWIGTYPE_p_scfImplementation1TpyMessageReceiver_iMessageReceiver_t swig_types[1114]
+#define SWIGTYPE_p_scfImplementation1TpyMessageSender_iMessageSender_t swig_types[1115]
+#define SWIGTYPE_p_scfImplementation1TpyPcPropertyListener_iPcPropertyListener_t swig_types[1116]
+#define SWIGTYPE_p_scfImplementation3TcelPcCommon_iCelPropertyClass_iCelTimerListener_iMessageSender_t swig_types[1117]
+#define SWIGTYPE_p_scfImplementationExt0TPcCommon_celPcCommon_t swig_types[1118]
+#define SWIGTYPE_p_scfImplementationExt0TcsImageMemory_csImageBase_t swig_types[1119]
+#define SWIGTYPE_p_scfImplementationExt1TcsColliderWrapper_csObject_scfFakeInterfaceTcsColliderWrapper_t_t swig_types[1120]
+#define SWIGTYPE_p_scfImplementationExt1TcsPath_csObject_iPath_t swig_types[1121]
+#define SWIGTYPE_p_scfImplementationExt1TpyPcCommon_PcCommon_iPcPython_t swig_types[1122]
+#define SWIGTYPE_p_scfImplementationExt2TcsProcTexture_csObject_iTextureWrapper_iProcTexture_t swig_types[1123]
+#define SWIGTYPE_p_scfInterfaceMetadataList swig_types[1124]
+#define SWIGTYPE_p_uint16_t swig_types[1125]
+#define SWIGTYPE_p_uint32_t swig_types[1126]
+#define SWIGTYPE_p_uint64_t swig_types[1127]
+#define SWIGTYPE_p_uint8_t swig_types[1128]
+#define SWIGTYPE_p_uint_least64_t swig_types[1129]
+#define SWIGTYPE_p_unsigned_int swig_types[1130]
+#define SWIGTYPE_p_unsigned_long swig_types[1131]
+#define SWIGTYPE_p_void swig_types[1132]
+static swig_type_info *swig_types[1134];
+static swig_module_info swig_module = {swig_types, 1133, 0, 0, 0, 0};
#define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name)
#define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name)
@@ -4140,7 +4138,7 @@
#define SWIG_name "_blcelc"
-#define SWIGVERSION 0x010331
+#define SWIGVERSION 0x010333
#define SWIG_VERSION SWIGVERSION
@@ -4310,14 +4308,12 @@
#include
-#ifndef LLONG_MIN
-# define LLONG_MIN LONG_LONG_MIN
-#endif
-#ifndef LLONG_MAX
-# define LLONG_MAX LONG_LONG_MAX
-#endif
-#ifndef ULLONG_MAX
-# define ULLONG_MAX ULONG_LONG_MAX
+#if !defined(SWIG_NO_LLONG_MAX)
+# if !defined(LLONG_MAX) && defined(__GNUC__) && defined (__LONG_LONG_MAX__)
+# define LLONG_MAX __LONG_LONG_MAX__
+# define LLONG_MIN (-LLONG_MAX - 1LL)
+# define ULLONG_MAX (LLONG_MAX * 2ULL + 1ULL)
+# endif
#endif
@@ -4646,34 +4642,11 @@
SWIGINTERN int
SWIG_AsVal_bool (PyObject *obj, bool *val)
{
- if (obj == Py_True) {
- if (val) *val = true;
- return SWIG_OK;
- } else if (obj == Py_False) {
- if (val) *val = false;
- return SWIG_OK;
- } else {
- long v = 0;
- int res = SWIG_AddCast(SWIG_AsVal_long (obj, val ? &v : 0));
- if (SWIG_IsOK(res) && val) *val = v ? true : false;
- return res;
- }
-}
-
-
-SWIGINTERN int
-SWIG_AsVal_unsigned_SS_char (PyObject * obj, unsigned char *val)
-{
- unsigned long v;
- int res = SWIG_AsVal_unsigned_SS_long (obj, &v);
- if (SWIG_IsOK(res)) {
- if ((v > UCHAR_MAX)) {
- return SWIG_OverflowError;
- } else {
- if (val) *val = static_cast< unsigned char >(v);
- }
- }
- return res;
+ int r = PyObject_IsTrue(obj);
+ if (r == -1)
+ return SWIG_ERROR;
+ if (val) *val = r ? true : false;
+ return SWIG_OK;
}
@@ -4720,13 +4693,6 @@
-SWIGINTERNINLINE PyObject *
-SWIG_From_unsigned_SS_char (unsigned char value)
-{
- return SWIG_From_unsigned_SS_long (value);
-}
-
-
#define SWIG_From_double PyFloat_FromDouble
@@ -4803,13 +4769,6 @@
return pl;
}
-
-SWIGINTERNINLINE PyObject *
-SWIG_From_unsigned_SS_int (unsigned int value)
-{
- return SWIG_From_unsigned_SS_long (value);
-}
-
SWIGINTERN iObject *iCelEntity_Object_get(iCelEntity *self){ return (iObject*)(self->QueryObject()); }
SWIGINTERN void iCelEntity_Name_set(iCelEntity *self,char const *_val){ self->SetName(_val); }
SWIGINTERN char const *iCelEntity_Name_get(iCelEntity *self){ return (const char*)(self->GetName()); }
@@ -5006,7 +4965,7 @@
celData ret;
if(self->SendMessage (msg_id,prop,ret,params))
{
- /*@SWIG:CELDATA_RETURN@*/
+ /*@SWIG:/tmp/tmp2/V1.4/include/bindings/python/datatype.i,1,CELDATA_RETURN@*/
PyObject *obj = Py_None;
if ((&ret))
{
@@ -5745,6 +5704,7 @@
SWIGINTERN char const *iPcRegion_WorldDir_get(iPcRegion *self){ return (const char*)(self->GetWorldDir()); }
SWIGINTERN void iPcRegion_RegionName_set(iPcRegion *self,char const *_val){ self->SetRegionName(_val); }
SWIGINTERN char const *iPcRegion_RegionName_get(iPcRegion *self){ return (const char*)(self->GetRegionName()); }
+SWIGINTERN iRegion *iPcRegion_Region_get(iPcRegion *self){ return (iRegion*)(self->GetRegion()); }
SWIGINTERN bool iPcRegion_LoadWorld(iPcRegion *self,char const *vfsdir,char const *name){
self->SetWorldFile (vfsdir, name);
return self->Load ();
@@ -5817,9 +5777,11 @@
SWIGINTERN void iCelMapFile_SectorName_set(iCelMapFile *self,char const *_val){ self->SetSectorName(_val); }
SWIGINTERN char const *iCelMapFile_SectorName_get(iCelMapFile *self){ return (const char*)(self->GetSectorName()); }
SWIGINTERN char const *iCelRegion_Name_get(iCelRegion *self){ return (const char*)(self->GetName()); }
+SWIGINTERN char const *iCelRegion_CsRegionName_get(iCelRegion *self){ return (const char*)(self->GetCsRegionName()); }
SWIGINTERN void iCelRegion_CachePath_set(iCelRegion *self,char const *_val){ self->SetCachePath(_val); }
SWIGINTERN char const *iCelRegion_CachePath_get(iCelRegion *self){ return (const char*)(self->GetCachePath()); }
SWIGINTERN size_t iCelRegion_MapFileCount_get(iCelRegion *self){ return (size_t)(self->GetMapFileCount()); }
+SWIGINTERN iRegion *iCelRegion_CsRegion_get(iCelRegion *self){ return (iRegion*)(self->GetCsRegion()); }
SWIGINTERN char const *iCelZone_Name_get(iCelZone *self){ return (const char*)(self->GetName()); }
SWIGINTERN size_t iCelZone_RegionCount_get(iCelZone *self){ return (size_t)(self->GetRegionCount()); }
SWIGINTERN bool iPcZoneManager_ColliderWrappers_get(iPcZoneManager *self){ return (bool)(self->IsColliderWrappers()); }
@@ -5951,6 +5913,13 @@
return iface;
}
+
+SWIGINTERNINLINE PyObject *
+SWIG_From_unsigned_SS_int (unsigned int value)
+{
+ return SWIG_From_unsigned_SS_long (value);
+}
+
SWIGINTERN void iPcLinearMovement_Anchor_set(iPcLinearMovement *self,iPcMesh *_val){ self->SetAnchor(_val); }
SWIGINTERN iPcMesh *iPcLinearMovement_Anchor_get(iPcLinearMovement *self){ return (iPcMesh*)(self->GetAnchor()); }
SWIGINTERN void iPcLinearMovement_Speed_set(iPcLinearMovement *self,float _val){ self->SetSpeed (_val); }
@@ -6118,6 +6087,10 @@
return iface;
}
+SWIGINTERN void iPcActorAnalog_MovementSpeed_set(iPcActorAnalog *self,float _val){ self->SetMovementSpeed (_val); }
+SWIGINTERN void iPcActorAnalog_TurningSpeed_set(iPcActorAnalog *self,float _val){ self->SetTurningSpeed (_val); }
+SWIGINTERN int iPcActorAnalog_scfGetVersion(){ return scfInterfaceTraits::GetVersion(); }
+SWIGINTERN void delete_iPcActorAnalog(iPcActorAnalog *self){ if (self) self->DecRef (); }
iPcActorAnalog *celCreateActorAnalog(iCelPlLayer *pl, iCelEntity *entity, const char* tagname = 0 )
{
@@ -6175,124 +6148,6 @@
return iface;
}
-SWIGINTERN int iPcAnalogMotion_scfGetVersion(){ return scfInterfaceTraits::GetVersion(); }
-SWIGINTERN void delete_iPcAnalogMotion(iPcAnalogMotion *self){ if (self) self->DecRef (); }
-
-iPcAnalogMotion *celCreateAnalogMotion(iCelPlLayer *pl, iCelEntity *entity, const char* tagname = 0 )
-{
- CS_ASSERT (entity != 0);
- csRef pc;
- if (tagname)
- pc = pl->CreateTaggedPropertyClass(entity,"pcmove.analogmotion", tagname);
- else
- pc = pl->CreatePropertyClass(entity,"pcmove.analogmotion" );
- if (!pc.IsValid()) return 0;
- csRef pclm = scfQueryInterface(pc);
- if (!pclm.IsValid()) return 0;
- return pclm;
-}
-
-
-iPcAnalogMotion * celGetSetAnalogMotion (iCelPlLayer *pl, iCelEntity *entity, const char* tagname = 0)
-{
- CS_ASSERT (entity != 0);
- csRef pclm;
- if (tagname)
- pclm = (celQueryPropertyClassTag (entity->GetPropertyClassList (),tagname));
- else
- pclm = (celQueryPropertyClass (entity->GetPropertyClassList ()));
- if (pclm.IsValid()) return pclm;
- csRef pc;
- if (tagname)
- pc = pl->CreateTaggedPropertyClass(entity,"pcmove.analogmotion", tagname );
- else
- pc = pl->CreatePropertyClass(entity,"pcmove.analogmotion" );
- if (!pc.IsValid()) return 0;
- pclm = scfQueryInterface(pc);
- if (!pclm.IsValid()) return 0;
- return pclm;
-}
-
-
-iPcAnalogMotion * celGetAnalogMotion (iCelEntity *entity, const char* tagname = 0 )
-{
- CS_ASSERT (entity != 0);
- csRef pc;
- if (tagname)
- pc = (celQueryPropertyClassTag (entity->GetPropertyClassList (),tagname));
- else
- pc = (celQueryPropertyClass (entity->GetPropertyClassList ()));
- if (!pc.IsValid()) return 0;
- return pc;
-}
-
-
-iPcAnalogMotion *scfQuery_iPcAnalogMotion (iCelPropertyClass *pc)
-{
- csRef iface = scfQueryInterface(pc);
- if (iface) iface->IncRef ();
- return iface;
-}
-
-SWIGINTERN int iPcJump_scfGetVersion(){ return scfInterfaceTraits::GetVersion(); }
-SWIGINTERN void delete_iPcJump(iPcJump *self){ if (self) self->DecRef (); }
-
-iPcJump *celCreateJump(iCelPlLayer *pl, iCelEntity *entity, const char* tagname = 0 )
-{
- CS_ASSERT (entity != 0);
- csRef pc;
- if (tagname)
- pc = pl->CreateTaggedPropertyClass(entity,"pcmove.jump", tagname);
- else
- pc = pl->CreatePropertyClass(entity,"pcmove.jump" );
- if (!pc.IsValid()) return 0;
- csRef pclm = scfQueryInterface(pc);
- if (!pclm.IsValid()) return 0;
- return pclm;
-}
-
-
-iPcJump * celGetSetJump (iCelPlLayer *pl, iCelEntity *entity, const char* tagname = 0)
-{
- CS_ASSERT (entity != 0);
- csRef pclm;
- if (tagname)
- pclm = (celQueryPropertyClassTag (entity->GetPropertyClassList (),tagname));
- else
- pclm = (celQueryPropertyClass (entity->GetPropertyClassList ()));
- if (pclm.IsValid()) return pclm;
- csRef pc;
- if (tagname)
- pc = pl->CreateTaggedPropertyClass(entity,"pcmove.jump", tagname );
- else
- pc = pl->CreatePropertyClass(entity,"pcmove.jump" );
- if (!pc.IsValid()) return 0;
- pclm = scfQueryInterface(pc);
- if (!pclm.IsValid()) return 0;
- return pclm;
-}
-
-
-iPcJump * celGetJump (iCelEntity *entity, const char* tagname = 0 )
-{
- CS_ASSERT (entity != 0);
- csRef pc;
- if (tagname)
- pc = (celQueryPropertyClassTag (entity->GetPropertyClassList (),tagname));
- else
- pc = (celQueryPropertyClass (entity->GetPropertyClassList ()));
- if (!pc.IsValid()) return 0;
- return pc;
-}
-
-
-iPcJump *scfQuery_iPcJump (iCelPropertyClass *pc)
-{
- csRef iface = scfQueryInterface(pc);
- if (iface) iface->IncRef ();
- return iface;
-}
-
SWIGINTERN iCamera *iPcCamera_Camera_get(iPcCamera *self){ return (iCamera*)(self->GetCamera()); }
SWIGINTERN iView *iPcCamera_View_get(iPcCamera *self){ return (iView*)(self->GetView()); }
SWIGINTERN void iPcCamera_ClearZBuffer_set(iPcCamera *self,bool _val){ self->SetClearZBuffer(_val); }
@@ -8785,17 +8640,6 @@
};
-class pyPcInventoryListener :
- public scfImplementation1
-{
-public:
- pyPcInventoryListener(iObjectRegistry* object_reg) : scfImplementationType (this) {}
-~pyPcInventoryListener() {}
- virtual void AddChild (iPcInventory* inventory, iCelEntity* entity) { }
- virtual void RemoveChild (iPcInventory* inventory, iCelEntity* entity) { }
-};
-
-
/* ---------------------------------------------------
* C++ director class methods
@@ -8932,7 +8776,7 @@
celDataType SwigDirector_pyPcCommon::GetPropertyOrActionType(csStringID id) {
celDataType c_result;
swig::PyObject_var obj0;
- obj0 = PyLong_FromUnsignedLong((unsigned long)id);
+ obj0 = SWIG_From_unsigned_SS_long(static_cast< unsigned long >(id));
if (!swig_get_self()) {
Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call pyPcCommon.__init__.");
}
@@ -8967,7 +8811,7 @@
bool SwigDirector_pyPcCommon::IsPropertyReadOnly(csStringID arg0) {
bool c_result;
swig::PyObject_var obj0;
- obj0 = PyLong_FromUnsignedLong((unsigned long)arg0);
+ obj0 = SWIG_From_unsigned_SS_long(static_cast< unsigned long >(arg0));
if (!swig_get_self()) {
Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call pyPcCommon.__init__.");
}
@@ -9002,7 +8846,7 @@
long SwigDirector_pyPcCommon::GetPropertyLongByID(csStringID id) {
long c_result;
swig::PyObject_var obj0;
- obj0 = PyLong_FromUnsignedLong((unsigned long)id);
+ obj0 = SWIG_From_unsigned_SS_long(static_cast< unsigned long >(id));
if (!swig_get_self()) {
Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call pyPcCommon.__init__.");
}
@@ -9037,7 +8881,7 @@
float SwigDirector_pyPcCommon::GetPropertyFloatByID(csStringID id) {
float c_result;
swig::PyObject_var obj0;
- obj0 = PyLong_FromUnsignedLong((unsigned long)id);
+ obj0 = SWIG_From_unsigned_SS_long(static_cast< unsigned long >(id));
if (!swig_get_self()) {
Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call pyPcCommon.__init__.");
}
@@ -9072,7 +8916,7 @@
bool SwigDirector_pyPcCommon::GetPropertyBoolByID(csStringID id) {
bool c_result;
swig::PyObject_var obj0;
- obj0 = PyLong_FromUnsignedLong((unsigned long)id);
+ obj0 = SWIG_From_unsigned_SS_long(static_cast< unsigned long >(id));
if (!swig_get_self()) {
Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call pyPcCommon.__init__.");
}
@@ -9111,7 +8955,7 @@
char *c_result;
swig::PyObject_var obj0;
- obj0 = PyLong_FromUnsignedLong((unsigned long)id);
+ obj0 = SWIG_From_unsigned_SS_long(static_cast< unsigned long >(id));
if (!swig_get_self()) {
Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call pyPcCommon.__init__.");
}
@@ -9148,7 +8992,7 @@
bool SwigDirector_pyPcCommon::GetPropertyVectorByID(csStringID id, csVector2 &v) {
bool c_result;
swig::PyObject_var obj0;
- obj0 = PyLong_FromUnsignedLong((unsigned long)id);
+ obj0 = SWIG_From_unsigned_SS_long(static_cast< unsigned long >(id));
swig::PyObject_var obj1;
obj1 = SWIG_NewPointerObj(SWIG_as_voidptr(&v), SWIGTYPE_p_csVector2, 0 );
if (!swig_get_self()) {
@@ -9185,7 +9029,7 @@
bool SwigDirector_pyPcCommon::GetPropertyVectorByID(csStringID id, csVector3 &v) {
bool c_result;
swig::PyObject_var obj0;
- obj0 = PyLong_FromUnsignedLong((unsigned long)id);
+ obj0 = SWIG_From_unsigned_SS_long(static_cast< unsigned long >(id));
swig::PyObject_var obj1;
obj1 = SWIG_NewPointerObj(SWIG_as_voidptr(&v), SWIGTYPE_p_csVector3, 0 );
if (!swig_get_self()) {
@@ -9222,7 +9066,7 @@
bool SwigDirector_pyPcCommon::GetPropertyColorByID(csStringID id, csColor &v) {
bool c_result;
swig::PyObject_var obj0;
- obj0 = PyLong_FromUnsignedLong((unsigned long)id);
+ obj0 = SWIG_From_unsigned_SS_long(static_cast< unsigned long >(id));
swig::PyObject_var obj1;
obj1 = SWIG_NewPointerObj(SWIG_as_voidptr(&v), SWIGTYPE_p_csColor, 0 );
if (!swig_get_self()) {
@@ -9263,7 +9107,7 @@
iCelPropertyClass *c_result;
swig::PyObject_var obj0;
- obj0 = PyLong_FromUnsignedLong((unsigned long)id);
+ obj0 = SWIG_From_unsigned_SS_long(static_cast< unsigned long >(id));
if (!swig_get_self()) {
Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call pyPcCommon.__init__.");
}
@@ -9302,7 +9146,7 @@
iCelEntity *c_result;
swig::PyObject_var obj0;
- obj0 = PyLong_FromUnsignedLong((unsigned long)id);
+ obj0 = SWIG_From_unsigned_SS_long(static_cast< unsigned long >(id));
if (!swig_get_self()) {
Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call pyPcCommon.__init__.");
}
@@ -9341,7 +9185,7 @@
iBase *c_result;
swig::PyObject_var obj0;
- obj0 = PyLong_FromUnsignedLong((unsigned long)id);
+ obj0 = SWIG_From_unsigned_SS_long(static_cast< unsigned long >(id));
if (!swig_get_self()) {
Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call pyPcCommon.__init__.");
}
@@ -9376,7 +9220,7 @@
bool SwigDirector_pyPcCommon::PerformAction(csStringID actionID, iCelParameterBlock *params, celData &ret) {
bool c_result;
swig::PyObject_var obj0;
- obj0 = PyLong_FromUnsignedLong((unsigned long)actionID);
+ obj0 = SWIG_From_unsigned_SS_long(static_cast< unsigned long >(actionID));
swig::PyObject_var obj1;
obj1 = SWIG_NewPointerObj(SWIG_as_voidptr(params), SWIGTYPE_p_iCelParameterBlock, 0 );
swig::PyObject_var obj2;
@@ -9471,9 +9315,12 @@
}
}
}
- {
- c_result = (csStringID)PyLong_AsUnsignedLong(result);
+ unsigned long swig_val;
+ int swig_res = SWIG_AsVal_unsigned_SS_long(result, &swig_val);
+ if (!SWIG_IsOK(swig_res)) {
+ Swig::DirectorTypeMismatchException::raise(SWIG_ErrorType(SWIG_ArgError(swig_res)), "in output value of type '""csStringID""'");
}
+ c_result = static_cast< csStringID >(swig_val);
return (csStringID) c_result;
}
@@ -9485,7 +9332,7 @@
char *c_result;
swig::PyObject_var obj0;
- obj0 = PyLong_FromUnsignedLong((unsigned long)arg0);
+ obj0 = SWIG_From_unsigned_SS_long(static_cast< unsigned long >(arg0));
if (!swig_get_self()) {
Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call pyPcCommon.__init__.");
}
@@ -10427,7 +10274,7 @@
bool SwigDirector_pyMessageReceiver::ReceiveMessage(csStringID msg_id, iMessageSender *sender, celData &ret, iCelParameterBlock *params) {
bool c_result;
swig::PyObject_var obj0;
- obj0 = PyLong_FromUnsignedLong((unsigned long)msg_id);
+ obj0 = SWIG_From_unsigned_SS_long(static_cast< unsigned long >(msg_id));
swig::PyObject_var obj1;
obj1 = SWIG_NewPointerObj(SWIG_as_voidptr(sender), SWIGTYPE_p_iMessageSender, 0 );
swig::PyObject_var obj2;
@@ -10504,74 +10351,6 @@
}
-SwigDirector_pyPcInventoryListener::SwigDirector_pyPcInventoryListener(PyObject *self, iObjectRegistry *object_reg): pyPcInventoryListener(object_reg), Swig::Director(self) {
- SWIG_DIRECTOR_RGTR((pyPcInventoryListener *)this, this);
-}
-
-
-
-
-SwigDirector_pyPcInventoryListener::~SwigDirector_pyPcInventoryListener() {
-}
-
-void SwigDirector_pyPcInventoryListener::AddChild(iPcInventory *inventory, iCelEntity *entity) {
- swig::PyObject_var obj0;
- obj0 = SWIG_NewPointerObj(SWIG_as_voidptr(inventory), SWIGTYPE_p_iPcInventory, 0 );
- swig::PyObject_var obj1;
- obj1 = SWIG_NewPointerObj(SWIG_as_voidptr(entity), SWIGTYPE_p_iCelEntity, 0 );
- if (!swig_get_self()) {
- Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call pyPcInventoryListener.__init__.");
- }
-#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
- const size_t swig_method_index = 0;
- const char * const swig_method_name = "AddChild";
- PyObject* method = swig_get_method(swig_method_index, swig_method_name);
- swig::PyObject_var result = PyObject_CallFunctionObjArgs(method ,(PyObject *)obj0,(PyObject *)obj1, NULL);
-#else
- swig::PyObject_var swig_method_name = PyString_FromString((char *)"AddChild");
- swig::PyObject_var result = PyObject_CallMethodObjArgs(swig_get_self(), (PyObject *) swig_method_name ,(PyObject *)obj0,(PyObject *)obj1, NULL);
-#endif
- if (result == NULL) {
- PyObject *error = PyErr_Occurred();
- {
- if (error != NULL) {
- PyErr_Print ();
- //throw Swig::DirectorMethodException();
- }
- }
- }
-}
-
-
-void SwigDirector_pyPcInventoryListener::RemoveChild(iPcInventory *inventory, iCelEntity *entity) {
- swig::PyObject_var obj0;
- obj0 = SWIG_NewPointerObj(SWIG_as_voidptr(inventory), SWIGTYPE_p_iPcInventory, 0 );
- swig::PyObject_var obj1;
- obj1 = SWIG_NewPointerObj(SWIG_as_voidptr(entity), SWIGTYPE_p_iCelEntity, 0 );
- if (!swig_get_self()) {
- Swig::DirectorException::raise("'self' uninitialized, maybe you forgot to call pyPcInventoryListener.__init__.");
- }
-#if defined(SWIG_PYTHON_DIRECTOR_VTABLE)
- const size_t swig_method_index = 1;
- const char * const swig_method_name = "RemoveChild";
- PyObject* method = swig_get_method(swig_method_index, swig_method_name);
- swig::PyObject_var result = PyObject_CallFunctionObjArgs(method ,(PyObject *)obj0,(PyObject *)obj1, NULL);
-#else
- swig::PyObject_var swig_method_name = PyString_FromString((char *)"RemoveChild");
- swig::PyObject_var result = PyObject_CallMethodObjArgs(swig_get_self(), (PyObject *) swig_method_name ,(PyObject *)obj0,(PyObject *)obj1, NULL);
-#endif
- if (result == NULL) {
- PyObject *error = PyErr_Occurred();
- {
- if (error != NULL) {
- PyErr_Print ();
- //throw Swig::DirectorMethodException();
- }
- }
- }
-}
-
-
#ifdef __cplusplus
extern "C" {
#endif
@@ -10741,7 +10520,7 @@
PyObject *resultobj = 0;
char *arg1 = (char *) 0 ;
scfInterfaceVersion arg2 ;
- SwigValueWrapper > arg3 ;
+ SwigValueWrapper< csPtr > arg3 ;
celWrapPtr *result = 0 ;
int res1 ;
char *buf1 = 0 ;
@@ -10792,7 +10571,7 @@
PyObject *resultobj = 0;
char *arg1 = (char *) 0 ;
scfInterfaceVersion arg2 ;
- SwigValueWrapper > arg3 ;
+ SwigValueWrapper< csRef > arg3 ;
celWrapPtr *result = 0 ;
int res1 ;
char *buf1 = 0 ;
@@ -10870,7 +10649,7 @@
int ii;
if (!PyTuple_Check(args)) SWIG_fail;
- argc = PyObject_Length(args);
+ argc = (int)PyObject_Length(args);
for (ii = 0; (ii < argc) && (ii < 3); ii++) {
argv[ii] = PyTuple_GET_ITEM(args,ii);
}
@@ -10920,7 +10699,7 @@
}
fail:
- SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_celWrapPtr'.\n Possible C/C++ prototypes are:\n celWrapPtr(char const *,scfInterfaceVersion,csPtr)\n celWrapPtr(char const *,scfInterfaceVersion,csRef)\n celWrapPtr(celWrapPtr const &)\n");
+ SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_celWrapPtr'.\n Possible C/C++ prototypes are:\n"" celWrapPtr(char const *,scfInterfaceVersion,csPtr)\n"" celWrapPtr(char const *,scfInterfaceVersion,csRef)\n"" celWrapPtr(celWrapPtr const &)\n");
return NULL;
}
@@ -10993,7 +10772,7 @@
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "celInitializer__RequestPlugins" "', argument " "1"" of type '" "iObjectRegistry *""'");
}
arg1 = reinterpret_cast< iObjectRegistry * >(argp1);
- res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_csArrayTcsPluginRequest_csArrayElementHandlerTcsPluginRequest_t_CS__Memory__AllocatorMalloc_csArrayCapacityFixedGrowT16_t_t, 0 | 0);
+ res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_csArrayTcsPluginRequest_csArrayElementHandlerTcsPluginRequest_t_CS__Memory__AllocatorMalloc_csArrayCapacityDefault_t, 0 | 0);
if (!SWIG_IsOK(res2)) {
SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "celInitializer__RequestPlugins" "', argument " "2"" of type '" "csArray const &""'");
}
@@ -11071,7 +10850,7 @@
int ii;
if (!PyTuple_Check(args)) SWIG_fail;
- argc = PyObject_Length(args);
+ argc = (int)PyObject_Length(args);
for (ii = 0; (ii < argc) && (ii < 2); ii++) {
argv[ii] = PyTuple_GET_ITEM(args,ii);
}
@@ -11099,7 +10878,7 @@
}
fail:
- SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'celInitializer_SetupVFS'.\n Possible C/C++ prototypes are:\n SetupVFS(iObjectRegistry *,char const *)\n celInitializer::SetupVFS(iObjectRegistry *)\n");
+ SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'celInitializer_SetupVFS'.\n Possible C/C++ prototypes are:\n"" SetupVFS(iObjectRegistry *,char const *)\n"" celInitializer::SetupVFS(iObjectRegistry *)\n");
return NULL;
}
@@ -11587,7 +11366,7 @@
int ii;
if (!PyTuple_Check(args)) SWIG_fail;
- argc = PyObject_Length(args);
+ argc = (int)PyObject_Length(args);
for (ii = 0; (ii < argc) && (ii < 3); ii++) {
argv[ii] = PyTuple_GET_ITEM(args,ii);
}
@@ -11627,7 +11406,7 @@
}
fail:
- SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'celDataArrayChangeAll_SetSize'.\n Possible C/C++ prototypes are:\n SetSize(size_t,celData const &)\n SetSize(size_t)\n");
+ SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'celDataArrayChangeAll_SetSize'.\n Possible C/C++ prototypes are:\n"" SetSize(iArrayChangeAll *,size_t,celData const &)\n"" SetSize(iArrayChangeAll *,size_t)\n");
return NULL;
}
@@ -12135,7 +11914,7 @@
int ii;
if (!PyTuple_Check(args)) SWIG_fail;
- argc = PyObject_Length(args);
+ argc = (int)PyObject_Length(args);
for (ii = 0; (ii < argc) && (ii < 1); ii++) {
argv[ii] = PyTuple_GET_ITEM(args,ii);
}
@@ -12152,7 +11931,7 @@
}
fail:
- SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_celData'.\n Possible C/C++ prototypes are:\n celData()\n celData(celData const &)\n");
+ SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_celData'.\n Possible C/C++ prototypes are:\n"" celData()\n"" celData(celData const &)\n");
return NULL;
}
@@ -12311,8 +12090,8 @@
uint8 arg2 ;
void *argp1 = 0 ;
int res1 = 0 ;
- unsigned char val2 ;
- int ecode2 = 0 ;
+ void *argp2 ;
+ int res2 = 0 ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
@@ -12322,11 +12101,19 @@
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "celData_Set" "', argument " "1"" of type '" "celData *""'");
}
arg1 = reinterpret_cast< celData * >(argp1);
- ecode2 = SWIG_AsVal_unsigned_SS_char(obj1, &val2);
- if (!SWIG_IsOK(ecode2)) {
- SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "celData_Set" "', argument " "2"" of type '" "uint8""'");
- }
- arg2 = static_cast< uint8 >(val2);
+ {
+ res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_uint8_t, 0 | 0);
+ if (!SWIG_IsOK(res2)) {
+ SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "celData_Set" "', argument " "2"" of type '" "uint8""'");
+ }
+ if (!argp2) {
+ SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "celData_Set" "', argument " "2"" of type '" "uint8""'");
+ } else {
+ uint8 * temp = reinterpret_cast< uint8 * >(argp2);
+ arg2 = *temp;
+ if (SWIG_IsNewObj(res2)) delete temp;
+ }
+ }
(arg1)->Set(arg2);
resultobj = SWIG_Py_Void();
return resultobj;
@@ -12765,7 +12552,7 @@
int ii;
if (!PyTuple_Check(args)) SWIG_fail;
- argc = PyObject_Length(args);
+ argc = (int)PyObject_Length(args);
for (ii = 0; (ii < argc) && (ii < 2); ii++) {
argv[ii] = PyTuple_GET_ITEM(args,ii);
}
@@ -12788,6 +12575,19 @@
int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_celData, 0);
_v = SWIG_CheckState(res);
if (_v) {
+ int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_uint8_t, 0);
+ _v = SWIG_CheckState(res);
+ if (_v) {
+ return _wrap_celData_Set__SWIG_2(self, args);
+ }
+ }
+ }
+ if (argc == 2) {
+ int _v;
+ void *vptr = 0;
+ int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_celData, 0);
+ _v = SWIG_CheckState(res);
+ if (_v) {
int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_int16_t, 0);
_v = SWIG_CheckState(res);
if (_v) {
@@ -12908,21 +12708,6 @@
_v = SWIG_CheckState(res);
if (_v) {
{
- int res = SWIG_AsVal_unsigned_SS_char(argv[1], NULL);
- _v = SWIG_CheckState(res);
- }
- if (_v) {
- return _wrap_celData_Set__SWIG_2(self, args);
- }
- }
- }
- if (argc == 2) {
- int _v;
- void *vptr = 0;
- int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_celData, 0);
- _v = SWIG_CheckState(res);
- if (_v) {
- {
int res = SWIG_AsVal_int(argv[1], NULL);
_v = SWIG_CheckState(res);
}
@@ -12991,7 +12776,7 @@
}
fail:
- SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'celData_Set'.\n Possible C/C++ prototypes are:\n Set(bool)\n Set(int8)\n Set(uint8)\n Set(int16)\n Set(uint16)\n Set(int32)\n Set(uint32)\n Set(float)\n Set(csVector2 const &)\n Set(csVector3 const &)\n Set(csVector4 const &)\n Set(csColor const &)\n Set(csColor4 const &)\n Set(char const *)\n Set(iCelPropertyClass *)\n Set(iCelEntity *)\n");
+ SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'celData_Set'.\n Possible C/C++ prototypes are:\n"" Set(celData *,bool)\n"" Set(celData *,int8)\n"" Set(celData *,uint8)\n"" Set(celData *,int16)\n"" Set(celData *,uint16)\n"" Set(celData *,int32)\n"" Set(celData *,uint32)\n"" Set(celData *,float)\n"" Set(celData *,csVector2 const &)\n"" Set(celData *,csVector3 const &)\n"" Set(celData *,csVector4 const &)\n"" Set(celData *,csColor const &)\n"" Set(celData *,csColor4 const &)\n"" Set(celData *,char const *)\n"" Set(celData *,iCelPropertyClass *)\n"" Set(celData *,iCelEntity *)\n");
return NULL;
}
@@ -13250,8 +13035,8 @@
uint8 arg2 ;
void *argp1 = 0 ;
int res1 = 0 ;
- unsigned char val2 ;
- int ecode2 = 0 ;
+ void *argp2 ;
+ int res2 = 0 ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
@@ -13261,11 +13046,19 @@
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "celData_value_ub_set" "', argument " "1"" of type '" "celData_value *""'");
}
arg1 = reinterpret_cast< celData_value * >(argp1);
- ecode2 = SWIG_AsVal_unsigned_SS_char(obj1, &val2);
- if (!SWIG_IsOK(ecode2)) {
- SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "celData_value_ub_set" "', argument " "2"" of type '" "uint8""'");
- }
- arg2 = static_cast< uint8 >(val2);
+ {
+ res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_uint8_t, 0 | 0);
+ if (!SWIG_IsOK(res2)) {
+ SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "celData_value_ub_set" "', argument " "2"" of type '" "uint8""'");
+ }
+ if (!argp2) {
+ SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "celData_value_ub_set" "', argument " "2"" of type '" "uint8""'");
+ } else {
+ uint8 * temp = reinterpret_cast< uint8 * >(argp2);
+ arg2 = *temp;
+ if (SWIG_IsNewObj(res2)) delete temp;
+ }
+ }
if (arg1) (arg1)->ub = arg2;
resultobj = SWIG_Py_Void();
@@ -13289,8 +13082,8 @@
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "celData_value_ub_get" "', argument " "1"" of type '" "celData_value *""'");
}
arg1 = reinterpret_cast< celData_value * >(argp1);
- result = (uint8) ((arg1)->ub);
- resultobj = SWIG_From_unsigned_SS_char(static_cast< unsigned char >(result));
+ result = ((arg1)->ub);
+ resultobj = SWIG_NewPointerObj((new uint8(static_cast< const uint8& >(result))), SWIGTYPE_p_uint8_t, SWIG_POINTER_OWN | 0 );
return resultobj;
fail:
return NULL;
@@ -14628,7 +14421,7 @@
iMessageSender *arg2 = (iMessageSender *) 0 ;
char *arg3 = (char *) 0 ;
iMessageReceiverFilter *arg4 = (iMessageReceiverFilter *) 0 ;
- SwigValueWrapper > result;
+ SwigValueWrapper< csRef > result;
void *argp1 = 0 ;
int res1 = 0 ;
void *argp2 = 0 ;
@@ -14666,7 +14459,7 @@
arg4 = reinterpret_cast< iMessageReceiverFilter * >(argp4);
result = (arg1)->CreateMessageDispatcher(arg2,(char const *)arg3,arg4);
{
- /*@SWIG:TYPEMAP_OUT_csRef_BODY@*/
+ /*@SWIG:csinclude/bindings/python/pythpre.i,114,TYPEMAP_OUT_csRef_BODY@*/
csRef ref((csRef&)result); /* explicit cast */
if (!ref.IsValid())
@@ -14691,7 +14484,7 @@
iMessageChannel *arg1 = (iMessageChannel *) 0 ;
iMessageSender *arg2 = (iMessageSender *) 0 ;
char *arg3 = (char *) 0 ;
- SwigValueWrapper > result;
+ SwigValueWrapper< csRef > result;
void *argp1 = 0 ;
int res1 = 0 ;
void *argp2 = 0 ;
@@ -14721,7 +14514,7 @@
arg3 = reinterpret_cast< char * >(buf3);
result = (arg1)->CreateMessageDispatcher(arg2,(char const *)arg3);
{
- /*@SWIG:TYPEMAP_OUT_csRef_BODY@*/
+ /*@SWIG:csinclude/bindings/python/pythpre.i,114,TYPEMAP_OUT_csRef_BODY@*/
csRef ref((csRef&)result); /* explicit cast */
if (!ref.IsValid())
@@ -14747,7 +14540,7 @@
int ii;
if (!PyTuple_Check(args)) SWIG_fail;
- argc = PyObject_Length(args);
+ argc = (int)PyObject_Length(args);
for (ii = 0; (ii < argc) && (ii < 4); ii++) {
argv[ii] = PyTuple_GET_ITEM(args,ii);
}
@@ -14794,7 +14587,7 @@
}
fail:
- SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'iMessageChannel_CreateMessageDispatcher'.\n Possible C/C++ prototypes are:\n CreateMessageDispatcher(iMessageSender *,char const *,iMessageReceiverFilter *)\n CreateMessageDispatcher(iMessageSender *,char const *)\n");
+ SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'iMessageChannel_CreateMessageDispatcher'.\n Possible C/C++ prototypes are:\n"" CreateMessageDispatcher(iMessageChannel *,iMessageSender *,char const *,iMessageReceiverFilter *)\n"" CreateMessageDispatcher(iMessageChannel *,iMessageSender *,char const *)\n");
return NULL;
}
@@ -14949,7 +14742,7 @@
int ii;
if (!PyTuple_Check(args)) SWIG_fail;
- argc = PyObject_Length(args);
+ argc = (int)PyObject_Length(args);
for (ii = 0; (ii < argc) && (ii < 3); ii++) {
argv[ii] = PyTuple_GET_ITEM(args,ii);
}
@@ -14987,7 +14780,7 @@
}
fail:
- SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'iMessageChannel_Unsubscribe'.\n Possible C/C++ prototypes are:\n Unsubscribe(iMessageReceiver *,char const *)\n Unsubscribe(iMessageReceiver *)\n");
+ SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'iMessageChannel_Unsubscribe'.\n Possible C/C++ prototypes are:\n"" Unsubscribe(iMessageChannel *,iMessageReceiver *,char const *)\n"" Unsubscribe(iMessageChannel *,iMessageReceiver *)\n");
return NULL;
}
@@ -15111,7 +14904,7 @@
int ii;
if (!PyTuple_Check(args)) SWIG_fail;
- argc = PyObject_Length(args);
+ argc = (int)PyObject_Length(args);
for (ii = 0; (ii < argc) && (ii < 5); ii++) {
argv[ii] = PyTuple_GET_ITEM(args,ii);
}
@@ -15168,7 +14961,7 @@
}
fail:
- SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'iMessageChannel_SendMessage'.\n Possible C/C++ prototypes are:\n SendMessage(char const *,iMessageSender *,iCelParameterBlock *,iCelDataArray *)\n SendMessage(char const *,iMessageSender *,iCelParameterBlock *)\n");
+ SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'iMessageChannel_SendMessage'.\n Possible C/C++ prototypes are:\n"" SendMessage(iMessageChannel *,char const *,iMessageSender *,iCelParameterBlock *,iCelDataArray *)\n"" SendMessage(iMessageChannel *,char const *,iMessageSender *,iCelParameterBlock *)\n");
return NULL;
}
@@ -15205,13 +14998,15 @@
SWIGINTERN PyObject *_wrap_iMessageReceiver_ReceiveMessage(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
iMessageReceiver *arg1 = (iMessageReceiver *) 0 ;
- SwigValueWrapper > arg2 ;
+ csStringID arg2 ;
iMessageSender *arg3 = (iMessageSender *) 0 ;
celData *arg4 = 0 ;
iCelParameterBlock *arg5 = (iCelParameterBlock *) 0 ;
bool result;
void *argp1 = 0 ;
int res1 = 0 ;
+ unsigned long val2 ;
+ int ecode2 = 0 ;
void *argp3 = 0 ;
int res3 = 0 ;
void *argp4 = 0 ;
@@ -15230,9 +15025,11 @@
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "iMessageReceiver_ReceiveMessage" "', argument " "1"" of type '" "iMessageReceiver *""'");
}
arg1 = reinterpret_cast< iMessageReceiver * >(argp1);
- {
- arg2 = (csStringID)PyLong_AsUnsignedLong(obj1);
- }
+ ecode2 = SWIG_AsVal_unsigned_SS_long(obj1, &val2);
+ if (!SWIG_IsOK(ecode2)) {
+ SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "iMessageReceiver_ReceiveMessage" "', argument " "2"" of type '" "csStringID""'");
+ }
+ arg2 = static_cast< csStringID >(val2);
res3 = SWIG_ConvertPtr(obj2, &argp3,SWIGTYPE_p_iMessageSender, 0 | 0 );
if (!SWIG_IsOK(res3)) {
SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "iMessageReceiver_ReceiveMessage" "', argument " "3"" of type '" "iMessageSender *""'");
@@ -15484,7 +15281,7 @@
int ii;
if (!PyTuple_Check(args)) SWIG_fail;
- argc = PyObject_Length(args);
+ argc = (int)PyObject_Length(args);
for (ii = 0; (ii < argc) && (ii < 3); ii++) {
argv[ii] = PyTuple_GET_ITEM(args,ii);
}
@@ -15523,7 +15320,7 @@
}
fail:
- SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'iMessageDispatcher_SendMessage'.\n Possible C/C++ prototypes are:\n SendMessage(iCelParameterBlock *,iCelDataArray *)\n SendMessage(iCelParameterBlock *)\n");
+ SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'iMessageDispatcher_SendMessage'.\n Possible C/C++ prototypes are:\n"" SendMessage(iMessageDispatcher *,iCelParameterBlock *,iCelDataArray *)\n"" SendMessage(iMessageDispatcher *,iCelParameterBlock *)\n");
return NULL;
}
@@ -15707,7 +15504,7 @@
int ii;
if (!PyTuple_Check(args)) SWIG_fail;
- argc = PyObject_Length(args);
+ argc = (int)PyObject_Length(args);
for (ii = 0; (ii < argc) && (ii < 3); ii++) {
argv[ii] = PyTuple_GET_ITEM(args,ii);
}
@@ -15772,7 +15569,7 @@
}
fail:
- SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_celEntityTemplateParams'.\n Possible C/C++ prototypes are:\n csHash<(csStringFast<(12)>,csStringFast<(12)>,CS::Memory::AllocatorMalloc,csArrayElementHandler<(CS::Container::HashElement<(csStringFast<(12)>,csStringFast<(12)>)>)>)>(size_t,size_t,size_t)\n csHash<(csStringFast<(12)>,csStringFast<(12)>,CS::Memory::AllocatorMalloc,csArrayElementHandler<(CS::Container::HashElement<(csStringFast<(12)>,csStringFast<(12)>)>)>)>(size_t,size_t)\n csHash<(csStringFast<(12)>,csStringFast<(12)>,CS::Memory::AllocatorMalloc,csArrayElementHandler<(CS::Container::HashElement<(csStringFast<(12)>,csStringFast<(12)>)>)>)>(size_t)\n csHash<(csStringFast<(12)>,csStringFast<(12)>,CS::Memory::AllocatorMalloc,csArrayElementHandler<(CS::Container::HashElement<(csStringFast<(12)>,csStringFast<(12)>)>)>)>()\n csHash<(csStringFast<(12)>,csStringFast<(12)>,CS::Memory::AllocatorMalloc,csArrayElementHandler<(CS::Container::HashElement<(csStringFast<(12)>,csStringFast<(12)>)>)>)>(csHash,csStringFast<12 >,CS::Memory::AllocatorMalloc,csArrayElementHandler,csStringFast<12 > > > > const &)\n");
+ SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_celEntityTemplateParams'.\n Possible C/C++ prototypes are:\n"" csHash<(csStringFast<(12)>,csStringFast<(12)>,CS::Memory::AllocatorMalloc,csArrayElementHandler<(CS::Container::HashElement<(csStringFast<(12)>,csStringFast<(12)>)>)>)>(size_t,size_t,size_t)\n"" csHash<(csStringFast<(12)>,csStringFast<(12)>,CS::Memory::AllocatorMalloc,csArrayElementHandler<(CS::Container::HashElement<(csStringFast<(12)>,csStringFast<(12)>)>)>)>(size_t,size_t)\n"" csHash<(csStringFast<(12)>,csStringFast<(12)>,CS::Memory::AllocatorMalloc,csArrayElementHandler<(CS::Container::HashElement<(csStringFast<(12)>,csStringFast<(12)>)>)>)>(size_t)\n"" csHash<(csStringFast<(12)>,csStringFast<(12)>,CS::Memory::AllocatorMalloc,csArrayElementHandler<(CS::Container::HashElement<(csStringFast<(12)>,csStringFast<(12)>)>)>)>()\n"" csHash<(csStringFast<(12)>,csStringFast<(12)>,CS::Memory::AllocatorMalloc,csArrayElementHandler<(CS::Container::HashElement<(csStringFast<(12)>,csStringFast<(12)>)>)>)>(csHash,csStringFast<12 >,CS::Memory::AllocatorMalloc,csArrayElementHandler,csStringFast<12 > > > > const &)\n");
return NULL;
}
@@ -15827,7 +15624,7 @@
SWIGINTERN PyObject *_wrap_celEntityTemplateParams_GetAll__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
csHash,csStringFast<12 >,CS::Memory::AllocatorMalloc,csArrayElementHandler,csStringFast<12 > > > > *arg1 = (csHash,csStringFast<12 >,CS::Memory::AllocatorMalloc,csArrayElementHandler,csStringFast<12 > > > > *) 0 ;
- SwigValueWrapper > > result;
+ SwigValueWrapper< csArray > > result;
void *argp1 = 0 ;
int res1 = 0 ;
PyObject * obj0 = 0 ;
@@ -15839,7 +15636,7 @@
}
arg1 = reinterpret_cast< csHash,csStringFast<12 >,CS::Memory::AllocatorMalloc,csArrayElementHandler,csStringFast<12 > > > > * >(argp1);
result = ((csHash,csStringFast<12 >,CS::Memory::AllocatorMalloc,csArrayElementHandler,csStringFast<12 > > > > const *)arg1)->GetAll();
- resultobj = SWIG_NewPointerObj((new csArray >(static_cast< const csArray >& >(result))), SWIGTYPE_p_csArrayTcsStringFastT12_t_csArrayElementHandlerTcsStringFastT12_t_t_CS__Memory__AllocatorMalloc_csArrayCapacityFixedGrowT16_t_t, SWIG_POINTER_OWN | 0 );
+ resultobj = SWIG_NewPointerObj((new csArray >(static_cast< const csArray >& >(result))), SWIGTYPE_p_csArrayTcsStringFastT12_t_csArrayElementHandlerTcsStringFastT12_t_t_CS__Memory__AllocatorMalloc_csArrayCapacityDefault_t, SWIG_POINTER_OWN | 0 );
return resultobj;
fail:
return NULL;
@@ -15850,7 +15647,7 @@
PyObject *resultobj = 0;
csHash,csStringFast<12 >,CS::Memory::AllocatorMalloc,csArrayElementHandler,csStringFast<12 > > > > *arg1 = (csHash,csStringFast<12 >,CS::Memory::AllocatorMalloc,csArrayElementHandler,csStringFast<12 > > > > *) 0 ;
csStringFast<12 > *arg2 = 0 ;
- SwigValueWrapper > > result;
+ SwigValueWrapper< csArray > > result;
void *argp1 = 0 ;
int res1 = 0 ;
PyObject * obj0 = 0 ;
@@ -15866,7 +15663,7 @@
arg2 = new csStringFast<(12)>(PyString_AsString(obj1));
}
result = ((csHash,csStringFast<12 >,CS::Memory::AllocatorMalloc,csArrayElementHandler,csStringFast<12 > > > > const *)arg1)->GetAll((csStringFast<12 > const &)*arg2);
- resultobj = SWIG_NewPointerObj((new csArray >(static_cast< const csArray >& >(result))), SWIGTYPE_p_csArrayTcsStringFastT12_t_csArrayElementHandlerTcsStringFastT12_t_t_CS__Memory__AllocatorMalloc_csArrayCapacityFixedGrowT16_t_t, SWIG_POINTER_OWN | 0 );
+ resultobj = SWIG_NewPointerObj((new csArray >(static_cast< const csArray >& >(result))), SWIGTYPE_p_csArrayTcsStringFastT12_t_csArrayElementHandlerTcsStringFastT12_t_t_CS__Memory__AllocatorMalloc_csArrayCapacityDefault_t, SWIG_POINTER_OWN | 0 );
{
delete arg2;
}
@@ -15885,7 +15682,7 @@
int ii;
if (!PyTuple_Check(args)) SWIG_fail;
- argc = PyObject_Length(args);
+ argc = (int)PyObject_Length(args);
for (ii = 0; (ii < argc) && (ii < 2); ii++) {
argv[ii] = PyTuple_GET_ITEM(args,ii);
}
@@ -15914,7 +15711,7 @@
}
fail:
- SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'celEntityTemplateParams_GetAll'.\n Possible C/C++ prototypes are:\n GetAll()\n GetAll(csStringFast<12 > const &)\n");
+ SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'celEntityTemplateParams_GetAll'.\n Possible C/C++ prototypes are:\n"" GetAll(csHash,csStringFast<12 >,CS::Memory::AllocatorMalloc,csArrayElementHandler,csStringFast<12 > > > > const *)\n"" GetAll(csHash,csStringFast<12 >,CS::Memory::AllocatorMalloc,csArrayElementHandler,csStringFast<12 > > > > const *,csStringFast<12 > const &)\n");
return NULL;
}
@@ -16110,7 +15907,7 @@
int ii;
if (!PyTuple_Check(args)) SWIG_fail;
- argc = PyObject_Length(args);
+ argc = (int)PyObject_Length(args);
for (ii = 0; (ii < argc) && (ii < 2); ii++) {
argv[ii] = PyTuple_GET_ITEM(args,ii);
}
@@ -16144,7 +15941,7 @@
}
fail:
- SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'celEntityTemplateParams_GetElementPointer'.\n Possible C/C++ prototypes are:\n GetElementPointer(csStringFast<12 > const &)\n GetElementPointer(csStringFast<12 > const &)\n");
+ SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'celEntityTemplateParams_GetElementPointer'.\n Possible C/C++ prototypes are:\n"" GetElementPointer(csHash,csStringFast<12 >,CS::Memory::AllocatorMalloc,csArrayElementHandler,csStringFast<12 > > > > const *,csStringFast<12 > const &)\n"" GetElementPointer(csHash,csStringFast<12 >,CS::Memory::AllocatorMalloc,csArrayElementHandler,csStringFast<12 > > > > *,csStringFast<12 > const &)\n");
return NULL;
}
@@ -16288,7 +16085,7 @@
int ii;
if (!PyTuple_Check(args)) SWIG_fail;
- argc = PyObject_Length(args);
+ argc = (int)PyObject_Length(args);
for (ii = 0; (ii < argc) && (ii < 3); ii++) {
argv[ii] = PyTuple_GET_ITEM(args,ii);
}
@@ -16327,7 +16124,7 @@
}
fail:
- SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'celEntityTemplateParams_GetOrCreate'.\n Possible C/C++ prototypes are:\n GetOrCreate(csStringFast<12 > const &,csStringFast<12 > const &)\n GetOrCreate(csStringFast<12 > const &)\n");
+ SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'celEntityTemplateParams_GetOrCreate'.\n Possible C/C++ prototypes are:\n"" GetOrCreate(csHash,csStringFast<12 >,CS::Memory::AllocatorMalloc,csArrayElementHandler,csStringFast<12 > > > > *,csStringFast<12 > const &,csStringFast<12 > const &)\n"" GetOrCreate(csHash,csStringFast<12 >,CS::Memory::AllocatorMalloc,csArrayElementHandler,csStringFast<12 > > > > *,csStringFast<12 > const &)\n");
return NULL;
}
@@ -16413,7 +16210,7 @@
int ii;
if (!PyTuple_Check(args)) SWIG_fail;
- argc = PyObject_Length(args);
+ argc = (int)PyObject_Length(args);
for (ii = 0; (ii < argc) && (ii < 2); ii++) {
argv[ii] = PyTuple_GET_ITEM(args,ii);
}
@@ -16442,7 +16239,7 @@
}
fail:
- SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'celEntityTemplateParams_DeleteAll'.\n Possible C/C++ prototypes are:\n DeleteAll()\n DeleteAll(csStringFast<12 > const &)\n");
+ SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'celEntityTemplateParams_DeleteAll'.\n Possible C/C++ prototypes are:\n"" DeleteAll(csHash,csStringFast<12 >,CS::Memory::AllocatorMalloc,csArrayElementHandler,csStringFast<12 > > > > *)\n"" DeleteAll(csHash,csStringFast<12 >,CS::Memory::AllocatorMalloc,csArrayElementHandler,csStringFast<12 > > > > *,csStringFast<12 > const &)\n");
return NULL;
}
@@ -16881,7 +16678,7 @@
int ii;
if (!PyTuple_Check(args)) SWIG_fail;
- argc = PyObject_Length(args);
+ argc = (int)PyObject_Length(args);
for (ii = 0; (ii < argc) && (ii < 3); ii++) {
argv[ii] = PyTuple_GET_ITEM(args,ii);
}
@@ -16946,7 +16743,7 @@
}
fail:
- SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_celQuestParams'.\n Possible C/C++ prototypes are:\n csHash<(csStringBase,csStringBase,CS::Memory::AllocatorMalloc,csArrayElementHandler<(CS::Container::HashElement<(csStringBase,csStringBase)>)>)>(size_t,size_t,size_t)\n csHash<(csStringBase,csStringBase,CS::Memory::AllocatorMalloc,csArrayElementHandler<(CS::Container::HashElement<(csStringBase,csStringBase)>)>)>(size_t,size_t)\n csHash<(csStringBase,csStringBase,CS::Memory::AllocatorMalloc,csArrayElementHandler<(CS::Container::HashElement<(csStringBase,csStringBase)>)>)>(size_t)\n csHash<(csStringBase,csStringBase,CS::Memory::AllocatorMalloc,csArrayElementHandler<(CS::Container::HashElement<(csStringBase,csStringBase)>)>)>()\n csHash<(csStringBase,csStringBase,CS::Memory::AllocatorMalloc,csArrayElementHandler<(CS::Container::HashElement<(csStringBase,csStringBase)>)>)>(csHash > > const &)\n");
+ SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'new_celQuestParams'.\n Possible C/C++ prototypes are:\n"" csHash<(csStringBase,csStringBase,CS::Memory::AllocatorMalloc,csArrayElementHandler<(CS::Container::HashElement<(csStringBase,csStringBase)>)>)>(size_t,size_t,size_t)\n"" csHash<(csStringBase,csStringBase,CS::Memory::AllocatorMalloc,csArrayElementHandler<(CS::Container::HashElement<(csStringBase,csStringBase)>)>)>(size_t,size_t)\n"" csHash<(csStringBase,csStringBase,CS::Memory::AllocatorMalloc,csArrayElementHandler<(CS::Container::HashElement<(csStringBase,csStringBase)>)>)>(size_t)\n"" csHash<(csStringBase,csStringBase,CS::Memory::AllocatorMalloc,csArrayElementHandler<(CS::Container::HashElement<(csStringBase,csStringBase)>)>)>()\n"" csHash<(csStringBase,csStringBase,CS::Memory::AllocatorMalloc,csArrayElementHandler<(CS::Container::HashElement<(csStringBase,csStringBase)>)>)>(csHash > > const &)\n");
return NULL;
}
@@ -16959,10 +16756,6 @@
csStringBase *result = 0 ;
void *argp1 = 0 ;
int res1 = 0 ;
- void *argp2 = 0 ;
- int res2 = 0 ;
- void *argp3 = 0 ;
- int res3 = 0 ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
PyObject * obj2 = 0 ;
@@ -16973,29 +16766,31 @@
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "celQuestParams_Put" "', argument " "1"" of type '" "csHash > > *""'");
}
arg1 = reinterpret_cast< csHash > > * >(argp1);
- res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_csStringBase, 0 | 0);
- if (!SWIG_IsOK(res2)) {
- SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "celQuestParams_Put" "', argument " "2"" of type '" "csStringBase const &""'");
- }
- if (!argp2) {
- SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "celQuestParams_Put" "', argument " "2"" of type '" "csStringBase const &""'");
- }
- arg2 = reinterpret_cast< csStringBase * >(argp2);
- res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_csStringBase, 0 | 0);
- if (!SWIG_IsOK(res3)) {
- SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "celQuestParams_Put" "', argument " "3"" of type '" "csStringBase const &""'");
+ {
+ arg2 = new csStringBase(PyString_AsString(obj1));
}
- if (!argp3) {
- SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "celQuestParams_Put" "', argument " "3"" of type '" "csStringBase const &""'");
+ {
+ arg3 = new csStringBase(PyString_AsString(obj2));
}
- arg3 = reinterpret_cast< csStringBase * >(argp3);
{
csStringBase &_result_ref = (arg1)->Put((csStringBase const &)*arg2,(csStringBase const &)*arg3);
result = (csStringBase *) &_result_ref;
}
resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_csStringBase, 0 | 0 );
+ {
+ delete arg2;
+ }
+ {
+ delete arg3;
+ }
return resultobj;
fail:
+ {
+ delete arg2;
+ }
+ {
+ delete arg3;
+ }
return NULL;
}
@@ -17003,7 +16798,7 @@
SWIGINTERN PyObject *_wrap_celQuestParams_GetAll__SWIG_0(PyObject *SWIGUNUSEDPARM(self), PyObject *args) {
PyObject *resultobj = 0;
csHash > > *arg1 = (csHash > > *) 0 ;
- SwigValueWrapper > result;
+ SwigValueWrapper< csArray > result;
void *argp1 = 0 ;
int res1 = 0 ;
PyObject * obj0 = 0 ;
@@ -17015,7 +16810,7 @@
}
arg1 = reinterpret_cast< csHash > > * >(argp1);
result = ((csHash > > const *)arg1)->GetAll();
- resultobj = SWIG_NewPointerObj((new csArray(static_cast< const csArray& >(result))), SWIGTYPE_p_csArrayTcsStringBase_csArrayElementHandlerTcsStringBase_t_CS__Memory__AllocatorMalloc_csArrayCapacityFixedGrowT16_t_t, SWIG_POINTER_OWN | 0 );
+ resultobj = SWIG_NewPointerObj((new csArray(static_cast< const csArray& >(result))), SWIGTYPE_p_csArrayTcsStringBase_csArrayElementHandlerTcsStringBase_t_CS__Memory__AllocatorMalloc_csArrayCapacityDefault_t, SWIG_POINTER_OWN | 0 );
return resultobj;
fail:
return NULL;
@@ -17026,11 +16821,9 @@
PyObject *resultobj = 0;
csHash > > *arg1 = (csHash > > *) 0 ;
csStringBase *arg2 = 0 ;
- SwigValueWrapper > result;
+ SwigValueWrapper< csArray > result;
void *argp1 = 0 ;
int res1 = 0 ;
- void *argp2 = 0 ;
- int res2 = 0 ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
@@ -17040,18 +16833,19 @@
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "celQuestParams_GetAll" "', argument " "1"" of type '" "csHash > > const *""'");
}
arg1 = reinterpret_cast< csHash > > * >(argp1);
- res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_csStringBase, 0 | 0);
- if (!SWIG_IsOK(res2)) {
- SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "celQuestParams_GetAll" "', argument " "2"" of type '" "csStringBase const &""'");
- }
- if (!argp2) {
- SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "celQuestParams_GetAll" "', argument " "2"" of type '" "csStringBase const &""'");
+ {
+ arg2 = new csStringBase(PyString_AsString(obj1));
}
- arg2 = reinterpret_cast< csStringBase * >(argp2);
result = ((csHash > > const *)arg1)->GetAll((csStringBase const &)*arg2);
- resultobj = SWIG_NewPointerObj((new csArray(static_cast< const csArray& >(result))), SWIGTYPE_p_csArrayTcsStringBase_csArrayElementHandlerTcsStringBase_t_CS__Memory__AllocatorMalloc_csArrayCapacityFixedGrowT16_t_t, SWIG_POINTER_OWN | 0 );
+ resultobj = SWIG_NewPointerObj((new csArray(static_cast< const csArray& >(result))), SWIGTYPE_p_csArrayTcsStringBase_csArrayElementHandlerTcsStringBase_t_CS__Memory__AllocatorMalloc_csArrayCapacityDefault_t, SWIG_POINTER_OWN | 0 );
+ {
+ delete arg2;
+ }
return resultobj;
fail:
+ {
+ delete arg2;
+ }
return NULL;
}
@@ -17062,7 +16856,7 @@
int ii;
if (!PyTuple_Check(args)) SWIG_fail;
- argc = PyObject_Length(args);
+ argc = (int)PyObject_Length(args);
for (ii = 0; (ii < argc) && (ii < 2); ii++) {
argv[ii] = PyTuple_GET_ITEM(args,ii);
}
@@ -17081,8 +16875,9 @@
int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_csHashTcsStringBase_csStringBase_CS__Memory__AllocatorMalloc_csArrayElementHandlerTCS__Container__HashElementTcsStringBase_csStringBase_t_t_t, 0);
_v = SWIG_CheckState(res);
if (_v) {
- int res = SWIG_ConvertPtr(argv[1], 0, SWIGTYPE_p_csStringBase, 0);
- _v = SWIG_CheckState(res);
+ {
+ _v = PyString_Check(argv[1]);
+ }
if (_v) {
return _wrap_celQuestParams_GetAll__SWIG_1(self, args);
}
@@ -17090,7 +16885,7 @@
}
fail:
- SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'celQuestParams_GetAll'.\n Possible C/C++ prototypes are:\n GetAll()\n GetAll(csStringBase const &)\n");
+ SWIG_SetErrorMsg(PyExc_NotImplementedError,"Wrong number of arguments for overloaded function 'celQuestParams_GetAll'.\n Possible C/C++ prototypes are:\n"" GetAll(csHash > > const *)\n"" GetAll(csHash > > const *,csStringBase const &)\n");
return NULL;
}
@@ -17103,10 +16898,6 @@
csStringBase *result = 0 ;
void *argp1 = 0 ;
int res1 = 0 ;
- void *argp2 = 0 ;
- int res2 = 0 ;
- void *argp3 = 0 ;
- int res3 = 0 ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
PyObject * obj2 = 0 ;
@@ -17117,29 +16908,31 @@
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "celQuestParams_PutUnique" "', argument " "1"" of type '" "csHash > > *""'");
}
arg1 = reinterpret_cast< csHash > > * >(argp1);
- res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_csStringBase, 0 | 0);
- if (!SWIG_IsOK(res2)) {
- SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "celQuestParams_PutUnique" "', argument " "2"" of type '" "csStringBase const &""'");
- }
- if (!argp2) {
- SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "celQuestParams_PutUnique" "', argument " "2"" of type '" "csStringBase const &""'");
- }
- arg2 = reinterpret_cast< csStringBase * >(argp2);
- res3 = SWIG_ConvertPtr(obj2, &argp3, SWIGTYPE_p_csStringBase, 0 | 0);
- if (!SWIG_IsOK(res3)) {
- SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "celQuestParams_PutUnique" "', argument " "3"" of type '" "csStringBase const &""'");
+ {
+ arg2 = new csStringBase(PyString_AsString(obj1));
}
- if (!argp3) {
- SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "celQuestParams_PutUnique" "', argument " "3"" of type '" "csStringBase const &""'");
+ {
+ arg3 = new csStringBase(PyString_AsString(obj2));
}
- arg3 = reinterpret_cast< csStringBase * >(argp3);
{
csStringBase &_result_ref = (arg1)->PutUnique((csStringBase const &)*arg2,(csStringBase const &)*arg3);
result = (csStringBase *) &_result_ref;
}
resultobj = SWIG_NewPointerObj(SWIG_as_voidptr(result), SWIGTYPE_p_csStringBase, 0 | 0 );
+ {
+ delete arg2;
+ }
+ {
+ delete arg3;
+ }
return resultobj;
fail:
+ {
+ delete arg2;
+ }
+ {
+ delete arg3;
+ }
return NULL;
}
@@ -17151,8 +16944,6 @@
bool result;
void *argp1 = 0 ;
int res1 = 0 ;
- void *argp2 = 0 ;
- int res2 = 0 ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
@@ -17162,18 +16953,19 @@
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "celQuestParams_Contains" "', argument " "1"" of type '" "csHash > > const *""'");
}
arg1 = reinterpret_cast< csHash > > * >(argp1);
- res2 = SWIG_ConvertPtr(obj1, &argp2, SWIGTYPE_p_csStringBase, 0 | 0);
- if (!SWIG_IsOK(res2)) {
- SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "celQuestParams_Contains" "', argument " "2"" of type '" "csStringBase const &""'");
- }
- if (!argp2) {
- SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "celQuestParams_Contains" "', argument " "2"" of type '" "csStringBase const &""'");
+ {
+ arg2 = new csStringBase(PyString_AsString(obj1));
}
- arg2 = reinterpret_cast< csStringBase * >(argp2);
result = (bool)((csHash > > const *)arg1)->Contains((csStringBase const &)*arg2);
resultobj = SWIG_From_bool(static_cast< bool >(result));
+ {
+ delete arg2;
+ }
return resultobj;
fail:
+ {
+ delete arg2;
+ }
return NULL;
}
@@ -17185,8 +16977,6 @@
bool result;
void *argp1 = 0 ;
int res1 = 0 ;
- void *argp2 = 0 ;
- int res2 = 0 ;
PyObject * obj0 = 0 ;
PyObject * obj1 = 0 ;
@@ -17196,18 +16986,19 @@
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "celQuestParams_In" "', argument " "1"" of type '" "csHash > > const *""'");
}
arg1 = reinterpret_cast< csHash