+ upd: Scintilla as DLL solution

This commit is contained in:
Rainer Kottenhoff 2020-05-20 23:59:18 +02:00
parent f511fd9b49
commit ba8e7a8467
6 changed files with 11 additions and 36 deletions

View File

@ -24,7 +24,7 @@
<RootNamespace>grepWinNP3</RootNamespace>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
<RestorePackages>true</RestorePackages>
<WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
<ProjectName>grepWinNP3</ProjectName>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

View File

@ -22,7 +22,7 @@
<SccProjectName />
<SccLocalPath />
<ProjectGuid>{781B17E7-427F-488F-A8E9-360BA38A10F3}</ProjectGuid>
<WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
<ProjectName>minipath</ProjectName>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

View File

@ -176,7 +176,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
ProjectSection(SolutionItems) = preProject
.editorconfig = .editorconfig
Build\Changes.txt = Build\Changes.txt
packages.config = packages.config
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "np3_ko_kr", "..\language\np3_ko_kr\np3_ko_kr.vcxproj", "{0FA07345-601B-474E-99C0-7E61E70DA72E}"
@ -228,6 +227,9 @@ EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Notepad3", "Notepad3", "{C3735E17-6EAE-4CC5-980E-30BCEF094862}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MiniPath", "MiniPath", "{D21C1F85-6FA3-4695-82CD-DDC5690E2D66}"
ProjectSection(SolutionItems) = preProject
..\minipath\.editorconfig = ..\minipath\.editorconfig
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "language", "language", "{8FD783D5-8709-432D-A88E-6E3073AFF220}"
EndProject

View File

@ -23,7 +23,7 @@
<ProjectGuid>{5877B917-512B-49F5-B514-1B4159E7A9CA}</ProjectGuid>
<ProjectName>Scintilla</ProjectName>
<RootNamespace>Scintilla</RootNamespace>
<WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

View File

@ -22,7 +22,7 @@
<Keyword>Win32Proj</Keyword>
<ProjectGuid>{BAAD32AB-CD47-12FD-873C-0BBC204B7641}</ProjectGuid>
<ProjectName>Notepad3</ProjectName>
<WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@ -122,7 +122,7 @@
<AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
<Link>
<AdditionalDependencies>comctl32.lib;imm32.lib;shlwapi.lib;uxtheme.lib;muiload.lib;dwrite.lib;scintilla.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>comctl32.lib;imm32.lib;shlwapi.lib;uxtheme.lib;muiload.lib;scintilla.lib;%(AdditionalDependencies)</AdditionalDependencies>
<GenerateDebugInformation>Debug</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
@ -185,7 +185,7 @@
<AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
<Link>
<AdditionalDependencies>comctl32.lib;imm32.lib;shlwapi.lib;uxtheme.lib;muiload.lib;dwrite.lib;scintilla.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>comctl32.lib;imm32.lib;shlwapi.lib;uxtheme.lib;muiload.lib;scintilla.lib;%(AdditionalDependencies)</AdditionalDependencies>
<GenerateDebugInformation>Debug</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX64</TargetMachine>
@ -249,7 +249,7 @@
<IntrinsicFunctions>true</IntrinsicFunctions>
</ClCompile>
<Link>
<AdditionalDependencies>comctl32.lib;imm32.lib;shlwapi.lib;uxtheme.lib;muiload.lib;dwrite.lib;scintilla.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>comctl32.lib;imm32.lib;shlwapi.lib;uxtheme.lib;muiload.lib;scintilla.lib;%(AdditionalDependencies)</AdditionalDependencies>
<GenerateDebugInformation>No</GenerateDebugInformation>
<MergeSections>.rdata=.text</MergeSections>
<OptimizeReferences>true</OptimizeReferences>
@ -316,7 +316,7 @@
<IntrinsicFunctions>true</IntrinsicFunctions>
</ClCompile>
<Link>
<AdditionalDependencies>comctl32.lib;imm32.lib;shlwapi.lib;uxtheme.lib;muiload.lib;dwrite.lib;scintilla.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>comctl32.lib;imm32.lib;shlwapi.lib;uxtheme.lib;muiload.lib;scintilla.lib;%(AdditionalDependencies)</AdditionalDependencies>
<GenerateDebugInformation>No</GenerateDebugInformation>
<MergeSections>.rdata=.text</MergeSections>
<OptimizeReferences>true</OptimizeReferences>
@ -428,9 +428,6 @@
<ClCompile Include="..\uchardet\uchardet\src\nsUTF8Prober.cpp" />
<ClCompile Include="..\uchardet\uchardet\src\uchardet.cpp" />
<ClCompile Include="AccelKeys.c" />
<ClCompile Include="ChooseFont\ChooseFont.cpp" />
<ClCompile Include="ChooseFont\FontEnumeration.cpp" />
<ClCompile Include="ChooseFont\GdiTextRenderer.cpp" />
<ClCompile Include="Config\Config.cpp" />
<ClCompile Include="Dialogs.c" />
<ClCompile Include="Dlapi.c" />
@ -533,9 +530,6 @@
<ClInclude Include="..\uthash\utstack.h" />
<ClInclude Include="..\uthash\utstring.h" />
<ClInclude Include="AccelKeys.h" />
<ClInclude Include="ChooseFont\ChooseFont.h" />
<ClInclude Include="ChooseFont\FontEnumeration.h" />
<ClInclude Include="ChooseFont\GdiTextRenderer.h" />
<ClInclude Include="Config\Config.h" />
<ClInclude Include="Config\SimpleIni.h" />
<ClInclude Include="Dialogs.h" />

View File

@ -22,9 +22,6 @@
<Filter Include="Source Files\Crypto">
<UniqueIdentifier>{aad339da-f291-4358-9ab1-a0fdee012ac6}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files\ChooseFont">
<UniqueIdentifier>{a6270a0b-5c38-4e68-b38c-5795ccb57302}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files\tinyexpr">
<UniqueIdentifier>{1de8e161-7393-4043-be9d-7bd2d0cb02df}</UniqueIdentifier>
</Filter>
@ -84,15 +81,6 @@
<ClCompile Include="..\tinyexpr\tinyexpr.c">
<Filter>Source Files\tinyexpr</Filter>
</ClCompile>
<ClCompile Include="ChooseFont\ChooseFont.cpp">
<Filter>Source Files\ChooseFont</Filter>
</ClCompile>
<ClCompile Include="ChooseFont\FontEnumeration.cpp">
<Filter>Source Files\ChooseFont</Filter>
</ClCompile>
<ClCompile Include="ChooseFont\GdiTextRenderer.cpp">
<Filter>Source Files\ChooseFont</Filter>
</ClCompile>
<ClCompile Include="StyleLexers\styleLexASM.c">
<Filter>Source Files\StyleLexers</Filter>
</ClCompile>
@ -464,15 +452,6 @@
<ClInclude Include="..\tinyexpr\tinyexpr.h">
<Filter>Source Files\tinyexpr</Filter>
</ClInclude>
<ClInclude Include="ChooseFont\ChooseFont.h">
<Filter>Source Files\ChooseFont</Filter>
</ClInclude>
<ClInclude Include="ChooseFont\FontEnumeration.h">
<Filter>Source Files\ChooseFont</Filter>
</ClInclude>
<ClInclude Include="ChooseFont\GdiTextRenderer.h">
<Filter>Source Files\ChooseFont</Filter>
</ClInclude>
<ClInclude Include="StyleLexers\EditLexer.h">
<Filter>Source Files\StyleLexers</Filter>
</ClInclude>