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 Packages Projects Releases Wiki Activity

Merge branch 'R_Stat_Lexer' of https://github.com/RaPeHoff/Notepad3 into R_Stat_Lexer

Browse Source
This commit is contained in:
Rainer Kottenhoff 2018-02-16 09:11:49 +01:00
commit 6e93ab5f5f
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Notepad3.vcxproj
View File

@ -110,6 +110,10 @@
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
<FloatingPointModel>Fast</FloatingPointModel>
<LanguageStandard>stdcpp17</LanguageStandard>
<<<<<<< HEAD
<EnableParallelCodeGeneration>true</EnableParallelCodeGeneration>
=======
>>>>>>> Notepad3_upstream_Rizone/master
</ClCompile>
<Link>
<AdditionalDependencies>msimg32.lib;comctl32.lib;imm32.lib;shlwapi.lib;scintilla.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -163,6 +167,10 @@
<StringPooling>true</StringPooling>
<FloatingPointModel>Fast</FloatingPointModel>
<LanguageStandard>stdcpp17</LanguageStandard>
<<<<<<< HEAD
<EnableParallelCodeGeneration>true</EnableParallelCodeGeneration>
=======
>>>>>>> Notepad3_upstream_Rizone/master
</ClCompile>
<Link>
<AdditionalDependencies>msimg32.lib;comctl32.lib;imm32.lib;shlwapi.lib;scintilla.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -214,6 +222,10 @@
<EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
<FloatingPointModel>Fast</FloatingPointModel>
<LanguageStandard>stdcpp17</LanguageStandard>
<<<<<<< HEAD
<EnableParallelCodeGeneration>true</EnableParallelCodeGeneration>
=======
>>>>>>> Notepad3_upstream_Rizone/master
</ClCompile>
<Link>
<AdditionalDependencies>msimg32.lib;comctl32.lib;imm32.lib;shlwapi.lib;scintilla.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -267,6 +279,10 @@
<StringPooling>true</StringPooling>
<FloatingPointModel>Fast</FloatingPointModel>
<LanguageStandard>stdcpp17</LanguageStandard>
<<<<<<< HEAD
<EnableParallelCodeGeneration>true</EnableParallelCodeGeneration>
=======
>>>>>>> Notepad3_upstream_Rizone/master
</ClCompile>
<Link>
<AdditionalDependencies>msimg32.lib;comctl32.lib;imm32.lib;shlwapi.lib;scintilla.lib;%(AdditionalDependencies)</AdditionalDependencies>