diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-27 12:07:49 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-27 12:07:49 -0800 |
| commit | ee68ada729837162e29d879ca408836d0d66c7ac (patch) | |
| tree | 44f7512f045850a0206c82c100a5d1a24601cb3c | |
| parent | 19356de24620c75c26152c5f19947c8a1e5215cb (diff) | |
| parent | ff0209a5b42ced7d8b9ef9c5d84cbc5a4d84a0ac (diff) | |
| download | subsurface-ee68ada729837162e29d879ca408836d0d66c7ac.tar.gz | |
Merge branch 'windows-fixes' of git://git.hohndel.org/subsurface
* 'windows-fixes' of git://git.hohndel.org/subsurface:
fix mingw-win32 specific warnings in libdivecomputer.c
Fix mingw-make.sh to find correct xslt-config
| -rw-r--r-- | libdivecomputer.c | 6 | ||||
| -rwxr-xr-x | packaging/windows/mingw-make.sh | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/libdivecomputer.c b/libdivecomputer.c index b1c86c5ee..9d4c1065a 100644 --- a/libdivecomputer.c +++ b/libdivecomputer.c @@ -1,5 +1,7 @@ #include <stdio.h> #include <pthread.h> +#include <unistd.h> +#include <inttypes.h> #include "dive.h" #include "divelist.h" @@ -433,8 +435,8 @@ static void event_cb(device_t *device, device_event_t event, const void *data, v break; case DEVICE_EVENT_CLOCK: devdata->clock = *clock; - printf("Event: systime=%lld, devtime=%u\n", - clock->systime, clock->devtime); + printf("Event: systime=%"PRId64", devtime=%u\n", + (uint64_t)clock->systime, clock->devtime); break; default: break; diff --git a/packaging/windows/mingw-make.sh b/packaging/windows/mingw-make.sh index 79e7ad5ea..ec1f6ccc7 100755 --- a/packaging/windows/mingw-make.sh +++ b/packaging/windows/mingw-make.sh @@ -6,7 +6,9 @@ # the paths work for the default mingw32 install on OpenSUSE - adjust as # necessary +export PATH=/usr/i686-w64-mingw32/sys-root/mingw/bin:$PATH make CC=i686-w64-mingw32-gcc \ PKGCONFIG=i686-w64-mingw32-pkg-config \ PKG_CONFIG_PATH=/usr/i686-w64-mingw32/sys-root/i686-w64-mingw32/lib/pkgconfig/ \ + XSLTCONFIG=/usr/i686-w64-mingw32/sys-root/mingw/bin/xslt-config \ XML2CONFIG=/usr/i686-w64-mingw32/sys-root/mingw/bin/xml2-config NAME=subsurface.exe |