Merge branch 'careminster' into tests

author: KittoFlora 2009-11-16 01:40:15 +0100
committer: KittoFlora 2009-11-16 01:40:15 +0100
commit: 873c9098d8627972e80a1688e85a4cda45e1e7fe (patch)
tree: a0edc24aef11d5ad6928493d8985386f48dd2607 /prebuild.xml
parent: Merge branch 'vehicles' into tests (diff)
parent: Merge branch 'master' into careminster (diff)
download: opensim-SC-873c9098d8627972e80a1688e85a4cda45e1e7fe.zip
opensim-SC-873c9098d8627972e80a1688e85a4cda45e1e7fe.tar.gz
opensim-SC-873c9098d8627972e80a1688e85a4cda45e1e7fe.tar.bz2
opensim-SC-873c9098d8627972e80a1688e85a4cda45e1e7fe.tar.xz
1 files changed, 43 insertions, 1 deletions
diff --git a/prebuild.xml b/prebuild.xml
index 33cb647..047b66d 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -909,7 +909,7 @@
      </Files>
    </Project>
-    <Project frameworkVersion="v3_5" name="OpenSim.Grid.GridServer" path="OpenSim/Grid/GridServer" type="Exe">
+    <Project frameworkVersion="v3_5" name="OpenSim.Grid.GridServer" path="OpenSim/Grid/GridServer" type="Library">
      <Configuration name="Debug">
        <Options>
          <OutputPath>../../../bin/</OutputPath>
@@ -1721,6 +1721,48 @@
      </Files>
    </Project>
+<Project frameworkVersion="v3_5" name="OpenSim.Region.RegionCombinerModule" path="OpenSim/Region/RegionCombinerModule" type="Library">
+      <Configuration name="Debug">
+        <Options>
+          <OutputPath>../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+      <Configuration name="Release">
+        <Options>
+          <OutputPath>../../../bin/</OutputPath>
+        </Options>
+      </Configuration>
+      <ReferencePath>../../../bin/</ReferencePath>
+      <Reference name="System"/>
+      <Reference name="System.Xml"/>
+      <Reference name="OpenMetaverseTypes.dll"/>
+      <Reference name="OpenMetaverse.dll"/>
+      <Reference name="OpenSim.Framework"/>
+      <Reference name="OpenSim.Framework.Communications"/>
+      <Reference name="OpenSim.Region.Framework" />
+      <Reference name="OpenSim.Server.Base" />
+      <Reference name="OpenSim.Server.Handlers" />
+      <Reference name="OpenSim.Framework.Console"/>
+      <Reference name="OpenSim.Region.Physics.Manager"/>
+      <Reference name="OpenSim.Framework.Communications"/>
+      <Reference name="OpenSim.Region.CoreModules" />
+      <Reference name="Nini.dll" />
+      <Reference name="log4net.dll"/>
+          
+          <!-- To allow regions to have mono addins -->
+      <Reference name="Mono.Addins.dll" />
+      <Files>
+        <Match pattern="*.cs" recurse="true" />
+        <Match pattern="*.addin.xml" path="Resources" buildAction="EmbeddedResource" recurse="true"/>
+      </Files>
+    </Project>
    <Project frameworkVersion="v3_5" name="OpenSim.Region.Communications.Hypergrid" path="OpenSim/Region/Communications/Hypergrid" type="Library">
      <Configuration name="Debug">
        <Options>
author	KittoFlora	2009-11-16 01:40:15 +0100
committer	KittoFlora	2009-11-16 01:40:15 +0100
commit	873c9098d8627972e80a1688e85a4cda45e1e7fe (patch)
tree	a0edc24aef11d5ad6928493d8985386f48dd2607 /prebuild.xml
parent	Merge branch 'vehicles' into tests (diff)
parent	Merge branch 'master' into careminster (diff)
download	opensim-SC-873c9098d8627972e80a1688e85a4cda45e1e7fe.zip opensim-SC-873c9098d8627972e80a1688e85a4cda45e1e7fe.tar.gz opensim-SC-873c9098d8627972e80a1688e85a4cda45e1e7fe.tar.bz2 opensim-SC-873c9098d8627972e80a1688e85a4cda45e1e7fe.tar.xz

diff --git a/prebuild.xml b/prebuild.xml index 33cb647..047b66d 100644 --- a/prebuild.xml +++ b/prebuild.xml
@@ -909,7 +909,7 @@
909	</Files>	909	</Files>
910	</Project>	910	</Project>
911		911
912	<Project frameworkVersion="v3_5" name="OpenSim.Grid.GridServer" path="OpenSim/Grid/GridServer" type="Exe">	912	<Project frameworkVersion="v3_5" name="OpenSim.Grid.GridServer" path="OpenSim/Grid/GridServer" type="Library">
913	<Configuration name="Debug">	913	<Configuration name="Debug">
914	<Options>	914	<Options>
915	<OutputPath>../../../bin/</OutputPath>	915	<OutputPath>../../../bin/</OutputPath>
@@ -1721,6 +1721,48 @@
1721	</Files>	1721	</Files>
1722	</Project>	1722	</Project>
1723		1723
		1724
		1725	<Project frameworkVersion="v3_5" name="OpenSim.Region.RegionCombinerModule" path="OpenSim/Region/RegionCombinerModule" type="Library">
		1726	<Configuration name="Debug">
		1727	<Options>
		1728	<OutputPath>../../../bin/</OutputPath>
		1729	</Options>
		1730	</Configuration>
		1731	<Configuration name="Release">
		1732	<Options>
		1733	<OutputPath>../../../bin/</OutputPath>
		1734	</Options>
		1735	</Configuration>
		1736
		1737	<ReferencePath>../../../bin/</ReferencePath>
		1738	<Reference name="System"/>
		1739	<Reference name="System.Xml"/>
		1740	<Reference name="OpenMetaverseTypes.dll"/>
		1741	<Reference name="OpenMetaverse.dll"/>
		1742	<Reference name="OpenSim.Framework"/>
		1743	<Reference name="OpenSim.Framework.Communications"/>
		1744	<Reference name="OpenSim.Region.Framework" />
		1745	<Reference name="OpenSim.Server.Base" />
		1746	<Reference name="OpenSim.Server.Handlers" />
		1747	<Reference name="OpenSim.Framework.Console"/>
		1748	<Reference name="OpenSim.Region.Physics.Manager"/>
		1749	<Reference name="OpenSim.Framework.Communications"/>
		1750	<Reference name="OpenSim.Region.CoreModules" />
		1751	<Reference name="Nini.dll" />
		1752	<Reference name="log4net.dll"/>
		1753
		1754	<!-- To allow regions to have mono addins -->
		1755	<Reference name="Mono.Addins.dll" />
		1756
		1757	<Files>
		1758	<Match pattern="*.cs" recurse="true" />
		1759	<Match pattern="*.addin.xml" path="Resources" buildAction="EmbeddedResource" recurse="true"/>
		1760	</Files>
		1761	</Project>
		1762
		1763
		1764
		1765
1724	<Project frameworkVersion="v3_5" name="OpenSim.Region.Communications.Hypergrid" path="OpenSim/Region/Communications/Hypergrid" type="Library">	1766	<Project frameworkVersion="v3_5" name="OpenSim.Region.Communications.Hypergrid" path="OpenSim/Region/Communications/Hypergrid" type="Library">
1725	<Configuration name="Debug">	1767	<Configuration name="Debug">
1726	<Options>	1768	<Options>