From: Uwe Hermann Date: Thu, 29 Aug 2013 19:15:40 +0000 (+0200) Subject: sigrok-cross-mingw: Workaround for MXE/mingw Pulseview link issue. X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=99344584ff585a253127a13c422af6d185ccbef9;p=sigrok-util.git sigrok-cross-mingw: Workaround for MXE/mingw Pulseview link issue. --- diff --git a/cross-compile/mingw/sigrok-cross-mingw b/cross-compile/mingw/sigrok-cross-mingw index 7678709..afc4992 100755 --- a/cross-compile/mingw/sigrok-cross-mingw +++ b/cross-compile/mingw/sigrok-cross-mingw @@ -115,7 +115,8 @@ cd .. # PulseView git clone git://sigrok.org/pulseview cd pulseview -# TODO: Append (not prepend) "-llzma -llcms" to the linker. +# Temporary workaround: append (not prepend) "-llzma -llcms2" to the linker. +sed -i '224a \\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 cd ..