diff --git a/build/Or1.vcxproj b/build/Or1.vcxproj index 91c1ea83d..9bca15b40 100644 --- a/build/Or1.vcxproj +++ b/build/Or1.vcxproj @@ -1,4 +1,4 @@ - + @@ -77,7 +77,7 @@ NDEBUG;%(PreprocessorDefinitions) 0x0410 - ..\wx28X\include;%(AdditionalIncludeDirectories) + ..\libraries\wx28X\include;%(AdditionalIncludeDirectories) %(AdditionalDependencies) @@ -119,7 +119,6 @@ _DEBUG;WIN32;__LONGDOUBLE__;_WINDOWS;%(PreprocessorDefinitions) false MultiThreadedDebug - Level3 true EditAndContinue @@ -159,7 +158,6 @@ - %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -245,12 +243,18 @@ {2d38a763-3d74-4338-9362-b891784ec90e} + + {7b80f974-ce2e-4bd9-855a-44ff139ff288} + {a1ce9743-a597-4f92-b55a-345a366c9e55} + + {0042619a-6b7c-4d3d-9cd9-9bdd8d200c15} + - \ No newline at end of file + diff --git a/build/Sc0.vcxproj b/build/Sc0.vcxproj index 565e7c8c8..812f5717c 100644 --- a/build/Sc0.vcxproj +++ b/build/Sc0.vcxproj @@ -1,4 +1,4 @@ - + @@ -106,7 +106,8 @@ $(IntDir) - "C:\Program Files (x86)\Windows Kits\10\bin\10.0.16299.0\x64\signtool.exe" sign /a /s MY /n "Sirio Informatica e Sistemi SPA" /t http://timestamp.verisign.com/scripts/timstamp.dll /v "$(TargetPath)" + + @@ -220,6 +221,7 @@ + @@ -233,4 +235,4 @@ - \ No newline at end of file + diff --git a/build/Sc1.vcxproj b/build/Sc1.vcxproj index f381bdca9..ca09553ff 100644 --- a/build/Sc1.vcxproj +++ b/build/Sc1.vcxproj @@ -1,4 +1,4 @@ - + @@ -150,7 +150,8 @@ .\..\release/Sc1.bsc - "C:\Program Files (x86)\Windows Kits\10\bin\10.0.16299.0\x64\signtool.exe" sign /a /s MY /n "Sirio Informatica e Sistemi SPA" /t http://timestamp.verisign.com/scripts/timstamp.dll /v "$(TargetPath)" + + @@ -212,4 +213,4 @@ - \ No newline at end of file + diff --git a/build/Sc2.vcxproj b/build/Sc2.vcxproj index ca6b876cf..c75f35e62 100644 --- a/build/Sc2.vcxproj +++ b/build/Sc2.vcxproj @@ -1,4 +1,4 @@ - + @@ -145,7 +145,8 @@ .\..\release/Sc2.bsc - "C:\Program Files (x86)\Windows Kits\10\bin\10.0.16299.0\x64\signtool.exe" sign /a /s MY /n "Sirio Informatica e Sistemi SPA" /t http://timestamp.verisign.com/scripts/timstamp.dll /v "$(TargetPath)" + + @@ -277,4 +278,4 @@ - \ No newline at end of file + diff --git a/build/Sc3.vcxproj b/build/Sc3.vcxproj index 1054c4f8f..1082e811b 100644 --- a/build/Sc3.vcxproj +++ b/build/Sc3.vcxproj @@ -1,4 +1,4 @@ - + @@ -140,7 +140,8 @@ .\..\release/Sc3.bsc - "C:\Program Files (x86)\Windows Kits\10\bin\10.0.16299.0\x64\signtool.exe" sign /a /s MY /n "Sirio Informatica e Sistemi SPA" /t http://timestamp.verisign.com/scripts/timstamp.dll /v "$(TargetPath)" + + @@ -189,4 +190,4 @@ - \ No newline at end of file + diff --git a/build/at0.vcxproj b/build/at0.vcxproj index 780c3deb2..fada2a5f9 100644 --- a/build/at0.vcxproj +++ b/build/at0.vcxproj @@ -1,4 +1,4 @@ - + @@ -358,301 +358,6 @@ - - - Copying trr %(FullPath)... - copy %(FullPath) $(TargetDir)recdesc\%(Filename).trr - - $(TargetDir)recdesc\%(Filename).trr;%(Outputs) - Copying trr %(FullPath)... - copy %(FullPath) $(TargetDir)recdesc\%(Filename).trr - - $(TargetDir)recdesc\%(Filename).trr;%(Outputs) - - - Copying trr %(FullPath)... - copy %(FullPath) $(TargetDir)recdesc\%(Filename).trr - - $(TargetDir)recdesc\%(Filename).trr;%(Outputs) - Copying trr %(FullPath)... - copy %(FullPath) $(TargetDir)recdesc\%(Filename).trr - - $(TargetDir)recdesc\%(Filename).trr;%(Outputs) - - - Copying trr %(FullPath)... - copy %(FullPath) $(TargetDir)recdesc\%(Filename).trr - - $(TargetDir)recdesc\%(Filename).trr;%(Outputs) - Copying trr %(FullPath)... - copy %(FullPath) $(TargetDir)recdesc\%(Filename).trr - - $(TargetDir)recdesc\%(Filename).trr;%(Outputs) - - - Copying trr %(FullPath)... - copy %(FullPath) $(TargetDir)recdesc\%(Filename).trr - - $(TargetDir)recdesc\%(Filename).trr;%(Outputs) - Copying trr %(FullPath)... - copy %(FullPath) $(TargetDir)recdesc\%(Filename).trr - - $(TargetDir)recdesc\%(Filename).trr;%(Outputs) - - - Copying trr %(FullPath)... - copy %(FullPath) $(TargetDir)recdesc\%(Filename).trr - - $(TargetDir)recdesc\%(Filename).trr;%(Outputs) - Copying trr %(FullPath)... - copy %(FullPath) $(TargetDir)recdesc\%(Filename).trr - - $(TargetDir)recdesc\%(Filename).trr;%(Outputs) - - - Copying trr %(FullPath)... - copy %(FullPath) $(TargetDir)recdesc\%(Filename).trr - - $(TargetDir)recdesc\%(Filename).trr;%(Outputs) - Copying trr %(FullPath)... - copy %(FullPath) $(TargetDir)recdesc\%(Filename).trr - - $(TargetDir)recdesc\%(Filename).trr;%(Outputs) - - - Copying trr %(FullPath)... - copy %(FullPath) $(TargetDir)recdesc\%(Filename).trr - - $(TargetDir)recdesc\%(Filename).trr;%(Outputs) - Copying trr %(FullPath)... - copy %(FullPath) $(TargetDir)recdesc\%(Filename).trr - - $(TargetDir)recdesc\%(Filename).trr;%(Outputs) - - - Copying trr %(FullPath)... - copy %(FullPath) $(TargetDir)recdesc\%(Filename).trr - - $(TargetDir)recdesc\%(Filename).trr;%(Outputs) - Copying trr %(FullPath)... - copy %(FullPath) $(TargetDir)recdesc\%(Filename).trr - - $(TargetDir)recdesc\%(Filename).trr;%(Outputs) - - - Copying trr %(FullPath)... - copy %(FullPath) $(TargetDir)recdesc\%(Filename).trr - - $(TargetDir)recdesc\%(Filename).trr;%(Outputs) - Copying trr %(FullPath)... - copy %(FullPath) $(TargetDir)recdesc\%(Filename).trr - - $(TargetDir)recdesc\%(Filename).trr;%(Outputs) - - - Copying trr %(FullPath)... - copy %(FullPath) $(TargetDir)recdesc\%(Filename).trr - - $(TargetDir)recdesc\%(Filename).trr;%(Outputs) - Copying trr %(FullPath)... - copy %(FullPath) $(TargetDir)recdesc\%(Filename).trr - - $(TargetDir)recdesc\%(Filename).trr;%(Outputs) - - - Copying trr %(FullPath)... - copy %(FullPath) $(TargetDir)recdesc\%(Filename).trr - - $(TargetDir)recdesc\%(Filename).trr;%(Outputs) - Copying trr %(FullPath)... - copy %(FullPath) $(TargetDir)recdesc\%(Filename).trr - - $(TargetDir)recdesc\%(Filename).trr;%(Outputs) - - - Copying trr %(FullPath)... - copy %(FullPath) $(TargetDir)recdesc\%(Filename).trr - - $(TargetDir)recdesc\%(Filename).trr;%(Outputs) - Copying trr %(FullPath)... - copy %(FullPath) $(TargetDir)recdesc\%(Filename).trr - - $(TargetDir)recdesc\%(Filename).trr;%(Outputs) - - - Copying trr %(FullPath)... - copy %(FullPath) $(TargetDir)recdesc\%(Filename).trr - - $(TargetDir)recdesc\%(Filename).trr;%(Outputs) - Copying trr %(FullPath)... - copy %(FullPath) $(TargetDir)recdesc\%(Filename).trr - - $(TargetDir)recdesc\%(Filename).trr;%(Outputs) - - - Copying trr %(FullPath)... - copy %(FullPath) $(TargetDir)recdesc\%(Filename).trr - - $(TargetDir)recdesc\%(Filename).trr;%(Outputs) - Copying trr %(FullPath)... - copy %(FullPath) $(TargetDir)recdesc\%(Filename).trr - - $(TargetDir)recdesc\%(Filename).trr;%(Outputs) - - - Copying trr %(FullPath)... - copy %(FullPath) $(TargetDir)recdesc\%(Filename).trr - - $(TargetDir)recdesc\%(Filename).trr;%(Outputs) - Copying trr %(FullPath)... - copy %(FullPath) $(TargetDir)recdesc\%(Filename).trr - - $(TargetDir)recdesc\%(Filename).trr;%(Outputs) - - - - - Copying dir %(FullPath)... - copy %(FullPath) $(TargetDir)recdesc\%(Filename).dir - - $(TargetDir)recdesc\%(Filename).dir;%(Outputs) - Copying dir %(FullPath)... - copy %(FullPath) $(TargetDir)recdesc\%(Filename).dir - - $(TargetDir)recdesc\%(Filename).dir;%(Outputs) - - - Copying dir %(FullPath)... - copy %(FullPath) $(TargetDir)recdesc\%(Filename).dir - - $(TargetDir)recdesc\%(Filename).dir;%(Outputs) - Copying dir %(FullPath)... - copy %(FullPath) $(TargetDir)recdesc\%(Filename).dir - - $(TargetDir)recdesc\%(Filename).dir;%(Outputs) - - - Copying dir %(FullPath)... - copy %(FullPath) $(TargetDir)recdesc\%(Filename).dir - - $(TargetDir)recdesc\%(Filename).dir;%(Outputs) - Copying dir %(FullPath)... - copy %(FullPath) $(TargetDir)recdesc\%(Filename).dir - - $(TargetDir)recdesc\%(Filename).dir;%(Outputs) - - - Copying dir %(FullPath)... - copy %(FullPath) $(TargetDir)recdesc\%(Filename).dir - - $(TargetDir)recdesc\%(Filename).dir;%(Outputs) - Copying dir %(FullPath)... - copy %(FullPath) $(TargetDir)recdesc\%(Filename).dir - - $(TargetDir)recdesc\%(Filename).dir;%(Outputs) - - - Copying dir %(FullPath)... - copy %(FullPath) $(TargetDir)recdesc\%(Filename).dir - - $(TargetDir)recdesc\%(Filename).dir;%(Outputs) - Copying dir %(FullPath)... - copy %(FullPath) $(TargetDir)recdesc\%(Filename).dir - - $(TargetDir)recdesc\%(Filename).dir;%(Outputs) - - - Copying dir %(FullPath)... - copy %(FullPath) $(TargetDir)recdesc\%(Filename).dir - - $(TargetDir)recdesc\%(Filename).dir;%(Outputs) - Copying dir %(FullPath)... - copy %(FullPath) $(TargetDir)recdesc\%(Filename).dir - - $(TargetDir)recdesc\%(Filename).dir;%(Outputs) - - - Copying dir %(FullPath)... - copy %(FullPath) $(TargetDir)recdesc\%(Filename).dir - - $(TargetDir)recdesc\%(Filename).dir;%(Outputs) - Copying dir %(FullPath)... - copy %(FullPath) $(TargetDir)recdesc\%(Filename).dir - - $(TargetDir)recdesc\%(Filename).dir;%(Outputs) - - - Copying dir %(FullPath)... - copy %(FullPath) $(TargetDir)recdesc\%(Filename).dir - - $(TargetDir)recdesc\%(Filename).dir;%(Outputs) - Copying dir %(FullPath)... - copy %(FullPath) $(TargetDir)recdesc\%(Filename).dir - - $(TargetDir)recdesc\%(Filename).dir;%(Outputs) - - - Copying dir %(FullPath)... - copy %(FullPath) $(TargetDir)recdesc\%(Filename).dir - - $(TargetDir)recdesc\%(Filename).dir;%(Outputs) - Copying dir %(FullPath)... - copy %(FullPath) $(TargetDir)recdesc\%(Filename).dir - - $(TargetDir)recdesc\%(Filename).dir;%(Outputs) - - - Copying dir %(FullPath)... - copy %(FullPath) $(TargetDir)recdesc\%(Filename).dir - - $(TargetDir)recdesc\%(Filename).dir;%(Outputs) - Copying dir %(FullPath)... - copy %(FullPath) $(TargetDir)recdesc\%(Filename).dir - - $(TargetDir)recdesc\%(Filename).dir;%(Outputs) - - - Copying dir %(FullPath)... - copy %(FullPath) $(TargetDir)recdesc\%(Filename).dir - - $(TargetDir)recdesc\%(Filename).dir;%(Outputs) - Copying dir %(FullPath)... - copy %(FullPath) $(TargetDir)recdesc\%(Filename).dir - - $(TargetDir)recdesc\%(Filename).dir;%(Outputs) - - - Copying dir %(FullPath)... - copy %(FullPath) $(TargetDir)recdesc\%(Filename).dir - - $(TargetDir)recdesc\%(Filename).dir;%(Outputs) - Copying dir %(FullPath)... - copy %(FullPath) $(TargetDir)recdesc\%(Filename).dir - - $(TargetDir)recdesc\%(Filename).dir;%(Outputs) - - - Copying dir %(FullPath)... - copy %(FullPath) $(TargetDir)recdesc\%(Filename).dir - - $(TargetDir)recdesc\%(Filename).dir;%(Outputs) - Copying dir %(FullPath)... - copy %(FullPath) $(TargetDir)recdesc\%(Filename).dir - - $(TargetDir)recdesc\%(Filename).dir;%(Outputs) - - - Copying dir %(FullPath)... - copy %(FullPath) $(TargetDir)recdesc\%(Filename).dir - - $(TargetDir)recdesc\%(Filename).dir;%(Outputs) - Copying dir %(FullPath)... - copy %(FullPath) $(TargetDir)recdesc\%(Filename).dir - - $(TargetDir)recdesc\%(Filename).dir;%(Outputs) - - - Copying men %(FullPath)... diff --git a/build/ca0.vcxproj b/build/ca0.vcxproj index e00da0f8c..fd5d81c72 100644 --- a/build/ca0.vcxproj +++ b/build/ca0.vcxproj @@ -1,4 +1,4 @@ - + @@ -239,32 +239,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build/fd.vcxproj b/build/fd.vcxproj index 2fe599852..f29e575a2 100644 --- a/build/fd.vcxproj +++ b/build/fd.vcxproj @@ -1,4 +1,4 @@ - + @@ -62,12 +62,11 @@ Level3 Disabled WIN32;_DEBUG;_WINDOWS;__LONGDOUBLE__ - ..\src\xvaga\;..\wx28X\lib\vc_dll\mswd\;..\wx28X\include\ + ..\src\xvaga;;..\libraries\wx28X\lib\vc_dll\msw\;..\libraries\wx28X\include\;..\libraries\wxPG\propgrid\include\;%(AdditionalIncludeDirectories) MultiThreadedDebug ProgramDatabase true false - Windows @@ -75,7 +74,7 @@ wsock32.lib;%(AdditionalDependencies) - ..\wx28X\include; + ..\libraries\wx28X\include;;%(AdditionalIncludeDirectories) @@ -86,7 +85,7 @@ MaxSpeed true WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - ..\src\xvaga;..\wx28X\lib\vc_dll\msw\;..\wx28X\include\ + ..\src\xvaga;;..\libraries\wx28X\lib\vc_dll\msw\;..\libraries\wx28X\include\;..\libraries\wxPG\propgrid\include\;%(AdditionalIncludeDirectories) true MultiThreaded @@ -96,7 +95,7 @@ wsock32.lib;%(AdditionalDependencies) - ..\wx28X\include; + ..\libraries\wx28X\include;;%(AdditionalIncludeDirectories) @@ -104,40 +103,40 @@ - + true - + true - + true - + true - + true - + true - + true - + true - + true - + true - + true - + true @@ -166,4 +165,4 @@ - \ No newline at end of file + diff --git a/build/gv.sln b/build/gv.sln index 47a78853c..6a72733bd 100644 --- a/build/gv.sln +++ b/build/gv.sln @@ -1,10 +1,14 @@ - -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.33403.129 +MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gv0", "gv0.vcxproj", "{9F10033D-A054-43E6-8449-F6EC63813400}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AgaLib", "AgaLib.vcxproj", "{2D38A763-3D74-4338-9362-B891784EC90E}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cglib", "cglib.vcxproj", "{7B80F974-CE2E-4BD9-855A-44FF139FF288}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -19,8 +23,15 @@ Global {2D38A763-3D74-4338-9362-B891784EC90E}.Debug|Win32.Build.0 = Debug|Win32 {2D38A763-3D74-4338-9362-B891784EC90E}.Release|Win32.ActiveCfg = Release|Win32 {2D38A763-3D74-4338-9362-B891784EC90E}.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 = {12F71982-EDF3-4465-9069-2C58C9BF328D} + EndGlobalSection EndGlobal diff --git a/build/gv0.vcxproj b/build/gv0.vcxproj index ee02342b2..6014ed5f0 100644 --- a/build/gv0.vcxproj +++ b/build/gv0.vcxproj @@ -1,5 +1,5 @@ - - + + Debug @@ -13,15 +13,18 @@ {9F10033D-A054-43E6-8449-F6EC63813400} gv0 + 10.0.17763.0 Application false + v141 Application false + v141 @@ -73,7 +76,7 @@ NDEBUG;%(PreprocessorDefinitions) 0x0410 - ..\wx28X\include;%(AdditionalIncludeDirectories) + ..\libraries\wx28X\include;;%(AdditionalIncludeDirectories) wsock32.lib;%(AdditionalDependencies) @@ -117,7 +120,6 @@ $(IntDir) $(IntDir) $(IntDir)$(TargetName).pdb - Level3 true EditAndContinue @@ -126,7 +128,7 @@ _DEBUG;%(PreprocessorDefinitions) 0x0410 - ..\..\wx289\include;%(AdditionalIncludeDirectories) + ..\libraries\wx28X\include;;%(AdditionalIncludeDirectories) version.lib;wsock32.lib;comctl32.lib;rpcrt4.lib;%(AdditionalDependencies) @@ -169,12 +171,6 @@ - - - - - - %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -187,12 +183,7 @@ %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - + %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -226,6 +217,9 @@ {2d38a763-3d74-4338-9362-b891784ec90e} + + {7b80f974-ce2e-4bd9-855a-44ff139ff288} + @@ -234,4 +228,4 @@ - \ No newline at end of file + diff --git a/build/ha.sln b/build/ha.sln index 065817ee3..853a924e1 100644 --- a/build/ha.sln +++ b/build/ha.sln @@ -1,4 +1,4 @@ - + Microsoft Visual Studio Solution File, Format Version 11.00 # Visual Studio 2010 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ha0", "ha0.vcxproj", "{2DB7F8EF-BABB-4A27-BC7D-8821B0D285C6}" @@ -19,6 +19,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vedoc", "vedoc.vcxproj", "{ 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 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lilib", "lilib.vcxproj", "{B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fplib", "fplib.vcxproj", "{C575788B-0BE4-4F68-B9C9-3C204EC04E07}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -61,8 +67,23 @@ Global {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 + {B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Debug|Win32.ActiveCfg = Debug|Win32 + {B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Debug|Win32.Build.0 = Debug|Win32 + {B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Release|Win32.ActiveCfg = Release|Win32 + {B61F0AD4-0CCE-4371-8E92-85A26CAF1A7C}.Release|Win32.Build.0 = Release|Win32 + {C575788B-0BE4-4F68-B9C9-3C204EC04E07}.Debug|Win32.ActiveCfg = Debug|Win32 + {C575788B-0BE4-4F68-B9C9-3C204EC04E07}.Debug|Win32.Build.0 = Debug|Win32 + {C575788B-0BE4-4F68-B9C9-3C204EC04E07}.Release|Win32.ActiveCfg = Release|Win32 + {C575788B-0BE4-4F68-B9C9-3C204EC04E07}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {34D84CC1-F494-44BF-AFC1-2A66E84CB2D8} + EndGlobalSection EndGlobal diff --git a/build/ha0.vcxproj b/build/ha0.vcxproj index d56909163..e169b2565 100644 --- a/build/ha0.vcxproj +++ b/build/ha0.vcxproj @@ -1,5 +1,5 @@ - - + + Debug @@ -13,15 +13,18 @@ {2DB7F8EF-BABB-4A27-BC7D-8821B0D285C6} lv0 + 10.0.17763.0 Application false + v141 Application false + v141 @@ -79,7 +82,7 @@ NDEBUG;%(PreprocessorDefinitions) 0x0410 - ..\wx28X\include;%(AdditionalIncludeDirectories) + ..\libraries\wx28X\include;%(AdditionalIncludeDirectories) %(AdditionalDependencies) @@ -118,7 +121,6 @@ $(IntDir)\ $(IntDir)\ $(IntDir)\ - Level3 true ProgramDatabase @@ -127,7 +129,7 @@ _DEBUG;%(PreprocessorDefinitions) 0x0410 - ..\wx28X\include;%(AdditionalIncludeDirectories) + ..\libraries\wx28X\include;%(AdditionalIncludeDirectories) wsock32.lib;%(AdditionalDependencies) @@ -177,7 +179,6 @@ - @@ -223,6 +224,9 @@ {2d38a763-3d74-4338-9362-b891784ec90e} + + {7b80f974-ce2e-4bd9-855a-44ff139ff288} + {a1ce9743-a597-4f92-b55a-345a366c9e55} @@ -234,4 +238,4 @@ - \ No newline at end of file + diff --git a/build/ha1.vcxproj b/build/ha1.vcxproj index af39f5c26..9d902c66b 100644 --- a/build/ha1.vcxproj +++ b/build/ha1.vcxproj @@ -1,5 +1,5 @@ - - + + Debug @@ -13,15 +13,18 @@ {5C6DF9DD-C3A6-4562-8699-10E0B0FB4DC9} ha1 + 10.0.17763.0 Application false + v141 Application false + v141 @@ -68,7 +71,6 @@ .\..\debug/ .\..\debug/ .\..\debug/ - Level3 true ProgramDatabase @@ -77,7 +79,7 @@ _DEBUG;%(PreprocessorDefinitions) 0x0410 - ..\wx28X\include;%(AdditionalIncludeDirectories) + ..\libraries\wx28X\include;%(AdditionalIncludeDirectories) wsock32.lib;%(AdditionalDependencies) @@ -122,7 +124,7 @@ NDEBUG;%(PreprocessorDefinitions) 0x0410 - ..\wx28X\include;%(AdditionalIncludeDirectories) + ..\libraries\wx28X\include;%(AdditionalIncludeDirectories) %(AdditionalDependencies) @@ -141,10 +143,6 @@ - - - - @@ -191,6 +189,9 @@ {2d38a763-3d74-4338-9362-b891784ec90e} + + {7b80f974-ce2e-4bd9-855a-44ff139ff288} + {a1ce9743-a597-4f92-b55a-345a366c9e55} @@ -202,4 +203,4 @@ - \ No newline at end of file + diff --git a/build/ha2.vcxproj b/build/ha2.vcxproj index 4193324f0..c09ab7aed 100644 --- a/build/ha2.vcxproj +++ b/build/ha2.vcxproj @@ -1,5 +1,5 @@ - - + + Debug @@ -13,15 +13,18 @@ {9A321567-FAE8-4FC3-A257-B9E35E0736B9} lv0 + 10.0.17763.0 Application false + v141 Application false + v141 @@ -79,7 +82,7 @@ NDEBUG;%(PreprocessorDefinitions) 0x0410 - ..\wx28X\include;%(AdditionalIncludeDirectories) + ..\libraries\wx28X\include;%(AdditionalIncludeDirectories) %(AdditionalDependencies) @@ -121,7 +124,6 @@ $(IntDir)\ $(IntDir)\ $(IntDir)\ - Level3 true ProgramDatabase @@ -130,7 +132,7 @@ _DEBUG;%(PreprocessorDefinitions) 0x0410 - ..\..\wx2811\include;%(AdditionalIncludeDirectories) + ..\libraries\wx28X\include;%(AdditionalIncludeDirectories) wsock32.lib;%(AdditionalDependencies) @@ -201,12 +203,18 @@ {2d38a763-3d74-4338-9362-b891784ec90e} + + {c575788b-0be4-4f68-b9c9-3c204ec04e07} + {a1ce9743-a597-4f92-b55a-345a366c9e55} + + {0042619a-6b7c-4d3d-9cd9-9bdd8d200c15} + - \ No newline at end of file + diff --git a/build/ha3.vcxproj b/build/ha3.vcxproj index b9794131c..ae20622d0 100644 --- a/build/ha3.vcxproj +++ b/build/ha3.vcxproj @@ -1,5 +1,5 @@ - - + + Debug @@ -13,15 +13,18 @@ {6AE44AC2-D05F-4754-ACB2-6FC24F3800BB} lv0 + 10.0.17763.0 Application false + v141 Application false + v141 @@ -79,7 +82,7 @@ NDEBUG;%(PreprocessorDefinitions) 0x0410 - ..\wx28X\include;%(AdditionalIncludeDirectories) + ..\libraries\wx28X\include;%(AdditionalIncludeDirectories) %(AdditionalDependencies) @@ -121,7 +124,6 @@ $(IntDir)\ $(IntDir)\ $(IntDir)\ - Level3 true ProgramDatabase @@ -130,7 +132,7 @@ _DEBUG;%(PreprocessorDefinitions) 0x0410 - ..\wx28X\include;%(AdditionalIncludeDirectories) + ..\libraries\wx28X\include;%(AdditionalIncludeDirectories) wsock32.lib;%(AdditionalDependencies) @@ -210,36 +212,22 @@ - - - Document - true - - - Document - true - - - Document - true - - - Document - true - - - Document - true - - - Document - true - - {2d38a763-3d74-4338-9362-b891784ec90e} + + {7b80f974-ce2e-4bd9-855a-44ff139ff288} + + + {b61f0ad4-0cce-4371-8e92-85a26caf1a7c} + + + {a1ce9743-a597-4f92-b55a-345a366c9e55} + + + {0042619a-6b7c-4d3d-9cd9-9bdd8d200c15} + diff --git a/build/ha3.vcxproj.filters b/build/ha3.vcxproj.filters index d3fc4baab..fd4d99edc 100644 --- a/build/ha3.vcxproj.filters +++ b/build/ha3.vcxproj.filters @@ -73,9 +73,6 @@ {9b1b500c-a736-44cc-ac06-8de27d20f582} - - {67ec6a05-4693-4c55-a26a-0e16117eeb8d} - @@ -88,24 +85,4 @@ Reports - - - Libraries - - - Libraries - - - Libraries - - - Libraries - - - Libraries - - - Libraries - - \ No newline at end of file diff --git a/build/ha_profiles.vcxproj b/build/ha_profiles.vcxproj index 5895d36f8..782d95968 100644 --- a/build/ha_profiles.vcxproj +++ b/build/ha_profiles.vcxproj @@ -1,5 +1,5 @@ - - + + Debug @@ -17,17 +17,20 @@ {50411897-4D04-4906-A9D6-67FF865B513D} lv_profiles + 10.0.17763.0 Utility false MultiByte + v141 Utility false MultiByte + v141 @@ -157,4 +160,4 @@ - \ No newline at end of file + diff --git a/build/hacnv.vcxproj b/build/hacnv.vcxproj index b020fe098..7a16d41e2 100644 --- a/build/hacnv.vcxproj +++ b/build/hacnv.vcxproj @@ -1,5 +1,5 @@ - - + + Debug @@ -13,15 +13,18 @@ {21311A14-C276-4CED-AED2-53793A599FA0} lv0 + 10.0.17763.0 Application false + v141 Application false + v141 @@ -76,7 +79,7 @@ NDEBUG;%(PreprocessorDefinitions) 0x0410 - ..\wx28X\include;%(AdditionalIncludeDirectories) + ..\libraries\wx28X\include;%(AdditionalIncludeDirectories) %(AdditionalDependencies) @@ -116,7 +119,6 @@ $(IntDir)\ $(IntDir)\ $(IntDir)\ - Level3 true ProgramDatabase @@ -124,7 +126,7 @@ _DEBUG;%(PreprocessorDefinitions) 0x0410 - ..\..\wx2811\include;%(AdditionalIncludeDirectories) + ..\libraries\wx28X\include;%(AdditionalIncludeDirectories) wsock32.lib;%(AdditionalDependencies) @@ -170,20 +172,6 @@ true - - - true - - - true - - - true - - - true - - ..\wx28X\include;%(AdditionalIncludeDirectories) @@ -207,7 +195,6 @@ - @@ -224,6 +211,15 @@ {2d38a763-3d74-4338-9362-b891784ec90e} + + {7b80f974-ce2e-4bd9-855a-44ff139ff288} + + + {a1ce9743-a597-4f92-b55a-345a366c9e55} + + + {0042619a-6b7c-4d3d-9cd9-9bdd8d200c15} + diff --git a/build/hacnv.vcxproj.filters b/build/hacnv.vcxproj.filters index d60b1de9a..8a1dc43c4 100644 --- a/build/hacnv.vcxproj.filters +++ b/build/hacnv.vcxproj.filters @@ -1,9 +1,6 @@  - - Sources - Sources @@ -55,20 +52,6 @@ - - - Libraries - - - Libraries - - - Libraries - - - Libraries - - Masks @@ -97,8 +80,5 @@ {3305f646-3b52-43e2-bd36-18e754e42dda} uml - - {5a39f4c8-89ee-47c9-b08a-c972968375f9} - \ No newline at end of file diff --git a/build/ic.sln b/build/ic.sln index 9dd4d0241..e4c38289d 100644 --- a/build/ic.sln +++ b/build/ic.sln @@ -1,4 +1,4 @@ - + Microsoft Visual Studio Solution File, Format Version 11.00 # Visual Studio 2010 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ic0", "ic0.vcxproj", "{E3E7DE6C-EDE3-48D4-8F15-333B71AE4AC2}" @@ -23,4 +23,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {829677FF-FAB2-4FD8-8370-28FC8239C213} + EndGlobalSection EndGlobal diff --git a/build/ic0.vcxproj b/build/ic0.vcxproj index 68056f88a..0502cd31d 100644 --- a/build/ic0.vcxproj +++ b/build/ic0.vcxproj @@ -1,4 +1,4 @@ - + @@ -70,7 +70,6 @@ .\..\debug/ .\..\debug/ .\..\debug/ - Level3 true ProgramDatabase @@ -126,7 +125,7 @@ NDEBUG;%(PreprocessorDefinitions) 0x0410 - ..\wx28X\include;%(AdditionalIncludeDirectories) + ..\libraries\wx28X\include;%(AdditionalIncludeDirectories) %(AdditionalDependencies) @@ -190,4 +189,4 @@ - \ No newline at end of file + diff --git a/build/mr.sln b/build/mr.sln index 85fbfbea4..a2768d997 100644 --- a/build/mr.sln +++ b/build/mr.sln @@ -1,4 +1,4 @@ - + Microsoft Visual Studio Solution File, Format Version 11.00 # Visual Studio 2010 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mr0", "mr0.vcxproj", "{92083925-A9A5-4539-95E2-39EA1511D912}" @@ -11,6 +11,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 +41,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 = {F0EE82B6-D20C-40B3-AA2A-34F77E2D02E1} + EndGlobalSection EndGlobal diff --git a/build/mr0.vcxproj b/build/mr0.vcxproj index 31bee4aad..4efcfa94c 100644 --- a/build/mr0.vcxproj +++ b/build/mr0.vcxproj @@ -1,4 +1,4 @@ - + @@ -120,7 +120,7 @@ NDEBUG;%(PreprocessorDefinitions) 0x0410 - ..\wx28X\include;%(AdditionalIncludeDirectories) + ..\libraries\wx28X\include;%(AdditionalIncludeDirectories) %(AdditionalDependencies) @@ -139,7 +139,8 @@ .\..\release/mr0.bsc - "C:\Program Files (x86)\Windows Kits\10\bin\10.0.16299.0\x64\signtool.exe" sign /a /s MY /n "Sirio Informatica e Sistemi SPA" /t http://timestamp.verisign.com/scripts/timstamp.dll /v "$(TargetPath)" + + @@ -210,16 +211,6 @@ - - - - - - - - - - @@ -260,6 +251,9 @@ {a1ce9743-a597-4f92-b55a-345a366c9e55} + + {0042619a-6b7c-4d3d-9cd9-9bdd8d200c15} + diff --git a/build/mr0.vcxproj.filters b/build/mr0.vcxproj.filters index 351ffbb63..7a4373701 100644 --- a/build/mr0.vcxproj.filters +++ b/build/mr0.vcxproj.filters @@ -13,14 +13,6 @@ {612d6730-a29c-4740-84fe-16e51cbcb8fd} h - - {65bb3588-ceaf-46b5-96a1-75ee432bd582} - trr - - - {e2495c95-8717-45a7-88d0-7304732f7f54} - dir - {14d5e3e5-5452-4ecc-851a-c7fbb4af15a4} ini @@ -119,28 +111,6 @@ Headers - - - Trr - - - Trr - - - Trr - - - - - Dir - - - Dir - - - Dir - - Ini diff --git a/build/mr1.vcxproj b/build/mr1.vcxproj index 712ec6ed9..1ad509469 100644 --- a/build/mr1.vcxproj +++ b/build/mr1.vcxproj @@ -1,4 +1,4 @@ - + @@ -75,7 +75,7 @@ NDEBUG;%(PreprocessorDefinitions) 0x0410 - ..\wx28X\include;%(AdditionalIncludeDirectories) + ..\libraries\wx28X\include;%(AdditionalIncludeDirectories) %(AdditionalDependencies) @@ -144,12 +144,6 @@ - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -205,12 +199,18 @@ {2d38a763-3d74-4338-9362-b891784ec90e} + + {7b80f974-ce2e-4bd9-855a-44ff139ff288} + {a1ce9743-a597-4f92-b55a-345a366c9e55} + + {0042619a-6b7c-4d3d-9cd9-9bdd8d200c15} + - \ No newline at end of file + diff --git a/build/mr2.vcxproj b/build/mr2.vcxproj index 3be80a7cd..eb2da32d7 100644 --- a/build/mr2.vcxproj +++ b/build/mr2.vcxproj @@ -1,4 +1,4 @@ - + @@ -123,7 +123,7 @@ NDEBUG;%(PreprocessorDefinitions) 0x0410 - ..\wx28X\include;%(AdditionalIncludeDirectories) + ..\libraries\wx28X\include;%(AdditionalIncludeDirectories) %(AdditionalDependencies) @@ -143,12 +143,6 @@ - - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) - %(PreprocessorDefinitions) - %(AdditionalIncludeDirectories) %(PreprocessorDefinitions) @@ -259,12 +253,18 @@ {2d38a763-3d74-4338-9362-b891784ec90e} + + {7b80f974-ce2e-4bd9-855a-44ff139ff288} + {a1ce9743-a597-4f92-b55a-345a366c9e55} + + {0042619a-6b7c-4d3d-9cd9-9bdd8d200c15} + - \ No newline at end of file + diff --git a/build/np.sln b/build/np.sln index 07c2b0963..4759eb770 100644 --- a/build/np.sln +++ b/build/np.sln @@ -1,10 +1,12 @@ - + Microsoft Visual Studio Solution File, Format Version 11.00 # Visual Studio 2010 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "np0", "np0.vcxproj", "{3D726EFE-764B-4B24-A4ED-DCD41B9BB386}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AgaLib", "AgaLib.vcxproj", "{2D38A763-3D74-4338-9362-B891784EC90E}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cglib", "cglib.vcxproj", "{7B80F974-CE2E-4BD9-855A-44FF139FF288}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -19,8 +21,15 @@ Global {2D38A763-3D74-4338-9362-B891784EC90E}.Debug|Win32.Build.0 = Debug|Win32 {2D38A763-3D74-4338-9362-B891784EC90E}.Release|Win32.ActiveCfg = Release|Win32 {2D38A763-3D74-4338-9362-B891784EC90E}.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 = {6F0CC896-A4EA-406D-8B5A-78B26B81969E} + EndGlobalSection EndGlobal diff --git a/build/np0.vcxproj b/build/np0.vcxproj index 7386e55a1..1c4442637 100644 --- a/build/np0.vcxproj +++ b/build/np0.vcxproj @@ -1,4 +1,4 @@ - + @@ -100,7 +100,8 @@ $(IntDir) - "C:\Program Files (x86)\Windows Kits\10\bin\10.0.16299.0\x64\signtool.exe" sign /a /s MY /n "Sirio Informatica e Sistemi SPA" /t http://timestamp.verisign.com/scripts/timstamp.dll /v "$(TargetPath)" + + @@ -123,7 +124,6 @@ .\../debug/ $(IntDir) .\../debug/ - Level3 true EditAndContinue @@ -214,8 +214,6 @@ true true - - true true @@ -229,11 +227,7 @@ true - - - - @@ -249,9 +243,12 @@ {2d38a763-3d74-4338-9362-b891784ec90e} + + {7b80f974-ce2e-4bd9-855a-44ff139ff288} + - \ No newline at end of file + diff --git a/build/or.sln b/build/or.sln index f1510f1dc..574acfc4c 100644 --- a/build/or.sln +++ b/build/or.sln @@ -1,4 +1,4 @@ - + Microsoft Visual Studio Solution File, Format Version 11.00 # Visual Studio 2010 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Or1", "Or1.vcxproj", "{BBB4EEFA-F24B-4B6C-9632-D7F42283869D}" @@ -7,6 +7,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}") = "cglib", "cglib.vcxproj", "{7B80F974-CE2E-4BD9-855A-44FF139FF288}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vedocext", "vedocext.vcxproj", "{0042619A-6B7C-4D3D-9CD9-9BDD8D200C15}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -25,8 +29,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 + {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 + {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 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {1950298D-2D81-41D3-9724-4324BC8CDAEF} + EndGlobalSection EndGlobal diff --git a/build/pa.sln b/build/pa.sln index 3556c6daa..b6127ca0b 100644 --- a/build/pa.sln +++ b/build/pa.sln @@ -1,4 +1,4 @@ - + Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 VisualStudioVersion = 15.0.28307.757 @@ -13,6 +13,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vedocext", "vedocext.vcxpro EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cglib", "cglib.vcxproj", "{7B80F974-CE2E-4BD9-855A-44FF139FF288}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fplib", "fplib.vcxproj", "{C575788B-0BE4-4F68-B9C9-3C204EC04E07}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -39,6 +41,10 @@ Global {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 + {C575788B-0BE4-4F68-B9C9-3C204EC04E07}.Debug|Win32.ActiveCfg = Debug|Win32 + {C575788B-0BE4-4F68-B9C9-3C204EC04E07}.Debug|Win32.Build.0 = Debug|Win32 + {C575788B-0BE4-4F68-B9C9-3C204EC04E07}.Release|Win32.ActiveCfg = Release|Win32 + {C575788B-0BE4-4F68-B9C9-3C204EC04E07}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/build/pa0.vcxproj b/build/pa0.vcxproj index 557f51473..899808fd4 100644 --- a/build/pa0.vcxproj +++ b/build/pa0.vcxproj @@ -1,4 +1,4 @@ - + @@ -194,6 +194,9 @@ {7b80f974-ce2e-4bd9-855a-44ff139ff288} + + {c575788b-0be4-4f68-b9c9-3c204ec04e07} + {a1ce9743-a597-4f92-b55a-345a366c9e55} @@ -205,4 +208,4 @@ - \ No newline at end of file + diff --git a/build/pe0.vcxproj b/build/pe0.vcxproj index 8da875619..be5b93bd2 100644 --- a/build/pe0.vcxproj +++ b/build/pe0.vcxproj @@ -1,4 +1,4 @@ - + @@ -77,7 +77,7 @@ NDEBUG;%(PreprocessorDefinitions) 0x0410 - ..\wx28X\include;%(AdditionalIncludeDirectories) + ..\libraries\wx28X\include;%(AdditionalIncludeDirectories) %(AdditionalDependencies) @@ -124,7 +124,7 @@ _DEBUG;%(PreprocessorDefinitions) 0x0410 - ..\wx28X\include;%(AdditionalIncludeDirectories) + ..\libraries\wx28X\include;%(AdditionalIncludeDirectories) version.lib;wsock32.lib;comctl32.lib;rpcrt4.lib;%(AdditionalDependencies) @@ -147,10 +147,6 @@ - - - - @@ -197,6 +193,9 @@ {2d38a763-3d74-4338-9362-b891784ec90e} + + {7b80f974-ce2e-4bd9-855a-44ff139ff288} + {a1ce9743-a597-4f92-b55a-345a366c9e55} @@ -208,4 +207,4 @@ - \ No newline at end of file + diff --git a/build/pe1.vcxproj b/build/pe1.vcxproj index 421af246a..a306fcfab 100644 --- a/build/pe1.vcxproj +++ b/build/pe1.vcxproj @@ -1,4 +1,4 @@ - + @@ -80,7 +80,7 @@ NDEBUG;%(PreprocessorDefinitions) 0x0410 - ..\wx28X\include;%(AdditionalIncludeDirectories) + ..\libraries\wx28X\include;%(AdditionalIncludeDirectories) %(AdditionalDependencies) @@ -122,7 +122,7 @@ _DEBUG;%(PreprocessorDefinitions) 0x0410 - ..\wx28X\include;%(AdditionalIncludeDirectories) + ..\libraries\wx28X\include;%(AdditionalIncludeDirectories) version.lib;wsock32.lib;comctl32.lib;rpcrt4.lib;%(AdditionalDependencies) @@ -201,4 +201,4 @@ - \ No newline at end of file + diff --git a/build/pr0.vcxproj b/build/pr0.vcxproj index cd7bb2272..a5209e42b 100644 --- a/build/pr0.vcxproj +++ b/build/pr0.vcxproj @@ -221,16 +221,6 @@ - - - - - - - - - - diff --git a/build/pr0.vcxproj.filters b/build/pr0.vcxproj.filters index 198bccf19..c1d28b962 100644 --- a/build/pr0.vcxproj.filters +++ b/build/pr0.vcxproj.filters @@ -13,14 +13,6 @@ {fd9ec001-7ba6-48eb-ad30-fb2415af4089} h - - {39701b64-cae4-4192-96b1-bb8d1e6ef587} - trr - - - {eace73aa-fca7-4c15-91d6-fce0057ee454} - dir - {af898b1a-45b5-4e56-875b-121640ad601c} men @@ -114,28 +106,6 @@ Headers - - - Trr - - - Trr - - - Trr - - - - - Dir - - - Dir - - - Dir - - Men diff --git a/build/ri.sln b/build/ri.sln index 06555fe77..6f6582ab9 100644 --- a/build/ri.sln +++ b/build/ri.sln @@ -1,4 +1,4 @@ - + Microsoft Visual Studio Solution File, Format Version 11.00 # Visual Studio 2010 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ri0", "ri0.vcxproj", "{E3E7DE6C-EDE3-48D4-8F15-333B71AE4AC2}" @@ -7,6 +7,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ri1", "ri1.vcxproj", "{53A5 EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AgaLib", "AgaLib.vcxproj", "{2D38A763-3D74-4338-9362-B891784EC90E}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cglib", "cglib.vcxproj", "{7B80F974-CE2E-4BD9-855A-44FF139FF288}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -25,8 +27,15 @@ Global {2D38A763-3D74-4338-9362-B891784EC90E}.Debug|Win32.Build.0 = Debug|Win32 {2D38A763-3D74-4338-9362-B891784EC90E}.Release|Win32.ActiveCfg = Release|Win32 {2D38A763-3D74-4338-9362-B891784EC90E}.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 = {9A60D5FE-67B9-4B58-A90A-63016FC1D3AF} + EndGlobalSection EndGlobal diff --git a/build/ri0.vcxproj b/build/ri0.vcxproj index 45dcd119a..f07d5379b 100644 --- a/build/ri0.vcxproj +++ b/build/ri0.vcxproj @@ -1,5 +1,5 @@ - - + + Debug @@ -13,15 +13,18 @@ {E3E7DE6C-EDE3-48D4-8F15-333B71AE4AC2} ri0 + 10.0.17763.0 Application false + v141 Application false + v141 @@ -69,7 +72,6 @@ .\..\debug/ .\..\debug/ .\..\debug/ - Level3 true ProgramDatabase @@ -78,7 +80,7 @@ _DEBUG;%(PreprocessorDefinitions) 0x0410 - ..\wx28X\include;%(AdditionalIncludeDirectories) + ..\libraries\wx28X\include;%(AdditionalIncludeDirectories) wsock32.lib;%(AdditionalDependencies) @@ -123,7 +125,7 @@ NDEBUG;%(PreprocessorDefinitions) 0x0410 - ..\wx28X\include;%(AdditionalIncludeDirectories) + ..\libraries\wx28X\include;%(AdditionalIncludeDirectories) %(AdditionalDependencies) @@ -143,8 +145,6 @@ - - @@ -185,9 +185,12 @@ {2d38a763-3d74-4338-9362-b891784ec90e} + + {7b80f974-ce2e-4bd9-855a-44ff139ff288} + - \ No newline at end of file + diff --git a/build/ri1.vcxproj b/build/ri1.vcxproj index 3b961b6cd..ba8374a9c 100644 --- a/build/ri1.vcxproj +++ b/build/ri1.vcxproj @@ -1,5 +1,5 @@ - - + + Debug @@ -13,15 +13,18 @@ {53A55171-13C0-4BDE-8325-1186461B9EAA} ri1 + 10.0.17763.0 Application false + v141 Application false + v141 @@ -67,7 +70,6 @@ .\..\debug/ .\..\debug/ .\..\debug/ - Level3 true ProgramDatabase @@ -76,7 +78,7 @@ _DEBUG;%(PreprocessorDefinitions) 0x0410 - ..\wx28X\include;%(AdditionalIncludeDirectories) + ..\libraries\wx28X\include;%(AdditionalIncludeDirectories) wsock32.lib;%(AdditionalDependencies) @@ -122,7 +124,7 @@ NDEBUG;%(PreprocessorDefinitions) 0x0410 - ..\wx28X\include;%(AdditionalIncludeDirectories) + ..\libraries\wx28X\include;%(AdditionalIncludeDirectories) %(AdditionalDependencies) @@ -144,8 +146,6 @@ - - @@ -180,9 +180,12 @@ {2d38a763-3d74-4338-9362-b891784ec90e} + + {7b80f974-ce2e-4bd9-855a-44ff139ff288} + - \ No newline at end of file + diff --git a/build/sl.sln b/build/sl.sln index f0cf55345..2e592b863 100644 --- a/build/sl.sln +++ b/build/sl.sln @@ -1,4 +1,4 @@ - + Microsoft Visual Studio Solution File, Format Version 11.00 # Visual Studio 2010 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sl0", "sl0.vcxproj", "{9C91BACF-9A70-4973-B8CC-FA3D2AF9867C}" @@ -35,4 +35,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {19D332C0-6F58-426D-88A4-EDCE3E23E7A9} + EndGlobalSection EndGlobal diff --git a/build/sl0.vcxproj b/build/sl0.vcxproj index d5d43d676..abe515007 100644 --- a/build/sl0.vcxproj +++ b/build/sl0.vcxproj @@ -1,5 +1,5 @@ - - + + Debug @@ -13,15 +13,18 @@ {9C91BACF-9A70-4973-B8CC-FA3D2AF9867C} sl0 + 10.0.17763.0 Application false + v141 Application false + v141 @@ -65,7 +68,6 @@ _DEBUG;WIN32;__LONGDOUBLE__;_WINDOWS;%(PreprocessorDefinitions) false MultiThreadedDebug - Level3 true EditAndContinue @@ -75,7 +77,7 @@ _DEBUG;%(PreprocessorDefinitions) 0x0410 - ..\wx28X\include;%(AdditionalIncludeDirectories) + ..\libraries\wx28X\include;%(AdditionalIncludeDirectories) %(AdditionalDependencies) @@ -119,7 +121,7 @@ NDEBUG;%(PreprocessorDefinitions) 0x0410 - ..\wx28X\include;%(AdditionalIncludeDirectories) + ..\libraries\wx28X\include;%(AdditionalIncludeDirectories) %(AdditionalDependencies) @@ -205,4 +207,4 @@ - \ No newline at end of file +