From: Uwe Hermann Date: Tue, 25 Aug 2015 15:10:13 +0000 (+0200) Subject: sigrok-cross-mingw: Update patch to match recent changes. X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=a4cee1f8e2156ffb6ce7dbc83ebd62ef370d7e09;p=sigrok-util.git sigrok-cross-mingw: Update patch to match recent changes. --- diff --git a/cross-compile/mingw/libsigrok_firmwaredir.patch b/cross-compile/mingw/libsigrok_firmwaredir.patch index 6299afe..51d26b5 100644 --- a/cross-compile/mingw/libsigrok_firmwaredir.patch +++ b/cross-compile/mingw/libsigrok_firmwaredir.patch @@ -1,13 +1,13 @@ -diff --git a/configure.ac b/configure.ac -index dc4771e..a1274a2 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -484,7 +484,7 @@ AC_SEARCH_LIBS([pow], [m]) - # We need to link against the Winsock2 library for SCPI over TCP. - AS_CASE([$host], [*mingw*], [LIBS="$LIBS -lws2_32"]) +diff --git a/Makefile.am b/Makefile.am +index 9519056..334f4df 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -22,7 +22,7 @@ ACLOCAL_AMFLAGS = -I m4 + AM_LIBTOOLFLAGS = --silent + MAKEFLAGS = --no-print-directory --AC_SUBST([FIRMWARE_DIR], ['$(datadir)/sigrok-firmware']) -+AC_SUBST([FIRMWARE_DIR], ['firmware']) - AC_SUBST([MAKEFLAGS], ['--no-print-directory']) - AC_SUBST([AM_LIBTOOLFLAGS], ['--silent']) +-FIRMWARE_DIR = $(datadir)/sigrok-firmware ++FIRMWARE_DIR = firmware + local_includes = -Iinclude -I$(srcdir)/include -I$(srcdir)/src -I. + if BINDINGS_CXX