mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update cross building for Windows on Linux

Browse source 
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>
This commit is contained in:
Dirk Hohndel 2014-03-07 16:33:00 -08:00
parent 18303b6f43
commit 4edf37f9be
5 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
INSTALL
View file

@ -210,6 +210,14 @@ $ mingw32-cmake -DCMAKE_BUILD_TYPE=Release -DQTONLY=TRUE ../sources
$ mingw32-make -j4 $ mingw32-make -j4
$ mingw32-make install $ mingw32-make install
To compile libgit2, use:
$ mkdir -p ~/src/libgit2/build
$ git clone git://github.com/libgit2/libgit2 ~/src/libgit2
$ cd ~/src/libgit2/build
$ mingw32-cmake ..
$ mingw32-cmake --build .
To compile Subsurface, use: To compile Subsurface, use:
$ mkdir -p ~/src/subsurface $ mkdir -p ~/src/subsurface

2
packaging/windows/mingw-make.sh
View file

@ -11,5 +11,5 @@
rm packaging/windows/subsurface.nsi > /dev/null 2>&1 rm packaging/windows/subsurface.nsi > /dev/null 2>&1
export PATH=/usr/i686-w64-mingw32/sys-root/mingw/bin:$PATH 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 $@ mingw32-make $@

2
packaging/windows/subsurface.nsi.in
View file

@ -120,6 +120,8 @@ Section
File libssl-10.dll File libssl-10.dll
File libeay32.dll File libeay32.dll
File ssleay32.dll File ssleay32.dll
File libgit2.dll
File libcrypto-10.dll
File Qt*4.dll File Qt*4.dll
File subsurface.ico File subsurface.ico
File qt.conf File qt.conf

9
subsurface-configure.pri
View file

@ -126,7 +126,14 @@ LIBS *= $$XSLT_LIBS $$XML2_LIBS
# We're searching for: # We're searching for:
# libzip # libzip
# sqlite3 # 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 # Add libiconv if needed
link_pkgconfig: packagesExist(libiconv): PKGCONFIG += libiconv link_pkgconfig: packagesExist(libiconv): PKGCONFIG += libiconv

2
subsurface.pro
View file

@ -195,7 +195,7 @@ QTTRANSLATIONS = \
qt_sk.qm \ qt_sk.qm \
qt_sv.qm qt_sv.qm
doc.commands += $(MKDIR) $$OUT_PWD/Documentation$$escape_expand(\\n\\t)$(MAKE) -C $$PWD/Documentation OUT=$$OUT_PWD/Documentation/ doc doc.commands += $(CHK_DIR_EXISTS) $$OUT_PWD/Documentation$$escape_expand(\\n\\t)$(MAKE) -C $$PWD/Documentation OUT=$$OUT_PWD/Documentation/ doc
all.depends += doc all.depends += doc
QMAKE_EXTRA_TARGETS += doc all QMAKE_EXTRA_TARGETS += doc all