diff options
| author | Melanie | 2013-11-03 21:34:36 +0000 |
|---|---|---|
| committer | Melanie | 2013-11-03 21:34:36 +0000 |
| commit | ba203ed94fb9fb27e4da2663dad6cac21d5892e3 (patch) | |
| tree | c03981fa7b9070af3cec331234b78762c49a8a06 /prebuild.xml | |
| parent | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ... (diff) | |
| parent | Add current .NET windows framework requirement to README. (diff) | |
| download | opensim-SC_OLD-ba203ed94fb9fb27e4da2663dad6cac21d5892e3.zip opensim-SC_OLD-ba203ed94fb9fb27e4da2663dad6cac21d5892e3.tar.gz opensim-SC_OLD-ba203ed94fb9fb27e4da2663dad6cac21d5892e3.tar.bz2 opensim-SC_OLD-ba203ed94fb9fb27e4da2663dad6cac21d5892e3.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'prebuild.xml')
| -rw-r--r-- | prebuild.xml | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/prebuild.xml b/prebuild.xml index 3c0b881..8548229 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
| @@ -2198,6 +2198,42 @@ | |||
| 2198 | </Files> | 2198 | </Files> |
| 2199 | </Project> | 2199 | </Project> |
| 2200 | 2200 | ||
| 2201 | <Project frameworkVersion="v3_5" name="OpenSim.Data.PGSQL" path="OpenSim/Data/PGSQL" type="Library"> | ||
| 2202 | <Configuration name="Debug"> | ||
| 2203 | <Options> | ||
| 2204 | <OutputPath>../../../bin/</OutputPath> | ||
| 2205 | </Options> | ||
| 2206 | </Configuration> | ||
| 2207 | <Configuration name="Release"> | ||
| 2208 | <Options> | ||
| 2209 | <OutputPath>../../../bin/</OutputPath> | ||
| 2210 | </Options> | ||
| 2211 | </Configuration> | ||
| 2212 | |||
| 2213 | <ReferencePath>../../../bin/</ReferencePath> | ||
| 2214 | <Reference name="System"/> | ||
| 2215 | <Reference name="System.Core"/> | ||
| 2216 | <Reference name="System.Xml"/> | ||
| 2217 | <Reference name="System.Data"/> | ||
| 2218 | <Reference name="System.Drawing"/> | ||
| 2219 | <Reference name="OpenSim.Framework"/> | ||
| 2220 | <Reference name="OpenSim.Data"/> | ||
| 2221 | <Reference name="OpenSim.Region.Framework"/> | ||
| 2222 | <Reference name="OpenSim.Framework.Console"/> | ||
| 2223 | <Reference name="OpenMetaverseTypes" path="../../../bin/"/> | ||
| 2224 | <Reference name="OpenMetaverse" path="../../../bin/"/> | ||
| 2225 | <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/> | ||
| 2226 | <Reference name="log4net" path="../../../bin/"/> | ||
| 2227 | <Reference name="Mono.Addins" path="../../../bin/"/> | ||
| 2228 | <Reference name="Npgsql" path="../../../bin/"/> | ||
| 2229 | |||
| 2230 | <Files> | ||
| 2231 | <Match pattern="*.cs" recurse="true"/> | ||
| 2232 | <Match buildAction="EmbeddedResource" path="Resources" pattern="*.migrations"/> | ||
| 2233 | <Match buildAction="EmbeddedResource" path="Resources" pattern="*.addin.xml" recurse="true"/> | ||
| 2234 | </Files> | ||
| 2235 | </Project> | ||
| 2236 | |||
| 2201 | <Project frameworkVersion="v3_5" name="OpenSim.Data.SQLite" path="OpenSim/Data/SQLite" type="Library"> | 2237 | <Project frameworkVersion="v3_5" name="OpenSim.Data.SQLite" path="OpenSim/Data/SQLite" type="Library"> |
| 2202 | <Configuration name="Debug"> | 2238 | <Configuration name="Debug"> |
| 2203 | <Options> | 2239 | <Options> |