Version 11.1.12

papyrussolution · Oct 3, 2021 · d125b10 · d125b10
1 parent b994da8
commit d125b10
Show file tree

Hide file tree

Showing 328 changed files with 11,824 additions and 10,364 deletions.
diff --git a/Src/BuildVC2017/OSF.sln b/Src/BuildVC2017/OSF.sln
@@ -148,6 +148,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SciLexer-npp", "SciLexer-np
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "perl5", "perl5.vcxproj", "{36CECA27-6B36-4909-BFAB-4542D8C30688}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "PERL", "PERL", "{B584CA7C-4A15-4E2C-90EE-25B8D1540F9B}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|ARM = Debug|ARM
@@ -4658,6 +4660,7 @@ Global
 		{9795A60D-A88C-3BE8-A5C4-2095E3E93B21} = {B2222931-AD38-4193-B30D-11FE50CCAF67}
 		{FCF60E65-1B78-4D1D-AB59-4FC00AC8C248} = {FC2D240F-F208-46D3-89D0-935D2B7A6D4D}
 		{FBE04237-9C7B-4973-9C60-505975998B39} = {FC2D240F-F208-46D3-89D0-935D2B7A6D4D}
+		{36CECA27-6B36-4909-BFAB-4542D8C30688} = {B584CA7C-4A15-4E2C-90EE-25B8D1540F9B}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {1DB7DD27-2333-4F70-A3FA-D6FDA370C9F2}

diff --git a/Src/BuildVC2017/Utils.sln b/Src/BuildVC2017/Utils.sln
@@ -80,6 +80,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "FlexBison", "FlexBison", "{
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "onig", "onig.vcxproj", "{D115C575-B8EE-3BD7-8046-688A4D145686}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Supplemental-Generation", "Supplemental-Generation.vcxproj", "{E83C1FED-368F-45D9-A5FE-DFE76D5F50C2}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|x64 = Debug|x64
@@ -1024,6 +1026,34 @@ Global
 		{D115C575-B8EE-3BD7-8046-688A4D145686}.Universe-HTT|x64.Build.0 = Release|x64
 		{D115C575-B8EE-3BD7-8046-688A4D145686}.Universe-HTT|x86.ActiveCfg = Release|Win32
 		{D115C575-B8EE-3BD7-8046-688A4D145686}.Universe-HTT|x86.Build.0 = Release|Win32
