Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitc6dde24

Browse files
committed
Updated for libiconv 1.16
1 parent47e28b8 commitc6dde24

File tree

5 files changed

+4615
-12
lines changed

5 files changed

+4615
-12
lines changed

‎build/helpers/dependencies.cmd

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ IF %SDK% == MSVC2019 (
2020
SETWindowsTargetPlatformVersion=%WindowsSDKVersion%
2121
)
2222

23-
rem GOTO:BUILD_OPENSSL
23+
rem GOTO :BUILD_XSLT
2424

2525
if"%PRODUCT_NAME%"=="PostgreSQL"goto :SKIP_ZSTD
2626
if"%PRODUCT_NAME%"=="PostgresPro"goto :SKIP_ZSTD
@@ -123,18 +123,17 @@ patch -f -p0 < libiconv.patch || GOTO :ERROR
123123
msbuild libiconv.vcxproj /m /p:Configuration=Release /p:Platform=%Platform% /p:PlatformToolset=%PlatformToolset%||GOTO :ERROR
124124

125125
cp -av include%DEPENDENCIES_BIN_DIR%\iconv||GOTO :ERROR
126-
cp -av iconv.h%DEPENDENCIES_BIN_DIR%\iconv\include||GOTO :ERROR
127-
cp -av config.h%DEPENDENCIES_BIN_DIR%\iconv\include||GOTO :ERROR
126+
cp -av iconv.h%DEPENDENCIES_BIN_DIR%\iconv\include
127+
cp -av config.h%DEPENDENCIES_BIN_DIR%\iconv\include
128128
MKDIR%DEPENDENCIES_BIN_DIR%\iconv\lib
129-
cp -av Release*/*.dll%DEPENDENCIES_BIN_DIR%\iconv\lib||GOTO :ERROR
130-
cp -av Release*/libiconv.dll%DEPENDENCIES_BIN_DIR%\iconv\lib\iconv.dll||GOTO :ERROR
131-
cp -av Release*/*.lib%DEPENDENCIES_BIN_DIR%\iconv\lib||GOTO :ERROR
132-
cp -av Release*/libiconv.lib%DEPENDENCIES_BIN_DIR%\iconv\lib\iconv.lib||GOTO :ERROR
129+
cp -av%Platform%/Release*/*.dll%DEPENDENCIES_BIN_DIR%\iconv\lib||GOTO :ERROR
130+
cp -av%Platform%/Release*/libiconv.dll%DEPENDENCIES_BIN_DIR%\iconv\lib\iconv.dll||GOTO :ERROR
131+
cp -av%Platform%/Release*/*.lib%DEPENDENCIES_BIN_DIR%\iconv\lib||GOTO :ERROR
132+
cp -av%Platform%/Release*/libiconv.lib%DEPENDENCIES_BIN_DIR%\iconv\lib\iconv.lib||GOTO :ERROR
133133
cp -av lib%DEPENDENCIES_BIN_DIR%\iconv\libiconv||GOTO :ERROR
134134
CD /D%DOWNLOADS_DIR%
135135
7z a -r%DOWNLOADS_DIR%\%DEPS_ZIP%%DEPENDENCIES_BIN_DIR%\iconv
136136

137-
138137
:BUILD_ZLIB
139138
TITLE Building zlib...
140139
CD /D%DOWNLOADS_DIR%
@@ -223,7 +222,6 @@ cp -av include %DEPENDENCIES_BIN_DIR%\libxslt || GOTO :ERROR
223222
CD /D%DOWNLOADS_DIR%
224223
7z a -r%DOWNLOADS_DIR%\%DEPS_ZIP%%DEPENDENCIES_BIN_DIR%\libxslt -y
225224

226-
227225
:BUILD_OPENSSL
228226
TITLE Building OpenSSL...
229227
CD /D%DOWNLOADS_DIR%

‎build/helpers/setvars.cmd

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
REM LIBRARY VERSIONS
2-
SETICONV_VER=1.15
3-
SETXSLT_VER=1.1.29
2+
SETICONV_VER=1.16
3+
SETXSLT_VER=1.1.32
44
SETZLIB_VER=1.2.11
5-
SETXML_VER=2.9.7
5+
SETXML_VER=2.9.9
66
rem SET OPENSSL_VER=1.0.2n
77
SETOPENSSL_VER=1.1.1g
88
SETGETTEXT_VER=0.19.8

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp