aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/prebuild.xml
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2013-01-24 00:03:44 +0000
committerJustin Clark-Casey (justincc)2013-01-24 00:03:44 +0000
commit55c6753b13d4c8cd69cc986db5f6e321b8e65bb7 (patch)
tree70ae7a976ba9be4e7e8d1cb98d3a6e61e4dfb7d4 /prebuild.xml
parentAdd information on ScriptStopStrategy to [XEngine] in OpenSimDefaults.ini and... (diff)
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-55c6753b13d4c8cd69cc986db5f6e321b8e65bb7.zip
opensim-SC_OLD-55c6753b13d4c8cd69cc986db5f6e321b8e65bb7.tar.gz
opensim-SC_OLD-55c6753b13d4c8cd69cc986db5f6e321b8e65bb7.tar.bz2
opensim-SC_OLD-55c6753b13d4c8cd69cc986db5f6e321b8e65bb7.tar.xz
Merge branch 'master' into cooptermination
Diffstat (limited to 'prebuild.xml')
-rw-r--r--prebuild.xml36
1 files changed, 2 insertions, 34 deletions
diff --git a/prebuild.xml b/prebuild.xml
index e891433..cea4530 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -1727,45 +1727,13 @@
1727 <Configuration name="Debug"> 1727 <Configuration name="Debug">
1728 <Options> 1728 <Options>
1729 <OutputPath>../../../../bin/Physics/</OutputPath> 1729 <OutputPath>../../../../bin/Physics/</OutputPath>
1730 <AllowUnsafe>true</AllowUnsafe>
1730 </Options> 1731 </Options>
1731 </Configuration> 1732 </Configuration>
1732 <Configuration name="Release"> 1733 <Configuration name="Release">
1733 <Options> 1734 <Options>
1734 <OutputPath>../../../../bin/Physics/</OutputPath> 1735 <OutputPath>../../../../bin/Physics/</OutputPath>
1735 </Options> 1736 <AllowUnsafe>true</AllowUnsafe>
1736 </Configuration>
1737
1738 <ReferencePath>../../../../bin/</ReferencePath>
1739 <Reference name="System"/>
1740 <Reference name="System.Core"/>
1741 <Reference name="System.Xml"/>
1742 <Reference name="OpenMetaverseTypes" path="../../../../bin/"/>
1743 <Reference name="Nini.dll" path="../../../../bin/"/>
1744 <Reference name="OpenSim.Framework"/>
1745 <Reference name="OpenSim.Region.Framework"/>
1746 <Reference name="OpenSim.Region.CoreModules"/>
1747 <Reference name="OpenSim.Framework.Console"/>
1748 <Reference name="OpenSim.Region.Physics.Manager"/>
1749 <Reference name="OpenSim.Region.Physics.ConvexDecompositionDotNet"/>
1750 <Reference name="BulletXNA.dll" path="../../../../bin/"/>
1751 <Reference name="log4net.dll" path="../../../../bin/"/>
1752
1753 <Files>
1754 <Match pattern="*.cs" recurse="true">
1755 <Exclude name="Tests" pattern="Tests"/>
1756 </Match>
1757 </Files>
1758 </Project>
1759
1760 <Project frameworkVersion="v3_5" name="OpenSim.Region.Physics.BulletSNPlugin" path="OpenSim/Region/Physics/BulletSNPlugin" type="Library">
1761 <Configuration name="Debug">
1762 <Options>
1763 <OutputPath>../../../../bin/Physics/</OutputPath>
1764 </Options>
1765 </Configuration>
1766 <Configuration name="Release">
1767 <Options>
1768 <OutputPath>../../../../bin/Physics/</OutputPath>
1769 </Options> 1737 </Options>
1770 </Configuration> 1738 </Configuration>
1771 1739