Skip to content

Commit 4e517a6

Browse files
committed
Updating RESVG windows build instructions, and removing unit tests from 32-bit windows
1 parent d98b5f2 commit 4e517a6

File tree

2 files changed

+19
-40
lines changed

2 files changed

+19
-40
lines changed

.gitlab-ci.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@ windows-builder-x86:
106106
- $env:MSYSTEM = "MINGW32"
107107
- 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"
108108
- cmake --build build
109-
- cmake --build build --target coverage
110109
- cmake --install build
111110
- $PROJECT_VERSION = (Select-String -Path "CMakeLists.txt" -Pattern '^set\(PROJECT_VERSION_FULL "(.*)\"' | %{$_.Matches.Groups[1].value})
112111
- $PROJECT_SO = (Select-String -Path "CMakeLists.txt" -Pattern '^set\(PROJECT_SO_VERSION (.*)\)' | %{$_.Matches.Groups[1].value})

doc/INSTALL-WINDOWS.md

Lines changed: 19 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ directions to setup a Windows build environment for OpenShot.
179179
```
180180
PATH=$PATH:/c/msys64/mingw64/bin:/c/msys64/mingw64/lib (64-bit PATH)
181181
or
182-
PATH=$PATH:/c/msys32/mingw32/bin:/c/msys32/mingw32/lib (32-bit PATH)
182+
PATH=$PATH:/c/msys64/mingw32/bin:/c/msys64/mingw32/lib (32-bit PATH)
183183
```
184184

185185
4) Update and upgrade all packages
@@ -191,24 +191,14 @@ pacman -Syu
191191
5a) Install the following packages (**64-Bit**)
192192

193193
```
194-
pacman -S --needed base-devel mingw-w64-x86_64-toolchain
195-
pacman -S mingw64/mingw-w64-x86_64-ffmpeg
196-
pacman -S mingw64/mingw-w64-x86_64-qt5
197-
pacman -S mingw64/mingw-w64-x86_64-python3-pyqt5
198-
pacman -S mingw64/mingw-w64-x86_64-swig
199-
pacman -S mingw64/mingw-w64-x86_64-cmake
200-
pacman -S mingw64/mingw-w64-x86_64-doxygen
201-
pacman -S mingw64/mingw-w64-x86_64-python3-pip
202-
pacman -S mingw32/mingw-w64-i686-zeromq
203-
pacman -S mingw64/mingw-w64-x86_64-python3-pyzmq
204-
pacman -S mingw64/mingw-w64-x86_64-python3-cx_Freeze
205-
pacman -S mingw64/mingw-w64-x86_64-ninja
206-
pacman -S mingw64/mingw-w64-x86_64-catch
207-
pacman -S mingw-w64-x86_64-python3-PyOpenGL
208-
pacman -S mingw-w64-clang-x86_64-python-pyopengl-accelerate
209-
pacman -S mingw-w64-x86_64-python-pyopengl-accelerate
210-
pacman -S mingw-w64-x86_64-python-pywin32
211-
pacman -S git
194+
pacman -S --needed --noconfirm \
195+
mingw-w64-x86_64-rust base-devel mingw-w64-x86_64-toolchain \
196+
mingw-w64-x86_64-ffmpeg mingw-w64-x86_64-qt5 mingw-w64-x86_64-python3-pyqt5 \
197+
mingw-w64-x86_64-swig mingw-w64-x86_64-cmake mingw-w64-x86_64-doxygen \
198+
mingw-w64-x86_64-python3-pip mingw-w64-i686-zeromq mingw-w64-x86_64-python3-pyzmq \
199+
mingw-w64-x86_64-python3-cx_Freeze mingw-w64-x86_64-ninja mingw-w64-x86_64-catch \
200+
mingw-w64-x86_64-python3-PyOpenGL mingw-w64-clang-x86_64-python-pyopengl-accelerate \
201+
mingw-w64-x86_64-python-pyopengl-accelerate mingw-w64-x86_64-python-pywin32 git
212202
213203
# Install ImageMagick if needed (OPTIONAL and NOT NEEDED)
214204
pacman -S mingw64/mingw-w64-x86_64-imagemagick
@@ -217,23 +207,13 @@ pacman -S mingw64/mingw-w64-x86_64-imagemagick
217207
5b) **Or** Install the following packages (**32-Bit**)
218208

219209
```
220-
pacman -S --needed base-devel mingw32/mingw-w64-i686-toolchain
221-
pacman -S mingw32/mingw-w64-i686-ffmpeg
222-
pacman -S mingw32/mingw-w64-i686-qt5
223-
pacman -S mingw32/mingw-w64-i686-python3-pyqt5
224-
pacman -S mingw32/mingw-w64-i686-swig
225-
pacman -S mingw32/mingw-w64-i686-cmake
226-
pacman -S mingw32/mingw-w64-i686-doxygen
227-
pacman -S mingw32/mingw-w64-i686-python3-pip
228-
pacman -S mingw32/mingw-w64-i686-zeromq
229-
pacman -S mingw32/mingw-w64-i686-python3-pyzmq
230-
pacman -S mingw32/mingw-w64-i686-python3-cx_Freeze
231-
pacman -S mingw32/mingw-w64-i686-ninja
232-
pacman -S mingw32/mingw-w64-i686-catch
233-
pacman -S mingw-w64-i686-python-pyopengl
234-
pacman -S mingw-w64-i686-python-pyopengl-accelerate
235-
pacman -S mingw-w64-i686-python-pywin32
236-
pacman -S git
210+
pacman -S --needed --noconfirm \
211+
mingw-w64-i686-rust mingw-w64-i686-toolchain mingw-w64-i686-ffmpeg \
212+
mingw-w64-i686-qt5 mingw-w64-i686-python3-pyqt5 mingw-w64-i686-swig \
213+
mingw-w64-i686-cmake mingw-w64-i686-doxygen mingw-w64-i686-python3-pip \
214+
mingw-w64-i686-zeromq mingw-w64-i686-python3-pyzmq mingw-w64-i686-python3-cx_Freeze \
215+
mingw-w64-i686-ninja mingw-w64-i686-catch mingw-w64-i686-python-pyopengl \
216+
mingw-w64-i686-python-pyopengl-accelerate mingw-w64-i686-python-pywin32
237217
238218
# Install ImageMagick if needed (OPTIONAL and NOT NEEDED)
239219
pacman -S mingw32/mingw-w32-x86_32-imagemagick
@@ -294,17 +274,17 @@ make install -i
294274

295275
```
296276
git clone https://github.com/RazrFalcon/resvg
297-
cd resvg/c-api
277+
cd resvg/crates/c-api
298278
QT_DIR="C:\\msys64\\mingw64\\" cargo build --verbose --release
299279
**OR**
300280
QT_DIR="C:\\msys64\\mingw32\\" cargo build --verbose --release
301281
302-
cd ../
282+
cd ../../
303283
304284
# copy all required files into the system directories
305285
cp target/release/resvg.dll /usr/lib/
306286
mkdir -p /usr/include/resvg/
307-
cp c-api/*.h /usr/include/resvg/
287+
cp crates/c-api/*.h /usr/include/resvg/
308288
```
309289

310290
11) ZMQ++ Header (This might not be needed anymore)

0 commit comments

Comments
 (0)