+		{E83C1FED-368F-45D9-A5FE-DFE76D5F50C2}.Debug|x64.ActiveCfg = Debug|x64
+		{E83C1FED-368F-45D9-A5FE-DFE76D5F50C2}.Debug|x64.Build.0 = Debug|x64
+		{E83C1FED-368F-45D9-A5FE-DFE76D5F50C2}.Debug|x86.ActiveCfg = Debug|Win32
+		{E83C1FED-368F-45D9-A5FE-DFE76D5F50C2}.Debug|x86.Build.0 = Debug|Win32
+		{E83C1FED-368F-45D9-A5FE-DFE76D5F50C2}.MtDllDebug|x64.ActiveCfg = Debug|x64
+		{E83C1FED-368F-45D9-A5FE-DFE76D5F50C2}.MtDllDebug|x64.Build.0 = Debug|x64
+		{E83C1FED-368F-45D9-A5FE-DFE76D5F50C2}.MtDllDebug|x86.ActiveCfg = Debug|Win32
+		{E83C1FED-368F-45D9-A5FE-DFE76D5F50C2}.MtDllDebug|x86.Build.0 = Debug|Win32
+		{E83C1FED-368F-45D9-A5FE-DFE76D5F50C2}.MtDllRelease|x64.ActiveCfg = Release|x64
+		{E83C1FED-368F-45D9-A5FE-DFE76D5F50C2}.MtDllRelease|x64.Build.0 = Release|x64
+		{E83C1FED-368F-45D9-A5FE-DFE76D5F50C2}.MtDllRelease|x86.ActiveCfg = Release|Win32
+		{E83C1FED-368F-45D9-A5FE-DFE76D5F50C2}.MtDllRelease|x86.Build.0 = Release|Win32
+		{E83C1FED-368F-45D9-A5FE-DFE76D5F50C2}.Release|x64.ActiveCfg = Release|x64
+		{E83C1FED-368F-45D9-A5FE-DFE76D5F50C2}.Release|x64.Build.0 = Release|x64
+		{E83C1FED-368F-45D9-A5FE-DFE76D5F50C2}.Release|x86.ActiveCfg = Release|Win32
+		{E83C1FED-368F-45D9-A5FE-DFE76D5F50C2}.Release|x86.Build.0 = Release|Win32
+		{E83C1FED-368F-45D9-A5FE-DFE76D5F50C2}.ServerDebug|x64.ActiveCfg = Debug|x64
+		{E83C1FED-368F-45D9-A5FE-DFE76D5F50C2}.ServerDebug|x64.Build.0 = Debug|x64
+		{E83C1FED-368F-45D9-A5FE-DFE76D5F50C2}.ServerDebug|x86.ActiveCfg = Debug|Win32
+		{E83C1FED-368F-45D9-A5FE-DFE76D5F50C2}.ServerDebug|x86.Build.0 = Debug|Win32
+		{E83C1FED-368F-45D9-A5FE-DFE76D5F50C2}.ServerRelease|x64.ActiveCfg = Release|x64
+		{E83C1FED-368F-45D9-A5FE-DFE76D5F50C2}.ServerRelease|x64.Build.0 = Release|x64
+		{E83C1FED-368F-45D9-A5FE-DFE76D5F50C2}.ServerRelease|x86.ActiveCfg = Release|Win32
+		{E83C1FED-368F-45D9-A5FE-DFE76D5F50C2}.ServerRelease|x86.Build.0 = Release|Win32
+		{E83C1FED-368F-45D9-A5FE-DFE76D5F50C2}.Universe-HTT|x64.ActiveCfg = Release|x64
+		{E83C1FED-368F-45D9-A5FE-DFE76D5F50C2}.Universe-HTT|x64.Build.0 = Release|x64
+		{E83C1FED-368F-45D9-A5FE-DFE76D5F50C2}.Universe-HTT|x86.ActiveCfg = Release|Win32
+		{E83C1FED-368F-45D9-A5FE-DFE76D5F50C2}.Universe-HTT|x86.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/Src/BuildVC2017/notepadPlus.vcxproj b/Src/BuildVC2017/notepadPlus.vcxproj
@@ -138,7 +138,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>
-      <AdditionalIncludeDirectories>..\include;..\OSF\npp-gh20210917\scintilla\include;..\OSF\npp-gh20210917\PowerEditor\include;..\OSF\npp-gh20210917\PowerEditor\src;..\OSF\npp-gh20210917\PowerEditor\src\tinyxml;..\OSF\npp-gh20210917\PowerEditor\src\Win32Explr;..\OSF\npp-gh20210917\PowerEditor\src\tinyxml\tinyXmlA;..\OSF\npp-gh20210917\PowerEditor\src\json;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\include;..\osf\npp-gh20210917\scintilla\include;..\OSF\npp-gh20210917\PowerEditor\include;..\OSF\npp-gh20210917\PowerEditor\src;..\OSF\npp-gh20210917\PowerEditor\src\tinyxml;..\OSF\npp-gh20210917\PowerEditor\src\Win32Explr;..\OSF\npp-gh20210917\PowerEditor\src\tinyxml\tinyXmlA;..\OSF\npp-gh20210917\PowerEditor\src\json;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>Async</ExceptionHandling>
       <BasicRuntimeChecks>UninitializedLocalUsageCheck</BasicRuntimeChecks>
@@ -192,7 +192,7 @@ copy ..\OSF\npp-gh20210917\PowerEditor\src\contextMenu.xml $(ProjectDir)..\..\pp
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>
-      <AdditionalIncludeDirectories>..\include;..\OSF\npp-gh20210917\scintilla\include;..\OSF\npp-gh20210917\PowerEditor\include;..\OSF\npp-gh20210917\PowerEditor\src;..\OSF\npp-gh20210917\PowerEditor\src\tinyxml;..\OSF\npp-gh20210917\PowerEditor\src\Win32Explr;..\OSF\npp-gh20210917\PowerEditor\src\tinyxml\tinyXmlA;..\OSF\npp-gh20210917\PowerEditor\src\json;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\include;..\osf\npp-gh20210917\scintilla\include;..\OSF\npp-gh20210917\PowerEditor\include;..\OSF\npp-gh20210917\PowerEditor\src;..\OSF\npp-gh20210917\PowerEditor\src\tinyxml;..\OSF\npp-gh20210917\PowerEditor\src\Win32Explr;..\OSF\npp-gh20210917\PowerEditor\src\tinyxml\tinyXmlA;..\OSF\npp-gh20210917\PowerEditor\src\json;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>Async</ExceptionHandling>
       <BasicRuntimeChecks>UninitializedLocalUsageCheck</BasicRuntimeChecks>
