From 4e517a6d96e93a6b7d3882010865e180a8a1505b Mon Sep 17 00:00:00 2001 From: Jonathan Thomas Date: Sat, 17 Feb 2024 15:58:40 -0600 Subject: [PATCH] Updating RESVG windows build instructions, and removing unit tests from 32-bit windows --- .gitlab-ci.yml | 1 - doc/INSTALL-WINDOWS.md | 58 ++++++++++++++---------------------------- 2 files changed, 19 insertions(+), 40 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ad5c43e43..d5a5cc2d9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -106,7 +106,6 @@ windows-builder-x86: - $env:MSYSTEM = "MINGW32" - cmake -B build -S . -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -D"babl_DIR=C:/msys64/mingw32" -D"CMAKE_INSTALL_PREFIX:PATH=$CI_PROJECT_DIR\build\install-x86" -D"OpenShotAudio_ROOT=$CI_PROJECT_DIR\build\install-x86" -D"PYTHON_MODULE_PATH=python" -D"RUBY_MODULE_PATH=ruby" -G "MinGW Makefiles" -D"CMAKE_BUILD_TYPE:STRING=Release" -D"CMAKE_CXX_FLAGS=-m32" -D"CMAKE_EXE_LINKER_FLAGS=-Wl,--large-address-aware" -D"CMAKE_C_FLAGS=-m32" - cmake --build build - - cmake --build build --target coverage - cmake --install build - $PROJECT_VERSION = (Select-String -Path "CMakeLists.txt" -Pattern '^set\(PROJECT_VERSION_FULL "(.*)\"' | %{$_.Matches.Groups[1].value}) - $PROJECT_SO = (Select-String -Path "CMakeLists.txt" -Pattern '^set\(PROJECT_SO_VERSION (.*)\)' | %{$_.Matches.Groups[1].value}) diff --git a/doc/INSTALL-WINDOWS.md b/doc/INSTALL-WINDOWS.md index 0d3123ac7..4f04cb62c 100644 --- a/doc/INSTALL-WINDOWS.md +++ b/doc/INSTALL-WINDOWS.md @@ -179,7 +179,7 @@ directions to setup a Windows build environment for OpenShot. ``` PATH=$PATH:/c/msys64/mingw64/bin:/c/msys64/mingw64/lib (64-bit PATH) or -PATH=$PATH:/c/msys32/mingw32/bin:/c/msys32/mingw32/lib (32-bit PATH) +PATH=$PATH:/c/msys64/mingw32/bin:/c/msys64/mingw32/lib (32-bit PATH) ``` 4) Update and upgrade all packages @@ -191,24 +191,14 @@ pacman -Syu 5a) Install the following packages (**64-Bit**) ``` -pacman -S --needed base-devel mingw-w64-x86_64-toolchain -pacman -S mingw64/mingw-w64-x86_64-ffmpeg -pacman -S mingw64/mingw-w64-x86_64-qt5 -pacman -S mingw64/mingw-w64-x86_64-python3-pyqt5 -pacman -S mingw64/mingw-w64-x86_64-swig -pacman -S mingw64/mingw-w64-x86_64-cmake -pacman -S mingw64/mingw-w64-x86_64-doxygen -pacman -S mingw64/mingw-w64-x86_64-python3-pip -pacman -S mingw32/mingw-w64-i686-zeromq -pacman -S mingw64/mingw-w64-x86_64-python3-pyzmq -pacman -S mingw64/mingw-w64-x86_64-python3-cx_Freeze -pacman -S mingw64/mingw-w64-x86_64-ninja -pacman -S mingw64/mingw-w64-x86_64-catch -pacman -S mingw-w64-x86_64-python3-PyOpenGL -pacman -S mingw-w64-clang-x86_64-python-pyopengl-accelerate -pacman -S mingw-w64-x86_64-python-pyopengl-accelerate -pacman -S mingw-w64-x86_64-python-pywin32 -pacman -S git +pacman -S --needed --noconfirm \ +mingw-w64-x86_64-rust base-devel mingw-w64-x86_64-toolchain \ +mingw-w64-x86_64-ffmpeg mingw-w64-x86_64-qt5 mingw-w64-x86_64-python3-pyqt5 \ +mingw-w64-x86_64-swig mingw-w64-x86_64-cmake mingw-w64-x86_64-doxygen \ +mingw-w64-x86_64-python3-pip mingw-w64-i686-zeromq mingw-w64-x86_64-python3-pyzmq \ +mingw-w64-x86_64-python3-cx_Freeze mingw-w64-x86_64-ninja mingw-w64-x86_64-catch \ +mingw-w64-x86_64-python3-PyOpenGL mingw-w64-clang-x86_64-python-pyopengl-accelerate \ +mingw-w64-x86_64-python-pyopengl-accelerate mingw-w64-x86_64-python-pywin32 git # Install ImageMagick if needed (OPTIONAL and NOT NEEDED) pacman -S mingw64/mingw-w64-x86_64-imagemagick @@ -217,23 +207,13 @@ pacman -S mingw64/mingw-w64-x86_64-imagemagick 5b) **Or** Install the following packages (**32-Bit**) ``` -pacman -S --needed base-devel mingw32/mingw-w64-i686-toolchain -pacman -S mingw32/mingw-w64-i686-ffmpeg -pacman -S mingw32/mingw-w64-i686-qt5 -pacman -S mingw32/mingw-w64-i686-python3-pyqt5 -pacman -S mingw32/mingw-w64-i686-swig -pacman -S mingw32/mingw-w64-i686-cmake -pacman -S mingw32/mingw-w64-i686-doxygen -pacman -S mingw32/mingw-w64-i686-python3-pip -pacman -S mingw32/mingw-w64-i686-zeromq -pacman -S mingw32/mingw-w64-i686-python3-pyzmq -pacman -S mingw32/mingw-w64-i686-python3-cx_Freeze -pacman -S mingw32/mingw-w64-i686-ninja -pacman -S mingw32/mingw-w64-i686-catch -pacman -S mingw-w64-i686-python-pyopengl -pacman -S mingw-w64-i686-python-pyopengl-accelerate -pacman -S mingw-w64-i686-python-pywin32 -pacman -S git +pacman -S --needed --noconfirm \ +mingw-w64-i686-rust mingw-w64-i686-toolchain mingw-w64-i686-ffmpeg \ +mingw-w64-i686-qt5 mingw-w64-i686-python3-pyqt5 mingw-w64-i686-swig \ +mingw-w64-i686-cmake mingw-w64-i686-doxygen mingw-w64-i686-python3-pip \ +mingw-w64-i686-zeromq mingw-w64-i686-python3-pyzmq mingw-w64-i686-python3-cx_Freeze \ +mingw-w64-i686-ninja mingw-w64-i686-catch mingw-w64-i686-python-pyopengl \ +mingw-w64-i686-python-pyopengl-accelerate mingw-w64-i686-python-pywin32 # Install ImageMagick if needed (OPTIONAL and NOT NEEDED) pacman -S mingw32/mingw-w32-x86_32-imagemagick @@ -294,17 +274,17 @@ make install -i ``` git clone https://github.com/RazrFalcon/resvg -cd resvg/c-api +cd resvg/crates/c-api QT_DIR="C:\\msys64\\mingw64\\" cargo build --verbose --release **OR** QT_DIR="C:\\msys64\\mingw32\\" cargo build --verbose --release -cd ../ +cd ../../ # copy all required files into the system directories cp target/release/resvg.dll /usr/lib/ mkdir -p /usr/include/resvg/ -cp c-api/*.h /usr/include/resvg/ +cp crates/c-api/*.h /usr/include/resvg/ ``` 11) ZMQ++ Header (This might not be needed anymore)