diff options
author | Melanie | 2013-01-24 00:25:08 +0000 |
---|---|---|
committer | Melanie | 2013-01-24 00:25:08 +0000 |
commit | be4c8c4931637b7b0849d12c634599c702483364 (patch) | |
tree | 9a49626efcc10f1272b37176616a41476b044045 /prebuild.xml | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Merge branch 'master' into cooptermination (diff) | |
download | opensim-SC_OLD-be4c8c4931637b7b0849d12c634599c702483364.zip opensim-SC_OLD-be4c8c4931637b7b0849d12c634599c702483364.tar.gz opensim-SC_OLD-be4c8c4931637b7b0849d12c634599c702483364.tar.bz2 opensim-SC_OLD-be4c8c4931637b7b0849d12c634599c702483364.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
Diffstat (limited to 'prebuild.xml')
-rw-r--r-- | prebuild.xml | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/prebuild.xml b/prebuild.xml index c92be99..b2c76ea 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
@@ -2516,6 +2516,40 @@ | |||
2516 | </Files> | 2516 | </Files> |
2517 | </Project> | 2517 | </Project> |
2518 | 2518 | ||
2519 | <Project frameworkVersion="v3_5" name="OpenSim.Region.ScriptEngine.XEngine.Api.Runtime" path="OpenSim/Region/ScriptEngine/XEngine/Api/Runtime" type="Library"> | ||
2520 | <Configuration name="Debug"> | ||
2521 | <Options> | ||
2522 | <OutputPath>../../../../../../bin/</OutputPath> | ||
2523 | </Options> | ||
2524 | </Configuration> | ||
2525 | <Configuration name="Release"> | ||
2526 | <Options> | ||
2527 | <OutputPath>../../../../../../bin/</OutputPath> | ||
2528 | </Options> | ||
2529 | </Configuration> | ||
2530 | |||
2531 | <ReferencePath>../../../../../../bin/</ReferencePath> | ||
2532 | <Reference name="System"/> | ||
2533 | <Reference name="System.Data"/> | ||
2534 | <Reference name="System.Web"/> | ||
2535 | <Reference name="System.Xml"/> | ||
2536 | <Reference name="OpenMetaverseTypes" path="../../../../../../bin/"/> | ||
2537 | <Reference name="OpenSim"/> | ||
2538 | <Reference name="OpenSim.Framework"/> | ||
2539 | <Reference name="OpenSim.Framework.Communications"/> | ||
2540 | <Reference name="OpenSim.Region.Framework"/> | ||
2541 | <Reference name="OpenSim.Region.CoreModules"/> | ||
2542 | <Reference name="OpenSim.Framework.Console"/> | ||
2543 | <Reference name="OpenSim.Region.ScriptEngine.Shared"/> | ||
2544 | <Reference name="OpenSim.Region.ScriptEngine.Shared.Api.Runtime"/> | ||
2545 | <Reference name="Nini" path="../../../../../../bin/"/> | ||
2546 | <Reference name="log4net" path="../../../../../../bin/"/> | ||
2547 | |||
2548 | <Files> | ||
2549 | <Match pattern="*.cs" recurse="true"/> | ||
2550 | </Files> | ||
2551 | </Project> | ||
2552 | |||
2519 | <Project frameworkVersion="v3_5" name="OpenSim.Region.ScriptEngine.XEngine" path="OpenSim/Region/ScriptEngine/XEngine" type="Library"> | 2553 | <Project frameworkVersion="v3_5" name="OpenSim.Region.ScriptEngine.XEngine" path="OpenSim/Region/ScriptEngine/XEngine" type="Library"> |
2520 | <Configuration name="Debug"> | 2554 | <Configuration name="Debug"> |
2521 | <Options> | 2555 | <Options> |
@@ -2546,6 +2580,8 @@ | |||
2546 | <Reference name="OpenSim.Region.ScriptEngine.Shared.CodeTools"/> | 2580 | <Reference name="OpenSim.Region.ScriptEngine.Shared.CodeTools"/> |
2547 | <Reference name="OpenSim.Region.ScriptEngine.Shared.Instance"/> | 2581 | <Reference name="OpenSim.Region.ScriptEngine.Shared.Instance"/> |
2548 | <Reference name="OpenSim.Region.ScriptEngine.Shared.Api"/> | 2582 | <Reference name="OpenSim.Region.ScriptEngine.Shared.Api"/> |
2583 | <Reference name="OpenSim.Region.ScriptEngine.Shared.Api.Runtime"/> | ||
2584 | <Reference name="OpenSim.Region.ScriptEngine.XEngine.Api.Runtime"/> | ||
2549 | <Reference name="SmartThreadPool"/> | 2585 | <Reference name="SmartThreadPool"/> |
2550 | <Reference name="Nini" path="../../../../bin/"/> | 2586 | <Reference name="Nini" path="../../../../bin/"/> |
2551 | <Reference name="log4net" path="../../../../bin/"/> | 2587 | <Reference name="log4net" path="../../../../bin/"/> |
@@ -2553,6 +2589,7 @@ | |||
2553 | <Files> | 2589 | <Files> |
2554 | <Match buildAction="EmbeddedResource" path="Resources" pattern="*.addin.xml" recurse="true"/> | 2590 | <Match buildAction="EmbeddedResource" path="Resources" pattern="*.addin.xml" recurse="true"/> |
2555 | <Match pattern="*.cs" recurse="true"> | 2591 | <Match pattern="*.cs" recurse="true"> |
2592 | <Exclude name="Api"/> | ||
2556 | <Exclude name="Tests" pattern="Tests"/> | 2593 | <Exclude name="Tests" pattern="Tests"/> |
2557 | </Match> | 2594 | </Match> |
2558 | </Files> | 2595 | </Files> |