Switch to unified view

a/windows/mkinstdir.sh b/windows/mkinstdir.sh
...
...
31
MINGWBIN=`dirname $gccpath`
31
MINGWBIN=`dirname $gccpath`
32
32
33
test -z "$MINGWBIN" && fatal cannot find gcc
33
test -z "$MINGWBIN" && fatal cannot find gcc
34
34
35
# Where to copy the Qt Dlls from:
35
# Where to copy the Qt Dlls from:
36
QTBIN=C:/Qt/5.5/mingw492_32/bin
36
QTBIN=C:/Qt/Qt5.8.0/5.8/mingw53_32/bin
37
PATH=$QTBIN:$PATH
37
PATH=$QTBIN:$PATH
38
export PATH
38
export PATH
39
39
40
# Qt arch
40
# Qt arch
41
QTA=Desktop_Qt_5_5_0_MinGW_32bit
41
QTA=Desktop_Qt_5_8_0_MinGW_32bit
42
if test X$ReleaseBuild = X'y'; then
42
if test X$ReleaseBuild = X'y'; then
43
    qtsdir=release
43
    qtsdir=release
44
else
44
else
45
    qtsdir=debug
45
    qtsdir=debug
46
fi
46
fi
...
...
71
71
72
copyqt()
72
copyqt()
73
{
73
{
74
    cd $DESTDIR
74
    cd $DESTDIR
75
    $QTBIN/windeployqt upplay.exe
75
    $QTBIN/windeployqt upplay.exe
76
    # Apparently because the webkit part was grafted "by hand" on the
77
    # Qt set, we need to copy some dll explicitely
78
    addlibs="Qt5Core.dll Qt5Multimedia.dll \
79
Qt5MultimediaWidgets.dll Qt5OpenGL.dll \
80
Qt5Positioning.dll Qt5PrintSupport.dll Qt5Sensors.dll \
81
Qt5Sql.dll icudt57.dll \
82
icuin57.dll icuuc57.dll libQt5WebKit.dll \
83
libQt5WebKitWidgets.dll \
84
libxml2-2.dll libxslt-1.dll"
85
   for i in $addlibs;do
86
       chkcp $QTBIN/$i $DESTDIR
87
   done
76
}
88
}
77
89
78
90
79
test -d $DESTDIR/share/cdbrowser || mkdir -p $DESTDIR/share/cdbrowser || exit 1
91
test -d $DESTDIR/share/cdbrowser || mkdir -p $DESTDIR/share/cdbrowser || exit 1
80
copyupplay
92
copyupplay