Changeset 4abf619 in subsurface


Ignore:
Timestamp:
Jan 2, 2017, 8:22:22 AM (9 months ago)
Author:
Dirk Hohndel <dirk@…>
Branches:
master
Children:
dc438c5
Parents:
346f4d4f
git-author:
Dirk Hohndel <dirk@…> (01/02/17 05:21:30)
git-committer:
Dirk Hohndel <dirk@…> (01/02/17 08:22:22)
Message:

MXE build script: update to match current mxe

Many of the hacks I used to need are no longer necessary.

Signed-off-by: Dirk Hohndel <dirk@…>

File:
1 edited

Legend:

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

    r04d8d7c r4abf619  
    2424# now you can start the build
    2525#
    26 # make libxml2 libxslt libusb1 qt5 nsis
    27 #
    28 # after qtbase has finished building you need to edit
    29 # ~/src/win/mxe/usr/i686-w64-mingw32.shared/qt5/mkspecs/qconfig.pri
    30 # and add the following line at the top:
    31 # MINGW_IN_SHELL = 1
    32 # (of course without the leading '#')
    33 # then you can enable the QtWebKit build by editing
    34 # ~/src/win/mxe/src/qtwebkit.mk and changing the "disabled" define to read
    35 #
    36 # define $(PKG)_BUILD_SHARED
    37 #     # looks for build tools with .exe suffix and tries to use win_flex
    38 #     $(SED) -i 's,\.exe,,' '$(1)/Tools/qmake/mkspecs/features/functions.prf'
    39 # ...
    40 #
    41 # and remove the empty definition of $(PKG)_BUILD_SHARED below
    42 #
    43 # Do all this in a separate terminal while the build is still running :-)
     26# make libxml2 libxslt libusb1 libzip qt5 nsis
     27#
    4428# After quite a while (depending on your machine anywhere from 15-20
    4529# minutes to several hours) you should have a working MXE install in
    4630# ~/src/win/mxe
    47 #
    48 # I also had to enable a shared build for libxslt in src/libxslt.mk
    49 #---
    50 # diff --git a/src/libxslt.mk b/src/libxslt.mk
    51 # index 99d59b6..3f5c3b4 100644
    52 # --- a/src/libxslt.mk
    53 # +++ b/src/libxslt.mk
    54 # @@ -18,11 +18,11 @@ define $(PKG)_UPDATE
    55 #      head -1
    56 #  endef
    57 #
    58 # -define $(PKG)_BUILD
    59 # +define $(PKG)_BUILD_SHARED
    60 #      cd '$(1)' && ./configure \
    61 #          --host='$(TARGET)' \
    62 #          --build="`config.guess`" \
    63 # -        --disable-shared \
    64 # +        --enable-shared \
    65 #          --without-debug \
    66 #          --prefix='$(PREFIX)/$(TARGET)' \
    67 #          --with-libxml-prefix='$(PREFIX)/$(TARGET)' \
    68 # @@ -31,4 +31,3 @@ define $(PKG)_BUILD
    69 #      $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
    70 #  endef
    71 #
    72 # -$(PKG)_BUILD_SHARED =
    73 #---
    74 # after this run
    75 # make libxslt
    76 # again
    7731#
    7832# Now this script will come in:
     
    8438#
    8539# ~/src/win/mxe                    <- current MXE git with Qt5, automake (see above)
    86 #      /win/libzip                 <- libzip sources from their latest distribution tar ball
    8740#      /win/grantlee               <- Grantlee 5.0.0 sources from git
    8841#      /win/libssh2                <- from git - v1.6 seems to work
     
    222175
    223176
    224 # libzip
    225 
    226 cd "$BUILDDIR"
    227 if [[ ! -d libzip || -f build.libzip ]] ; then
    228         rm -f build.libzip
    229         mkdir -p libzip
    230         cd libzip
    231         cmake -DCMAKE_TOOLCHAIN_FILE=$BASEDIR/mxe/usr/i686-w64-mingw32.shared/share/cmake/mxe-conf.cmake \
    232                 -DCMAKE_BUILD_TYPE=Release \
    233                         $BASEDIR/libzip
    234         make $JOBS
    235         make install
    236 fi
    237 
    238 
    239177# libgit2:
    240178
     
    340278        -DMARBLE_INCLUDE_DIR="$BASEDIR"/mxe/usr/i686-w64-mingw32.shared/include \
    341279        -DMARBLE_LIBRARIES="$BASEDIR"/mxe/usr/i686-w64-mingw32.shared/lib/libssrfmarblewidget.dll \
     280        -DMAKE_TESTS=OFF \
    342281        "$BASEDIR"/subsurface
    343282
Note: See TracChangeset for help on using the changeset viewer.