Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mingw fixes #1483

Merged
merged 2 commits into from
Mar 3, 2025
Merged

Mingw fixes #1483

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9bf8c5f
mingw: install libz packages
farindk Mar 3, 2025
474eb8e
mingw: set `CMAKE_FIND_ROOT_PATH` accordingly
kleisauke Mar 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions scripts/install-ci-linux.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,8 @@ if [ "$MINGW" == "32" ]; then
g++-mingw-w64-i686 \
gcc-mingw-w64-i686 \
mingw-w64-i686-dev \
libz-mingw-w64-dev \
libz-mingw-w64 \
wine-stable \
wine32 \
"
Expand All @@ -135,6 +137,8 @@ elif [ "$MINGW" == "64" ]; then
g++-mingw-w64-x86-64 \
gcc-mingw-w64-x86-64 \
mingw-w64-x86-64-dev \
libz-mingw-w64-dev \
libz-mingw-w64 \
wine-stable \
"
fi
Expand Down
8 changes: 5 additions & 3 deletions scripts/run-ci.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,14 +71,16 @@ if [ "$MINGW" == "32" ]; then
export CXX=i686-w64-mingw32-g++
BIN_SUFFIX=.exe
BIN_WRAPPER=/usr/lib/wine/wine
export WINEPATH="$(dirname $($CXX --print-file-name=libstdc++.a));/usr/i686-w64-mingw32/lib"
MINGW_SYSROOT="/usr/i686-w64-mingw32"
export WINEPATH="$(dirname $($CXX --print-file-name=libstdc++.a));$MINGW_SYSROOT/lib"
elif [ "$MINGW" == "64" ]; then
# Make sure the correct compiler will be used.
export CC=x86_64-w64-mingw32-gcc
export CXX=x86_64-w64-mingw32-g++
BIN_SUFFIX=.exe
BIN_WRAPPER=/usr/lib/wine/wine64
export WINEPATH="$(dirname $($CXX --print-file-name=libstdc++.a));/usr/x86_64-w64-mingw32/lib"
MINGW_SYSROOT="/usr/x86_64-w64-mingw32"
export WINEPATH="$(dirname $($CXX --print-file-name=libstdc++.a));$MINGW_SYSROOT/lib"
fi

PKG_CONFIG_PATH=
Expand Down Expand Up @@ -138,7 +140,7 @@ if [ "$CURRENT_OS" = "osx" ] ; then
CMAKE_OPTIONS="$CMAKE_OPTIONS -DCMAKE_FIND_FRAMEWORK=LAST"
fi
if [ -n "$MINGW" ]; then
CMAKE_OPTIONS="$CMAKE_OPTIONS -DCMAKE_SYSTEM_NAME=Windows"
CMAKE_OPTIONS="$CMAKE_OPTIONS -DCMAKE_SYSTEM_NAME=Windows -DCMAKE_FIND_ROOT_PATH=$MINGW_SYSROOT"
fi
if [ "$CLANG_TIDY" = "1" ]; then
CMAKE_OPTIONS="$CMAKE_OPTIONS -DCMAKE_EXPORT_COMPILE_COMMANDS=ON"
Expand Down
Loading