Skip to content

Commit 30c44c2

Browse files
VictorSpirinVictorSpirin
committed
Fixed iconv patch for win32 build
1 parent 9ebcb5f commit 30c44c2

File tree

3 files changed

+35
-11
lines changed

3 files changed

+35
-11
lines changed

‎patches/libiconv/libiconv-1.16-MSVC2013.patch

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1158,7 +1158,7 @@ diff -ruN libiconv.vcxproj origin/libiconv.vcxproj
11581158
+#endif /* _LIBICONV_H */
11591159
--- libiconv.vcxproj 1970-01-01 03:00:00.000000000 +0300
11601160
+++ origin/libiconv.vcxproj 2015-10-05 17:07:03.038087288 +0300
1161-
@@ -0,0 +1,374 @@
1161+
@@ -0,0 +1,382 @@
11621162
+<?xml version="1.0" encoding="utf-8"?>
11631163
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
11641164
+ <ItemGroup Label="ProjectConfigurations">
@@ -1189,23 +1189,31 @@ diff -ruN libiconv.vcxproj origin/libiconv.vcxproj
11891189
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
11901190
+ <UseDebugLibraries>true</UseDebugLibraries>
11911191
+ <PlatformToolset>v120</PlatformToolset>
1192+
+ <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
1193+
+ <IntDir>$(Platform)\$(Configuration)\</IntDir>
11921194
+ </PropertyGroup>
11931195
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
11941196
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
11951197
+ <UseDebugLibraries>true</UseDebugLibraries>
11961198
+ <PlatformToolset>v120</PlatformToolset>
1199+
+ <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
1200+
+ <IntDir>$(Platform)\$(Configuration)\</IntDir>
11971201
+ </PropertyGroup>
11981202
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
11991203
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
12001204
+ <UseDebugLibraries>false</UseDebugLibraries>
12011205
+ <PlatformToolset>v120</PlatformToolset>
12021206
+ <WholeProgramOptimization>true</WholeProgramOptimization>
1207+
+ <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
1208+
+ <IntDir>$(Platform)\$(Configuration)\</IntDir>
12031209
+ </PropertyGroup>
12041210
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
12051211
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
12061212
+ <UseDebugLibraries>false</UseDebugLibraries>
12071213
+ <PlatformToolset>v120</PlatformToolset>
12081214
+ <WholeProgramOptimization>true</WholeProgramOptimization>
1215+
+ <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
1216+
+ <IntDir>$(Platform)\$(Configuration)\</IntDir>
12091217
+ </PropertyGroup>
12101218
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
12111219
+ <ImportGroup Label="ExtensionSettings">

‎patches/libiconv/libiconv-1.16-MSVC2017.patch

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1158,7 +1158,7 @@ diff -ruN libiconv.vcxproj origin/libiconv.vcxproj
11581158
+#endif /* _LIBICONV_H */
11591159
--- libiconv.vcxproj 1970-01-01 03:00:00.000000000 +0300
11601160
+++ origin/libiconv.vcxproj 2015-10-05 17:07:03.038087288 +0300
1161-
@@ -0,0 +1,374 @@
1161+
@@ -0,0 +1,382 @@
11621162
+<?xml version="1.0" encoding="utf-8"?>
11631163
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
11641164
+ <ItemGroup Label="ProjectConfigurations">
@@ -1188,24 +1188,32 @@ diff -ruN libiconv.vcxproj origin/libiconv.vcxproj
11881188
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
11891189
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
11901190
+ <UseDebugLibraries>true</UseDebugLibraries>
1191-
+ <PlatformToolset>v141</PlatformToolset>
1191+
+ <PlatformToolset>v120</PlatformToolset>
1192+
+ <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
1193+
+ <IntDir>$(Platform)\$(Configuration)\</IntDir>
11921194
+ </PropertyGroup>
11931195
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
11941196
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
11951197
+ <UseDebugLibraries>true</UseDebugLibraries>
1196-
+ <PlatformToolset>v141</PlatformToolset>
1198+
+ <PlatformToolset>v120</PlatformToolset>
1199+
+ <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
1200+
+ <IntDir>$(Platform)\$(Configuration)\</IntDir>
11971201
+ </PropertyGroup>
11981202
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
11991203
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
12001204
+ <UseDebugLibraries>false</UseDebugLibraries>
1201-
+ <PlatformToolset>v141</PlatformToolset>
1205+
+ <PlatformToolset>v120</PlatformToolset>
12021206
+ <WholeProgramOptimization>true</WholeProgramOptimization>
1207+
+ <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
1208+
+ <IntDir>$(Platform)\$(Configuration)\</IntDir>
12031209
+ </PropertyGroup>
12041210
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
12051211
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
12061212
+ <UseDebugLibraries>false</UseDebugLibraries>
1207-
+ <PlatformToolset>v141</PlatformToolset>
1213+
+ <PlatformToolset>v120</PlatformToolset>
12081214
+ <WholeProgramOptimization>true</WholeProgramOptimization>
1215+
+ <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
1216+
+ <IntDir>$(Platform)\$(Configuration)\</IntDir>
12091217
+ </PropertyGroup>
12101218
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
12111219
+ <ImportGroup Label="ExtensionSettings">

