diff options
| author | Dan Lake | 2011-07-20 15:01:32 -0700 |
|---|---|---|
| committer | Dan Lake | 2011-07-20 15:01:32 -0700 |
| commit | 2c11f7fc38ba14e041ed0e648088d574dadaaffe (patch) | |
| tree | d593e3d1130e78ec74a11650d413f451a9a844da /prebuild.xml | |
| parent | Merge branch 'master' into bulletsim (diff) | |
| parent | Removed unused AddPrimShape methods in PhysicsScene caused by merge conflicts (diff) | |
| download | opensim-SC_OLD-2c11f7fc38ba14e041ed0e648088d574dadaaffe.zip opensim-SC_OLD-2c11f7fc38ba14e041ed0e648088d574dadaaffe.tar.gz opensim-SC_OLD-2c11f7fc38ba14e041ed0e648088d574dadaaffe.tar.bz2 opensim-SC_OLD-2c11f7fc38ba14e041ed0e648088d574dadaaffe.tar.xz | |
Merge branch 'master' into bulletsim
Diffstat (limited to 'prebuild.xml')
| -rw-r--r-- | prebuild.xml | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/prebuild.xml b/prebuild.xml index 63590c8..53cb30c 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
| @@ -3224,29 +3224,30 @@ | |||
| 3224 | TODO: this is kind of lame, we basically build a duplicate | 3224 | TODO: this is kind of lame, we basically build a duplicate |
| 3225 | assembly but with tests added in, just because we can't resolve cross-bin-dir-refs. | 3225 | assembly but with tests added in, just because we can't resolve cross-bin-dir-refs. |
| 3226 | --> | 3226 | --> |
| 3227 | <Project frameworkVersion="v3_5" name="OpenSim.Region.Physics.OdePlugin.Tests" path="OpenSim/Region/Physics/OdePlugin" type="Library"> | 3227 | <Project frameworkVersion="v3_5" name="OpenSim.Region.Physics.OdePlugin.Tests" path="OpenSim/Region/Physics/OdePlugin/Tests" type="Library"> |
| 3228 | <Configuration name="Debug"> | 3228 | <Configuration name="Debug"> |
| 3229 | <Options> | 3229 | <Options> |
| 3230 | <OutputPath>../../../../bin/</OutputPath> | 3230 | <OutputPath>../../../../../bin/</OutputPath> |
| 3231 | </Options> | 3231 | </Options> |
| 3232 | </Configuration> | 3232 | </Configuration> |
| 3233 | <Configuration name="Release"> | 3233 | <Configuration name="Release"> |
| 3234 | <Options> | 3234 | <Options> |
| 3235 | <OutputPath>../../../../bin/</OutputPath> | 3235 | <OutputPath>../../../../../bin/</OutputPath> |
| 3236 | </Options> | 3236 | </Options> |
| 3237 | </Configuration> | 3237 | </Configuration> |
| 3238 | 3238 | ||
| 3239 | <ReferencePath>../../../../bin/</ReferencePath> | 3239 | <ReferencePath>../../../../../bin/</ReferencePath> |
| 3240 | <Reference name="System"/> | 3240 | <Reference name="System"/> |
| 3241 | <Reference name="System.Core"/> | 3241 | <Reference name="System.Core"/> |
| 3242 | <Reference name="OpenMetaverseTypes" path="../../../../bin/"/> | 3242 | <Reference name="OpenMetaverseTypes" path="../../../../../bin/"/> |
| 3243 | <Reference name="Nini" path="../../../../bin/"/> | 3243 | <Reference name="Nini" path="../../../../../bin/"/> |
| 3244 | <Reference name="OpenSim.Framework"/> | 3244 | <Reference name="OpenSim.Framework"/> |
| 3245 | <Reference name="OpenSim.Framework.Console"/> | 3245 | <Reference name="OpenSim.Framework.Console"/> |
| 3246 | <Reference name="OpenSim.Region.Physics.Manager"/> | 3246 | <Reference name="OpenSim.Region.Physics.Manager"/> |
| 3247 | <Reference name="Ode.NET" path="../../../../bin/"/> | 3247 | <Reference name="OpenSim.Region.Physics.OdePlugin" path="../../../../../bin/Physics/"/> |
| 3248 | <Reference name="nunit.framework" path="../../../../bin/"/> | 3248 | <Reference name="Ode.NET" path="../../../../../bin/"/> |
| 3249 | <Reference name="log4net" path="../../../../bin/"/> | 3249 | <Reference name="nunit.framework" path="../../../../../bin/"/> |
| 3250 | <Reference name="log4net" path="../../../../../bin/"/> | ||
| 3250 | 3251 | ||
| 3251 | <Files> | 3252 | <Files> |
| 3252 | <Match pattern="*.cs" recurse="true"/> | 3253 | <Match pattern="*.cs" recurse="true"/> |