diff options
| author | Lasse Collin <lasse.collin@tukaani.org> | 2022-08-18 17:38:05 +0300 |
|---|---|---|
| committer | Lasse Collin <lasse.collin@tukaani.org> | 2022-08-18 17:51:07 +0300 |
| commit | ad5ef6d3c30bb749113c51aa0bbe8bcb5e193fbe (patch) | |
| tree | a847fd568e610dc88c2cf306276fe46048c138a3 | |
| parent | Bump version and soname for 5.2.6. (diff) | |
| download | xz-ad5ef6d3c30bb749113c51aa0bbe8bcb5e193fbe.tar.xz | |
Windows: Fix broken liblzma.dll build with Visual Studio project files.
The bug was introduced in 352ba2d69af2136bc814aa1df1a132559d445616
"Windows: Fix building of resource files when config.h isn't used."
That commit fixed liblzma.dll build with CMake while keeping it
working with Autotools on Windows but the VS project files were
forgotten.
I haven't tested these changes.
Thanks to Olivier B. for reporting the bug and for the initial patch.
| -rw-r--r-- | windows/vs2013/liblzma_dll.vcxproj | 6 | ||||
| -rw-r--r-- | windows/vs2017/liblzma_dll.vcxproj | 6 | ||||
| -rw-r--r-- | windows/vs2019/liblzma_dll.vcxproj | 6 |
3 files changed, 18 insertions, 0 deletions
diff --git a/windows/vs2013/liblzma_dll.vcxproj b/windows/vs2013/liblzma_dll.vcxproj index f764dc10..03c2ab7d 100644 --- a/windows/vs2013/liblzma_dll.vcxproj +++ b/windows/vs2013/liblzma_dll.vcxproj @@ -137,6 +137,7 @@ </Link> <ResourceCompile> <AdditionalIncludeDirectories>./;../../src/liblzma/common;../../src/common;../../src/liblzma/api;</AdditionalIncludeDirectories> + <PreprocessorDefinitions>HAVE_CONFIG_H</PreprocessorDefinitions> </ResourceCompile> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> @@ -154,6 +155,7 @@ </Link> <ResourceCompile> <AdditionalIncludeDirectories>./;../../src/liblzma/common;../../src/common;../../src/liblzma/api;</AdditionalIncludeDirectories> + <PreprocessorDefinitions>HAVE_CONFIG_H</PreprocessorDefinitions> </ResourceCompile> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> @@ -173,6 +175,7 @@ </Link> <ResourceCompile> <AdditionalIncludeDirectories>./;../../src/liblzma/common;../../src/common;../../src/liblzma/api;</AdditionalIncludeDirectories> + <PreprocessorDefinitions>HAVE_CONFIG_H</PreprocessorDefinitions> </ResourceCompile> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> @@ -191,6 +194,7 @@ </Link> <ResourceCompile> <AdditionalIncludeDirectories>./;../../src/liblzma/common;../../src/common;../../src/liblzma/api;</AdditionalIncludeDirectories> + <PreprocessorDefinitions>HAVE_CONFIG_H</PreprocessorDefinitions> </ResourceCompile> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseMT|Win32'"> @@ -210,6 +214,7 @@ </Link> <ResourceCompile> <AdditionalIncludeDirectories>./;../../src/liblzma/common;../../src/common;../../src/liblzma/api;</AdditionalIncludeDirectories> + <PreprocessorDefinitions>HAVE_CONFIG_H</PreprocessorDefinitions> </ResourceCompile> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseMT|x64'"> @@ -228,6 +233,7 @@ </Link> <ResourceCompile> <AdditionalIncludeDirectories>./;../../src/liblzma/common;../../src/common;../../src/liblzma/api;</AdditionalIncludeDirectories> + <PreprocessorDefinitions>HAVE_CONFIG_H</PreprocessorDefinitions> </ResourceCompile> </ItemDefinitionGroup> <ItemGroup> diff --git a/windows/vs2017/liblzma_dll.vcxproj b/windows/vs2017/liblzma_dll.vcxproj index 33f3e694..ee889293 100644 --- a/windows/vs2017/liblzma_dll.vcxproj +++ b/windows/vs2017/liblzma_dll.vcxproj @@ -137,6 +137,7 @@ </Link> <ResourceCompile> <AdditionalIncludeDirectories>./;../../src/liblzma/common;../../src/common;../../src/liblzma/api;</AdditionalIncludeDirectories> + <PreprocessorDefinitions>HAVE_CONFIG_H</PreprocessorDefinitions> </ResourceCompile> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> @@ -154,6 +155,7 @@ </Link> <ResourceCompile> <AdditionalIncludeDirectories>./;../../src/liblzma/common;../../src/common;../../src/liblzma/api;</AdditionalIncludeDirectories> + <PreprocessorDefinitions>HAVE_CONFIG_H</PreprocessorDefinitions> </ResourceCompile> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> @@ -173,6 +175,7 @@ </Link> <ResourceCompile> <AdditionalIncludeDirectories>./;../../src/liblzma/common;../../src/common;../../src/liblzma/api;</AdditionalIncludeDirectories> + <PreprocessorDefinitions>HAVE_CONFIG_H</PreprocessorDefinitions> </ResourceCompile> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> @@ -191,6 +194,7 @@ </Link> <ResourceCompile> <AdditionalIncludeDirectories>./;../../src/liblzma/common;../../src/common;../../src/liblzma/api;</AdditionalIncludeDirectories> + <PreprocessorDefinitions>HAVE_CONFIG_H</PreprocessorDefinitions> </ResourceCompile> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseMT|Win32'"> @@ -210,6 +214,7 @@ </Link> <ResourceCompile> <AdditionalIncludeDirectories>./;../../src/liblzma/common;../../src/common;../../src/liblzma/api;</AdditionalIncludeDirectories> + <PreprocessorDefinitions>HAVE_CONFIG_H</PreprocessorDefinitions> </ResourceCompile> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseMT|x64'"> @@ -228,6 +233,7 @@ </Link> <ResourceCompile> <AdditionalIncludeDirectories>./;../../src/liblzma/common;../../src/common;../../src/liblzma/api;</AdditionalIncludeDirectories> + <PreprocessorDefinitions>HAVE_CONFIG_H</PreprocessorDefinitions> </ResourceCompile> </ItemDefinitionGroup> <ItemGroup> diff --git a/windows/vs2019/liblzma_dll.vcxproj b/windows/vs2019/liblzma_dll.vcxproj index fc5ddbb2..40926c52 100644 --- a/windows/vs2019/liblzma_dll.vcxproj +++ b/windows/vs2019/liblzma_dll.vcxproj @@ -138,6 +138,7 @@ </Link> <ResourceCompile> <AdditionalIncludeDirectories>./;../../src/liblzma/common;../../src/common;../../src/liblzma/api;</AdditionalIncludeDirectories> + <PreprocessorDefinitions>HAVE_CONFIG_H</PreprocessorDefinitions> </ResourceCompile> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> @@ -155,6 +156,7 @@ </Link> <ResourceCompile> <AdditionalIncludeDirectories>./;../../src/liblzma/common;../../src/common;../../src/liblzma/api;</AdditionalIncludeDirectories> + <PreprocessorDefinitions>HAVE_CONFIG_H</PreprocessorDefinitions> </ResourceCompile> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> @@ -174,6 +176,7 @@ </Link> <ResourceCompile> <AdditionalIncludeDirectories>./;../../src/liblzma/common;../../src/common;../../src/liblzma/api;</AdditionalIncludeDirectories> + <PreprocessorDefinitions>HAVE_CONFIG_H</PreprocessorDefinitions> </ResourceCompile> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> @@ -192,6 +195,7 @@ </Link> <ResourceCompile> <AdditionalIncludeDirectories>./;../../src/liblzma/common;../../src/common;../../src/liblzma/api;</AdditionalIncludeDirectories> + <PreprocessorDefinitions>HAVE_CONFIG_H</PreprocessorDefinitions> </ResourceCompile> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseMT|Win32'"> @@ -211,6 +215,7 @@ </Link> <ResourceCompile> <AdditionalIncludeDirectories>./;../../src/liblzma/common;../../src/common;../../src/liblzma/api;</AdditionalIncludeDirectories> + <PreprocessorDefinitions>HAVE_CONFIG_H</PreprocessorDefinitions> </ResourceCompile> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseMT|x64'"> @@ -229,6 +234,7 @@ </Link> <ResourceCompile> <AdditionalIncludeDirectories>./;../../src/liblzma/common;../../src/common;../../src/liblzma/api;</AdditionalIncludeDirectories> + <PreprocessorDefinitions>HAVE_CONFIG_H</PreprocessorDefinitions> </ResourceCompile> </ItemDefinitionGroup> <ItemGroup> |