claunia/flac
1
0
Fork 0
mirror of https://github.com/claunia/flac.git synced 2025-12-16 18:54:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Windows/MSVC utf8 build fixes

Browse Source 
Files share/utf8/charset.c and share/utf8/iconvert.c aren't needed
under Windows. This patch removes them from MSVC build system.

Patch-from: lvqcl <lvqcl.mail@gmail.com>
This commit is contained in:
Erik de Castro Lopo
2016-01-29 07:39:12 +11:00
parent 4288e44605
commit aceddf31c9
6 changed files with 3 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/share/utf8/charset.c
View File

@@ -31,7 +31,7 @@
# include <config.h> # include <config.h>
#endif #endif
#ifndef HAVE_ICONV /* should be ifdef USE_CHARSET_CONVERT */ #if !defined _WIN32 && !defined HAVE_ICONV /* should be && defined USE_CHARSET_CONVERT */
#include <stdlib.h> #include <stdlib.h>

2
src/share/utf8/iconvert.c
View File

@@ -20,7 +20,7 @@
# include <config.h> # include <config.h>
#endif #endif
#ifdef HAVE_ICONV #if !defined _WIN32 && defined HAVE_ICONV
#include <assert.h> #include <assert.h>
#include <errno.h> #include <errno.h>

2
src/share/utf8/utf8.c
View File

@@ -33,7 +33,6 @@
#include "share/alloc.h" #include "share/alloc.h"
#include "share/safe_str.h" #include "share/safe_str.h"
#include "share/utf8.h" #include "share/utf8.h"
#include "charset.h"
#ifdef _WIN32 #ifdef _WIN32
@@ -247,6 +246,7 @@ int utf8_decode(const char *from, char **to)
#endif #endif
#include "iconvert.h" #include "iconvert.h"
#include "charset.h"
static const char *current_charset(void) static const char *current_charset(void)
{ {

20
src/share/utf8/utf8_static.vcproj
View File

@@ -155,18 +155,6 @@
Filter="h;hpp;hxx;hm;inl;inc;xsd" Filter="h;hpp;hxx;hm;inl;inc;xsd"
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}" UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
> >
<File
RelativePath=".\charmaps.h"
>
</File>
<File
RelativePath=".\charset.h"
>
</File>
<File
RelativePath=".\charsetmap.h"
>
</File>
</Filter> </Filter>
<Filter <Filter
Name="Public Header Files" Name="Public Header Files"
@@ -181,14 +169,6 @@
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx" Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}" UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
> >
<File
RelativePath=".\charset.c"
>
</File>
<File
RelativePath=".\iconvert.c"
>
</File>
<File <File
RelativePath=".\utf8.c" RelativePath=".\utf8.c"
> >

5
src/share/utf8/utf8_static.vcxproj
View File

@@ -130,13 +130,8 @@
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="..\..\..\include\share\utf8.h" /> <ClInclude Include="..\..\..\include\share\utf8.h" />
<ClInclude Include="charmaps.h" />
<ClInclude Include="charset.h" />
<ClInclude Include="charsetmap.h" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="charset.c" />
<ClCompile Include="iconvert.c" />
<ClCompile Include="utf8.c" /> <ClCompile Include="utf8.c" />
</ItemGroup> </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

15
src/share/utf8/utf8_static.vcxproj.filters
View File

@@ -14,26 +14,11 @@
</Filter> </Filter>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="charmaps.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="charset.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="charsetmap.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="..\..\..\include\share\utf8.h"> <ClInclude Include="..\..\..\include\share\utf8.h">
<Filter>Public Header Files</Filter> <Filter>Public Header Files</Filter>
</ClInclude> </ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="charset.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="iconvert.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="utf8.c"> <ClCompile Include="utf8.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>