summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUwe Hermann <uwe@hermann-uwe.de>2012-10-13 15:49:09 +0200
committerUwe Hermann <uwe@hermann-uwe.de>2012-10-13 15:49:09 +0200
commit55e5c4e10d5d3f18d7f42ea6415782461ff55123 (patch)
tree07b8799c17771397ac48448de0485ee5b4de4aa1
parente0af499b4f5840190807636e536e1fb4956f71a9 (diff)
downloadlibsigrokdecode-55e5c4e10d5d3f18d7f42ea6415782461ff55123.tar.gz
libsigrokdecode-55e5c4e10d5d3f18d7f42ea6415782461ff55123.zip
Small update for the pkg-config files and Windows.
On Windows, cmake-using projects seem to have problems with the "-I/c/Python32/include" syntax we have in the libsigrokdecode .pc file. However, "-Ic:/Python32/include" works fine. So we just add both to support everything.
-rw-r--r--configure.ac5
1 files changed, 3 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index 1cd0a07..935e832 100644
--- a/configure.ac
+++ b/configure.ac
@@ -90,9 +90,10 @@ case "$build" in
*mingw*)
# We currently hardcode the paths to the Python 3.2 default install
# location as there's no 'python-config' script on Windows, it seems.
+ # Note: We add both the /c/ and c:/ syntax (needed for cmake).
AC_MSG_WARN([using hardcoded Python3 configuration on MinGW])
- CPPFLAGS_PYTHON="-I/c/Python32/include"
- LDFLAGS_PYTHON="-L/c/Python32/libs -lpython32"
+ CPPFLAGS_PYTHON="-I/c/Python32/include -Ic:/Python32/include"
+ LDFLAGS_PYTHON="-L/c/Python32/libs -Lc:/Python32/libs -lpython32"
;;
*)
# We know that Linux has 'python3-config'.