@@ -241,7 +241,7 @@ copy ..\OSF\npp-gh20210917\PowerEditor\src\contextMenu.xml $(ProjectDir)..\..\pp
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>
-      <AdditionalIncludeDirectories>..\include;..\OSF\npp-gh20210917\scintilla\include;..\OSF\npp-gh20210917\PowerEditor\include;..\OSF\npp-gh20210917\PowerEditor\src;..\OSF\npp-gh20210917\PowerEditor\src\tinyxml;..\OSF\npp-gh20210917\PowerEditor\src\Win32Explr;..\OSF\npp-gh20210917\PowerEditor\src\tinyxml\tinyXmlA;..\OSF\npp-gh20210917\PowerEditor\src\json;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\include;..\osf\npp-gh20210917\scintilla\include;..\OSF\npp-gh20210917\PowerEditor\include;..\OSF\npp-gh20210917\PowerEditor\src;..\OSF\npp-gh20210917\PowerEditor\src\tinyxml;..\OSF\npp-gh20210917\PowerEditor\src\Win32Explr;..\OSF\npp-gh20210917\PowerEditor\src\tinyxml\tinyXmlA;..\OSF\npp-gh20210917\PowerEditor\src\json;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ExceptionHandling>Async</ExceptionHandling>
       <BasicRuntimeChecks>UninitializedLocalUsageCheck</BasicRuntimeChecks>
@@ -292,7 +292,7 @@ copy ..\OSF\npp-gh20210917\PowerEditor\src\contextMenu.xml $(ProjectDir)..\..\pp
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <OmitFramePointers>false</OmitFramePointers>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>..\include;..\OSF\npp-gh20210917\scintilla\include;..\OSF\npp-gh20210917\PowerEditor\include;..\OSF\npp-gh20210917\PowerEditor\src;..\OSF\npp-gh20210917\PowerEditor\src\tinyxml;..\OSF\npp-gh20210917\PowerEditor\src\Win32Explr;..\OSF\npp-gh20210917\PowerEditor\src\tinyxml\tinyXmlA;..\OSF\npp-gh20210917\PowerEditor\src\json;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\include;..\osf\npp-gh20210917\scintilla\include;..\OSF\npp-gh20210917\PowerEditor\include;..\OSF\npp-gh20210917\PowerEditor\src;..\OSF\npp-gh20210917\PowerEditor\src\tinyxml;..\OSF\npp-gh20210917\PowerEditor\src\Win32Explr;..\OSF\npp-gh20210917\PowerEditor\src\tinyxml\tinyXmlA;..\OSF\npp-gh20210917\PowerEditor\src\json;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessToFile>false</PreprocessToFile>
       <PreprocessSuppressLineNumbers>false</PreprocessSuppressLineNumbers>
@@ -349,7 +349,7 @@ copy ..\OSF\npp-gh20210917\PowerEditor\src\contextMenu.xml $(ProjectDir)..\..\pp
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <OmitFramePointers>false</OmitFramePointers>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>..\include;..\OSF\npp-gh20210917\scintilla\include;..\OSF\npp-gh20210917\PowerEditor\include;..\OSF\npp-gh20210917\PowerEditor\src;..\OSF\npp-gh20210917\PowerEditor\src\tinyxml;..\OSF\npp-gh20210917\PowerEditor\src\Win32Explr;..\OSF\npp-gh20210917\PowerEditor\src\tinyxml\tinyXmlA;..\OSF\npp-gh20210917\PowerEditor\src\json;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\include;..\osf\npp-gh20210917\scintilla\include;..\OSF\npp-gh20210917\PowerEditor\include;..\OSF\npp-gh20210917\PowerEditor\src;..\OSF\npp-gh20210917\PowerEditor\src\tinyxml;..\OSF\npp-gh20210917\PowerEditor\src\Win32Explr;..\OSF\npp-gh20210917\PowerEditor\src\tinyxml\tinyXmlA;..\OSF\npp-gh20210917\PowerEditor\src\json;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessToFile>false</PreprocessToFile>
       <PreprocessSuppressLineNumbers>false</PreprocessSuppressLineNumbers>
