X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=cross-compile%2Fmingw%2Fsigrok-cross-mingw;h=b324429aa2deb50278c7776495944c8b17899f2b;hb=54207903a78f98c62a6fc7fb37e51c1f22187ba4;hp=a7d625f3b95dc22c179d9f028f7eb729030997ab;hpb=4e8697df7f33d4014cef88214b02d4a56addcde9;p=sigrok-util.git

diff --git a/cross-compile/mingw/sigrok-cross-mingw b/cross-compile/mingw/sigrok-cross-mingw
index a7d625f..b324429 100755
--- a/cross-compile/mingw/sigrok-cross-mingw
+++ b/cross-compile/mingw/sigrok-cross-mingw
@@ -53,7 +53,7 @@ GIT_CLONE="git clone --depth=1"
 # We need to find tools in the toolchain.
 export PATH=$MXE/usr/bin:$PATH
 
-TOOLCHAIN_TRIPLET="$TARGET-w64-mingw32.static"
+TOOLCHAIN_TRIPLET="$TARGET-w64-mingw32.static.posix"
 
 P="$PREFIX/lib/pkgconfig"
 P2="$MXE/usr/$TOOLCHAIN_TRIPLET/lib/pkgconfig"
@@ -62,9 +62,9 @@ CM="-DCMAKE_TOOLCHAIN_FILE=$MXE/usr/$TOOLCHAIN_TRIPLET/share/cmake/mxe-conf.cmak
 L="--disable-shared --enable-static"
 
 if [ $TARGET = "i686" ]; then
-	export PKG_CONFIG_PATH_i686_w64_mingw32_static="$P:$P2"
+	export PKG_CONFIG_PATH_i686_w64_mingw32_static_posix="$P:$P2"
 else
-	export PKG_CONFIG_PATH_x86_64_w64_mingw32_static="$P:$P2"
+	export PKG_CONFIG_PATH_x86_64_w64_mingw32_static_posix="$P:$P2"
 fi
 
 # Remove build directory contents (if any) and create a new build dir.
@@ -117,6 +117,7 @@ $WGET http://zadig.akeo.ie/downloads/zadig_xp.exe -O $PREFIX/zadig_xp.exe
 # libusb
 $GIT_CLONE git://github.com/dickens/libusb -b event-abstraction-v4
 cd libusb
+patch -p1 < ../../libusb_raw_io.patch
 ./bootstrap.sh
 ./configure $C $L
 make -j1 $V
@@ -135,7 +136,6 @@ cd ..
 # libsigrok
 $GIT_CLONE git://sigrok.org/libsigrok
 cd libsigrok
-patch -p1 < ../../libsigrok_firmwaredir.patch
 ./autogen.sh
 ./configure $C $L
 make $PARALLEL $V
@@ -146,7 +146,6 @@ cd ..
 $GIT_CLONE git://sigrok.org/libsigrokdecode
 cd libsigrokdecode
 ./autogen.sh
-patch -p1 < ../../srd_decodersdir.patch
 ./configure $C $L
 make $PARALLEL $V
 make install $V