X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-util.git;a=blobdiff_plain;f=cross-compile%2Fmingw%2Fsigrok-cross-mingw;h=aca0721ff4219118da1d56474086fc28c918180e;hp=52951b332eea75430b16ff54c7519adeca5358fa;hb=5b9f0cfce00d2b61855827e82dd36a322a502283;hpb=6ba97136f9e710e35ae1f604e80eefba775f9ead diff --git a/cross-compile/mingw/sigrok-cross-mingw b/cross-compile/mingw/sigrok-cross-mingw index 52951b3..aca0721 100755 --- a/cross-compile/mingw/sigrok-cross-mingw +++ b/cross-compile/mingw/sigrok-cross-mingw @@ -101,27 +101,11 @@ PKG_CONFIG_PATH_i686_pc_mingw32=$P:$P2 ./configure $C && make install makensis contrib/sigrok-cli_cross.nsi cd .. -## TODO: Doesn't fully work, yet. -## # sigrok-qt -## git clone git://sigrok.org/sigrok-qt -## cd sigrok-qt -## PKG_CONFIG_PATH_i686_pc_mingw32=$P:$P2 qmake -spec win32-g++ -## make -## # TODO: make install -## cd .. - -# # sigrok-gtk -# git clone git://sigrok.org/sigrok-gtk -# cd sigrok-gtk -# ./autogen.sh -# PKG_CONFIG_PATH_i686_pc_mingw32=$P:$P2 ./configure $C && make install -# cd .. - # PulseView git clone git://sigrok.org/pulseview cd pulseview # Temporary workaround: append (not prepend) "-llzma -llcms2" to the linker. -sed -i '224a \\tlist(APPEND PULSEVIEW_LINK_LIBS "-llzma -llcms2") # Quick hack' CMakeLists.txt +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 cd ..