Fix Windows build (fix #911)
This commit is contained in:
1 parent
8e4724e16c
commit
ec07936888
3 files changed
+10
No files matched your search
@@ -50,6 +50,10 @@ libjq_la_SOURCES = ${LIBJQ_SRC}
|
|||||||
libjq_la_LIBADD = -lm
|
libjq_la_LIBADD = -lm
|
||||||
libjq_la_LDFLAGS = -export-symbols-regex '^j[qv]_' -version-info 1:4:0
|
libjq_la_LDFLAGS = -export-symbols-regex '^j[qv]_' -version-info 1:4:0
|
||||||
|
|
||||||
|
if WIN32
|
||||||
|
libjq_la_LIBADD += -lshlwapi
|
||||||
|
endif
|
||||||
|
|
||||||
include_HEADERS = src/jv.h src/jq.h
|
include_HEADERS = src/jv.h src/jq.h
|
||||||
|
|
||||||
### Running tests under Valgrind
|
### Running tests under Valgrind
|
||||||
|
|||||||
@@ -81,6 +81,8 @@ fi
|
|||||||
AC_CHECK_FUNCS(memmem)
|
AC_CHECK_FUNCS(memmem)
|
||||||
AC_CHECK_FUNCS(mkstemp)
|
AC_CHECK_FUNCS(mkstemp)
|
||||||
|
|
||||||
|
AC_CHECK_HEADER("shlwapi.h",[have_win32=1;])
|
||||||
|
AM_CONDITIONAL([WIN32], [test "x$have_win32" = x1])
|
||||||
|
|
||||||
dnl Running tests with Valgrind is slow. It is faster to iterate on
|
dnl Running tests with Valgrind is slow. It is faster to iterate on
|
||||||
dnl code without Valgrind until tests pass, then enable Valgrind and
|
dnl code without Valgrind until tests pass, then enable Valgrind and
|
||||||
|
|||||||
@@ -8,6 +8,10 @@
|
|||||||
#include <sys/stat.h>
|
#include <sys/stat.h>
|
||||||
#include <libgen.h>
|
#include <libgen.h>
|
||||||
|
|
||||||
|
#ifdef WIN32
|
||||||
|
#include <shlwapi.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "jq_parser.h"
|
#include "jq_parser.h"
|
||||||
#include "locfile.h"
|
#include "locfile.h"
|
||||||
#include "jv.h"
|
#include "jv.h"
|
||||||
|
|||||||
Reference in new issue
Block a user