CodeCow/Notepad3
1
0
Fork 0
mirror of https://github.com/rizonesoft/Notepad3.git synced 2026-06-14 21:09:05 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Removed Visual Studio 2010 to 2013 Support

Browse Source 
Removed Visual Studio 2010 to 2013 Support and Cleaned Source Code.
This commit is contained in:
Derick Payne 2016-06-11 17:24:14 +02:00
parent 2ff761c6b6
commit 2429e56f3f
12 changed files with 38 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -40,4 +40,6 @@ Build/Signing/Certum.cer
Build/Signing/Certum.p12
Build/Signing/kSign.exe
Build/Signing/kSignCMD.exe
Build/Signing/Password.txt
Build/Signing/Password.txt
Notepad3.VC.db
Notepad3.VC.VC.opendb

2
Version.ini
View File

@ -7,7 +7,7 @@ Language=CPlusPlus
Major=auto
Minor=auto
Maintenance=auto
Build=305
Build=311
[CSharp]
AssemConfig=Rizonesoft.Voice.Win\Properties\AssemblyInfo.cs.conf

4
distrib/Changes.txt
View File

@ -3,8 +3,8 @@ Notepad3 Build 0000 (11 June 2016)
- Fixed Compiler warnings
- Updated to Scintilla 3.6.6
- Updated Apache Keywords for version 2.4
-
-
- Removed Visual Studio 2010 to 2013 Support
- Added Visual Studio 2015 Update 2 version number
-
-
-

2
minipath/Version.ini
View File

@ -1,4 +1,4 @@
[Version]
Build=73
Build=81
VersionHeader=src\VersionEx.h
ManifestConfig=res\MiniPath.exe.manifest.conf

2
minipath/res/MiniPath.exe.manifest
View File

@ -3,7 +3,7 @@
<assemblyIdentity
name="MiniPath"
processorArchitecture="*"
version="0.0.7.73"
version="0.0.8.81"
type="win32"
/>
<description>metapath</description>

4
minipath/src/VersionEx.h
View File

@ -1,4 +1,4 @@
#define VERSION_MAJOR 0
#define VERSION_MINOR 0
#define VERSION_REV 7
#define VERSION_BUILD 73
#define VERSION_REV 8
#define VERSION_BUILD 81

2
res/Notepad3.exe.manifest
View File

@ -3,7 +3,7 @@
<assemblyIdentity
name="Notepad3"
processorArchitecture="*"
version="0.3.0.305"
version="0.3.1.311"
type="win32"
/>
<description>Notepad3</description>

17
scintilla/Scintilla.vcxproj
View File

