1
0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00

chore(CI): Move QrEncode build from autotools to cmake

Autotools version failed to configure on macOS, and QrEncode's README says  "If
the configure script does not work well, try to use CMake." Cmake works for
both macOS and Windows.
This commit is contained in:
Anthony Bilinski 2022-03-03 01:33:17 -08:00
parent 6c85492f17
commit 4c969a9277
No known key found for this signature in database
GPG Key ID: 2AA8E0DA1B31FB3C
2 changed files with 7 additions and 8 deletions

View File

@ -14,13 +14,12 @@ parse_arch --dep "qrencode" --supported "win32 win64" "$@"
"${SCRIPT_DIR}/download/download_qrencode.sh"
CFLAGS="-O2 -g0" ./configure "${HOST_OPTION}" \
--prefix="${DEP_PREFIX}" \
--enable-shared \
--disable-static \
--disable-sdltest \
--without-tools \
--without-debug
cmake . \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX="${DEP_PREFIX}" \
"${CMAKE_TOOLCHAIN_FILE}" \
-DWITH_TOOLS=OFF \
-DBUILD_SHARED_LIBS=ON
make -j "${MAKE_JOBS}"
make install

View File

@ -190,7 +190,7 @@ RUN mkdir /export && \
cp /windows/bin/avformat-*.dll /export && \
cp /windows/bin/avutil-*.dll /export && \
cp /windows/bin/libexif-*.dll /export && \
cp /windows/bin/libqrencode.dll /export && \
cp /windows/lib/libqrencode.dll /export && \
cp /windows/bin/libsodium-*.dll /export && \
cp /windows/bin/libsqlcipher-*.dll /export && \
cp /windows/bin/libmsgpackc.dll /export && \