X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-util.git;a=blobdiff_plain;f=cross-compile%2Fmingw%2Fsigrok-cross-mingw;h=6bf521c5804c163b382055fe90791d4ae942f9f1;hp=8d0cdcefeca5559c118b25075e10db4963826c5e;hb=7eaac9545b57fe99e958b4ad4983abc23d41c143;hpb=ccf354f190394259692c83a149017d79b50a0262 diff --git a/cross-compile/mingw/sigrok-cross-mingw b/cross-compile/mingw/sigrok-cross-mingw index 8d0cdce..6bf521c 100755 --- a/cross-compile/mingw/sigrok-cross-mingw +++ b/cross-compile/mingw/sigrok-cross-mingw @@ -50,7 +50,7 @@ GIT_CLONE="git clone --depth=1" # We need to find tools in the toolchain. export PATH=$MXE/usr/bin:$PATH -TOOLCHAIN_TRIPLET="i686-pc-mingw32.static" +TOOLCHAIN_TRIPLET="i686-w64-mingw32.static" P="$PREFIX/lib/pkgconfig" P2="$MXE/usr/$TOOLCHAIN_TRIPLET/lib/pkgconfig" @@ -59,7 +59,7 @@ CM="-DCMAKE_TOOLCHAIN_FILE=$MXE/usr/$TOOLCHAIN_TRIPLET/share/cmake/mxe-conf.cmak L="--disable-shared --enable-static" DDK="$MXE/usr/$TOOLCHAIN_TRIPLET/include/ddk" -export PKG_CONFIG_PATH_i686_pc_mingw32_static="$P:$P2" +export PKG_CONFIG_PATH_i686_w64_mingw32_static="$P:$P2" # Remove build directory contents (if any) and create a new build dir. rm -rf $BUILDDIR