mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-12 13:56:17 +00:00
Update the mxe based sample script
Working on making the different ways we build things more consistent Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
parent
435ec2cbc2
commit
93559e81e2
1 changed files with 14 additions and 26 deletions
|
@ -25,6 +25,7 @@
|
||||||
# /libgit2
|
# /libgit2
|
||||||
# /marble
|
# /marble
|
||||||
# /subsurface
|
# /subsurface
|
||||||
|
# /install-root <- target for our temporary installs
|
||||||
#
|
#
|
||||||
# then start this script from ~/src/win/win32
|
# then start this script from ~/src/win/win32
|
||||||
#
|
#
|
||||||
|
@ -39,6 +40,7 @@ if [[ ! -d libgit2 || ! -d marble || ! -d subsurface ]] ; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
BASEDIR=$(cd "`dirname $0`/.."; pwd)
|
BASEDIR=$(cd "`dirname $0`/.."; pwd)
|
||||||
|
INSTALL_ROOT=$(pwd)/install-root
|
||||||
|
|
||||||
echo "Building in $BASEDIR ..."
|
echo "Building in $BASEDIR ..."
|
||||||
|
|
||||||
|
@ -82,17 +84,11 @@ cd ..
|
||||||
|
|
||||||
cd libgit2 || exit 1
|
cd libgit2 || exit 1
|
||||||
cmake -DCMAKE_TOOLCHAIN_FILE=$BASEDIR/mxe/usr/i686-w64-mingw32.shared/share/cmake/mxe-conf.cmake \
|
cmake -DCMAKE_TOOLCHAIN_FILE=$BASEDIR/mxe/usr/i686-w64-mingw32.shared/share/cmake/mxe-conf.cmake \
|
||||||
|
-DCMAKE_INSTALL_PREFIX=$INSTALL_ROOT \
|
||||||
-DBUILD_CLAR=OFF \
|
-DBUILD_CLAR=OFF \
|
||||||
$BASEDIR/../subsurface/libgit2
|
$BASEDIR/../subsurface/libgit2
|
||||||
make -j12
|
make -j12
|
||||||
|
make install
|
||||||
# fake install
|
|
||||||
if [ ! -h include ] ; then
|
|
||||||
ln -s $BASEDIR/../subsurface/libgit2/include .
|
|
||||||
fi
|
|
||||||
if [ ! -h build ] ; then
|
|
||||||
ln -s . build
|
|
||||||
fi
|
|
||||||
cd ..
|
cd ..
|
||||||
|
|
||||||
# libdivecomputer (can't figure out how to do out-of tree builds?)
|
# libdivecomputer (can't figure out how to do out-of tree builds?)
|
||||||
|
@ -100,8 +96,9 @@ cd ..
|
||||||
cd libdivecomputer || exit 1
|
cd libdivecomputer || exit 1
|
||||||
git pull
|
git pull
|
||||||
autoreconf --install
|
autoreconf --install
|
||||||
./configure --host=i686-w64-mingw32.shared --enable-static --disable-shared
|
./configure --host=i686-w64-mingw32.shared --enable-static --disable-shared --prefix=$INSTALL_ROOT
|
||||||
make -j12
|
make -j12
|
||||||
|
make install
|
||||||
cd ..
|
cd ..
|
||||||
|
|
||||||
# marble:
|
# marble:
|
||||||
|
@ -109,26 +106,15 @@ cd ..
|
||||||
cd marble
|
cd marble
|
||||||
cmake -DCMAKE_TOOLCHAIN_FILE=$BASEDIR/mxe/usr/i686-w64-mingw32.shared/share/cmake/mxe-conf.cmake \
|
cmake -DCMAKE_TOOLCHAIN_FILE=$BASEDIR/mxe/usr/i686-w64-mingw32.shared/share/cmake/mxe-conf.cmake \
|
||||||
-DCMAKE_PREFIX_PATH=$BASEDIR/mxe/usr/i686-w64-mingw32.shared/qt5 \
|
-DCMAKE_PREFIX_PATH=$BASEDIR/mxe/usr/i686-w64-mingw32.shared/qt5 \
|
||||||
|
-DCMAKE_INSTALL_PREFIX=$INSTALL_ROOT \
|
||||||
-DQTONLY=ON -DQT5BUILD=ON \
|
-DQTONLY=ON -DQT5BUILD=ON \
|
||||||
-DBUILD_MARBLE_APPS=OFF -DBUILD_MARBLE_EXAMPLES=OFF \
|
-DBUILD_MARBLE_APPS=OFF -DBUILD_MARBLE_EXAMPLES=OFF \
|
||||||
-DBUILD_MARBLE_TESTS=OFF -DBUILD_MARBLE_TOOLS=OFF \
|
-DBUILD_MARBLE_TESTS=OFF -DBUILD_MARBLE_TOOLS=OFF \
|
||||||
-DBUILD_TESTING=OFF -DWITH_DESIGNER_PLUGIN=OFF \
|
-DBUILD_TESTING=OFF -DWITH_DESIGNER_PLUGIN=OFF \
|
||||||
-DBUILD_WITH_DBUS=OFF $BASEDIR/../subsurface/marble-source
|
-DBUILD_WITH_DBUS=OFF $BASEDIR/../subsurface/marble-source
|
||||||
make -j12
|
make -j12
|
||||||
|
make install
|
||||||
|
|
||||||
# fake install
|
|
||||||
if [ ! -d include ] ; then
|
|
||||||
mkdir include
|
|
||||||
cd include
|
|
||||||
for i in $(find $BASEDIR/../subsurface/marble-source -name \*.h); do ln -s $i .; done
|
|
||||||
ln -s . marble
|
|
||||||
cd ..
|
|
||||||
fi
|
|
||||||
if [ ! -d lib ] ; then
|
|
||||||
mkdir lib
|
|
||||||
fi
|
|
||||||
cp src/lib/marble/libssrfmarblewidget.dll lib
|
|
||||||
cd ..
|
|
||||||
|
|
||||||
###############
|
###############
|
||||||
fi
|
fi
|
||||||
|
@ -151,10 +137,12 @@ fi
|
||||||
cmake -DCMAKE_TOOLCHAIN_FILE=$BASEDIR/mxe/usr/i686-w64-mingw32.shared/share/cmake/mxe-conf.cmake \
|
cmake -DCMAKE_TOOLCHAIN_FILE=$BASEDIR/mxe/usr/i686-w64-mingw32.shared/share/cmake/mxe-conf.cmake \
|
||||||
-DCMAKE_PREFIX_PATH=$BASEDIR/mxe/usr/i686-w64-mingw32.shared/qt5 \
|
-DCMAKE_PREFIX_PATH=$BASEDIR/mxe/usr/i686-w64-mingw32.shared/qt5 \
|
||||||
-DCMAKE_BUILD_TYPE=Release \
|
-DCMAKE_BUILD_TYPE=Release \
|
||||||
-DLIBDCDEVEL=$BUILDDIR/libdivecomputer \
|
-DLIBGIT2_INCLUDE_DIR=$(INSTALL_ROOT)/include \
|
||||||
-DLIBGIT2DEVEL=$BUILDDIR/libgit2 \
|
-DLIBGIT2_LIBRARIES=$(INSTALL_ROOT)/lib/libgit2.a \
|
||||||
-DLIBMARBLEDEVEL=$BUILDDIR/marble \
|
-DLIBDIVECOMPUTER_INCLUDE_DIR=$(INSTALL_ROOT)/include \
|
||||||
-DLRELEASE=$BASEDIR/mxe/usr/i686-w64-mingw32.shared/qt5/bin/lrelease \
|
-DLIBDIVECOMPUTER_LIBRARIES=$(INSTALL_ROOT)/lib/libdivecomputer.a \
|
||||||
|
-DMARBLE_INCLUDE_DIR=$(INSTALL_ROOT)/include \
|
||||||
|
-DMARBLE_LIBRARIES=$(INSTALL_ROOT)/lib/libssrfmarblewidget.dll \
|
||||||
-DQT_TRANSLATION_DIR=$BASEDIR/mxe/usr/i686-w64-mingw32.shared/qt5/translations \
|
-DQT_TRANSLATION_DIR=$BASEDIR/mxe/usr/i686-w64-mingw32.shared/qt5/translations \
|
||||||
-DMAKENSIS=i686-w64-mingw32.shared-makensis \
|
-DMAKENSIS=i686-w64-mingw32.shared-makensis \
|
||||||
$BASEDIR/../subsurface
|
$BASEDIR/../subsurface
|
||||||
|
|
Loading…
Add table
Reference in a new issue