@@ -405,7 +405,7 @@ copy ..\OSF\npp-gh20210917\PowerEditor\src\contextMenu.xml $(ProjectDir)..\..\pp
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
       <OmitFramePointers>false</OmitFramePointers>
       <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>..\include;..\OSF\npp-gh20210917\scintilla\include;..\OSF\npp-gh20210917\PowerEditor\include;..\OSF\npp-gh20210917\PowerEditor\src;..\OSF\npp-gh20210917\PowerEditor\src\tinyxml;..\OSF\npp-gh20210917\PowerEditor\src\Win32Explr;..\OSF\npp-gh20210917\PowerEditor\src\tinyxml\tinyXmlA;..\OSF\npp-gh20210917\PowerEditor\src\json;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\include;..\osf\npp-gh20210917\scintilla\include;..\OSF\npp-gh20210917\PowerEditor\include;..\OSF\npp-gh20210917\PowerEditor\src;..\OSF\npp-gh20210917\PowerEditor\src\tinyxml;..\OSF\npp-gh20210917\PowerEditor\src\Win32Explr;..\OSF\npp-gh20210917\PowerEditor\src\tinyxml\tinyXmlA;..\OSF\npp-gh20210917\PowerEditor\src\json;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessToFile>false</PreprocessToFile>
       <PreprocessSuppressLineNumbers>false</PreprocessSuppressLineNumbers>

diff --git a/Src/BuildVC2017/pthreads4w.vcxproj b/Src/BuildVC2017/pthreads4w.vcxproj
@@ -1259,9 +1259,7 @@
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='ServerRelease|x64'">CompileAsCpp</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='MtDllRelease|x64'">CompileAsCpp</CompileAs>
     </ClCompile>
-    <ClCompile Include="..\OSF\pthreads4w\SLTEST\benchtest1.c" />
     <ClCompile Include="..\OSF\pthreads4w\SLTEST\pthread4w-test.cpp" />
-    <ClCompile Include="..\OSF\pthreads4w\SLTEST\threestage.c" />
     <ClCompile Include="..\OSF\pthreads4w\sl_pthreads4w.c">
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='ServerDebug|Win32'">CompileAsCpp</CompileAs>
@@ -1299,7 +1297,6 @@
     <ClInclude Include="..\Osf\pthreads4w\ptw32_config.h" />
     <ClInclude Include="..\Osf\pthreads4w\sched.h" />
     <ClInclude Include="..\Osf\pthreads4w\semaphore.h" />
-    <ClInclude Include="..\OSF\pthreads4w\SLTEST\test.h" />
     <ClInclude Include="..\OSF\pthreads4w\sl_pthreads4w.h" />
     <ClInclude Include="..\Osf\pthreads4w\_ptw32.h" />
   </ItemGroup>

diff --git a/Src/BuildVC2017/pthreads4w.vcxproj.filters b/Src/BuildVC2017/pthreads4w.vcxproj.filters
@@ -61,12 +61,6 @@
     <ClCompile Include="..\OSF\pthreads4w\SLTEST\pthread4w-test.cpp">
       <Filter>Test</Filter>
     </ClCompile>
-    <ClCompile Include="..\OSF\pthreads4w\SLTEST\threestage.c">
-      <Filter>Test</Filter>
-    </ClCompile>
-    <ClCompile Include="..\OSF\pthreads4w\SLTEST\benchtest1.c">
-      <Filter>Test</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\Osf\pthreads4w\_ptw32.h">
@@ -96,8 +90,5 @@
     <ClInclude Include="..\Include\pthread.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\OSF\pthreads4w\SLTEST\test.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
   </ItemGroup>
 </Project>