Small update for the pkg-config files and Windows.
authorUwe Hermann <uwe@hermann-uwe.de>
Sat, 13 Oct 2012 13:49:09 +0000 (15:49 +0200)
committerUwe Hermann <uwe@hermann-uwe.de>
Sat, 13 Oct 2012 13:49:09 +0000 (15:49 +0200)
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.

configure.ac

index 1cd0a07f7ea91b3642c977d3ff4d3e4610af3bf7..935e832134f569b2e9db3d78ce7ad2b44f1ec64b 100644 (file)
@@ -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'.