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

Jump to bottom

Use our generated GTK bundle for travis #1072

Closed
wants to merge 3 commits into from
Closed

Use our generated GTK bundle for travis #1072

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ca9ec50
win32: do not cleanup bundle such that Geany itself cannot be compiled
kugel- Jun 14, 2016
99fb6d7
win32: do not -pthread in cross build script (for travis)
kugel- Jun 14, 2016
2635989
DO NOT MERGE temporary gtk bundle location for testing travis
kugel- Jun 14, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions scripts/cross-build-mingw.sh
View file
Open in desktop
Expand Up @@ -88,6 +88,8 @@ mkdir _deps
fetch_and_unzip "$BUNDLE_ZIP" _deps
# fixup the prefix= in the pkg-config files
sed -i "s%^\(prefix=\).*$%\1$PWD/_deps%" _deps/lib/pkgconfig/*.pc
# mingw-w64 doesn't know -pthread
sed -i -e 's%-pthread%%g' _deps/lib/pkgconfig/*.pc
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think -lpthread works on Linux, MinGW and OSX GCC/glibc.


export PKG_CONFIG_PATH="$PWD/_deps/lib/pkgconfig/"
export CPPFLAGS="-I$PWD/_deps/include"
Expand Down