diff options
author | Melanie | 2012-07-23 18:54:12 +0100 |
---|---|---|
committer | Melanie | 2012-07-23 18:54:12 +0100 |
commit | fb8e92c90b8bde44831a06d4a7adae64f181b5aa (patch) | |
tree | fdbb76f70f8016e685b616b51a90f7b1ef21427b /prebuild.xml | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Update BulletSim DLLs and SOs (diff) | |
download | opensim-SC_OLD-fb8e92c90b8bde44831a06d4a7adae64f181b5aa.zip opensim-SC_OLD-fb8e92c90b8bde44831a06d4a7adae64f181b5aa.tar.gz opensim-SC_OLD-fb8e92c90b8bde44831a06d4a7adae64f181b5aa.tar.bz2 opensim-SC_OLD-fb8e92c90b8bde44831a06d4a7adae64f181b5aa.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Helpers.cs
prebuild.xml
Diffstat (limited to 'prebuild.xml')
-rw-r--r-- | prebuild.xml | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/prebuild.xml b/prebuild.xml index cb62aec..2ef143b 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
@@ -1834,6 +1834,31 @@ | |||
1834 | </Files> | 1834 | </Files> |
1835 | </Project> | 1835 | </Project> |
1836 | 1836 | ||
1837 | <Project frameworkVersion="v3_5" name="OpenSim.Region.Physics.ConvexDecompositionDotNet" path="OpenSim/Region/Physics/ConvexDecompositionDotNet" type="Library"> | ||
1838 | <Configuration name="Debug"> | ||
1839 | <Options> | ||
1840 | <OutputPath>../../../../bin/</OutputPath> | ||
1841 | </Options> | ||
1842 | </Configuration> | ||
1843 | <Configuration name="Release"> | ||
1844 | <Options> | ||
1845 | <OutputPath>../../../../bin/</OutputPath> | ||
1846 | </Options> | ||
1847 | </Configuration> | ||
1848 | |||
1849 | <ReferencePath>../../../../bin/</ReferencePath> | ||
1850 | <Reference name="System"/> | ||
1851 | <Reference name="System.Core"/> | ||
1852 | <Reference name="System.Data"/> | ||
1853 | <Reference name="System.Xml"/> | ||
1854 | |||
1855 | <Files> | ||
1856 | <Match pattern="*.cs" recurse="true"> | ||
1857 | <Exclude name="Tests" pattern="Tests"/> | ||
1858 | </Match> | ||
1859 | </Files> | ||
1860 | </Project> | ||
1861 | |||
1837 | <!-- OpenSim app --> | 1862 | <!-- OpenSim app --> |
1838 | <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"> |
1839 | <Configuration name="Debug"> | 1864 | <Configuration name="Debug"> |