summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Hazan <ghazan@miranda.im>2018-10-08 14:07:01 +0300
committerGeorge Hazan <ghazan@miranda.im>2018-10-08 14:07:01 +0300
commit32197e8186bf0b15555d0910a89709f2fa956919 (patch)
treef8a41856c2f98854512f0897724efcd6ec430de7
parent0fac9e9fd54aecd1a712c85ddde1b84306cfe5a1 (diff)
Dbx_sqlite included into nightly build
-rw-r--r--bin15/mir_full.sln11
-rw-r--r--bin15/miranda32.sln25
-rw-r--r--tools/build_scripts/bin15/z2_PackPluginUpdater_x32.txt1
-rw-r--r--tools/build_scripts/bin15/z2_PackPluginUpdater_x64.txt1
-rw-r--r--tools/build_scripts/bin15/z3_PackArchives.txt1
-rw-r--r--tools/build_scripts/z2_PackPluginUpdater.txt1
6 files changed, 34 insertions, 6 deletions
diff --git a/bin15/mir_full.sln b/bin15/mir_full.sln
index dfbace0efb..7c8fcee5c2 100644
--- a/bin15/mir_full.sln
+++ b/bin15/mir_full.sln
@@ -453,6 +453,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mdbx_dump", "..\tools\mdbx_
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mdbx_load", "..\tools\mdbx_load\mdbx_load.vcxproj", "{63BA600E-86BF-4502-9EF0-8C090292E161}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dbx_sqlite", "..\plugins\Dbx_sqlite\dbx_sqlite.vcxproj", "{B3494FED-FB8C-43F4-B341-F26A3460203B}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -2035,6 +2037,14 @@ Global
{63BA600E-86BF-4502-9EF0-8C090292E161}.Release|Win32.Build.0 = Release|Win32
{63BA600E-86BF-4502-9EF0-8C090292E161}.Release|x64.ActiveCfg = Release|x64
{63BA600E-86BF-4502-9EF0-8C090292E161}.Release|x64.Build.0 = Release|x64
+ {B3494FED-FB8C-43F4-B341-F26A3460203B}.Debug|Win32.ActiveCfg = Debug|Win32
+ {B3494FED-FB8C-43F4-B341-F26A3460203B}.Debug|Win32.Build.0 = Debug|Win32
+ {B3494FED-FB8C-43F4-B341-F26A3460203B}.Debug|x64.ActiveCfg = Debug|x64
+ {B3494FED-FB8C-43F4-B341-F26A3460203B}.Debug|x64.Build.0 = Debug|x64
+ {B3494FED-FB8C-43F4-B341-F26A3460203B}.Release|Win32.ActiveCfg = Release|Win32
+ {B3494FED-FB8C-43F4-B341-F26A3460203B}.Release|Win32.Build.0 = Release|Win32
+ {B3494FED-FB8C-43F4-B341-F26A3460203B}.Release|x64.ActiveCfg = Release|x64
+ {B3494FED-FB8C-43F4-B341-F26A3460203B}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -2163,6 +2173,7 @@ Global
{6D19209B-ECE7-4B9C-941C-0AA2B484F199} = {37EDFBEA-8446-4BF3-9F2E-655908CDFB62}
{EE383404-7976-4E87-BD13-A9B7B47C0C10} = {F13387B0-1C74-48EC-9AEC-65E3B9DE29E4}
{63BA600E-86BF-4502-9EF0-8C090292E161} = {F13387B0-1C74-48EC-9AEC-65E3B9DE29E4}
+ {B3494FED-FB8C-43F4-B341-F26A3460203B} = {F13387B0-1C74-48EC-9AEC-65E3B9DE29E4}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {29A0C2A8-07A4-4A8B-8BED-8F7D024013D6}
diff --git a/bin15/miranda32.sln b/bin15/miranda32.sln
index 568ab259e5..44671a9c78 100644
--- a/bin15/miranda32.sln
+++ b/bin15/miranda32.sln
@@ -147,6 +147,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mdbx_dump", "..\tools\mdbx_
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mdbx_load", "..\tools\mdbx_load\mdbx_load.vcxproj", "{63BA600E-86BF-4502-9EF0-8C090292E161}"
EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Database", "Database", "{30B05A85-FD7F-49CD-BBA9-0B7CE5825D52}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dbx_sqlite", "..\plugins\Dbx_sqlite\dbx_sqlite.vcxproj", "{B3494FED-FB8C-43F4-B341-F26A3460203B}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -547,6 +551,14 @@ Global
{63BA600E-86BF-4502-9EF0-8C090292E161}.Release|Win32.Build.0 = Release|Win32
{63BA600E-86BF-4502-9EF0-8C090292E161}.Release|x64.ActiveCfg = Release|x64
{63BA600E-86BF-4502-9EF0-8C090292E161}.Release|x64.Build.0 = Release|x64
+ {B3494FED-FB8C-43F4-B341-F26A3460203B}.Debug|Win32.ActiveCfg = Debug|Win32
+ {B3494FED-FB8C-43F4-B341-F26A3460203B}.Debug|Win32.Build.0 = Debug|Win32
+ {B3494FED-FB8C-43F4-B341-F26A3460203B}.Debug|x64.ActiveCfg = Debug|x64
+ {B3494FED-FB8C-43F4-B341-F26A3460203B}.Debug|x64.Build.0 = Debug|x64
+ {B3494FED-FB8C-43F4-B341-F26A3460203B}.Release|Win32.ActiveCfg = Release|Win32
+ {B3494FED-FB8C-43F4-B341-F26A3460203B}.Release|Win32.Build.0 = Release|Win32
+ {B3494FED-FB8C-43F4-B341-F26A3460203B}.Release|x64.ActiveCfg = Release|x64
+ {B3494FED-FB8C-43F4-B341-F26A3460203B}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -559,7 +571,7 @@ Global
{7711F563-6473-4ABD-B5E3-477CE8384AD6} = {6221EF9E-F53A-4381-B760-4C0208E5D597}
{E2A369CD-EDA3-414F-8AD0-E732CD7EE68C} = {52282CDE-49DF-4662-B582-CCF971A9FEC2}
{9299B507-1AF9-4C93-9560-5F637D1E0C9E} = {6221EF9E-F53A-4381-B760-4C0208E5D597}
- {20D781FB-4A20-4B75-B863-304A47182966} = {6221EF9E-F53A-4381-B760-4C0208E5D597}
+ {20D781FB-4A20-4B75-B863-304A47182966} = {30B05A85-FD7F-49CD-BBA9-0B7CE5825D52}
{99D26CA1-BFD4-4E77-9A1E-919E54CF33F7} = {6221EF9E-F53A-4381-B760-4C0208E5D597}
{6DA1396F-2A44-4D5C-8442-012F71006217} = {812EF24D-9B76-4A94-ABE0-6F80C381C203}
{3A12F777-56A8-42EC-BD17-8F325524241E} = {812EF24D-9B76-4A94-ABE0-6F80C381C203}
@@ -594,12 +606,13 @@ Global
{DADE9455-DC28-465A-9604-2CA28052B9FB} = {812EF24D-9B76-4A94-ABE0-6F80C381C203}
{44298314-7DD4-4EF7-B576-30E503257223} = {949AF443-676D-4B48-B21E-9B6FC3A4808D}
{793B6174-89B0-4682-A957-A32BE7F61502} = {949AF443-676D-4B48-B21E-9B6FC3A4808D}
- {E0ACDEA0-0AC9-4431-8CA3-6B0CCACB2E18} = {6221EF9E-F53A-4381-B760-4C0208E5D597}
+ {E0ACDEA0-0AC9-4431-8CA3-6B0CCACB2E18} = {30B05A85-FD7F-49CD-BBA9-0B7CE5825D52}
{5D14CFF3-0D17-4528-99EA-DE9DCA47CC2E} = {52282CDE-49DF-4662-B582-CCF971A9FEC2}
- {6D19209B-ECE7-4B9C-941C-0AA2B484F199} = {52282CDE-49DF-4662-B582-CCF971A9FEC2}
- {0C02E395-E73F-47E3-8B95-B7924C0C7A6A} = {52282CDE-49DF-4662-B582-CCF971A9FEC2}
- {EE383404-7976-4E87-BD13-A9B7B47C0C10} = {52282CDE-49DF-4662-B582-CCF971A9FEC2}
- {63BA600E-86BF-4502-9EF0-8C090292E161} = {52282CDE-49DF-4662-B582-CCF971A9FEC2}
+ {6D19209B-ECE7-4B9C-941C-0AA2B484F199} = {30B05A85-FD7F-49CD-BBA9-0B7CE5825D52}
+ {0C02E395-E73F-47E3-8B95-B7924C0C7A6A} = {30B05A85-FD7F-49CD-BBA9-0B7CE5825D52}
+ {EE383404-7976-4E87-BD13-A9B7B47C0C10} = {30B05A85-FD7F-49CD-BBA9-0B7CE5825D52}
+ {63BA600E-86BF-4502-9EF0-8C090292E161} = {30B05A85-FD7F-49CD-BBA9-0B7CE5825D52}
+ {B3494FED-FB8C-43F4-B341-F26A3460203B} = {30B05A85-FD7F-49CD-BBA9-0B7CE5825D52}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {5A4CD630-DD83-4096-AA4D-7A141E43E853}
diff --git a/tools/build_scripts/bin15/z2_PackPluginUpdater_x32.txt b/tools/build_scripts/bin15/z2_PackPluginUpdater_x32.txt
index 1a55b5e8e2..9b7874c346 100644
--- a/tools/build_scripts/bin15/z2_PackPluginUpdater_x32.txt
+++ b/tools/build_scripts/bin15/z2_PackPluginUpdater_x32.txt
@@ -43,6 +43,7 @@ Plugins\cyrtranslit.dll
Plugins\dbeditorpp.dll
Plugins\dbx_mdbx.dll
Plugins\dbx_mmap.dll
+Plugins\dbx_sqlite.dll
Plugins\db_autobackups.dll
Plugins\discord.dll
Plugins\dummy.dll
diff --git a/tools/build_scripts/bin15/z2_PackPluginUpdater_x64.txt b/tools/build_scripts/bin15/z2_PackPluginUpdater_x64.txt
index 8f62d7c73f..2f99ec7922 100644
--- a/tools/build_scripts/bin15/z2_PackPluginUpdater_x64.txt
+++ b/tools/build_scripts/bin15/z2_PackPluginUpdater_x64.txt
@@ -43,6 +43,7 @@ Plugins\cyrtranslit.dll
Plugins\dbeditorpp.dll
Plugins\dbx_mmap.dll
Plugins\dbx_mdbx.dll
+Plugins\dbx_sqlite.dll
Plugins\db_autobackups.dll
Plugins\discord.dll
Plugins\dummy.dll
diff --git a/tools/build_scripts/bin15/z3_PackArchives.txt b/tools/build_scripts/bin15/z3_PackArchives.txt
index b9ba06f579..97230a24f7 100644
--- a/tools/build_scripts/bin15/z3_PackArchives.txt
+++ b/tools/build_scripts/bin15/z3_PackArchives.txt
@@ -86,6 +86,7 @@ Plugins\CrashDumper.dll
Plugins\Db_autobackups.dll
Plugins\Dbx_mdbx.dll
Plugins\Dbx_mmap.dll
+Plugins\Dbx_sqlite.dll
Plugins\Dummy.dll
Plugins\Facebook.dll
Plugins\GG.dll
diff --git a/tools/build_scripts/z2_PackPluginUpdater.txt b/tools/build_scripts/z2_PackPluginUpdater.txt
index cd6f6df855..91088daff2 100644
--- a/tools/build_scripts/z2_PackPluginUpdater.txt
+++ b/tools/build_scripts/z2_PackPluginUpdater.txt
@@ -56,6 +56,7 @@ Core\StdUserOnline.dll
Plugins\Db_autobackups.dll
Plugins\Dbx_mmap.dll
Plugins\Dbx_mdbx.dll
+Plugins\Dbx_sqlite.dll
Plugins\Dummy.dll
Plugins\Import.dll
Icons\Proto_Dummy.dll