@ -23,6 +23,7 @@
<ProjectGuid>{5877B917-512B-49F5-B514-1B4159E7A9CA}</ProjectGuid>
<ProjectName>Scintilla</ProjectName>
<RootNamespace>Scintilla</RootNamespace>
<WindowsTargetPlatformVersion>10</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@ -80,35 +81,35 @@
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\VS2012\$(Configuration)_x86\obj\scintilla\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32' And '$(VisualStudioVersion)'=='10.0'">..\bin\VS2010\$(Configuration)_x86\obj\scintilla\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32' And '$(VisualStudioVersion)'=='12.0'">..\bin\VS2013\$(Configuration)_x86\obj\scintilla\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32' And '$(VisualStudioVersion)'=='14.0'">..\bin\VS2015\$(Configuration)_x86\obj\scintilla\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32' And '$(VisualStudioVersion)'=='14.0'">..\Bin\$(Configuration)_x86\obj\scintilla\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\bin\VS2012\$(Configuration)_x64\obj\scintilla\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64' And '$(VisualStudioVersion)'=='10.0'">..\bin\VS2010\$(Configuration)_x64\obj\scintilla\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64' And '$(VisualStudioVersion)'=='12.0'">..\bin\VS2013\$(Configuration)_x64\obj\scintilla\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64' And '$(VisualStudioVersion)'=='14.0'">..\bin\VS2015\$(Configuration)_x64\obj\scintilla\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64' And '$(VisualStudioVersion)'=='14.0'">..\Bin\$(Configuration)_x64\obj\scintilla\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\VS2012\$(Configuration)_x86\obj\scintilla\</IntDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32' And '$(VisualStudioVersion)'=='10.0'">..\bin\VS2010\$(Configuration)_x86\obj\scintilla\</IntDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32' And '$(VisualStudioVersion)'=='12.0'">..\bin\VS2013\$(Configuration)_x86\obj\scintilla\</IntDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32' And '$(VisualStudioVersion)'=='14.0'">..\bin\VS2015\$(Configuration)_x86\obj\scintilla\</IntDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32' And '$(VisualStudioVersion)'=='14.0'">..\Bin\$(Configuration)_x86\obj\scintilla\</IntDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\bin\VS2012\$(Configuration)_x64\obj\scintilla\</IntDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64' And '$(VisualStudioVersion)'=='10.0'">..\bin\VS2010\$(Configuration)_x64\obj\scintilla\</IntDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64' And '$(VisualStudioVersion)'=='12.0'">..\bin\VS2013\$(Configuration)_x64\obj\scintilla\</IntDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64' And '$(VisualStudioVersion)'=='14.0'">..\bin\VS2015\$(Configuration)_x64\obj\scintilla\</IntDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64' And '$(VisualStudioVersion)'=='14.0'">..\Bin\$(Configuration)_x64\obj\scintilla\</IntDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\bin\VS2012\$(Configuration)_x86\obj\scintilla\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32' And '$(VisualStudioVersion)'=='10.0'">..\bin\VS2010\$(Configuration)_x86\obj\scintilla\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32' And '$(VisualStudioVersion)'=='12.0'">..\bin\VS2013\$(Configuration)_x86\obj\scintilla\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32' And '$(VisualStudioVersion)'=='14.0'">..\bin\VS2015\$(Configuration)_x86\obj\scintilla\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32' And '$(VisualStudioVersion)'=='14.0'">..\Bin\$(Configuration)_x86\obj\scintilla\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\bin\VS2012\$(Configuration)_x64\obj\scintilla\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64' And '$(VisualStudioVersion)'=='10.0'">..\bin\VS2010\$(Configuration)_x64\obj\scintilla\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64' And '$(VisualStudioVersion)'=='12.0'">..\bin\VS2013\$(Configuration)_x64\obj\scintilla\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64' And '$(VisualStudioVersion)'=='14.0'">..\bin\VS2015\$(Configuration)_x64\obj\scintilla\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64' And '$(VisualStudioVersion)'=='14.0'">..\Bin\$(Configuration)_x64\obj\scintilla\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\bin\VS2012\$(Configuration)_x86\obj\scintilla\</IntDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32' And '$(VisualStudioVersion)'=='10.0'">..\bin\VS2010\$(Configuration)_x86\obj\scintilla\</IntDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32' And '$(VisualStudioVersion)'=='12.0'">..\bin\VS2013\$(Configuration)_x86\obj\scintilla\</IntDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32' And '$(VisualStudioVersion)'=='14.0'">..\bin\VS2015\$(Configuration)_x86\obj\scintilla\</IntDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32' And '$(VisualStudioVersion)'=='14.0'">..\Bin\$(Configuration)_x86\obj\scintilla\</IntDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\bin\VS2012\$(Configuration)_x64\obj\scintilla\</IntDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64' And '$(VisualStudioVersion)'=='10.0'">..\bin\VS2010\$(Configuration)_x64\obj\scintilla\</IntDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64' And '$(VisualStudioVersion)'=='12.0'">..\bin\VS2013\$(Configuration)_x64\obj\scintilla\</IntDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64' And '$(VisualStudioVersion)'=='14.0'">..\bin\VS2015\$(Configuration)_x64\obj\scintilla\</IntDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64' And '$(VisualStudioVersion)'=='14.0'">..\Bin\$(Configuration)_x64\obj\scintilla\</IntDir>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
<LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
</PropertyGroup>

3
scintilla/Scintilla.vcxproj.filters
View File

@ -395,9 +395,6 @@
<ClInclude Include="src\XPM.h">
<Filter>src</Filter>
</ClInclude>
<ClInclude Include="win32\HanjaDic.h">
<Filter>win32</Filter>
</ClInclude>
<ClInclude Include="win32\PlatWin.h">
<Filter>win32</Filter>
</ClInclude>

68
src/Notepad3.vcxproj
View File

