diff options
author | Melanie | 2009-10-02 19:53:42 +0100 |
---|---|---|
committer | Melanie | 2009-10-02 19:53:42 +0100 |
commit | 9eccea577716ee4331d30d519da389393b8606cd (patch) | |
tree | 2e3f1ad5892a7e1d1dc0155f1613adab8bcd2690 /prebuild.xml | |
parent | Merge branch 'master' into vehicles (diff) | |
parent | Merge branch 'master' into diva-textures (diff) | |
download | opensim-SC_OLD-9eccea577716ee4331d30d519da389393b8606cd.zip opensim-SC_OLD-9eccea577716ee4331d30d519da389393b8606cd.tar.gz opensim-SC_OLD-9eccea577716ee4331d30d519da389393b8606cd.tar.bz2 opensim-SC_OLD-9eccea577716ee4331d30d519da389393b8606cd.tar.xz |
Merge branch 'master' into vehicles
Diffstat (limited to 'prebuild.xml')
-rw-r--r-- | prebuild.xml | 64 |
1 files changed, 1 insertions, 63 deletions
diff --git a/prebuild.xml b/prebuild.xml index ce04f12..22ff3d7 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
@@ -1541,6 +1541,7 @@ | |||
1541 | <Reference name="OpenMetaverseTypes.dll"/> | 1541 | <Reference name="OpenMetaverseTypes.dll"/> |
1542 | <Reference name="OpenMetaverse.StructuredData.dll"/> | 1542 | <Reference name="OpenMetaverse.StructuredData.dll"/> |
1543 | <Reference name="OpenMetaverse.dll"/> | 1543 | <Reference name="OpenMetaverse.dll"/> |
1544 | <Reference name="CSJ2K.dll"/> | ||
1544 | <Reference name="OpenSim.Framework"/> | 1545 | <Reference name="OpenSim.Framework"/> |
1545 | <Reference name="OpenSim.Framework.Capabilities"/> | 1546 | <Reference name="OpenSim.Framework.Capabilities"/> |
1546 | <Reference name="OpenSim.Framework.Communications"/> | 1547 | <Reference name="OpenSim.Framework.Communications"/> |
@@ -3534,35 +3535,6 @@ | |||
3534 | </Files> | 3535 | </Files> |
3535 | </Project> | 3536 | </Project> |
3536 | 3537 | ||
3537 | <Project frameworkVersion="v3_5" name="OpenSim.Framework.Servers.HttpServer.Tests" path="OpenSim/Framework/Servers/HttpServer/Tests" type="Library"> | ||
3538 | <Configuration name="Debug"> | ||
3539 | <Options> | ||
3540 | <OutputPath>../../../../../bin/</OutputPath> | ||
3541 | </Options> | ||
3542 | </Configuration> | ||
3543 | <Configuration name="Release"> | ||
3544 | <Options> | ||
3545 | <OutputPath>../../../../../bin/</OutputPath> | ||
3546 | </Options> | ||
3547 | </Configuration> | ||
3548 | |||
3549 | <ReferencePath>../../../../../bin/</ReferencePath> | ||
3550 | <Reference name="System"/> | ||
3551 | <Reference name="OpenSim.Data"/> | ||
3552 | <Reference name="OpenSim.Tests.Common"/> | ||
3553 | <Reference name="OpenSim.Framework"/> | ||
3554 | <Reference name="OpenSim.Framework.Servers"/> | ||
3555 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | ||
3556 | <Reference name="log4net.dll"/> | ||
3557 | <Reference name="HttpServer_OpenSim.dll"/> | ||
3558 | <Reference name="nunit.framework.dll" /> | ||
3559 | |||
3560 | <Files> | ||
3561 | <Match pattern="*.cs" recurse="true"> | ||
3562 | </Match> | ||
3563 | </Files> | ||
3564 | </Project> | ||
3565 | |||
3566 | <Project frameworkVersion="v3_5" name="OpenSim.Framework.Communications.Tests" path="OpenSim/Framework/Communications/Tests" type="Library"> | 3538 | <Project frameworkVersion="v3_5" name="OpenSim.Framework.Communications.Tests" path="OpenSim/Framework/Communications/Tests" type="Library"> |
3567 | <Configuration name="Debug"> | 3539 | <Configuration name="Debug"> |
3568 | <Options> | 3540 | <Options> |
@@ -3829,40 +3801,6 @@ | |||
3829 | </Files> | 3801 | </Files> |
3830 | </Project> | 3802 | </Project> |
3831 | 3803 | ||
3832 | <Project frameworkVersion="v3_5" name="OpenSim.Server.Handlers.Tests" path="OpenSim/Server/Handlers/Tests" type="Library"> | ||
3833 | <Configuration name="Debug"> | ||
3834 | <Options> | ||
3835 | <OutputPath>../../../../bin/</OutputPath> | ||
3836 | </Options> | ||
3837 | </Configuration> | ||
3838 | <Configuration name="Release"> | ||
3839 | <Options> | ||
3840 | <OutputPath>../../../../bin/</OutputPath> | ||
3841 | </Options> | ||
3842 | </Configuration> | ||
3843 | |||
3844 | <ReferencePath>../../../../bin/</ReferencePath> | ||
3845 | <Reference name="System"/> | ||
3846 | <Reference name="System.Xml"/> | ||
3847 | <Reference name="OpenMetaverseTypes.dll"/> | ||
3848 | <Reference name="OpenMetaverse.dll"/> | ||
3849 | <Reference name="nunit.framework.dll" /> | ||
3850 | <Reference name="OpenSim.Framework"/> | ||
3851 | <Reference name="OpenSim.Framework.Console"/> | ||
3852 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | ||
3853 | <Reference name="OpenSim.Server.Handlers"/> | ||
3854 | <Reference name="OpenSim.Server.Base"/> | ||
3855 | <Reference name="OpenSim.Services.Base" /> | ||
3856 | <Reference name="OpenSim.Services.Interfaces"/> | ||
3857 | <Reference name="OpenSim.Tests.Common"/> | ||
3858 | <Reference name="Nini.dll" /> | ||
3859 | <Reference name="log4net.dll"/> | ||
3860 | |||
3861 | <Files> | ||
3862 | <Match pattern="*.cs" recurse="true"/> | ||
3863 | </Files> | ||
3864 | </Project> | ||
3865 | |||
3866 | <?include file="addon-modules/*/prebuild.xml" ?> | 3804 | <?include file="addon-modules/*/prebuild.xml" ?> |
3867 | 3805 | ||
3868 | </Solution> | 3806 | </Solution> |