diff options
| author | Robert Adams | 2015-09-08 06:15:46 -0700 |
|---|---|---|
| committer | Robert Adams | 2015-09-08 06:15:46 -0700 |
| commit | 4dd17c4117ea413fb0c4418511956cb3abfe258c (patch) | |
| tree | 6f31a583610f8bf074d1f0b4e7ab6ccef37dec9a /prebuild.xml | |
| parent | Merge of ubitworkvarnew with opensim/master as of 20150905. (diff) | |
| download | opensim-SC-4dd17c4117ea413fb0c4418511956cb3abfe258c.zip opensim-SC-4dd17c4117ea413fb0c4418511956cb3abfe258c.tar.gz opensim-SC-4dd17c4117ea413fb0c4418511956cb3abfe258c.tar.bz2 opensim-SC-4dd17c4117ea413fb0c4418511956cb3abfe258c.tar.xz | |
More 'everything is a module' merging.
Have most of UbitOde converted.
There are compile errors in OpenSimBase as the new modules stuff is not all there.
Removed ChOdePlugin as it's connection to OdePlugin was tangled.
Diffstat (limited to 'prebuild.xml')
| -rw-r--r-- | prebuild.xml | 44 |
1 files changed, 7 insertions, 37 deletions
diff --git a/prebuild.xml b/prebuild.xml index d82f802..a9b9336 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
| @@ -359,38 +359,7 @@ | |||
| 359 | </Files> | 359 | </Files> |
| 360 | </Project> | 360 | </Project> |
| 361 | 361 | ||
| 362 | <Project frameworkVersion="v4_0" name="OpenSim.Region.Physics.ChOdePlugin" path="OpenSim/Region/Physics/ChOdePlugin" type="Library"> | 362 | <Project frameworkVersion="v4_0" name="OpenSim.Region.PhysicsModules.UbitOdePlugin" path="OpenSim/Region/PhysicsModules/UbitOdePlugin" type="Library"> |
| 363 | <Configuration name="Debug"> | ||
| 364 | <Options> | ||
| 365 | <OutputPath>../../../../bin/Physics/</OutputPath> | ||
| 366 | </Options> | ||
| 367 | </Configuration> | ||
| 368 | <Configuration name="Release"> | ||
| 369 | <Options> | ||
| 370 | <OutputPath>../../../../bin/Physics/</OutputPath> | ||
| 371 | </Options> | ||
| 372 | </Configuration> | ||
| 373 | |||
| 374 | <ReferencePath>../../../../bin/</ReferencePath> | ||
| 375 | <Reference name="System"/> | ||
| 376 | <Reference name="System.Core"/> | ||
| 377 | <Reference name="OpenMetaverseTypes.dll"/> | ||
| 378 | <Reference name="Nini.dll" /> | ||
| 379 | <Reference name="OpenSim.Framework"/> | ||
| 380 | <Reference name="OpenSim.Framework.Console"/> | ||
| 381 | <Reference name="OpenSim.Region.Physics.Manager"/> | ||
| 382 | <Reference name="OpenSim.Region.Physics.ConvexDecompositionDotNet"/> | ||
| 383 | <Reference name="Ode.NET.dll" /> | ||
| 384 | <Reference name="log4net.dll"/> | ||
| 385 | |||
| 386 | <Files> | ||
| 387 | <Match pattern="*.cs" recurse="true"> | ||
| 388 | <Exclude name="Tests" pattern="Tests"/> | ||
| 389 | </Match> | ||
| 390 | </Files> | ||
| 391 | </Project> | ||
| 392 | |||
| 393 | <Project frameworkVersion="v4_0" name="OpenSim.Region.Physics.UbitOdePlugin" path="OpenSim/Region/Physics/UbitOdePlugin" type="Library"> | ||
| 394 | <Configuration name="Debug"> | 363 | <Configuration name="Debug"> |
| 395 | <Options> | 364 | <Options> |
| 396 | <OutputPath>../../../../bin/Physics/</OutputPath> | 365 | <OutputPath>../../../../bin/Physics/</OutputPath> |
| @@ -410,8 +379,9 @@ | |||
| 410 | 379 | ||
| 411 | <Reference name="OpenSim.Framework"/> | 380 | <Reference name="OpenSim.Framework"/> |
| 412 | <Reference name="OpenSim.Framework.Console"/> | 381 | <Reference name="OpenSim.Framework.Console"/> |
| 413 | <Reference name="OpenSim.Region.Physics.Manager"/> | 382 | <Reference name="OpenSim.Region.Framework"/> |
| 414 | <Reference name="OpenSim.Region.Physics.ConvexDecompositionDotNet"/> | 383 | <Reference name="OpenSim.Region.PhysicsModules.SharedBase"/> |
| 384 | <Reference name="OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet"/> | ||
| 415 | <Reference name="log4net" path="../../../../bin/"/> | 385 | <Reference name="log4net" path="../../../../bin/"/> |
| 416 | 386 | ||
| 417 | <Files> | 387 | <Files> |
| @@ -421,7 +391,7 @@ | |||
| 421 | </Files> | 391 | </Files> |
| 422 | </Project> | 392 | </Project> |
| 423 | 393 | ||
| 424 | <Project frameworkVersion="v4_0" name="OpenSim.Region.Physics.UbitMeshing" path="OpenSim/Region/Physics/UbitMeshing" type="Library"> | 394 | <Project frameworkVersion="v4_0" name="OpenSim.Region.PhysicsModules.UbitMeshing" path="OpenSim/Region/PhysicsModules/UbitMeshing" type="Library"> |
| 425 | <Configuration name="Debug"> | 395 | <Configuration name="Debug"> |
| 426 | <Options> | 396 | <Options> |
| 427 | <OutputPath>../../../../bin/Physics/</OutputPath> | 397 | <OutputPath>../../../../bin/Physics/</OutputPath> |
| @@ -443,8 +413,8 @@ | |||
| 443 | <Reference name="Nini" path="../../../../bin/"/> | 413 | <Reference name="Nini" path="../../../../bin/"/> |
| 444 | <Reference name="OpenSim.Framework"/> | 414 | <Reference name="OpenSim.Framework"/> |
| 445 | <Reference name="OpenSim.Framework.Console"/> | 415 | <Reference name="OpenSim.Framework.Console"/> |
| 446 | <Reference name="OpenSim.Region.Physics.Manager"/> | 416 | <Reference name="OpenSim.Region.PhysicsModules.SharedBase"/> |
| 447 | <Reference name="OpenSim.Region.Physics.ConvexDecompositionDotNet"/> | 417 | <Reference name="OpenSim.Region.PhysicsModules.ConvexDecompositionDotNet"/> |
| 448 | <Reference name="log4net" path="../../../../bin/"/> | 418 | <Reference name="log4net" path="../../../../bin/"/> |
| 449 | <Reference name="zlib.net" path="../../../../bin/"/> | 419 | <Reference name="zlib.net" path="../../../../bin/"/> |
| 450 | 420 | ||