‎patches/libiconv/libiconv-1.16-MSVC2019.patch

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1158,7 +1158,7 @@ diff -ruN libiconv.vcxproj origin/libiconv.vcxproj
11581158
+#endif /* _LIBICONV_H */
11591159
--- libiconv.vcxproj 1970-01-01 03:00:00.000000000 +0300
11601160
+++ origin/libiconv.vcxproj 2015-10-05 17:07:03.038087288 +0300
1161-
@@ -0,0 +1,374 @@
1161+
@@ -0,0 +1,382 @@
11621162
+<?xml version="1.0" encoding="utf-8"?>
11631163
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
11641164
+ <ItemGroup Label="ProjectConfigurations">
@@ -1188,24 +1188,32 @@ diff -ruN libiconv.vcxproj origin/libiconv.vcxproj
11881188
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
11891189
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
11901190
+ <UseDebugLibraries>true</UseDebugLibraries>
1191-
+ <PlatformToolset>v142</PlatformToolset>
1191+
+ <PlatformToolset>v120</PlatformToolset>
1192+
+ <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
1193+
+ <IntDir>$(Platform)\$(Configuration)\</IntDir>
11921194
+ </PropertyGroup>
11931195
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
11941196
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
11951197
+ <UseDebugLibraries>true</UseDebugLibraries>
1196-
+ <PlatformToolset>v142</PlatformToolset>
1198+
+ <PlatformToolset>v120</PlatformToolset>
1199+
+ <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
1200+
+ <IntDir>$(Platform)\$(Configuration)\</IntDir>
11971201
+ </PropertyGroup>
11981202
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
11991203
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
12001204
+ <UseDebugLibraries>false</UseDebugLibraries>
1201-
+ <PlatformToolset>v142</PlatformToolset>
1205+
+ <PlatformToolset>v120</PlatformToolset>
12021206
+ <WholeProgramOptimization>true</WholeProgramOptimization>
1207+
+ <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
1208+
+ <IntDir>$(Platform)\$(Configuration)\</IntDir>
12031209
+ </PropertyGroup>
12041210
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
12051211
+ <ConfigurationType>DynamicLibrary</ConfigurationType>
12061212
+ <UseDebugLibraries>false</UseDebugLibraries>
1207-
+ <PlatformToolset>v142</PlatformToolset>
1213+
+ <PlatformToolset>v120</PlatformToolset>
12081214
+ <WholeProgramOptimization>true</WholeProgramOptimization>
1215+
+ <OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
1216+
+ <IntDir>$(Platform)\$(Configuration)\</IntDir>
12091217
+ </PropertyGroup>
12101218
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
12111219
+ <ImportGroup Label="ExtensionSettings">

0 commit comments

Comments
 (0)