BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

build: Do not define FIRMWARE_DIR on Windows 

The hard-coded location is bound to be wrong anyway. Instead, rely
on the new resource lookup code to find the firmware files in a
location relative to the library or executable.
This commit is contained in:
Daniel Elstner 2015-10-03 14:08:32 +02:00
parent 127c9cec82
commit 655b116cc1
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile.am
View File

@ -28,8 +28,14 @@ local_includes = -Iinclude -I$(srcdir)/include -I$(srcdir)/src -I.
if BINDINGS_CXX if BINDINGS_CXX
local_includes += -Ibindings/cxx/include -I$(srcdir)/bindings/cxx/include -Ibindings/cxx local_includes += -Ibindings/cxx/include -I$(srcdir)/bindings/cxx/include -Ibindings/cxx
endif 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. # 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 # The tests CFLAGS are a superset of the libsigrok CFLAGS, and the
# python bindings CFLAGS are a superset of the C++ bindings CFLAGS. # python bindings CFLAGS are a superset of the C++ bindings CFLAGS.

2
configure.ac
View File

@ -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 # http://www.gnu.org/software/libtool/manual/libtool.html#Updating-version-info
SR_LIB_VERSION_SET([SR_LIB_VERSION], [2:0:0]) 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 ## ## Optional dependencies ##
############################# #############################