Simone/nsis-plugin-ns7zip
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 8 Wiki Activity

fix(vcxproj): add vendor CPP/7zip/UI/Common to AdditionalIncludeDirectories

Browse Source 
Bundle source files (Main.cpp, ExtractCallbackConsole.cpp, MainAr.cpp,
StdAfx.h) use relative #includes like ../../../Common/ and ../../IPassword.h
that work on Linux via POSIX symlinks but fail on Windows where no symlinks
exist in the bundle tree.

Adding versions/VER/CPP/7zip/UI/Common/ as an AdditionalIncludeDirectory
makes MSVC resolve the ../ segments correctly against that anchor directory,
reaching the vendor files without requiring symlinks.

Fixes all three bundles: 25.01, 26.00, 26.01.
This commit is contained in:
Simone
2026-05-03 03:06:08 +02:00
parent f140165f75
commit 062c077a42
5 changed files with 40 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
versions/26.00-bundle/CPP/7zip/Bundles/Nsis7z/Nsis7z.vcxproj
+8 -8
View File
@@ -205,7 +205,7 @@
<RuntimeTypeInfo>false</RuntimeTypeInfo>
<SuppressStartupBanner>true</SuppressStartupBanner>
<WarningLevel>Level3</WarningLevel>
<AdditionalIncludeDirectories>..\..\..\..\..\26.00\CPP\;..\..\..\..\..\26.00\;..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\..\..\..\26.00\CPP\7zip\UI\Common\;..\..\..\..\..\26.00\CPP\;..\..\..\..\..\26.00\;..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AssemblerOutput>AssemblyAndMachineCode</AssemblerOutput>
<CallingConvention>FastCall</CallingConvention>
@@ -244,7 +244,7 @@
<RuntimeTypeInfo>false</RuntimeTypeInfo>
<SuppressStartupBanner>true</SuppressStartupBanner>
<WarningLevel>Level3</WarningLevel>
<AdditionalIncludeDirectories>..\..\..\..\..\26.00\CPP\;..\..\..\..\..\26.00\;..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\..\..\..\26.00\CPP\7zip\UI\Common\;..\..\..\..\..\26.00\CPP\;..\..\..\..\..\26.00\;..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AssemblerOutput>AssemblyAndMachineCode</AssemblerOutput>
<CallingConvention>FastCall</CallingConvention>
@@ -279,7 +279,7 @@
<WarningLevel>Level4</WarningLevel>
<MinimalRebuild>true</MinimalRebuild>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<AdditionalIncludeDirectories>..\..\..\..\..\26.00\CPP\;..\..\..\..\..\26.00\;..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\..\..\..\26.00\CPP\7zip\UI\Common\;..\..\..\..\..\26.00\CPP\;..\..\..\..\..\26.00\;..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;UNICODE;WIN32;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<CallingConvention>FastCall</CallingConvention>
@@ -313,7 +313,7 @@
<SuppressStartupBanner>true</SuppressStartupBanner>
<WarningLevel>Level4</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalIncludeDirectories>..\..\..\..\..\26.00\CPP\;..\..\..\..\..\26.00\;..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\..\..\..\26.00\CPP\7zip\UI\Common\;..\..\..\..\..\26.00\CPP\;..\..\..\..\..\26.00\;..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;UNICODE;WIN32;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<CallingConvention>FastCall</CallingConvention>
@@ -349,7 +349,7 @@
<RuntimeTypeInfo>false</RuntimeTypeInfo>
<SuppressStartupBanner>true</SuppressStartupBanner>
<WarningLevel>Level4</WarningLevel>
<AdditionalIncludeDirectories>..\..\..\..\..\26.00\CPP\;..\..\..\..\..\26.00\;..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\..\..\..\26.00\CPP\7zip\UI\Common\;..\..\..\..\..\26.00\CPP\;..\..\..\..\..\26.00\;..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;UNICODE;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<CallingConvention>FastCall</CallingConvention>
@@ -388,7 +388,7 @@
<RuntimeTypeInfo>false</RuntimeTypeInfo>
<SuppressStartupBanner>true</SuppressStartupBanner>
<WarningLevel>Level4</WarningLevel>
<AdditionalIncludeDirectories>..\..\..\..\..\26.00\CPP\;..\..\..\..\..\26.00\;..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\..\..\..\26.00\CPP\7zip\UI\Common\;..\..\..\..\..\26.00\CPP\;..\..\..\..\..\26.00\;..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;UNICODE;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<CallingConvention>FastCall</CallingConvention>
@@ -425,7 +425,7 @@
<WarningLevel>Level3</WarningLevel>
<MinimalRebuild>true</MinimalRebuild>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<AdditionalIncludeDirectories>..\..\..\..\..\26.00\CPP\;..\..\..\..\..\26.00\;..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\..\..\..\26.00\CPP\7zip\UI\Common\;..\..\..\..\..\26.00\CPP\;..\..\..\..\..\26.00\;..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<CallingConvention>FastCall</CallingConvention>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -458,7 +458,7 @@
<SuppressStartupBanner>true</SuppressStartupBanner>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalIncludeDirectories>..\..\..\..\..\26.00\CPP\;..\..\..\..\..\26.00\;..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\..\..\..\26.00\CPP\7zip\UI\Common\;..\..\..\..\..\26.00\CPP\;..\..\..\..\..\26.00\;..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<CallingConvention>FastCall</CallingConvention>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
versions/26.00-bundle/CPP/7zip/Bundles/Nsis7z/Nsis7z_vs2026.vcxproj
+8 -8
View File
@@ -205,7 +205,7 @@
<RuntimeTypeInfo>false</RuntimeTypeInfo>
<SuppressStartupBanner>true</SuppressStartupBanner>
<WarningLevel>Level3</WarningLevel>
<AdditionalIncludeDirectories>..\..\..\..\..\26.00\CPP\;..\..\..\..\..\26.00\;..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\..\..\..\26.00\CPP\7zip\UI\Common\;..\..\..\..\..\26.00\CPP\;..\..\..\..\..\26.00\;..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AssemblerOutput>AssemblyAndMachineCode</AssemblerOutput>
<CallingConvention>FastCall</CallingConvention>
@@ -244,7 +244,7 @@
<RuntimeTypeInfo>false</RuntimeTypeInfo>
<SuppressStartupBanner>true</SuppressStartupBanner>
<WarningLevel>Level3</WarningLevel>
<AdditionalIncludeDirectories>..\..\..\..\..\26.00\CPP\;..\..\..\..\..\26.00\;..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\..\..\..\26.00\CPP\7zip\UI\Common\;..\..\..\..\..\26.00\CPP\;..\..\..\..\..\26.00\;..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AssemblerOutput>AssemblyAndMachineCode</AssemblerOutput>
<CallingConvention>FastCall</CallingConvention>
@@ -279,7 +279,7 @@
<WarningLevel>Level4</WarningLevel>
<MinimalRebuild>true</MinimalRebuild>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<AdditionalIncludeDirectories>..\..\..\..\..\26.00\CPP\;..\..\..\..\..\26.00\;..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\..\..\..\26.00\CPP\7zip\UI\Common\;..\..\..\..\..\26.00\CPP\;..\..\..\..\..\26.00\;..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;UNICODE;WIN32;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<CallingConvention>FastCall</CallingConvention>
@@ -313,7 +313,7 @@
<SuppressStartupBanner>true</SuppressStartupBanner>
<WarningLevel>Level4</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalIncludeDirectories>..\..\..\..\..\26.00\CPP\;..\..\..\..\..\26.00\;..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\..\..\..\26.00\CPP\7zip\UI\Common\;..\..\..\..\..\26.00\CPP\;..\..\..\..\..\26.00\;..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;UNICODE;WIN32;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<CallingConvention>FastCall</CallingConvention>
@@ -349,7 +349,7 @@
<RuntimeTypeInfo>false</RuntimeTypeInfo>
<SuppressStartupBanner>true</SuppressStartupBanner>
<WarningLevel>Level4</WarningLevel>
<AdditionalIncludeDirectories>..\..\..\..\..\26.00\CPP\;..\..\..\..\..\26.00\;..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\..\..\..\26.00\CPP\7zip\UI\Common\;..\..\..\..\..\26.00\CPP\;..\..\..\..\..\26.00\;..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;UNICODE;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<CallingConvention>FastCall</CallingConvention>
@@ -388,7 +388,7 @@
<RuntimeTypeInfo>false</RuntimeTypeInfo>
<SuppressStartupBanner>true</SuppressStartupBanner>
<WarningLevel>Level4</WarningLevel>
<AdditionalIncludeDirectories>..\..\..\..\..\26.00\CPP\;..\..\..\..\..\26.00\;..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\..\..\..\26.00\CPP\7zip\UI\Common\;..\..\..\..\..\26.00\CPP\;..\..\..\..\..\26.00\;..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;UNICODE;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<CallingConvention>FastCall</CallingConvention>
@@ -425,7 +425,7 @@
<WarningLevel>Level3</WarningLevel>
<MinimalRebuild>true</MinimalRebuild>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<AdditionalIncludeDirectories>..\..\..\..\..\26.00\CPP\;..\..\..\..\..\26.00\;..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\..\..\..\26.00\CPP\7zip\UI\Common\;..\..\..\..\..\26.00\CPP\;..\..\..\..\..\26.00\;..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<CallingConvention>FastCall</CallingConvention>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -458,7 +458,7 @@
<SuppressStartupBanner>true</SuppressStartupBanner>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<AdditionalIncludeDirectories>..\..\..\..\..\26.00\CPP\;..\..\..\..\..\26.00\;..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\..\..\..\..\26.00\CPP\7zip\UI\Common\;..\..\..\..\..\26.00\CPP\;..\..\..\..\..\26.00\;..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<CallingConvention>FastCall</CallingConvention>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>