diff options
| author | Melanie | 2012-07-23 19:17:27 +0100 |
|---|---|---|
| committer | Melanie | 2012-07-23 19:17:27 +0100 |
| commit | 7dfd5819134240db68dce0d4aa0230f511840cc2 (patch) | |
| tree | ffb2880769cdc2fd660f35f64533a48ea617ee41 | |
| parent | Merge branch 'master' into careminster (diff) | |
| download | opensim-SC-7dfd5819134240db68dce0d4aa0230f511840cc2.zip opensim-SC-7dfd5819134240db68dce0d4aa0230f511840cc2.tar.gz opensim-SC-7dfd5819134240db68dce0d4aa0230f511840cc2.tar.bz2 opensim-SC-7dfd5819134240db68dce0d4aa0230f511840cc2.tar.xz | |
Fix merge issues in prebuild
| -rw-r--r-- | prebuild.xml | 66 |
1 files changed, 33 insertions, 33 deletions
diff --git a/prebuild.xml b/prebuild.xml index 2ef143b..52a91c3 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
| @@ -640,39 +640,6 @@ | |||
| 640 | </Files> | 640 | </Files> |
| 641 | </Project> | 641 | </Project> |
| 642 | 642 | ||
| 643 | <Project frameworkVersion="v4_0" name="OpenSim.Region.Physics.BulletSPlugin" path="OpenSim/Region/Physics/BulletSPlugin" type="Library"> | ||
| 644 | <Configuration name="Debug"> | ||
| 645 | <Options> | ||
| 646 | <OutputPath>../../../../bin/Physics/</OutputPath> | ||
| 647 | </Options> | ||
| 648 | </Configuration> | ||
| 649 | <Configuration name="Release"> | ||
| 650 | <Options> | ||
| 651 | <OutputPath>../../../../bin/Physics/</OutputPath> | ||
| 652 | </Options> | ||
| 653 | </Configuration> | ||
| 654 | |||
| 655 | <ReferencePath>../../../../bin/</ReferencePath> | ||
| 656 | <Reference name="System"/> | ||
| 657 | <Reference name="System.Core"/> | ||
| 658 | <Reference name="System.Xml"/> | ||
| 659 | <Reference name="OpenMetaverseTypes" path="../../../../bin/"/> | ||
| 660 | <Reference name="Nini.dll" path="../../../../bin/"/> | ||
| 661 | <Reference name="OpenSim.Framework"/> | ||
| 662 | <Reference name="OpenSim.Region.Framework"/> | ||
| 663 | <Reference name="OpenSim.Region.CoreModules"/> | ||
| 664 | <Reference name="OpenSim.Framework.Console"/> | ||
| 665 | <Reference name="OpenSim.Region.Physics.Manager"/> | ||
| 666 | <Reference name="OpenSim.Region.Physics.ConvexDecompositionDotNet"/> | ||
| 667 | <Reference name="log4net.dll" path="../../../../bin/"/> | ||
| 668 | |||
| 669 | <Files> | ||
| 670 | <Match pattern="*.cs" recurse="true"> | ||
| 671 | <Exclude name="Tests" pattern="Tests"/> | ||
| 672 | </Match> | ||
| 673 | </Files> | ||
| 674 | </Project> | ||
| 675 | |||
| 676 | <Project frameworkVersion="v4_0" name="OpenSim.Region.Physics.Meshing" path="OpenSim/Region/Physics/Meshing" type="Library"> | 643 | <Project frameworkVersion="v4_0" name="OpenSim.Region.Physics.Meshing" path="OpenSim/Region/Physics/Meshing" type="Library"> |
| 677 | <Configuration name="Debug"> | 644 | <Configuration name="Debug"> |
| 678 | <Options> | 645 | <Options> |
| @@ -1859,6 +1826,39 @@ | |||
| 1859 | </Files> | 1826 | </Files> |
| 1860 | </Project> | 1827 | </Project> |
| 1861 | 1828 | ||
| 1829 | <Project frameworkVersion="v4_0" name="OpenSim.Region.Physics.BulletSPlugin" path="OpenSim/Region/Physics/BulletSPlugin" type="Library"> | ||
| 1830 | <Configuration name="Debug"> | ||
| 1831 | <Options> | ||
| 1832 | <OutputPath>../../../../bin/Physics/</OutputPath> | ||
| 1833 | </Options> | ||
| 1834 | </Configuration> | ||
| 1835 | <Configuration name="Release"> | ||
| 1836 | <Options> | ||
| 1837 | <OutputPath>../../../../bin/Physics/</OutputPath> | ||
| 1838 | </Options> | ||
| 1839 | </Configuration> | ||
| 1840 | |||
| 1841 | <ReferencePath>../../../../bin/</ReferencePath> | ||
| 1842 | <Reference name="System"/> | ||
| 1843 | <Reference name="System.Core"/> | ||
| 1844 | <Reference name="System.Xml"/> | ||
| 1845 | <Reference name="OpenMetaverseTypes" path="../../../../bin/"/> | ||
| 1846 | <Reference name="Nini.dll" path="../../../../bin/"/> | ||
| 1847 | <Reference name="OpenSim.Framework"/> | ||
| 1848 | <Reference name="OpenSim.Region.Framework"/> | ||
| 1849 | <Reference name="OpenSim.Region.CoreModules"/> | ||
| 1850 | <Reference name="OpenSim.Framework.Console"/> | ||
| 1851 | <Reference name="OpenSim.Region.Physics.Manager"/> | ||
| 1852 | <Reference name="OpenSim.Region.Physics.ConvexDecompositionDotNet"/> | ||
| 1853 | <Reference name="log4net.dll" path="../../../../bin/"/> | ||
| 1854 | |||
| 1855 | <Files> | ||
| 1856 | <Match pattern="*.cs" recurse="true"> | ||
| 1857 | <Exclude name="Tests" pattern="Tests"/> | ||
| 1858 | </Match> | ||
| 1859 | </Files> | ||
| 1860 | </Project> | ||
| 1861 | |||
| 1862 | <!-- OpenSim app --> | 1862 | <!-- OpenSim app --> |
| 1863 | <Project frameworkVersion="v4_0" name="OpenSim" path="OpenSim/Region/Application" type="Exe"> | 1863 | <Project frameworkVersion="v4_0" name="OpenSim" path="OpenSim/Region/Application" type="Exe"> |
| 1864 | <Configuration name="Debug"> | 1864 | <Configuration name="Debug"> |