@@ -20,7 +20,7 @@ IF %SDK% == MSVC2019 (
20
20
SET WindowsTargetPlatformVersion = %WindowsSDKVersion%
21
21
)
22
22
23
- rem GOTO :BUILD_OPENSSL
23
+ rem GOTO :BUILD_XSLT
24
24
25
25
if " %PRODUCT_NAME% " == " PostgreSQL" goto :SKIP_ZSTD
26
26
if " %PRODUCT_NAME% " == " PostgresPro" goto :SKIP_ZSTD
@@ -123,18 +123,17 @@ patch -f -p0 < libiconv.patch || GOTO :ERROR
123
123
msbuild libiconv.vcxproj /m /p:Configuration=Release /p:Platform=%Platform% /p:PlatformToolset=%PlatformToolset% || GOTO :ERROR
124
124
125
125
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
128
128
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
133
133
cp -av lib %DEPENDENCIES_BIN_DIR% \iconv\libiconv || GOTO :ERROR
134
134
CD /D %DOWNLOADS_DIR%
135
135
7z a -r %DOWNLOADS_DIR% \%DEPS_ZIP% %DEPENDENCIES_BIN_DIR% \iconv
136
136
137
-
138
137
:BUILD_ZLIB
139
138
TITLE Building zlib...
140
139
CD /D %DOWNLOADS_DIR%
@@ -223,7 +222,6 @@ cp -av include %DEPENDENCIES_BIN_DIR%\libxslt || GOTO :ERROR
223
222
CD /D %DOWNLOADS_DIR%
224
223
7z a -r %DOWNLOADS_DIR% \%DEPS_ZIP% %DEPENDENCIES_BIN_DIR% \libxslt -y
225
224
226
-
227
225
:BUILD_OPENSSL
228
226
TITLE Building OpenSSL...
229
227
CD /D %DOWNLOADS_DIR%
0 commit comments