Changeset 0b59954 in subsurface


Ignore:
Timestamp:
Mar 26, 2017, 9:55:13 PM (7 months ago)
Author:
Dirk Hohndel <dirk@…>
Branches:
master
Children:
ae79135
Parents:
99351b7
git-author:
Stefan Fuchs <sfuchs@…> (03/26/17 10:51:53)
git-committer:
Dirk Hohndel <dirk@…> (03/26/17 21:55:13)
Message:

Improve mxe-based-build.sh for debug builds

Give a hint how to enable build of debug Qt5 DLLs when building MXE.
Take care about the "d"/"xxxd.dll" suffix for DLLs.
Copy libastro.dll from marble to correct loation as well (nevertheless we don't use it)

Signed-off-by: Stefan Fuchs <sfuchs@…>

File:
1 edited

Legend:

Unmodified
Added
Removed
  • packaging/windows/mxe-based-build.sh

    r2e53faa8 r0b59954  
    2121# # This variable controls the targets that will build.
    2222# MXE_TARGETS :=  i686-w64-mingw32.shared
     23#
     24# # Uncomment the next line if you want to do debug builds later
     25# # qtbase_CONFIGURE_OPTS=-debug-and-release
    2326#---
    2427# (documenting this in comments is hard... you need to remove
     
    7174# to rebuild libdivecomputer before you build Subsurface
    7275#
     76# If you want to create a installer for the debug build call
     77#
     78#  bash ../subsurface/packaging/windows/mxe-based-build.sh debug installer
     79#
     80# please be aware of the fact that this installer will be a few 100MB large
     81#
     82#
    7383# please send patches / additions to this file!
    7484#
     
    102112if [[ "$1" == "debug" ]] ; then
    103113        RELEASE="Debug"
     114        DLL_SUFFIX="d"
    104115        shift
    105116else
    106117        RELEASE="Release"
     118        DLL_SUFFIX=""
    107119fi
    108120
     
    244256        make install
    245257        # what the heck is marble doing?
    246         mv "$BASEDIR"/mxe/usr/i686-w64-mingw32.shared/libssrfmarblewidget.dll "$BASEDIR"/mxe/usr/i686-w64-mingw32.shared/lib
     258        mv "$BASEDIR"/mxe/usr/i686-w64-mingw32.shared/libssrfmarblewidget"$DLL_SUFFIX".dll "$BASEDIR"/mxe/usr/i686-w64-mingw32.shared/lib
     259        mv "$BASEDIR"/mxe/usr/i686-w64-mingw32.shared/libastro"$DLL_SUFFIX".dll "$BASEDIR"/mxe/usr/i686-w64-mingw32.shared/lib
    247260fi
    248261
     
    265278# for some reason we aren't installing libssrfmarblewidget.dll and # Qt5Xml.dll
    266279# I need to figure out why and fix that, but for now just manually copy that as well
    267 EXTRA_MANUAL_DEPENDENCIES="$BASEDIR/mxe/usr/i686-w64-mingw32.shared/lib/libssrfmarblewidget.dll \
    268 $BASEDIR/mxe/usr/i686-w64-mingw32.shared/qt5/bin/Qt5Xml.dll"
     280EXTRA_MANUAL_DEPENDENCIES="$BASEDIR/mxe/usr/i686-w64-mingw32.shared/lib/libssrfmarblewidget$DLL_SUFFIX.dll \
     281$BASEDIR/mxe/usr/i686-w64-mingw32.shared/qt5/bin/Qt5Xml$DLL_SUFFIX.dll"
     282
     283
     284
    269285
    270286STAGING_DIR=$BUILDDIR/subsurface/staging
     
    296312        -DLIBDIVECOMPUTER_LIBRARIES="$BASEDIR"/mxe/usr/i686-w64-mingw32.shared/lib/libdivecomputer.dll.a \
    297313        -DMARBLE_INCLUDE_DIR="$BASEDIR"/mxe/usr/i686-w64-mingw32.shared/include \
    298         -DMARBLE_LIBRARIES="$BASEDIR"/mxe/usr/i686-w64-mingw32.shared/lib/libssrfmarblewidget.dll \
     314        -DMARBLE_LIBRARIES="$BASEDIR"/mxe/usr/i686-w64-mingw32.shared/lib/libssrfmarblewidget"$DLL_SUFFIX".dll \
    299315        -DMAKE_TESTS=OFF \
    300316        "$BASEDIR"/subsurface
Note: See TracChangeset for help on using the changeset viewer.