From 4edf37f9be0374c73ae957c09b393f5bc913fe3f Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Fri, 7 Mar 2014 16:33:00 -0800 Subject: 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 --- packaging/windows/mingw-make.sh | 2 +- packaging/windows/subsurface.nsi.in | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'packaging') diff --git a/packaging/windows/mingw-make.sh b/packaging/windows/mingw-make.sh index 3d503bf0e..7ca88ea23 100755 --- a/packaging/windows/mingw-make.sh +++ b/packaging/windows/mingw-make.sh @@ -11,5 +11,5 @@ rm packaging/windows/subsurface.nsi > /dev/null 2>&1 export PATH=/usr/i686-w64-mingw32/sys-root/mingw/bin:$PATH -mingw32-qmake-qt4 CROSS_PATH=/usr/i686-w64-mingw32/sys-root/mingw +mingw32-qmake-qt4 CROSS_PATH=/usr/i686-w64-mingw32/sys-root/mingw LIBGIT2DEVEL=../libgit2 CONFIG+=libgit21-api mingw32-make $@ diff --git a/packaging/windows/subsurface.nsi.in b/packaging/windows/subsurface.nsi.in index 956ecf41b..1a718a2bf 100644 --- a/packaging/windows/subsurface.nsi.in +++ b/packaging/windows/subsurface.nsi.in @@ -120,6 +120,8 @@ Section File libssl-10.dll File libeay32.dll File ssleay32.dll + File libgit2.dll + File libcrypto-10.dll File Qt*4.dll File subsurface.ico File qt.conf -- cgit v1.2.3-70-g09d2