diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2014-03-07 16:33:00 -0800 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2014-03-07 16:33:00 -0800 |
| commit | 4edf37f9be0374c73ae957c09b393f5bc913fe3f (patch) | |
| tree | 3acfd408a1c3c946a428d906161a6dd66617e7bd /subsurface-configure.pri | |
| parent | 18303b6f43591c631de01db0067ecdf4cb6dac85 (diff) | |
| download | subsurface-4edf37f9be0374c73ae957c09b393f5bc913fe3f.tar.gz | |
Update cross building for Windows on Linux
This updates the instructions and the plumbing to be able to link against
a locally built libgit2
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'subsurface-configure.pri')
| -rw-r--r-- | subsurface-configure.pri | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/subsurface-configure.pri b/subsurface-configure.pri index 712b2272a..dff3b6f7d 100644 --- a/subsurface-configure.pri +++ b/subsurface-configure.pri @@ -126,7 +126,14 @@ LIBS *= $$XSLT_LIBS $$XML2_LIBS # We're searching for: # libzip # sqlite3 -link_pkgconfig: PKGCONFIG += libzip sqlite3 libgit2 +link_pkgconfig: PKGCONFIG += libzip sqlite3 + +isEmpty(LIBGIT2DEVEL) { + PKGCONFIG += libgit2 +} else { + INCLUDEPATH += $$LIBGIT2DEVEL/include + LIBS += -L$$LIBGIT2DEVEL/build -lgit2 -lz -lcrypto +} # Add libiconv if needed link_pkgconfig: packagesExist(libiconv): PKGCONFIG += libiconv |