X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=cross-compile%2Fmingw%2Fsigrok-cross-mingw;h=6b6c2ac4c4c1fe79ec3c21c148dc795b6ba4c91f;hb=147100f0c48f94184652ad8e2ee24e1b4b9867ef;hp=aca0721ff4219118da1d56474086fc28c918180e;hpb=5b9f0cfce00d2b61855827e82dd36a322a502283;p=sigrok-util.git diff --git a/cross-compile/mingw/sigrok-cross-mingw b/cross-compile/mingw/sigrok-cross-mingw index aca0721..6b6c2ac 100755 --- a/cross-compile/mingw/sigrok-cross-mingw +++ b/cross-compile/mingw/sigrok-cross-mingw @@ -79,6 +79,13 @@ chmod 755 $PREFIX/bin/python3-config wget -c http://python.org/ftp/python/3.2.3/python-3.2.3.msi \ -O $PREFIX/python-3.2.3.msi +# libserialport +git clone git://sigrok.org/libserialport +cd libserialport +./autogen.sh +PKG_CONFIG_PATH_i686_pc_mingw32=$P ./configure $C $L && make install +cd .. + # libsigrok git clone git://sigrok.org/libsigrok cd libsigrok @@ -98,7 +105,7 @@ git clone git://sigrok.org/sigrok-cli cd sigrok-cli ./autogen.sh PKG_CONFIG_PATH_i686_pc_mingw32=$P:$P2 ./configure $C && make install -makensis contrib/sigrok-cli_cross.nsi +makensis -DHOME=$HOME contrib/sigrok-cli_cross.nsi cd .. # PulseView @@ -107,6 +114,6 @@ cd pulseview # Temporary workaround: append (not prepend) "-llzma -llcms2" to the linker. sed -i '247a \\tlist(APPEND PULSEVIEW_LINK_LIBS "-llzma -llcms2") # Quick hack' CMakeLists.txt PKG_CONFIG_PATH_i686_pc_mingw32=$P:$P2 cmake $CM -DCMAKE_INSTALL_PREFIX:PATH=$PREFIX -DDISABLE_WERROR=y . && make install VERBOSE=1 -makensis contrib/pulseview_cross.nsi +makensis -DHOME=$HOME contrib/pulseview_cross.nsi cd ..