mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-01 07:53:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'windows-fixes' of git://git.hohndel.org/subsurface

Browse source 
* '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
This commit is contained in:
Linus Torvalds 2011-11-27 12:07:49 -08:00
commit ee68ada729
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libdivecomputer.c
View file

@ -1,5 +1,7 @@
#include <stdio.h> #include <stdio.h>
#include <pthread.h> #include <pthread.h>
#include <unistd.h>
#include <inttypes.h>
#include "dive.h" #include "dive.h"
#include "divelist.h" #include "divelist.h"
@ -433,8 +435,8 @@ static void event_cb(device_t *device, device_event_t event, const void *data, v
break; break;
case DEVICE_EVENT_CLOCK: case DEVICE_EVENT_CLOCK:
devdata->clock = *clock; devdata->clock = *clock;
printf("Event: systime=%lld, devtime=%u\n", printf("Event: systime=%"PRId64", devtime=%u\n",
clock->systime, clock->devtime); (uint64_t)clock->systime, clock->devtime);
break; break;
default: default:
break; break;

2
packaging/windows/mingw-make.sh
View file

@ -6,7 +6,9 @@
# the paths work for the default mingw32 install on OpenSUSE - adjust as # the paths work for the default mingw32 install on OpenSUSE - adjust as
# necessary # necessary
export PATH=/usr/i686-w64-mingw32/sys-root/mingw/bin:$PATH
make CC=i686-w64-mingw32-gcc \ make CC=i686-w64-mingw32-gcc \
PKGCONFIG=i686-w64-mingw32-pkg-config \ PKGCONFIG=i686-w64-mingw32-pkg-config \
PKG_CONFIG_PATH=/usr/i686-w64-mingw32/sys-root/i686-w64-mingw32/lib/pkgconfig/ \ 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 XML2CONFIG=/usr/i686-w64-mingw32/sys-root/mingw/bin/xml2-config NAME=subsurface.exe