diff options
| author | Melanie | 2012-02-21 10:20:56 +0000 |
|---|---|---|
| committer | Melanie | 2012-02-21 10:20:56 +0000 |
| commit | 03e7bc1526d24efe23f61f6a8dee88010ccfdb8c (patch) | |
| tree | c2c2afef43a697dec1373ef5987f7d163031e5e2 /prebuild.xml | |
| parent | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster (diff) | |
| parent | Both 32-bit and 64-bit BulletSim.dll must have the same name. Rename the 64 ... (diff) | |
| download | opensim-SC-03e7bc1526d24efe23f61f6a8dee88010ccfdb8c.zip opensim-SC-03e7bc1526d24efe23f61f6a8dee88010ccfdb8c.tar.gz opensim-SC-03e7bc1526d24efe23f61f6a8dee88010ccfdb8c.tar.bz2 opensim-SC-03e7bc1526d24efe23f61f6a8dee88010ccfdb8c.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
Diffstat (limited to 'prebuild.xml')
| -rw-r--r-- | prebuild.xml | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/prebuild.xml b/prebuild.xml index 783bcb4..358bc3c 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
| @@ -521,31 +521,6 @@ | |||
| 521 | </Files> | 521 | </Files> |
| 522 | </Project> | 522 | </Project> |
| 523 | 523 | ||
| 524 | <Project frameworkVersion="v3_5" name="OpenSim.Region.Physics.PhysXPlugin" path="OpenSim/Region/Physics/PhysXPlugin" type="Library"> | ||
| 525 | <Configuration name="Debug"> | ||
| 526 | <Options> | ||
| 527 | <OutputPath>../../../../bin/Physics/</OutputPath> | ||
| 528 | </Options> | ||
| 529 | </Configuration> | ||
| 530 | <Configuration name="Release"> | ||
| 531 | <Options> | ||
| 532 | <OutputPath>../../../../bin/Physics/</OutputPath> | ||
| 533 | </Options> | ||
| 534 | </Configuration> | ||
| 535 | |||
| 536 | <ReferencePath>../../../../bin/</ReferencePath> | ||
| 537 | <Reference name="System"/> | ||
| 538 | <Reference name="OpenMetaverseTypes" path="../../../../bin/"/> | ||
| 539 | <Reference name="Nini" path="../../../../bin/"/> | ||
| 540 | <Reference name="PhysX_Wrapper_Dotnet" path="../../../../bin/"/> | ||
| 541 | <Reference name="OpenSim.Framework"/> | ||
| 542 | <Reference name="OpenSim.Region.Physics.Manager"/> | ||
| 543 | <Reference name="log4net" path="../../../../bin/"/> | ||
| 544 | <Files> | ||
| 545 | <Match pattern="*.cs" recurse="true"/> | ||
| 546 | </Files> | ||
| 547 | </Project> | ||
| 548 | |||
| 549 | <Project frameworkVersion="v3_5" name="OpenSim.Region.Physics.OdePlugin" path="OpenSim/Region/Physics/OdePlugin" type="Library"> | 524 | <Project frameworkVersion="v3_5" name="OpenSim.Region.Physics.OdePlugin" path="OpenSim/Region/Physics/OdePlugin" type="Library"> |
| 550 | <Configuration name="Debug"> | 525 | <Configuration name="Debug"> |
| 551 | <Options> | 526 | <Options> |