summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--libdivecomputer.c6
-rwxr-xr-xpackaging/windows/mingw-make.sh2
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