From da77f7d3085771b1f8786cc7e682efc8f7646605 Mon Sep 17 00:00:00 2001 From: Rainer Kottenhoff Date: Tue, 8 Aug 2017 16:03:52 +0200 Subject: [PATCH] - fixing issues for batch buils all project configs (Release/Debug/Win32/x64) - automatic linkage of dependant link-library projects (scintilla static lib) does not work (due to a VS bug or special Scintilla .vcxproj settings ?) --- Notepad3.sln | 22 +++----- Notepad3_vs2017.sln | 25 ++++----- minipath/minipath.vcxproj | 42 ++++++++++----- minipath/minipath_VS2017.vcxproj | 36 ++++++++----- scintilla/Scintilla.vcxproj | 78 +++++++++++++++------------ scintilla/Scintilla_VS2017.vcxproj | 84 +++++++++++++++++------------- src/Notepad3.vcxproj | 48 +++++++++++++---- src/Notepad3_VS2017.vcxproj | 48 +++++++++++++---- 8 files changed, 236 insertions(+), 147 deletions(-) diff --git a/Notepad3.sln b/Notepad3.sln index 9503f1d2e..718e3eaff 100644 --- a/Notepad3.sln +++ b/Notepad3.sln @@ -1,6 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.23107.0 +# Visual Studio 15 +VisualStudioVersion = 15.0.26430.16 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Notepad3", "src\Notepad3.vcxproj", "{BAAD32AB-CD47-12FD-873C-0BBC204B7641}" EndProject @@ -12,48 +12,38 @@ Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 Release|Win32 = Release|Win32 Release|x64 = Release|x64 - Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {BAAD32AB-CD47-12FD-873C-0BBC204B7641}.Debug|Win32.ActiveCfg = Debug|Win32 {BAAD32AB-CD47-12FD-873C-0BBC204B7641}.Debug|Win32.Build.0 = Debug|Win32 {BAAD32AB-CD47-12FD-873C-0BBC204B7641}.Debug|x64.ActiveCfg = Debug|x64 {BAAD32AB-CD47-12FD-873C-0BBC204B7641}.Debug|x64.Build.0 = Debug|x64 - {BAAD32AB-CD47-12FD-873C-0BBC204B7641}.Debug|x86.ActiveCfg = Debug|Win32 - {BAAD32AB-CD47-12FD-873C-0BBC204B7641}.Debug|x86.Build.0 = Debug|Win32 {BAAD32AB-CD47-12FD-873C-0BBC204B7641}.Release|Win32.ActiveCfg = Release|Win32 {BAAD32AB-CD47-12FD-873C-0BBC204B7641}.Release|Win32.Build.0 = Release|Win32 {BAAD32AB-CD47-12FD-873C-0BBC204B7641}.Release|x64.ActiveCfg = Release|x64 {BAAD32AB-CD47-12FD-873C-0BBC204B7641}.Release|x64.Build.0 = Release|x64 - {BAAD32AB-CD47-12FD-873C-0BBC204B7641}.Release|x86.ActiveCfg = Release|Win32 - {BAAD32AB-CD47-12FD-873C-0BBC204B7641}.Release|x86.Build.0 = Release|Win32 {5877B917-512B-49F5-B514-1B4159E7A9CA}.Debug|Win32.ActiveCfg = Debug|Win32 {5877B917-512B-49F5-B514-1B4159E7A9CA}.Debug|Win32.Build.0 = Debug|Win32 {5877B917-512B-49F5-B514-1B4159E7A9CA}.Debug|x64.ActiveCfg = Debug|x64 {5877B917-512B-49F5-B514-1B4159E7A9CA}.Debug|x64.Build.0 = Debug|x64 - {5877B917-512B-49F5-B514-1B4159E7A9CA}.Debug|x86.ActiveCfg = Debug|Win32 - {5877B917-512B-49F5-B514-1B4159E7A9CA}.Debug|x86.Build.0 = Debug|Win32 {5877B917-512B-49F5-B514-1B4159E7A9CA}.Release|Win32.ActiveCfg = Release|Win32 {5877B917-512B-49F5-B514-1B4159E7A9CA}.Release|Win32.Build.0 = Release|Win32 {5877B917-512B-49F5-B514-1B4159E7A9CA}.Release|x64.ActiveCfg = Release|x64 {5877B917-512B-49F5-B514-1B4159E7A9CA}.Release|x64.Build.0 = Release|x64 - {5877B917-512B-49F5-B514-1B4159E7A9CA}.Release|x86.ActiveCfg = Release|Win32 - {5877B917-512B-49F5-B514-1B4159E7A9CA}.Release|x86.Build.0 = Release|Win32 {781B17E7-427F-488F-A8E9-360BA38A10F3}.Debug|Win32.ActiveCfg = Debug|Win32 {781B17E7-427F-488F-A8E9-360BA38A10F3}.Debug|Win32.Build.0 = Debug|Win32 + {781B17E7-427F-488F-A8E9-360BA38A10F3}.Debug|Win32.Deploy.0 = Debug|Win32 {781B17E7-427F-488F-A8E9-360BA38A10F3}.Debug|x64.ActiveCfg = Debug|x64 {781B17E7-427F-488F-A8E9-360BA38A10F3}.Debug|x64.Build.0 = Debug|x64 - {781B17E7-427F-488F-A8E9-360BA38A10F3}.Debug|x86.ActiveCfg = Debug|Win32 - {781B17E7-427F-488F-A8E9-360BA38A10F3}.Debug|x86.Build.0 = Debug|Win32 + {781B17E7-427F-488F-A8E9-360BA38A10F3}.Debug|x64.Deploy.0 = Debug|x64 {781B17E7-427F-488F-A8E9-360BA38A10F3}.Release|Win32.ActiveCfg = Release|Win32 {781B17E7-427F-488F-A8E9-360BA38A10F3}.Release|Win32.Build.0 = Release|Win32 + {781B17E7-427F-488F-A8E9-360BA38A10F3}.Release|Win32.Deploy.0 = Release|Win32 {781B17E7-427F-488F-A8E9-360BA38A10F3}.Release|x64.ActiveCfg = Release|x64 {781B17E7-427F-488F-A8E9-360BA38A10F3}.Release|x64.Build.0 = Release|x64 - {781B17E7-427F-488F-A8E9-360BA38A10F3}.Release|x86.ActiveCfg = Release|Win32 - {781B17E7-427F-488F-A8E9-360BA38A10F3}.Release|x86.Build.0 = Release|Win32 + {781B17E7-427F-488F-A8E9-360BA38A10F3}.Release|x64.Deploy.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Notepad3_vs2017.sln b/Notepad3_vs2017.sln index 4f95c593d..afc167569 100644 --- a/Notepad3_vs2017.sln +++ b/Notepad3_vs2017.sln @@ -3,57 +3,50 @@ Microsoft Visual Studio Solution File, Format Version 12.00 VisualStudioVersion = 15.0.26430.16 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Notepad3", "src\Notepad3_VS2017.vcxproj", "{BAAD32AB-CD47-12FD-873C-0BBC204B7641}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Scintilla", "scintilla\Scintilla_VS2017.vcxproj", "{5877B917-512B-49F5-B514-1B4159E7A9CA}" + ProjectSection(ProjectDependencies) = postProject + {5877B917-512B-49F5-B514-1B4159E7A9CA} = {5877B917-512B-49F5-B514-1B4159E7A9CA} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "minipath", "minipath\minipath_VS2017.vcxproj", "{781B17E7-427F-488F-A8E9-360BA38A10F3}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Scintilla", "scintilla\Scintilla_VS2017.vcxproj", "{5877B917-512B-49F5-B514-1B4159E7A9CA}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 Release|Win32 = Release|Win32 Release|x64 = Release|x64 - Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {BAAD32AB-CD47-12FD-873C-0BBC204B7641}.Debug|Win32.ActiveCfg = Debug|Win32 {BAAD32AB-CD47-12FD-873C-0BBC204B7641}.Debug|Win32.Build.0 = Debug|Win32 {BAAD32AB-CD47-12FD-873C-0BBC204B7641}.Debug|x64.ActiveCfg = Debug|x64 {BAAD32AB-CD47-12FD-873C-0BBC204B7641}.Debug|x64.Build.0 = Debug|x64 - {BAAD32AB-CD47-12FD-873C-0BBC204B7641}.Debug|x86.ActiveCfg = Debug|Win32 - {BAAD32AB-CD47-12FD-873C-0BBC204B7641}.Debug|x86.Build.0 = Debug|Win32 {BAAD32AB-CD47-12FD-873C-0BBC204B7641}.Release|Win32.ActiveCfg = Release|Win32 {BAAD32AB-CD47-12FD-873C-0BBC204B7641}.Release|Win32.Build.0 = Release|Win32 {BAAD32AB-CD47-12FD-873C-0BBC204B7641}.Release|x64.ActiveCfg = Release|x64 {BAAD32AB-CD47-12FD-873C-0BBC204B7641}.Release|x64.Build.0 = Release|x64 - {BAAD32AB-CD47-12FD-873C-0BBC204B7641}.Release|x86.ActiveCfg = Release|Win32 - {BAAD32AB-CD47-12FD-873C-0BBC204B7641}.Release|x86.Build.0 = Release|Win32 {5877B917-512B-49F5-B514-1B4159E7A9CA}.Debug|Win32.ActiveCfg = Debug|Win32 {5877B917-512B-49F5-B514-1B4159E7A9CA}.Debug|Win32.Build.0 = Debug|Win32 {5877B917-512B-49F5-B514-1B4159E7A9CA}.Debug|x64.ActiveCfg = Debug|x64 {5877B917-512B-49F5-B514-1B4159E7A9CA}.Debug|x64.Build.0 = Debug|x64 - {5877B917-512B-49F5-B514-1B4159E7A9CA}.Debug|x86.ActiveCfg = Debug|Win32 - {5877B917-512B-49F5-B514-1B4159E7A9CA}.Debug|x86.Build.0 = Debug|Win32 {5877B917-512B-49F5-B514-1B4159E7A9CA}.Release|Win32.ActiveCfg = Release|Win32 {5877B917-512B-49F5-B514-1B4159E7A9CA}.Release|Win32.Build.0 = Release|Win32 {5877B917-512B-49F5-B514-1B4159E7A9CA}.Release|x64.ActiveCfg = Release|x64 {5877B917-512B-49F5-B514-1B4159E7A9CA}.Release|x64.Build.0 = Release|x64 - {5877B917-512B-49F5-B514-1B4159E7A9CA}.Release|x86.ActiveCfg = Release|Win32 - {5877B917-512B-49F5-B514-1B4159E7A9CA}.Release|x86.Build.0 = Release|Win32 {781B17E7-427F-488F-A8E9-360BA38A10F3}.Debug|Win32.ActiveCfg = Debug|Win32 {781B17E7-427F-488F-A8E9-360BA38A10F3}.Debug|Win32.Build.0 = Debug|Win32 + {781B17E7-427F-488F-A8E9-360BA38A10F3}.Debug|Win32.Deploy.0 = Debug|Win32 {781B17E7-427F-488F-A8E9-360BA38A10F3}.Debug|x64.ActiveCfg = Debug|x64 {781B17E7-427F-488F-A8E9-360BA38A10F3}.Debug|x64.Build.0 = Debug|x64 - {781B17E7-427F-488F-A8E9-360BA38A10F3}.Debug|x86.ActiveCfg = Debug|Win32 - {781B17E7-427F-488F-A8E9-360BA38A10F3}.Debug|x86.Build.0 = Debug|Win32 + {781B17E7-427F-488F-A8E9-360BA38A10F3}.Debug|x64.Deploy.0 = Debug|x64 {781B17E7-427F-488F-A8E9-360BA38A10F3}.Release|Win32.ActiveCfg = Release|Win32 {781B17E7-427F-488F-A8E9-360BA38A10F3}.Release|Win32.Build.0 = Release|Win32 + {781B17E7-427F-488F-A8E9-360BA38A10F3}.Release|Win32.Deploy.0 = Release|Win32 {781B17E7-427F-488F-A8E9-360BA38A10F3}.Release|x64.ActiveCfg = Release|x64 {781B17E7-427F-488F-A8E9-360BA38A10F3}.Release|x64.Build.0 = Release|x64 - {781B17E7-427F-488F-A8E9-360BA38A10F3}.Release|x86.ActiveCfg = Release|Win32 - {781B17E7-427F-488F-A8E9-360BA38A10F3}.Release|x86.Build.0 = Release|Win32 + {781B17E7-427F-488F-A8E9-360BA38A10F3}.Release|x64.Deploy.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/minipath/minipath.vcxproj b/minipath/minipath.vcxproj index c176c3eb7..263f92eff 100644 --- a/minipath/minipath.vcxproj +++ b/minipath/minipath.vcxproj @@ -62,33 +62,37 @@ ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\ ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\minipath\ + true ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\ ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\minipath\ + true ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\ ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\minipath\ + true ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\ ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\minipath\ + true Disabled _DEBUG;WIN32;_WINDOWS;UNICODE;_UNICODE;_M_IX86;%(PreprocessorDefinitions) MultiThreadedDebug - - Debug/metapath.pch + NotUsing + + $(IntDir) - ..\Bin\$(Configuration)_x86\obj\minipath\ - ..\Bin\$(Configuration)_x86\obj\minipath\ Level3 true - ProgramDatabase + EditAndContinue EnableFastChecks + /MACHINE:I386 %(AdditionalOptions) @@ -96,6 +100,7 @@ true true Windows + Default _DEBUG;%(PreprocessorDefinitions) @@ -119,21 +124,22 @@ true MultiThreaded true - - ..\Bin\$(Configuration)_x86\minipath.pch + NotUsing + + $(IntDir) - ..\Bin\$(Configuration)_x86\obj\minipath\ - ..\Bin\$(Configuration)_x86\obj\minipath\ Level3 true - ProgramDatabase + None Default + /MACHINE:I386 %(AdditionalOptions) comctl32.lib;shlwapi.lib;psapi.lib;%(AdditionalDependencies) true Windows + Default NDEBUG;%(PreprocessorDefinitions) @@ -154,29 +160,37 @@ comctl32.lib;shlwapi.lib;psapi.lib;%(AdditionalDependencies) Windows + Default - ..\Bin\$(Configuration)_x64\obj\minipath\ - ..\Bin\$(Configuration)_x64\obj\minipath\ MultiThreadedDebug EnableFastChecks Disabled + NotUsing + + + + EditAndContinue comctl32.lib;shlwapi.lib;psapi.lib;%(AdditionalDependencies) Windows + Default - ..\Bin\$(Configuration)_x64\obj\minipath\ - ..\Bin\$(Configuration)_x64\obj\minipath\ MultiThreaded Default + NotUsing + + + + None diff --git a/minipath/minipath_VS2017.vcxproj b/minipath/minipath_VS2017.vcxproj index cb7dbba93..fc7dbd792 100644 --- a/minipath/minipath_VS2017.vcxproj +++ b/minipath/minipath_VS2017.vcxproj @@ -62,33 +62,37 @@ ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\ ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\minipath\ + true ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\ ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\minipath\ + true ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\ ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\minipath\ + true ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\ ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\minipath\ + true Disabled _DEBUG;WIN32;_WINDOWS;UNICODE;_UNICODE;_M_IX86;%(PreprocessorDefinitions) MultiThreadedDebug - - Debug/metapath.pch + NotUsing + + $(IntDir) - ..\Bin\$(Configuration)_x86\obj\minipath\ - ..\Bin\$(Configuration)_x86\obj\minipath\ Level3 true ProgramDatabase EnableFastChecks + /MACHINE:I386 %(AdditionalOptions) @@ -96,6 +100,7 @@ true true Windows + Default _DEBUG;%(PreprocessorDefinitions) @@ -119,21 +124,22 @@ true MultiThreaded true - - ..\Bin\$(Configuration)_x86\minipath.pch + NotUsing + + $(IntDir) - ..\Bin\$(Configuration)_x86\obj\minipath\ - ..\Bin\$(Configuration)_x86\obj\minipath\ Level3 true ProgramDatabase Default + /MACHINE:I386 %(AdditionalOptions) comctl32.lib;shlwapi.lib;psapi.lib;%(AdditionalDependencies) true Windows + Default NDEBUG;%(PreprocessorDefinitions) @@ -154,29 +160,35 @@ comctl32.lib;shlwapi.lib;psapi.lib;%(AdditionalDependencies) Windows + Default - ..\Bin\$(Configuration)_x64\obj\minipath\ - ..\Bin\$(Configuration)_x64\obj\minipath\ MultiThreadedDebug EnableFastChecks Disabled + NotUsing + + + comctl32.lib;shlwapi.lib;psapi.lib;%(AdditionalDependencies) Windows + Default - ..\Bin\$(Configuration)_x64\obj\minipath\ - ..\Bin\$(Configuration)_x64\obj\minipath\ MultiThreaded Default + NotUsing + + + diff --git a/scintilla/Scintilla.vcxproj b/scintilla/Scintilla.vcxproj index 9f2fe5192..cb264049c 100644 --- a/scintilla/Scintilla.vcxproj +++ b/scintilla/Scintilla.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -78,38 +78,38 @@ <_ProjectFileVersion>10.0.30319.1 - ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\lib\Scintilla\ - ..\bin\VS2010\$(Configuration)_x86\obj\scintilla\ - ..\bin\VS2013\$(Configuration)_x86\obj\scintilla\ - ..\Bin\$(Configuration)_x86\obj\scintilla\ - ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\lib\Scintilla\ - ..\bin\VS2010\$(Configuration)_x64\obj\scintilla\ - ..\bin\VS2013\$(Configuration)_x64\obj\scintilla\ - ..\Bin\$(Configuration)_x64\obj\scintilla\ - ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\Scintilla\ - ..\bin\VS2010\$(Configuration)_x86\obj\scintilla\ - ..\bin\VS2013\$(Configuration)_x86\obj\scintilla\ - ..\Bin\$(Configuration)_x86\obj\scintilla\ - ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\Scintilla\ - ..\bin\VS2010\$(Configuration)_x64\obj\scintilla\ - ..\bin\VS2013\$(Configuration)_x64\obj\scintilla\ - ..\Bin\$(Configuration)_x64\obj\scintilla\ - ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\lib\Scintilla\ - ..\bin\VS2010\$(Configuration)_x86\obj\scintilla\ - ..\bin\VS2013\$(Configuration)_x86\obj\scintilla\ - ..\Bin\$(Configuration)_x86\obj\scintilla\ - ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\lib\Scintilla\ - ..\bin\VS2010\$(Configuration)_x64\obj\scintilla\ - ..\bin\VS2013\$(Configuration)_x64\obj\scintilla\ - ..\Bin\$(Configuration)_x64\obj\scintilla\ - ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\Scintilla\ - ..\bin\VS2010\$(Configuration)_x86\obj\scintilla\ - ..\bin\VS2013\$(Configuration)_x86\obj\scintilla\ - ..\Bin\$(Configuration)_x86\obj\scintilla\ - ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\Scintilla\ - ..\bin\VS2010\$(Configuration)_x64\obj\scintilla\ - ..\bin\VS2013\$(Configuration)_x64\obj\scintilla\ - ..\Bin\$(Configuration)_x64\obj\scintilla\ + ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\ + ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\ + ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\ + ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\ + ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\ + ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\ + ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\ + ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\ + ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\scintilla\ + ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\scintilla\ + ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\scintilla\ + ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\scintilla\ + ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\scintilla\ + ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\scintilla\ + ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\scintilla\ + ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\scintilla\ + ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\ + ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\ + ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\ + ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\ + ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\ + ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\ + ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\ + ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\ + ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\scintilla\ + ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\scintilla\ + ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\scintilla\ + ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\scintilla\ + ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\scintilla\ + ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\scintilla\ + ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\scintilla\ + ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\scintilla\ false false @@ -126,6 +126,9 @@ Level3 false + + true + @@ -143,6 +146,9 @@ MachineX64 + + true + @@ -156,6 +162,9 @@ MultiThreaded Level3 + + true + @@ -171,6 +180,9 @@ MachineX64 + + true + diff --git a/scintilla/Scintilla_VS2017.vcxproj b/scintilla/Scintilla_VS2017.vcxproj index 840cfdf1a..ff4107b22 100644 --- a/scintilla/Scintilla_VS2017.vcxproj +++ b/scintilla/Scintilla_VS2017.vcxproj @@ -29,35 +29,35 @@ Unicode StaticLibrary - v141_xp v100 v120_xp v140_xp + v141_xp Unicode StaticLibrary - v141_xp v100 v120_xp v140_xp + v141_xp Unicode StaticLibrary - v141_xp v100 v120_xp v140_xp + v141_xp true Unicode StaticLibrary - v141_xp v100 v120_xp v140_xp + v141_xp true @@ -78,38 +78,38 @@ <_ProjectFileVersion>10.0.30319.1 - ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\lib\Scintilla\ - ..\bin\VS2010\$(Configuration)_x86\obj\scintilla\ - ..\bin\VS2013\$(Configuration)_x86\obj\scintilla\ - ..\Bin\$(Configuration)_x86\obj\scintilla\ - ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\lib\Scintilla\ - ..\bin\VS2010\$(Configuration)_x64\obj\scintilla\ - ..\bin\VS2013\$(Configuration)_x64\obj\scintilla\ - ..\Bin\$(Configuration)_x64\obj\scintilla\ - ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\Scintilla\ - ..\bin\VS2010\$(Configuration)_x86\obj\scintilla\ - ..\bin\VS2013\$(Configuration)_x86\obj\scintilla\ - ..\Bin\$(Configuration)_x86\obj\scintilla\ - ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\Scintilla\ - ..\bin\VS2010\$(Configuration)_x64\obj\scintilla\ - ..\bin\VS2013\$(Configuration)_x64\obj\scintilla\ - ..\Bin\$(Configuration)_x64\obj\scintilla\ - ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\lib\Scintilla\ - ..\bin\VS2010\$(Configuration)_x86\obj\scintilla\ - ..\bin\VS2013\$(Configuration)_x86\obj\scintilla\ - ..\Bin\$(Configuration)_x86\obj\scintilla\ - ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\lib\Scintilla\ - ..\bin\VS2010\$(Configuration)_x64\obj\scintilla\ - ..\bin\VS2013\$(Configuration)_x64\obj\scintilla\ - ..\Bin\$(Configuration)_x64\obj\scintilla\ - ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\Scintilla\ - ..\bin\VS2010\$(Configuration)_x86\obj\scintilla\ - ..\bin\VS2013\$(Configuration)_x86\obj\scintilla\ - ..\Bin\$(Configuration)_x86\obj\scintilla\ - ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\Scintilla\ - ..\bin\VS2010\$(Configuration)_x64\obj\scintilla\ - ..\bin\VS2013\$(Configuration)_x64\obj\scintilla\ - ..\Bin\$(Configuration)_x64\obj\scintilla\ + ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\ + ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\ + ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\ + ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\ + ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\ + ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\ + ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\ + ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\ + ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\scintilla\ + ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\scintilla\ + ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\scintilla\ + ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\scintilla\ + ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\scintilla\ + ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\scintilla\ + ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\scintilla\ + ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\scintilla\ + ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\ + ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\ + ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\ + ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\ + ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\ + ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\ + ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\ + ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\ + ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\scintilla\ + ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\scintilla\ + ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\scintilla\ + ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\scintilla\ + ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\scintilla\ + ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\scintilla\ + ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\scintilla\ + ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\scintilla\ false false @@ -126,6 +126,9 @@ Level3 false + + true + @@ -143,6 +146,9 @@ MachineX64 + + true + @@ -156,6 +162,9 @@ MultiThreaded Level3 + + true + @@ -171,6 +180,9 @@ MachineX64 + + true + diff --git a/src/Notepad3.vcxproj b/src/Notepad3.vcxproj index 6e3aaca16..afd4844da 100644 --- a/src/Notepad3.vcxproj +++ b/src/Notepad3.vcxproj @@ -79,7 +79,7 @@ false ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\ - false + true ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\ @@ -91,7 +91,7 @@ false ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\ - false + true ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\ @@ -105,12 +105,15 @@ WIN32;STATIC_BUILD;SCI_LEXER;BOOKMARK_EDITION;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreadedDebug Level3 + false - msimg32.lib;comctl32.lib;imm32.lib;shlwapi.lib;%(AdditionalDependencies) - true + msimg32.lib;comctl32.lib;imm32.lib;shlwapi.lib;scintilla.lib;%(AdditionalDependencies) + Debug Windows MachineX86 + $(IntermediateOutputPath);%(AdditionalLibraryDirectories) + Default ..\Version.exe @@ -119,6 +122,10 @@ WIN32;BOOKMARK_EDITION;%(PreprocessorDefinitions) + + false + false + @@ -131,12 +138,15 @@ _WIN64;STATIC_BUILD;SCI_LEXER;BOOKMARK_EDITION;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreadedDebug Level3 + false - msimg32.lib;comctl32.lib;imm32.lib;shlwapi.lib;%(AdditionalDependencies) - true + msimg32.lib;comctl32.lib;imm32.lib;shlwapi.lib;scintilla.lib;%(AdditionalDependencies) + Debug Windows MachineX64 + $(IntermediateOutputPath);%(AdditionalLibraryDirectories) + Default @@ -147,6 +157,10 @@ _WIN64;BOOKMARK_EDITION;%(PreprocessorDefinitions) + + false + false + @@ -157,16 +171,19 @@ WIN32;STATIC_BUILD;SCI_LEXER;BOOKMARK_EDITION;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreaded Level3 + None - msimg32.lib;comctl32.lib;imm32.lib;shlwapi.lib;%(AdditionalDependencies) + msimg32.lib;comctl32.lib;imm32.lib;shlwapi.lib;scintilla.lib;%(AdditionalDependencies) true - true + No .rdata=.text true true Windows MachineX86 + $(IntermediateOutputPath);%(AdditionalLibraryDirectories) + Default ..\Version.exe @@ -175,6 +192,10 @@ WIN32;BOOKMARK_EDITION;%(PreprocessorDefinitions) + + false + false + @@ -184,16 +205,19 @@ _WIN64;STATIC_BUILD;SCI_LEXER;BOOKMARK_EDITION;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreaded Level3 + None - msimg32.lib;comctl32.lib;imm32.lib;shlwapi.lib;%(AdditionalDependencies) + msimg32.lib;comctl32.lib;imm32.lib;shlwapi.lib;scintilla.lib;%(AdditionalDependencies) true - true + No .rdata=.text true true Windows MachineX64 + $(IntermediateOutputPath);%(AdditionalLibraryDirectories) + Default @@ -204,6 +228,10 @@ _WIN64;BOOKMARK_EDITION;%(PreprocessorDefinitions) + + false + false + diff --git a/src/Notepad3_VS2017.vcxproj b/src/Notepad3_VS2017.vcxproj index 87254eb0a..60b9fd9b5 100644 --- a/src/Notepad3_VS2017.vcxproj +++ b/src/Notepad3_VS2017.vcxproj @@ -79,7 +79,7 @@ false ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\ - false + true ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\ @@ -91,7 +91,7 @@ false ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\obj\ - false + true ..\Bin\$(Configuration)_$(PlatformShortName)_$(PlatformToolset)\ @@ -105,12 +105,15 @@ WIN32;STATIC_BUILD;SCI_LEXER;BOOKMARK_EDITION;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreadedDebug Level3 + false - msimg32.lib;comctl32.lib;imm32.lib;shlwapi.lib;%(AdditionalDependencies) - true + msimg32.lib;comctl32.lib;imm32.lib;shlwapi.lib;scintilla.lib;%(AdditionalDependencies) + Debug Windows MachineX86 + $(IntermediateOutputPath);%(AdditionalLibraryDirectories) + Default ..\Version.exe @@ -119,6 +122,10 @@ WIN32;BOOKMARK_EDITION;%(PreprocessorDefinitions) + + false + false + @@ -131,12 +138,15 @@ _WIN64;STATIC_BUILD;SCI_LEXER;BOOKMARK_EDITION;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreadedDebug Level3 + false - msimg32.lib;comctl32.lib;imm32.lib;shlwapi.lib;%(AdditionalDependencies) - true + msimg32.lib;comctl32.lib;imm32.lib;shlwapi.lib;scintilla.lib;%(AdditionalDependencies) + Debug Windows MachineX64 + $(IntermediateOutputPath);%(AdditionalLibraryDirectories) + Default @@ -147,6 +157,10 @@ _WIN64;BOOKMARK_EDITION;%(PreprocessorDefinitions) + + false + false + @@ -157,16 +171,19 @@ WIN32;STATIC_BUILD;SCI_LEXER;BOOKMARK_EDITION;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreaded Level3 + None - msimg32.lib;comctl32.lib;imm32.lib;shlwapi.lib;%(AdditionalDependencies) + msimg32.lib;comctl32.lib;imm32.lib;shlwapi.lib;scintilla.lib;%(AdditionalDependencies) true - true + No .rdata=.text true true Windows MachineX86 + $(IntermediateOutputPath);%(AdditionalLibraryDirectories) + Default ..\Version.exe @@ -175,6 +192,10 @@ WIN32;BOOKMARK_EDITION;%(PreprocessorDefinitions) + + false + false + @@ -184,16 +205,19 @@ _WIN64;STATIC_BUILD;SCI_LEXER;BOOKMARK_EDITION;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreaded Level3 + None - msimg32.lib;comctl32.lib;imm32.lib;shlwapi.lib;%(AdditionalDependencies) + msimg32.lib;comctl32.lib;imm32.lib;shlwapi.lib;scintilla.lib;%(AdditionalDependencies) true - true + No .rdata=.text true true Windows MachineX64 + $(IntermediateOutputPath);%(AdditionalLibraryDirectories) + Default @@ -204,6 +228,10 @@ _WIN64;BOOKMARK_EDITION;%(PreprocessorDefinitions) + + false + false +