summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Notepad2_icl13.vcxproj269
-rw-r--r--src/Notepad2_icl13.vcxproj.filters114
-rw-r--r--src/Version.h5
3 files changed, 1 insertions, 387 deletions
diff --git a/src/Notepad2_icl13.vcxproj b/src/Notepad2_icl13.vcxproj
deleted file mode 100644
index 2d6651a..0000000
--- a/src/Notepad2_icl13.vcxproj
+++ /dev/null
@@ -1,269 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|x64">
- <Configuration>Debug</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <Keyword>Win32Proj</Keyword>
- <ProjectGuid>{A39FCE76-EE3C-4357-9969-0EBA6FC6039D}</ProjectGuid>
- <ProjectName>Notepad2</ProjectName>
- <RootNamespace>Notepad2</RootNamespace>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <CharacterSet>Unicode</CharacterSet>
- <ConfigurationType>Application</ConfigurationType>
- <PlatformToolset>Intel C++ Compiler XE 13.0</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <CharacterSet>Unicode</CharacterSet>
- <ConfigurationType>Application</ConfigurationType>
- <InterproceduralOptimization>true</InterproceduralOptimization>
- <PlatformToolset>Intel C++ Compiler XE 13.0</PlatformToolset>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
- <CharacterSet>Unicode</CharacterSet>
- <ConfigurationType>Application</ConfigurationType>
- <PlatformToolset>Intel C++ Compiler XE 13.0</PlatformToolset>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <CharacterSet>Unicode</CharacterSet>
- <ConfigurationType>Application</ConfigurationType>
- <InterproceduralOptimization>true</InterproceduralOptimization>
- <PlatformToolset>Intel C++ Compiler XE 13.0</PlatformToolset>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\ICL13\$(Configuration)_x86\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\bin\ICL13\$(Configuration)_x64\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\bin\ICL13\$(Configuration)_x86\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\bin\ICL13\$(Configuration)_x64\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\bin\ICL13\$(Configuration)_x86\obj\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\bin\ICL13\$(Configuration)_x64\obj\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\bin\ICL13\$(Configuration)_x86\obj\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\bin\ICL13\$(Configuration)_x64\obj\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</GenerateManifest>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</GenerateManifest>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>
- <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</GenerateManifest>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <PreBuildEvent>
- <Command>..\update_rev.bat</Command>
- <Message>Generating revision number...</Message>
- </PreBuildEvent>
- <ClCompile>
- <AdditionalIncludeDirectories>..\scintilla\include;..\scintilla\lexlib;..\scintilla\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- <DisableSpecificDiagnostics>2</DisableSpecificDiagnostics>
- <MultiProcessorCompilation>true</MultiProcessorCompilation>
- <Optimization>Disabled</Optimization>
- <PreprocessorDefinitions>WIN32;STATIC_BUILD;SCI_LEXER;BOOKMARK_EDITION;NDEBUG;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
- <WarningLevel>Level3</WarningLevel>
- <DisableSpecificWarnings>1885;%(DisableSpecificWarnings)</DisableSpecificWarnings>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>WIN32;BOOKMARK_EDITION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>comctl32.lib;imm32.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Windows</SubSystem>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <PreBuildEvent>
- <Command>..\update_rev.bat</Command>
- <Message>Generating revision number...</Message>
- </PreBuildEvent>
- <ClCompile>
- <AdditionalIncludeDirectories>..\scintilla\include;..\scintilla\lexlib;..\scintilla\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <DisableSpecificDiagnostics>2</DisableSpecificDiagnostics>
- <MultiProcessorCompilation>true</MultiProcessorCompilation>
- <Optimization>Disabled</Optimization>
- <PreprocessorDefinitions>_WIN64;STATIC_BUILD;SCI_LEXER;BOOKMARK_EDITION;NDEBUG;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
- <WarningLevel>Level3</WarningLevel>
- <DisableSpecificWarnings>1885;%(DisableSpecificWarnings)</DisableSpecificWarnings>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_WIN64;BOOKMARK_EDITION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>comctl32.lib;imm32.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Windows</SubSystem>
- <TargetMachine>MachineX64</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <PreBuildEvent>
- <Command>..\update_rev.bat</Command>
- <Message>Generating revision number...</Message>
- </PreBuildEvent>
- <ClCompile>
- <AdditionalIncludeDirectories>..\scintilla\include;..\scintilla\lexlib;..\scintilla\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <DisableSpecificDiagnostics>2</DisableSpecificDiagnostics>
- <FloatingPointModel>Fast</FloatingPointModel>
- <InterproceduralOptimization>MultiFile</InterproceduralOptimization>
- <IntrinsicFunctions>true</IntrinsicFunctions>
- <MultiProcessorCompilation>true</MultiProcessorCompilation>
- <Optimization>MaxSpeedHighLevel</Optimization>
- <OptimizeForWindowsApplication>true</OptimizeForWindowsApplication>
- <PreprocessorDefinitions>WIN32;STATIC_BUILD;SCI_LEXER;BOOKMARK_EDITION;NDEBUG;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
- <StringPooling>true</StringPooling>
- <WarningLevel>Level3</WarningLevel>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- <DisableSpecificWarnings>1885;%(DisableSpecificWarnings)</DisableSpecificWarnings>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>WIN32;BOOKMARK_EDITION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>comctl32.lib;imm32.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <MergeSections>.rdata=.text</MergeSections>
- <OptimizeReferences>true</OptimizeReferences>
- <SetChecksum>true</SetChecksum>
- <SubSystem>Windows</SubSystem>
- <TargetMachine>MachineX86</TargetMachine>
- <WPOAsmListLocation>$(IntDir)</WPOAsmListLocation>
- <WPOObjectFile>$(IntDir)</WPOObjectFile>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <PreBuildEvent>
- <Command>..\update_rev.bat</Command>
- <Message>Generating revision number...</Message>
- </PreBuildEvent>
- <ClCompile>
- <AdditionalIncludeDirectories>..\scintilla\include;..\scintilla\lexlib;..\scintilla\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- <DisableSpecificDiagnostics>2</DisableSpecificDiagnostics>
- <FloatingPointModel>Fast</FloatingPointModel>
- <InterproceduralOptimization>MultiFile</InterproceduralOptimization>
- <IntrinsicFunctions>true</IntrinsicFunctions>
- <MultiProcessorCompilation>true</MultiProcessorCompilation>
- <OmitFramePointers>true</OmitFramePointers>
- <Optimization>MaxSpeedHighLevel</Optimization>
- <OptimizeForWindowsApplication>true</OptimizeForWindowsApplication>
- <PreprocessorDefinitions>_WIN64;STATIC_BUILD;SCI_LEXER;BOOKMARK_EDITION;NDEBUG;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
- <StringPooling>true</StringPooling>
- <WarningLevel>Level3</WarningLevel>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- <DisableSpecificWarnings>1885;%(DisableSpecificWarnings)</DisableSpecificWarnings>
- </ClCompile>
- <ResourceCompile>
- <PreprocessorDefinitions>_WIN64;BOOKMARK_EDITION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <SuppressStartupBanner>true</SuppressStartupBanner>
- </ResourceCompile>
- <Link>
- <AdditionalDependencies>comctl32.lib;imm32.lib;shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <MergeSections>.rdata=.text</MergeSections>
- <OptimizeReferences>true</OptimizeReferences>
- <SetChecksum>true</SetChecksum>
- <SubSystem>Windows</SubSystem>
- <TargetMachine>MachineX64</TargetMachine>
- <WPOAsmListLocation>$(IntDir)</WPOAsmListLocation>
- <WPOObjectFile>$(IntDir)</WPOObjectFile>
- </Link>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="Dialogs.c" />
- <ClCompile Include="Dlapi.c" />
- <ClCompile Include="Edit.c" />
- <ClCompile Include="Helpers.c" />
- <ClCompile Include="Notepad2.c" />
- <ClCompile Include="Print.cpp" />
- <ClCompile Include="Styles.c" />
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="Dialogs.h" />
- <ClInclude Include="Dlapi.h" />
- <ClInclude Include="Edit.h" />
- <ClInclude Include="Helpers.h" />
- <ClInclude Include="Notepad2.h" />
- <ClInclude Include="SciCall.h" />
- <ClInclude Include="Styles.h" />
- <ClInclude Include="resource.h" />
- <ClInclude Include="Version.h" />
- </ItemGroup>
- <ItemGroup>
- <None Include="..\res\Copy.cur" />
- <None Include="..\res\Encoding.bmp" />
- <None Include="..\res\Next.bmp" />
- <None Include="..\res\Notepad2.ico" />
- <None Include="..\res\Open.bmp" />
- <None Include="..\res\Pick.bmp" />
- <None Include="..\res\Prev.bmp" />
- <None Include="..\res\Run.ico" />
- <None Include="..\res\Styles.ico" />
- <None Include="..\res\Toolbar.bmp" />
- <None Include="Notepad2.ver" />
- </ItemGroup>
- <ItemGroup>
- <Manifest Include="..\res\Notepad2.exe.manifest" />
- </ItemGroup>
- <ItemGroup>
- <ResourceCompile Include="Notepad2.rc" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\scintilla\Scintilla_icl13.vcxproj">
- <Project>{5877b917-512b-49f5-b514-1b4159e7a9ca}</Project>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project> \ No newline at end of file
diff --git a/src/Notepad2_icl13.vcxproj.filters b/src/Notepad2_icl13.vcxproj.filters
deleted file mode 100644
index 3a1b851..0000000
--- a/src/Notepad2_icl13.vcxproj.filters
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup>
- <Filter Include="Header Files">
- <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
- <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
- </Filter>
- <Filter Include="Resource Files">
- <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
- <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx</Extensions>
- </Filter>
- <Filter Include="Source Files">
- <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
- <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
- </Filter>
- </ItemGroup>
- <ItemGroup>
- <ClCompile Include="Dialogs.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="Dlapi.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="Edit.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="Helpers.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="Notepad2.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="Print.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="Styles.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- </ItemGroup>
- <ItemGroup>
- <ClInclude Include="Dialogs.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="Dlapi.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="Edit.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="Helpers.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="Notepad2.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="SciCall.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="Styles.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="resource.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- <ClInclude Include="Version.h">
- <Filter>Header Files</Filter>
- </ClInclude>
- </ItemGroup>
- <ItemGroup>
- <None Include="..\res\Copy.cur">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="..\res\Encoding.bmp">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="..\res\Next.bmp">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="..\res\Notepad2.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="..\res\Open.bmp">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="..\res\Pick.bmp">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="..\res\Prev.bmp">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="..\res\Run.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="..\res\Styles.ico">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="..\res\Toolbar.bmp">
- <Filter>Resource Files</Filter>
- </None>
- <None Include="Notepad2.ver">
- <Filter>Resource Files</Filter>
- </None>
- </ItemGroup>
- <ItemGroup>
- <Manifest Include="..\res\Notepad2.exe.manifest">
- <Filter>Resource Files</Filter>
- </Manifest>
- </ItemGroup>
- <ItemGroup>
- <ResourceCompile Include="Notepad2.rc">
- <Filter>Resource Files</Filter>
- </ResourceCompile>
- </ItemGroup>
-</Project> \ No newline at end of file
diff --git a/src/Version.h b/src/Version.h
index de80ffd..ea7fd6a 100644
--- a/src/Version.h
+++ b/src/Version.h
@@ -56,10 +56,7 @@
#endif
// Compiler specific
-#if defined(__INTEL_COMPILER)
- #define VERSION_COMPILER L"ICL " STRINGIFY(__INTEL_COMPILER) L" Build " \
- STRINGIFY(__INTEL_COMPILER_BUILD_DATE)
-#elif defined(WDK_BUILD)
+#if defined(WDK_BUILD)
#if _MSC_VER == 1600
#if (_MSC_FULL_VER >= 160040219)
#define VERSION_COMPILER L"WDK (MSVC 2010 SP1)"