diff options
| author | Dan Lake | 2011-07-20 15:04:23 -0700 |
|---|---|---|
| committer | Dan Lake | 2011-07-20 15:04:23 -0700 |
| commit | 81fe1cfad60617023d2260511c728ce09d497ed0 (patch) | |
| tree | 1b270d657b9af67c85b7c00fd21c05b09b375bae | |
| parent | Merge branch 'master' into bulletsim (diff) | |
| parent | reorder bulletsim and convex decomposition projects in prebuild.xml. seems (diff) | |
| download | opensim-SC-81fe1cfad60617023d2260511c728ce09d497ed0.zip opensim-SC-81fe1cfad60617023d2260511c728ce09d497ed0.tar.gz opensim-SC-81fe1cfad60617023d2260511c728ce09d497ed0.tar.bz2 opensim-SC-81fe1cfad60617023d2260511c728ce09d497ed0.tar.xz | |
Merge branch 'bulletsim' of ssh://opensimulator.org/var/git/opensim into bulletsim
Diffstat (limited to '')
| -rw-r--r-- | prebuild.xml | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/prebuild.xml b/prebuild.xml index 53cb30c..f505731 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
| @@ -601,31 +601,23 @@ | |||
| 601 | </Files> | 601 | </Files> |
| 602 | </Project> | 602 | </Project> |
| 603 | 603 | ||
| 604 | <Project frameworkVersion="v3_5" name="OpenSim.Region.Physics.BulletSPlugin" path="OpenSim/Region/Physics/BulletSPlugin" type="Library"> | 604 | <Project frameworkVersion="v3_5" name="OpenSim.Region.Physics.ConvexDecompositionDotNet" path="OpenSim/Region/Physics/ConvexDecompositionDotNet" type="Library"> |
| 605 | <Configuration name="Debug"> | 605 | <Configuration name="Debug"> |
| 606 | <Options> | 606 | <Options> |
| 607 | <OutputPath>../../../../bin/Physics/</OutputPath> | 607 | <OutputPath>../../../../bin/</OutputPath> |
| 608 | </Options> | 608 | </Options> |
| 609 | </Configuration> | 609 | </Configuration> |
| 610 | <Configuration name="Release"> | 610 | <Configuration name="Release"> |
| 611 | <Options> | 611 | <Options> |
| 612 | <OutputPath>../../../../bin/Physics/</OutputPath> | 612 | <OutputPath>../../../../bin/</OutputPath> |
| 613 | </Options> | 613 | </Options> |
| 614 | </Configuration> | 614 | </Configuration> |
| 615 | 615 | ||
| 616 | <ReferencePath>../../../../bin/</ReferencePath> | 616 | <ReferencePath>../../../../bin/</ReferencePath> |
| 617 | <Reference name="System"/> | 617 | <Reference name="System"/> |
| 618 | <Reference name="System.Core"/> | 618 | <Reference name="System.Core"/> |
| 619 | <Reference name="System.Data"/> | ||
| 619 | <Reference name="System.Xml"/> | 620 | <Reference name="System.Xml"/> |
| 620 | <Reference name="OpenMetaverseTypes" path="../../../../bin/"/> | ||
| 621 | <Reference name="Nini.dll" path="../../../../bin/"/> | ||
| 622 | <Reference name="OpenSim.Framework"/> | ||
| 623 | <Reference name="OpenSim.Region.Framework"/> | ||
| 624 | <Reference name="OpenSim.Region.CoreModules"/> | ||
| 625 | <Reference name="OpenSim.Framework.Console"/> | ||
| 626 | <Reference name="OpenSim.Region.Physics.Manager"/> | ||
| 627 | <Reference name="OpenSim.Region.Physics.ConvexDecompositionDotNet"/> | ||
| 628 | <Reference name="log4net.dll" path="../../../../bin/"/> | ||
| 629 | 621 | ||
| 630 | <Files> | 622 | <Files> |
| 631 | <Match pattern="*.cs" recurse="true"> | 623 | <Match pattern="*.cs" recurse="true"> |
| @@ -634,7 +626,7 @@ | |||
| 634 | </Files> | 626 | </Files> |
| 635 | </Project> | 627 | </Project> |
| 636 | 628 | ||
| 637 | <Project frameworkVersion="v3_5" name="OpenSim.Region.Physics.ConvexDecompositionDotNet" path="OpenSim/Region/Physics/ConvexDecompositionDotNet" type="Library"> | 629 | <Project frameworkVersion="v3_5" name="OpenSim.Region.Physics.BulletSPlugin" path="OpenSim/Region/Physics/BulletSPlugin" type="Library"> |
| 638 | <Configuration name="Debug"> | 630 | <Configuration name="Debug"> |
| 639 | <Options> | 631 | <Options> |
| 640 | <OutputPath>../../../../bin/Physics/</OutputPath> | 632 | <OutputPath>../../../../bin/Physics/</OutputPath> |
| @@ -649,8 +641,16 @@ | |||
| 649 | <ReferencePath>../../../../bin/</ReferencePath> | 641 | <ReferencePath>../../../../bin/</ReferencePath> |
| 650 | <Reference name="System"/> | 642 | <Reference name="System"/> |
| 651 | <Reference name="System.Core"/> | 643 | <Reference name="System.Core"/> |
| 652 | <Reference name="System.Data"/> | ||
| 653 | <Reference name="System.Xml"/> | 644 | <Reference name="System.Xml"/> |
| 645 | <Reference name="OpenMetaverseTypes" path="../../../../bin/"/> | ||
| 646 | <Reference name="Nini.dll" path="../../../../bin/"/> | ||
| 647 | <Reference name="OpenSim.Framework"/> | ||
| 648 | <Reference name="OpenSim.Region.Framework"/> | ||
| 649 | <Reference name="OpenSim.Region.CoreModules"/> | ||
| 650 | <Reference name="OpenSim.Framework.Console"/> | ||
| 651 | <Reference name="OpenSim.Region.Physics.Manager"/> | ||
| 652 | <Reference name="OpenSim.Region.Physics.ConvexDecompositionDotNet"/> | ||
| 653 | <Reference name="log4net.dll" path="../../../../bin/"/> | ||
| 654 | 654 | ||
| 655 | <Files> | 655 | <Files> |
| 656 | <Match pattern="*.cs" recurse="true"> | 656 | <Match pattern="*.cs" recurse="true"> |