aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDiva Canto2010-04-26 15:03:47 -0700
committerDiva Canto2010-04-26 15:03:47 -0700
commit2686573b1cfd2a4493d589b6f2987c3a61829b3a (patch)
tree1fba54a90ec8fcc5a2b1c14453a9897c8def9421
parent* Commenting SQLiteNG out of prebuild.xml, because it's making compile fail i... (diff)
downloadopensim-SC-2686573b1cfd2a4493d589b6f2987c3a61829b3a.zip
opensim-SC-2686573b1cfd2a4493d589b6f2987c3a61829b3a.tar.gz
opensim-SC-2686573b1cfd2a4493d589b6f2987c3a61829b3a.tar.bz2
opensim-SC-2686573b1cfd2a4493d589b6f2987c3a61829b3a.tar.xz
Uncommenting SQLiteNG project again. I found a Mono.Data.Sqlite.dll that makes the compilation in Windows happy again. Not sure if this is the right dll, Justin -- I grabbed it somewhere from mono 2.4.6 for Windows.
-rw-r--r--bin/Mono.Data.Sqlite.dllbin0 -> 169472 bytes
-rw-r--r--prebuild.xml3
2 files changed, 1 insertions, 2 deletions
diff --git a/bin/Mono.Data.Sqlite.dll b/bin/Mono.Data.Sqlite.dll
new file mode 100644
index 0000000..2b81a44
--- /dev/null
+++ b/bin/Mono.Data.Sqlite.dll
Binary files differ
diff --git a/prebuild.xml b/prebuild.xml
index dd163f0..123f569 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -2215,7 +2215,6 @@
2215 </Files> 2215 </Files>
2216 </Project> 2216 </Project>
2217 2217
2218 <!--
2219 <Project frameworkVersion="v3_5" name="OpenSim.Data.SQLiteNG" path="OpenSim/Data/SQLiteNG" type="Library"> 2218 <Project frameworkVersion="v3_5" name="OpenSim.Data.SQLiteNG" path="OpenSim/Data/SQLiteNG" type="Library">
2220 <Configuration name="Debug"> 2219 <Configuration name="Debug">
2221 <Options> 2220 <Options>
@@ -2251,7 +2250,7 @@
2251 <Match pattern="*.addin.xml" path="Resources" buildAction="EmbeddedResource" recurse="true"/> 2250 <Match pattern="*.addin.xml" path="Resources" buildAction="EmbeddedResource" recurse="true"/>
2252 </Files> 2251 </Files>
2253 </Project> 2252 </Project>
2254--> 2253
2255 2254
2256 <Project frameworkVersion="v3_5" name="OpenSim.Region.ScriptEngine.Shared" path="OpenSim/Region/ScriptEngine/Shared" type="Library"> 2255 <Project frameworkVersion="v3_5" name="OpenSim.Region.ScriptEngine.Shared" path="OpenSim/Region/ScriptEngine/Shared" type="Library">
2257 <Configuration name="Debug"> 2256 <Configuration name="Debug">