@ -29,38 +29,26 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<CharacterSet>Unicode</CharacterSet>
<ConfigurationType>Application</ConfigurationType>
<PlatformToolset>v110_xp</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)'=='10.0'">v100</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)'=='12.0'">v120_xp</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)'=='14.0'">v140_xp</PlatformToolset>
<PlatformToolset>v140_xp</PlatformToolset>
<UseDebugLibraries>true</UseDebugLibraries>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<CharacterSet>Unicode</CharacterSet>
<ConfigurationType>Application</ConfigurationType>
<PlatformToolset>v110_xp</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)'=='10.0'">v100</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)'=='12.0'">v120_xp</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)'=='14.0'">v140_xp</PlatformToolset>
<PlatformToolset>v140_xp</PlatformToolset>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<CharacterSet>Unicode</CharacterSet>
<ConfigurationType>Application</ConfigurationType>
<PlatformToolset>v110_xp</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)'=='10.0'">v100</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)'=='12.0'">v120_xp</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)'=='14.0'">v140_xp</PlatformToolset>
<PlatformToolset>v140_xp</PlatformToolset>
<UseDebugLibraries>true</UseDebugLibraries>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<CharacterSet>Unicode</CharacterSet>
<ConfigurationType>Application</ConfigurationType>
<PlatformToolset>v110_xp</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)'=='10.0'">v100</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)'=='12.0'">v120_xp</PlatformToolset>
<PlatformToolset Condition="'$(VisualStudioVersion)'=='14.0'">v140_xp</PlatformToolset>
<PlatformToolset>v140_xp</PlatformToolset>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
</PropertyGroup>
@ -82,51 +70,27 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<GenerateManifest>false</GenerateManifest>
<IntDir>..\bin\VS2012\$(Configuration)_x86\obj\</IntDir>
<IntDir Condition="'$(VisualStudioVersion)'=='10.0'">..\bin\VS2010\$(Configuration)_x86\obj\</IntDir>
<IntDir Condition="'$(VisualStudioVersion)'=='12.0'">..\bin\VS2013\$(Configuration)_x86\obj\</IntDir>
<IntDir Condition="'$(VisualStudioVersion)'=='14.0'">..\Bin\$(Configuration)_x86\obj\</IntDir>
<IntDir>..\Bin\$(Configuration)_x86\obj\</IntDir>
<LinkIncremental>true</LinkIncremental>
<OutDir>..\bin\VS2012\$(Configuration)_x86\</OutDir>
<OutDir Condition="'$(VisualStudioVersion)'=='10.0'">..\bin\VS2010\$(Configuration)_x86\</OutDir>
<OutDir Condition="'$(VisualStudioVersion)'=='12.0'">..\bin\VS2013\$(Configuration)_x86\</OutDir>
<OutDir Condition="'$(VisualStudioVersion)'=='14.0'">..\Bin\$(Configuration)_x86\</OutDir>
<OutDir>..\Bin\$(Configuration)_x86\</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<GenerateManifest>false</GenerateManifest>
<IntDir>..\bin\VS2012\$(Configuration)_x86\obj\</IntDir>
<IntDir Condition="'$(VisualStudioVersion)'=='10.0'">..\bin\VS2010\$(Configuration)_x86\obj\</IntDir>
<IntDir Condition="'$(VisualStudioVersion)'=='12.0'">..\bin\VS2013\$(Configuration)_x86\obj\</IntDir>
<IntDir Condition="'$(VisualStudioVersion)'=='14.0'">..\Bin\$(Configuration)_x86\obj\</IntDir>
<IntDir>..\Bin\$(Configuration)_x86\obj\</IntDir>
<LinkIncremental>false</LinkIncremental>
<OutDir>..\bin\VS2012\$(Configuration)_x86\</OutDir>
<OutDir Condition="'$(VisualStudioVersion)'=='10.0'">..\bin\VS2010\$(Configuration)_x86\</OutDir>
<OutDir Condition="'$(VisualStudioVersion)'=='12.0'">..\bin\VS2013\$(Configuration)_x86\</OutDir>
<OutDir Condition="'$(VisualStudioVersion)'=='14.0'">..\Bin\$(Configuration)_x86\</OutDir>
<OutDir>..\Bin\$(Configuration)_x86\</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<GenerateManifest>false</GenerateManifest>
<IntDir>..\bin\VS2012\$(Configuration)_x64\obj\</IntDir>
<IntDir Condition="'$(VisualStudioVersion)'=='10.0'">..\bin\VS2010\$(Configuration)_x64\obj\</IntDir>
<IntDir Condition="'$(VisualStudioVersion)'=='12.0'">..\bin\VS2013\$(Configuration)_x64\obj\</IntDir>
<IntDir Condition="'$(VisualStudioVersion)'=='14.0'">..\Bin\$(Configuration)_x64\obj\</IntDir>
<IntDir>..\Bin\$(Configuration)_x64\obj\</IntDir>
<LinkIncremental>true</LinkIncremental>
<OutDir>..\bin\VS2012\$(Configuration)_x64\</OutDir>
<OutDir Condition="'$(VisualStudioVersion)'=='10.0'">..\bin\VS2010\$(Configuration)_x64\</OutDir>
<OutDir Condition="'$(VisualStudioVersion)'=='12.0'">..\bin\VS2013\$(Configuration)_x64\</OutDir>
<OutDir Condition="'$(VisualStudioVersion)'=='14.0'">..\Bin\$(Configuration)_x64\</OutDir>
<OutDir>..\Bin\$(Configuration)_x64\</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<GenerateManifest>false</GenerateManifest>
<IntDir>..\bin\VS2012\$(Configuration)_x64\obj\</IntDir>
<IntDir Condition="'$(VisualStudioVersion)'=='10.0'">..\bin\VS2010\$(Configuration)_x64\obj\</IntDir>
<IntDir Condition="'$(VisualStudioVersion)'=='12.0'">..\bin\VS2013\$(Configuration)_x64\obj\</IntDir>
<IntDir Condition="'$(VisualStudioVersion)'=='14.0'">..\Bin\$(Configuration)_x64\obj\</IntDir>
<IntDir>..\Bin\$(Configuration)_x64\obj\</IntDir>
<LinkIncremental>false</LinkIncremental>
<OutDir>..\bin\VS2012\$(Configuration)_x64\</OutDir>
<OutDir Condition="'$(VisualStudioVersion)'=='10.0'">..\bin\VS2010\$(Configuration)_x64\</OutDir>
<OutDir Condition="'$(VisualStudioVersion)'=='12.0'">..\bin\VS2013\$(Configuration)_x64\</OutDir>
<OutDir Condition="'$(VisualStudioVersion)'=='14.0'">..\Bin\$(Configuration)_x64\</OutDir>
<OutDir>..\Bin\$(Configuration)_x64\</OutDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
@ -148,8 +112,7 @@
</Link>
<PreBuildEvent>
<Command>..\Version.exe</Command>
<Message>
</Message>
<Message>Generating version number...</Message>
</PreBuildEvent>
<ResourceCompile>
<PreprocessorDefinitions>WIN32;BOOKMARK_EDITION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@ -186,7 +149,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<AdditionalIncludeDirectories>..\scintilla\include;..\scintilla\lexlib;..\scintilla\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<EnableEnhancedInstructionSet Condition="'$(VisualStudioVersion)'&gt;'10.0'">NoExtensions</EnableEnhancedInstructionSet>
<EnableEnhancedInstructionSet>NoExtensions</EnableEnhancedInstructionSet>
<MultiProcessorCompilation>true</MultiProcessorCompilation>
<Optimization>MaxSpeed</Optimization>
<PreprocessorDefinitions>WIN32;STATIC_BUILD;SCI_LEXER;BOOKMARK_EDITION;NDEBUG;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@ -205,8 +168,7 @@
</Link>
<PreBuildEvent>
<Command>..\Version.exe</Command>
<Message>
</Message>
<Message>Generating version number...</Message>
</PreBuildEvent>
<ResourceCompile>
<PreprocessorDefinitions>WIN32;BOOKMARK_EDITION;%(PreprocessorDefinitions)</PreprocessorDefinitions>

