#251 "Release ICU LPeg" configuration added

Author: cshnik

Notepad2e.sln

@@ -18,6 +18,8 @@ Global
 		Debug LPeg|x86 = Debug LPeg|x86
 		Debug|x64 = Debug|x64
 		Debug|x86 = Debug|x86
+		Release ICU LPeg|x64 = Release ICU LPeg|x64
+		Release ICU LPeg|x86 = Release ICU LPeg|x86
 		Release ICU|x64 = Release ICU|x64
 		Release ICU|x86 = Release ICU|x86
 		Release LPeg|x64 = Release LPeg|x64
@@ -38,6 +40,10 @@ Global
 		{B69A8C7E-A22D-45DA-9997-2D1403C7AEE8}.Debug|x64.Build.0 = Debug|x64
 		{B69A8C7E-A22D-45DA-9997-2D1403C7AEE8}.Debug|x86.ActiveCfg = Debug|Win32
 		{B69A8C7E-A22D-45DA-9997-2D1403C7AEE8}.Debug|x86.Build.0 = Debug|Win32
+		{B69A8C7E-A22D-45DA-9997-2D1403C7AEE8}.Release ICU LPeg|x64.ActiveCfg = Release ICU LPeg|x64
+		{B69A8C7E-A22D-45DA-9997-2D1403C7AEE8}.Release ICU LPeg|x64.Build.0 = Release ICU LPeg|x64
+		{B69A8C7E-A22D-45DA-9997-2D1403C7AEE8}.Release ICU LPeg|x86.ActiveCfg = Release ICU LPeg|Win32
+		{B69A8C7E-A22D-45DA-9997-2D1403C7AEE8}.Release ICU LPeg|x86.Build.0 = Release ICU LPeg|Win32
 		{B69A8C7E-A22D-45DA-9997-2D1403C7AEE8}.Release ICU|x64.ActiveCfg = Release ICU|x64
 		{B69A8C7E-A22D-45DA-9997-2D1403C7AEE8}.Release ICU|x64.Build.0 = Release ICU|x64
 		{B69A8C7E-A22D-45DA-9997-2D1403C7AEE8}.Release ICU|x86.ActiveCfg = Release ICU|Win32
@@ -62,6 +68,8 @@ Global
 		{A3852498-51BF-4A24-B720-F69D2E5E6403}.Debug|x64.Build.0 = Debug|x64
 		{A3852498-51BF-4A24-B720-F69D2E5E6403}.Debug|x86.ActiveCfg = Debug|Win32
 		{A3852498-51BF-4A24-B720-F69D2E5E6403}.Debug|x86.Build.0 = Debug|Win32
+		{A3852498-51BF-4A24-B720-F69D2E5E6403}.Release ICU LPeg|x64.ActiveCfg = Release|x64
+		{A3852498-51BF-4A24-B720-F69D2E5E6403}.Release ICU LPeg|x86.ActiveCfg = Release|Win32
 		{A3852498-51BF-4A24-B720-F69D2E5E6403}.Release ICU|x64.ActiveCfg = Release|x64
 		{A3852498-51BF-4A24-B720-F69D2E5E6403}.Release ICU|x86.ActiveCfg = Release|Win32
 		{A3852498-51BF-4A24-B720-F69D2E5E6403}.Release LPeg|x64.ActiveCfg = Release|x64

Notepad2e.vcxproj

@@ -25,6 +25,14 @@
       <Configuration>Debug ICU</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release ICU LPeg|Win32">
+      <Configuration>Release ICU LPeg</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release ICU LPeg|x64">
+      <Configuration>Release ICU LPeg</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release LPeg|Win32">
       <Configuration>Release LPeg</Configuration>
       <Platform>Win32</Platform>
@@ -83,6 +91,10 @@
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)'=='Release ICU LPeg'" Label="Configuration">
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
@@ -252,6 +264,32 @@
       <PreprocessorDefinitions>ICU_BUILD;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)'=='Release ICU LPeg'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>$(ICU_ROOT)\include;$(BOOST_ROOT_ICU);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <Optimization>MaxSpeed</Optimization>
+      <PreprocessorDefinitions>INCLUDE_DEPRECATED_FEATURES;ICU_BUILD;LPEG_LEXER;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <OmitFramePointers>true</OmitFramePointers>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>
+    </ClCompile>
+    <Link>
+      <AdditionalLibraryDirectories>$(BOOST_ROOT_ICU)\stage\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Release ICU LPeg|Win32'">icuregex86.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Release ICU LPeg|x64'">icuregex64.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <SetChecksum>true</SetChecksum>
+    </Link>
+    <ResourceCompile>
+      <PreprocessorDefinitions>ICU_BUILD;LPEG_LEXER;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ResourceCompile>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="scintilla\boostregex\BoostRegExSearch.cxx" />
     <ClCompile Include="scintilla\boostregex\UTF8DocumentIterator.cxx" />

src/version.h

@@ -28,7 +28,9 @@
 #define VERSION_FILEVERSION_SHORT    L"1." VERSION_FILEVERSION_BUILD_STRING
 #define VERSION_LEGALCOPYRIGHT_SHORT L"Copyright © 2004-2011"
 #define VERSION_LEGALCOPYRIGHT_LONG  L"© Florian Balmer and contributors"
-#ifdef ICU_BUILD
+#if defined(ICU_BUILD) && defined(LPEG_LEXER)
+#define VERSION_FILEDESCRIPTION_BASE L"Notepad 2e-ICU-LPeg"
+#elif ICU_BUILD
 #define VERSION_FILEDESCRIPTION_BASE L"Notepad 2e-ICU"
 #elif LPEG_LEXER
 #define VERSION_FILEDESCRIPTION_BASE L"Notepad 2e-LPeg"
@@ -40,7 +42,10 @@
 #else
 #define VERSION_FILEDESCRIPTION      VERSION_FILEDESCRIPTION_BASE
 #endif
-#ifdef ICU_BUILD
+#if defined(ICU_BUILD) && defined(LPEG_LEXER)
+#define VERSION_INTERNALNAME         L"Notepad2e-ICU-LPeg"
+#define VERSION_ORIGINALFILENAME     L"Notepad2eil.exe"
+#elif ICU_BUILD
 #define VERSION_INTERNALNAME         L"Notepad2e-ICU"
 #define VERSION_ORIGINALFILENAME     L"Notepad2ei.exe"
 #elif LPEG_LEXER