aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/prebuild.xml
diff options
context:
space:
mode:
authorMelanie2012-03-21 00:01:11 +0000
committerMelanie2012-03-21 00:01:11 +0000
commit117a86276904d8f75e4cea7e9528dd267ca3ea9f (patch)
tree467a85e00ef65c0a4bb8dad020e19055f2d39026 /prebuild.xml
parentMove the health monitoring stuff where it will do some good (diff)
parentUpdate prebuild (diff)
downloadopensim-SC_OLD-117a86276904d8f75e4cea7e9528dd267ca3ea9f.zip
opensim-SC_OLD-117a86276904d8f75e4cea7e9528dd267ca3ea9f.tar.gz
opensim-SC_OLD-117a86276904d8f75e4cea7e9528dd267ca3ea9f.tar.bz2
opensim-SC_OLD-117a86276904d8f75e4cea7e9528dd267ca3ea9f.tar.xz
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
Diffstat (limited to 'prebuild.xml')
-rw-r--r--prebuild.xml51
1 files changed, 27 insertions, 24 deletions
diff --git a/prebuild.xml b/prebuild.xml
index d009e87..0123c2a 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -552,28 +552,23 @@
552 </Files> 552 </Files>
553 </Project> 553 </Project>
554 554
555 <Project frameworkVersion="v3_5" name="OpenSim.Region.Physics.ChOdePlugin" path="OpenSim/Region/Physics/ChOdePlugin" type="Library"> 555 <Project frameworkVersion="v3_5" name="OpenSim.Region.Physics.ConvexDecompositionDotNet" path="OpenSim/Region/Physics/ConvexDecompositionDotNet" type="Library">
556 <Configuration name="Debug"> 556 <Configuration name="Debug">
557 <Options> 557 <Options>
558 <OutputPath>../../../../bin/Physics/</OutputPath> 558 <OutputPath>../../../../bin/</OutputPath>
559 </Options> 559 </Options>
560 </Configuration> 560 </Configuration>
561 <Configuration name="Release"> 561 <Configuration name="Release">
562 <Options> 562 <Options>
563 <OutputPath>../../../../bin/Physics/</OutputPath> 563 <OutputPath>../../../../bin/</OutputPath>
564 </Options> 564 </Options>
565 </Configuration> 565 </Configuration>
566 566
567 <ReferencePath>../../../../bin/</ReferencePath> 567 <ReferencePath>../../../../bin/</ReferencePath>
568 <Reference name="System"/> 568 <Reference name="System"/>
569 <Reference name="System.Core"/> 569 <Reference name="System.Core"/>
570 <Reference name="OpenMetaverseTypes.dll"/> 570 <Reference name="System.Data"/>
571 <Reference name="Nini.dll" /> 571 <Reference name="System.Xml"/>
572 <Reference name="OpenSim.Framework"/>
573 <Reference name="OpenSim.Framework.Console"/>
574 <Reference name="OpenSim.Region.Physics.Manager"/>
575 <Reference name="Ode.NET.dll" />
576 <Reference name="log4net.dll"/>
577 572
578 <Files> 573 <Files>
579 <Match pattern="*.cs" recurse="true"> 574 <Match pattern="*.cs" recurse="true">
@@ -582,7 +577,7 @@
582 </Files> 577 </Files>
583 </Project> 578 </Project>
584 579
585 <Project frameworkVersion="v3_5" name="OpenSim.Region.Physics.UbitOdePlugin" path="OpenSim/Region/Physics/UbitOdePlugin" type="Library"> 580 <Project frameworkVersion="v3_5" name="OpenSim.Region.Physics.ChOdePlugin" path="OpenSim/Region/Physics/ChOdePlugin" type="Library">
586 <Configuration name="Debug"> 581 <Configuration name="Debug">
587 <Options> 582 <Options>
588 <OutputPath>../../../../bin/Physics/</OutputPath> 583 <OutputPath>../../../../bin/Physics/</OutputPath>
@@ -597,46 +592,53 @@
597 <ReferencePath>../../../../bin/</ReferencePath> 592 <ReferencePath>../../../../bin/</ReferencePath>
598 <Reference name="System"/> 593 <Reference name="System"/>
599 <Reference name="System.Core"/> 594 <Reference name="System.Core"/>
600 <Reference name="OpenMetaverseTypes" path="../../../../bin/"/> 595 <Reference name="OpenMetaverseTypes.dll"/>
601 <Reference name="Nini" path="../../../../bin/"/> 596 <Reference name="Nini.dll" />
602
603 <Reference name="OpenSim.Framework"/> 597 <Reference name="OpenSim.Framework"/>
604 <Reference name="OpenSim.Framework.Console"/> 598 <Reference name="OpenSim.Framework.Console"/>
605 <Reference name="OpenSim.Region.Physics.Manager"/> 599 <Reference name="OpenSim.Region.Physics.Manager"/>
606 <Reference name="log4net" path="../../../../bin/"/> 600 <Reference name="OpenSim.Region.Physics.ConvexDecompositionDotNet"/>
601 <Reference name="Ode.NET.dll" />
602 <Reference name="log4net.dll"/>
607 603
608 <Files> 604 <Files>
609 <Match pattern="*.cs" recurse="true"> 605 <Match pattern="*.cs" recurse="true">
610 <Exclude name="Tests" pattern="Tests"/> 606 <Exclude name="Tests" pattern="Tests"/>
611 </Match> 607 </Match>
612 </Files> 608 </Files>
613 </Project> 609 </Project>
614 610
615 <Project frameworkVersion="v3_5" name="OpenSim.Region.Physics.ConvexDecompositionDotNet" path="OpenSim/Region/Physics/ConvexDecompositionDotNet" type="Library"> 611 <Project frameworkVersion="v3_5" name="OpenSim.Region.Physics.UbitOdePlugin" path="OpenSim/Region/Physics/UbitOdePlugin" type="Library">
616 <Configuration name="Debug"> 612 <Configuration name="Debug">
617 <Options> 613 <Options>
618 <OutputPath>../../../../bin/</OutputPath> 614 <OutputPath>../../../../bin/Physics/</OutputPath>
619 </Options> 615 </Options>
620 </Configuration> 616 </Configuration>
621 <Configuration name="Release"> 617 <Configuration name="Release">
622 <Options> 618 <Options>
623 <OutputPath>../../../../bin/</OutputPath> 619 <OutputPath>../../../../bin/Physics/</OutputPath>
624 </Options> 620 </Options>
625 </Configuration> 621 </Configuration>
626 622
627 <ReferencePath>../../../../bin/</ReferencePath> 623 <ReferencePath>../../../../bin/</ReferencePath>
628 <Reference name="System"/> 624 <Reference name="System"/>
629 <Reference name="System.Core"/> 625 <Reference name="System.Core"/>
630 <Reference name="System.Data"/> 626 <Reference name="OpenMetaverseTypes" path="../../../../bin/"/>
631 <Reference name="System.Xml"/> 627 <Reference name="Nini" path="../../../../bin/"/>
628
629 <Reference name="OpenSim.Framework"/>
630 <Reference name="OpenSim.Framework.Console"/>
631 <Reference name="OpenSim.Region.Physics.Manager"/>
632 <Reference name="OpenSim.Region.Physics.ConvexDecompositionDotNet"/>
633 <Reference name="log4net" path="../../../../bin/"/>
632 634
633 <Files> 635 <Files>
634 <Match pattern="*.cs" recurse="true"> 636 <Match pattern="*.cs" recurse="true">
635 <Exclude name="Tests" pattern="Tests"/> 637 <Exclude name="Tests" pattern="Tests"/>
636 </Match> 638 </Match>
637 </Files> 639 </Files>
638 </Project> 640 </Project>
639 641
640 <Project frameworkVersion="v3_5" name="OpenSim.Region.Physics.BulletSPlugin" path="OpenSim/Region/Physics/BulletSPlugin" type="Library"> 642 <Project frameworkVersion="v3_5" name="OpenSim.Region.Physics.BulletSPlugin" path="OpenSim/Region/Physics/BulletSPlugin" type="Library">
641 <Configuration name="Debug"> 643 <Configuration name="Debug">
642 <Options> 644 <Options>
@@ -724,6 +726,7 @@
724 <Reference name="OpenSim.Framework"/> 726 <Reference name="OpenSim.Framework"/>
725 <Reference name="OpenSim.Framework.Console"/> 727 <Reference name="OpenSim.Framework.Console"/>
726 <Reference name="OpenSim.Region.Physics.Manager"/> 728 <Reference name="OpenSim.Region.Physics.Manager"/>
729 <Reference name="OpenSim.Region.Physics.ConvexDecompositionDotNet"/>
727 <Reference name="log4net" path="../../../../bin/"/> 730 <Reference name="log4net" path="../../../../bin/"/>
728 <Reference name="zlib.net" path="../../../../bin/"/> 731 <Reference name="zlib.net" path="../../../../bin/"/>
729 732