Commit 0c22965d authored by Rob Swindell's avatar Rob Swindell 💬
Browse files

Fix Windows build: filedat.c now requires utf8.h

And a couple of projects didn't have the encode directory in their include path.
parent baccf391
Pipeline #2765 passed with stage
in 9 minutes and 20 seconds
...@@ -39,6 +39,7 @@ ...@@ -39,6 +39,7 @@
<Import Project="..\build\target_ia32.props" /> <Import Project="..\build\target_ia32.props" />
<Import Project="..\hash\hash.props" /> <Import Project="..\hash\hash.props" />
<Import Project="..\..\3rdp\win32.release\libarchive\libarchive.props" /> <Import Project="..\..\3rdp\win32.release\libarchive\libarchive.props" />
<Import Project="..\encode\encode.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
...@@ -49,6 +50,7 @@ ...@@ -49,6 +50,7 @@
<Import Project="..\build\target_ia32.props" /> <Import Project="..\build\target_ia32.props" />
<Import Project="..\hash\hash.props" /> <Import Project="..\hash\hash.props" />
<Import Project="..\..\3rdp\win32.release\libarchive\libarchive.props" /> <Import Project="..\..\3rdp\win32.release\libarchive\libarchive.props" />
<Import Project="..\encode\encode.props" />
</ImportGroup> </ImportGroup>
<PropertyGroup Label="UserMacros" /> <PropertyGroup Label="UserMacros" />
<PropertyGroup> <PropertyGroup>
......
...@@ -43,6 +43,7 @@ ...@@ -43,6 +43,7 @@
<Import Project="..\hash\hash.props" /> <Import Project="..\hash\hash.props" />
<Import Project="..\build\undeprecate.props" /> <Import Project="..\build\undeprecate.props" />
<Import Project="..\..\3rdp\win32.release\libarchive\libarchive.props" /> <Import Project="..\..\3rdp\win32.release\libarchive\libarchive.props" />
<Import Project="..\encode\encode.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
...@@ -51,6 +52,7 @@ ...@@ -51,6 +52,7 @@
<Import Project="..\hash\hash.props" /> <Import Project="..\hash\hash.props" />
<Import Project="..\build\undeprecate.props" /> <Import Project="..\build\undeprecate.props" />
<Import Project="..\..\3rdp\win32.release\libarchive\libarchive.props" /> <Import Project="..\..\3rdp\win32.release\libarchive\libarchive.props" />
<Import Project="..\encode\encode.props" />
</ImportGroup> </ImportGroup>
<PropertyGroup Label="UserMacros" /> <PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment