diff --git a/Makefile.am b/Makefile.am index 06832cae..ab932857 100644 --- a/Makefile.am +++ b/Makefile.am @@ -28,8 +28,14 @@ local_includes = -Iinclude -I$(srcdir)/include -I$(srcdir)/src -I. if BINDINGS_CXX local_includes += -Ibindings/cxx/include -I$(srcdir)/bindings/cxx/include -Ibindings/cxx endif +# Do not hard-code the firmware location on Windows. +if WIN32 +global_defs = +else +global_defs = -DFIRMWARE_DIR='"$(FIRMWARE_DIR)"' +endif # Ensure that local include directories are always searched first. -AM_CPPFLAGS = $(local_includes) -DFIRMWARE_DIR='"$(FIRMWARE_DIR)"' +AM_CPPFLAGS = $(local_includes) $(global_defs) # The tests CFLAGS are a superset of the libsigrok CFLAGS, and the # python bindings CFLAGS are a superset of the C++ bindings CFLAGS. diff --git a/configure.ac b/configure.ac index ba98f3e8..0ffb23c8 100644 --- a/configure.ac +++ b/configure.ac @@ -69,6 +69,8 @@ SR_PKG_VERSION_SET([SR_PACKAGE_VERSION], [AC_PACKAGE_VERSION]) # http://www.gnu.org/software/libtool/manual/libtool.html#Updating-version-info SR_LIB_VERSION_SET([SR_LIB_VERSION], [2:0:0]) +AM_CONDITIONAL([WIN32], [test -z "${host_os##mingw*}" || test -z "${host_os##cygwin*}"]) + ############################# ## Optional dependencies ## #############################