diff --git a/build/AgaLib.vcxproj.filters b/build/AgaLib.vcxproj.filters index 65e59b119..e7dd7b67e 100644 --- a/build/AgaLib.vcxproj.filters +++ b/build/AgaLib.vcxproj.filters @@ -523,6 +523,9 @@ Headers + + Headers + @@ -774,6 +777,9 @@ Sources + + Sources + diff --git a/build/Ba1.vcxproj b/build/Ba1.vcxproj index 9eb55acee..8a109f65a 100644 --- a/build/Ba1.vcxproj +++ b/build/Ba1.vcxproj @@ -361,6 +361,7 @@ $(TargetDir)%(Filename).msk;%(Outputs) Document + diff --git a/build/Ba1.vcxproj.filters b/build/Ba1.vcxproj.filters index 9f8afa63d..e4b8f28b0 100644 --- a/build/Ba1.vcxproj.filters +++ b/build/Ba1.vcxproj.filters @@ -154,6 +154,9 @@ Masks + + Masks + diff --git a/build/Cg4.vcxproj b/build/Cg4.vcxproj index 7eda9b56b..6f8290ca2 100644 --- a/build/Cg4.vcxproj +++ b/build/Cg4.vcxproj @@ -302,8 +302,7 @@ - - + diff --git a/build/Cg4.vcxproj.filters b/build/Cg4.vcxproj.filters index 3d32f934a..e5bbcb52e 100644 --- a/build/Cg4.vcxproj.filters +++ b/build/Cg4.vcxproj.filters @@ -202,10 +202,7 @@ Headers - - Headers - - + Headers diff --git a/build/ci1.vcxproj b/build/ci1.vcxproj index 566c90a6f..8710e331e 100644 --- a/build/ci1.vcxproj +++ b/build/ci1.vcxproj @@ -220,14 +220,15 @@ - - Designer - Designer - + + + Designer + + diff --git a/build/ci1.vcxproj.filters b/build/ci1.vcxproj.filters index 412315722..ca19244a8 100644 --- a/build/ci1.vcxproj.filters +++ b/build/ci1.vcxproj.filters @@ -152,9 +152,6 @@ Reports - - Reports - Reports @@ -170,6 +167,12 @@ Reports + + Reports + + + Reports + diff --git a/build/db.sln b/build/db.sln index e2e6becfa..983b44885 100644 --- a/build/db.sln +++ b/build/db.sln @@ -1,6 +1,8 @@  -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.28307.1622 +MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "db0", "db0.vcxproj", "{8BE4C959-C8F6-4D27-9E3E-983737D70449}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "db1", "db1.vcxproj", "{7812F135-F255-4DE8-B77F-9F48BB68737C}" @@ -11,6 +13,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AgaLib", "AgaLib.vcxproj", EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vedoc", "vedoc.vcxproj", "{A1CE9743-A597-4F92-B55A-345A366C9E55}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vedocext", "vedocext.vcxproj", "{0042619A-6B7C-4D3D-9CD9-9BDD8D200C15}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cglib", "cglib.vcxproj", "{7B80F974-CE2E-4BD9-855A-44FF139FF288}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -37,8 +43,19 @@ Global {A1CE9743-A597-4F92-B55A-345A366C9E55}.Debug|Win32.Build.0 = Debug|Win32 {A1CE9743-A597-4F92-B55A-345A366C9E55}.Release|Win32.ActiveCfg = Release|Win32 {A1CE9743-A597-4F92-B55A-345A366C9E55}.Release|Win32.Build.0 = Release|Win32 + {0042619A-6B7C-4D3D-9CD9-9BDD8D200C15}.Debug|Win32.ActiveCfg = Debug|Win32 + {0042619A-6B7C-4D3D-9CD9-9BDD8D200C15}.Debug|Win32.Build.0 = Debug|Win32 + {0042619A-6B7C-4D3D-9CD9-9BDD8D200C15}.Release|Win32.ActiveCfg = Release|Win32 + {0042619A-6B7C-4D3D-9CD9-9BDD8D200C15}.Release|Win32.Build.0 = Release|Win32 + {7B80F974-CE2E-4BD9-855A-44FF139FF288}.Debug|Win32.ActiveCfg = Debug|Win32 + {7B80F974-CE2E-4BD9-855A-44FF139FF288}.Debug|Win32.Build.0 = Debug|Win32 + {7B80F974-CE2E-4BD9-855A-44FF139FF288}.Release|Win32.ActiveCfg = Release|Win32 + {7B80F974-CE2E-4BD9-855A-44FF139FF288}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {3749CCD9-DAAE-4BBE-9685-1FA083C25AFF} + EndGlobalSection EndGlobal diff --git a/build/db0.vcxproj b/build/db0.vcxproj index 77cb28a94..7065228a4 100644 --- a/build/db0.vcxproj +++ b/build/db0.vcxproj @@ -222,6 +222,9 @@ + + + @@ -246,6 +249,9 @@ {2d38a763-3d74-4338-9362-b891784ec90e} + + {7b80f974-ce2e-4bd9-855a-44ff139ff288} + diff --git a/build/db0.vcxproj.filters b/build/db0.vcxproj.filters index 2d19c2fe0..b45e91c9c 100644 --- a/build/db0.vcxproj.filters +++ b/build/db0.vcxproj.filters @@ -130,6 +130,15 @@ Headers + + Headers + + + Headers + + + Headers + diff --git a/build/db1.vcxproj b/build/db1.vcxproj index 37b98f9fa..7360bd0a8 100644 --- a/build/db1.vcxproj +++ b/build/db1.vcxproj @@ -132,7 +132,7 @@ _DEBUG;%(PreprocessorDefinitions) 0x0410 - ..\wx28X\include;%(AdditionalIncludeDirectories) + ..\libraries\wx28X\include;%(AdditionalIncludeDirectories) wsock32.lib;%(AdditionalDependencies) @@ -223,6 +223,9 @@ {a1ce9743-a597-4f92-b55a-345a366c9e55} + + {0042619a-6b7c-4d3d-9cd9-9bdd8d200c15} + diff --git a/build/db2.vcxproj b/build/db2.vcxproj index 4db733553..d70cc1b39 100644 --- a/build/db2.vcxproj +++ b/build/db2.vcxproj @@ -77,7 +77,7 @@ _DEBUG;%(PreprocessorDefinitions) 0x0410 - ..\wx28X\include;%(AdditionalIncludeDirectories) + ..\libraries\wx28X\include;%(AdditionalIncludeDirectories) wsock32.lib;%(AdditionalDependencies) @@ -220,6 +220,9 @@ {2d38a763-3d74-4338-9362-b891784ec90e} + + {7b80f974-ce2e-4bd9-855a-44ff139ff288} +