OpenSim
/
opensim
mirror of https://github.com/opensim/opensim.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

changes so mono.data.sqlite use dllmap

This commit is contained in:
UbitUmarov 2022-11-24 15:11:56 +00:00
parent a133a0c7ac
commit 4565281d41
10 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSim/Data/SQLite/SQLiteAssetData.cs
View File

@ -81,8 +81,7 @@ namespace OpenSim.Data.SQLite
/// <param name="dbconnect">connect string</param>
override public void Initialise(string dbconnect)
{
if (Util.IsWindows())
Util.LoadArchSpecificWindowsDll("sqlite3.dll");
DllmapConfigHelper.RegisterAssembly(typeof(SQLiteAssetData).Assembly);
if (dbconnect.Length == 0)
{

3
OpenSim/Data/SQLite/SQLiteAuthenticationData.cs
View File

@ -65,8 +65,7 @@ namespace OpenSim.Data.SQLite
if (!m_initialized)
{
if (Util.IsWindows())
Util.LoadArchSpecificWindowsDll("sqlite3.dll");
DllmapConfigHelper.RegisterAssembly(typeof(SQLiteAuthenticationData).Assembly);
m_Connection = new SqliteConnection(connectionString);
m_Connection.Open();

3
OpenSim/Data/SQLite/SQLiteEstateData.cs
View File

@ -69,8 +69,7 @@ namespace OpenSim.Data.SQLite
public void Initialise(string connectionString)
{
if (Util.IsWindows())
Util.LoadArchSpecificWindowsDll("sqlite3.dll");
DllmapConfigHelper.RegisterAssembly(typeof(SQLiteEstateStore).Assembly);
m_connectionString = connectionString;

3
OpenSim/Data/SQLite/SQLiteFramework.cs
View File

@ -48,8 +48,7 @@ namespace OpenSim.Data.SQLite
protected SQLiteFramework(string connectionString)
{
if (Util.IsWindows())
Util.LoadArchSpecificWindowsDll("sqlite3.dll");
DllmapConfigHelper.RegisterAssembly(typeof(SQLiteFramework).Assembly);
}
//////////////////////////////////////////////////////////////

3
OpenSim/Data/SQLite/SQLiteSimulationData.cs
View File

@ -113,8 +113,7 @@ namespace OpenSim.Data.SQLite
{
try
{
if (Util.IsWindows())
Util.LoadArchSpecificWindowsDll("sqlite3.dll");
DllmapConfigHelper.RegisterAssembly(typeof(SQLiteSimulationData).Assembly);
m_connectionString = connectionString;

3
OpenSim/Data/SQLite/SQLiteUserProfilesData.cs
View File

@ -69,8 +69,7 @@ namespace OpenSim.Data.SQLite
public void Initialise(string connectionString)
{
if (Util.IsWindows())
Util.LoadArchSpecificWindowsDll("sqlite3.dll");
DllmapConfigHelper.RegisterAssembly(typeof(SQLiteUserProfilesData).Assembly);
m_connectionString = connectionString;

3
OpenSim/Data/SQLite/SQLiteXInventoryData.cs
View File

@ -52,8 +52,7 @@ namespace OpenSim.Data.SQLite
public SQLiteXInventoryData(string conn, string realm)
{
if (Util.IsWindows())
Util.LoadArchSpecificWindowsDll("sqlite3.dll");
DllmapConfigHelper.RegisterAssembly(typeof(SQLiteXInventoryData).Assembly);
m_Folders = new SqliteFolderHandler(
conn, "inventoryfolders", "XInventoryStore");

3
OpenSim/Region/OptionalModules/UserStatistics/WebStatsModule.cs
View File

@ -91,8 +91,7 @@ namespace OpenSim.Region.UserStatistics
if (!enabled)
return;
if (Util.IsWindows())
Util.LoadArchSpecificWindowsDll("sqlite3.dll");
DllmapConfigHelper.RegisterAssembly(typeof(WebStatsModule).Assembly);
//IConfig startupConfig = config.Configs["Startup"];

8
bin/Mono.Data.Sqlite.dll.config
View File

@ -1,5 +1,7 @@
<configuration>
<dllmap os="osx" dll="sqlite3" target="lib64/libsqlite3.dylib" />
<dllmap os="!windows,osx" cpu="x86-64,ia64" wordsize="64" dll="sqlite3" target="lib64/libsqlite3_64.so" />
<dllmap os="!windows,osx" cpu="x86" wordsize="32" dll="sqlite3" target="lib32/libsqlite3_32.so" />
<dllmap os="windows" cpu="x86-64" dll="sqlite3" target="lib64/sqlite3.dll" />
<dllmap os="windows" cpu="x86" dll="sqlite3" target="lib32/sqlite3.dll" />
<dllmap os="osx" cpu="x86,x86-64" dll="sqlite3" target="lib64/libsqlite3.dylib" />
<dllmap os="!windows,osx" cpu="x86-64" dll="sqlite3" target="lib64/libsqlite3_64.so" />
<dllmap os="!windows,osx" cpu="x86" dll="sqlite3" target="lib32/libsqlite3_32.so" />
</configuration>

7
bin/OpenSim.Region.OptionalModules.dll.config Normal file
View File

@ -0,0 +1,7 @@
<configuration>
<dllmap os="windows" cpu="x86-64" dll="sqlite3" target="lib64/sqlite3.dll" />
<dllmap os="windows" cpu="x86" dll="sqlite3" target="lib32/sqlite3.dll" />
<dllmap os="osx" cpu="x86,x86-64" dll="sqlite3" target="lib64/libsqlite3.dylib" />
<dllmap os="!windows,osx" cpu="x86-64" dll="sqlite3" target="lib64/libsqlite3_64.so" />
<dllmap os="!windows,osx" cpu="x86" dll="sqlite3" target="lib32/libsqlite3_32.so" />
</configuration>