diff options
author | Melanie | 2010-10-03 16:52:27 +0100 |
---|---|---|
committer | Melanie | 2010-10-03 16:52:27 +0100 |
commit | 5910be236f62c22fb3d044652d69b0c39c35ffe0 (patch) | |
tree | 7f0c18f7f107b2fd88a34e8f97fa2faab3a2d4f4 /prebuild.xml | |
parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
download | opensim-SC_OLD-5910be236f62c22fb3d044652d69b0c39c35ffe0.zip opensim-SC_OLD-5910be236f62c22fb3d044652d69b0c39c35ffe0.tar.gz opensim-SC_OLD-5910be236f62c22fb3d044652d69b0c39c35ffe0.tar.bz2 opensim-SC_OLD-5910be236f62c22fb3d044652d69b0c39c35ffe0.tar.xz |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'prebuild.xml')
-rw-r--r-- | prebuild.xml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/prebuild.xml b/prebuild.xml index 7a8618e..d508922 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
@@ -1400,11 +1400,13 @@ | |||
1400 | <Configuration name="Debug"> | 1400 | <Configuration name="Debug"> |
1401 | <Options> | 1401 | <Options> |
1402 | <OutputPath>../../../bin/</OutputPath> | 1402 | <OutputPath>../../../bin/</OutputPath> |
1403 | <AllowUnsafe>true</AllowUnsafe> | ||
1403 | </Options> | 1404 | </Options> |
1404 | </Configuration> | 1405 | </Configuration> |
1405 | <Configuration name="Release"> | 1406 | <Configuration name="Release"> |
1406 | <Options> | 1407 | <Options> |
1407 | <OutputPath>../../../bin/</OutputPath> | 1408 | <OutputPath>../../../bin/</OutputPath> |
1409 | <AllowUnsafe>true</AllowUnsafe> | ||
1408 | </Options> | 1410 | </Options> |
1409 | </Configuration> | 1411 | </Configuration> |
1410 | 1412 | ||
@@ -1419,6 +1421,7 @@ | |||
1419 | <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/> | 1421 | <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/> |
1420 | <Reference name="OpenMetaverse" path="../../../bin/"/> | 1422 | <Reference name="OpenMetaverse" path="../../../bin/"/> |
1421 | <Reference name="CSJ2K" path="../../../bin/"/> | 1423 | <Reference name="CSJ2K" path="../../../bin/"/> |
1424 | <Reference name="Warp3D" path="../../../bin/" localCopy="true"/> | ||
1422 | <Reference name="OpenSim.Framework"/> | 1425 | <Reference name="OpenSim.Framework"/> |
1423 | <Reference name="OpenSim.Framework.Capabilities"/> | 1426 | <Reference name="OpenSim.Framework.Capabilities"/> |
1424 | <Reference name="OpenSim.Framework.Communications"/> | 1427 | <Reference name="OpenSim.Framework.Communications"/> |