18
src/Version.h
View File

@ -49,21 +49,7 @@
#endif
// Compiler specific
#if defined(WDK_BUILD)
#if _MSC_VER == 1600
#if (_MSC_FULL_VER >= 160040219)
#define VERSION_COMPILER L"WDK (Microsoft Visual C++ 2010 SP1)"
#else
#define VERSION_COMPILER L"WDK (Microsoft Visual C++ 2010)"
#endif
#elif _MSC_VER == 1500
#if (_MSC_FULL_VER == 150030729)
#define VERSION_COMPILER L"WDK"
#else
#define VERSION_COMPILER L"WDK (version unknown)"
#endif
#endif
#elif defined(_MSC_VER)
#if defined(_MSC_VER)
#if _MSC_VER == 1900
#if (_MSC_FULL_VER == 190023918)
#define VERSION_COMPILER L"Microsoft Visual C++ 2015 Update 2"
@ -71,8 +57,6 @@
#define VERSION_COMPILER L"Microsoft Visual C++ 2015 Update 1"
#elif (_MSC_FULL_VER == 190023026)
#define VERSION_COMPILER L"Microsoft Visual C++ 2015"
#elif (_MSC_FULL_VER < 190023026)
#define VERSION_COMPILER L"Microsoft Visual C++ 2015 Preview/Beta/RC"
#else
#define VERSION_COMPILER L"Microsoft Visual C++ 2015"
#endif

4
src/VersionEx.h
View File

@ -1,4 +1,4 @@
#define VERSION_MAJOR 0
#define VERSION_MINOR 3
#define VERSION_REV 0
#define VERSION_BUILD 305
#define VERSION_REV 1
#define VERSION_BUILD 311