Merge remote-tracking branch 'frank/master'

* frank/master:
  distributing mingw-cross-configure.sh
  fixed windows compilation with autotools
  fixed missing error codes for windows
  fixd compiler warnings
  fixed recognition of windows environment
This commit is contained in:
Philippe Teuwen
2013-06-16 00:46:51 +02:00
15 changed files with 100 additions and 90 deletions

View File

@@ -15,31 +15,36 @@ noinst_LTLIBRARIES = libnfcutils.la
libnfcutils_la_SOURCES = nfc-utils.c
nfc_emulate_forum_tag4_SOURCES = nfc-emulate-forum-tag4.c nfc-utils.h
nfc_emulate_forum_tag4_LDADD = $(top_builddir)/libnfc/libnfc.la \
libnfcutils.la
nfc_emulate_forum_tag4_LDADD = libnfcutils.la \
$(top_builddir)/libnfc/libnfc.la
nfc_list_SOURCES = nfc-list.c nfc-utils.h
nfc_list_LDADD = $(top_builddir)/libnfc/libnfc.la \
libnfcutils.la
nfc_list_LDADD = libnfcutils.la \
$(top_builddir)/libnfc/libnfc.la
nfc_mfclassic_SOURCES = nfc-mfclassic.c mifare.c mifare.h nfc-utils.h
nfc_mfclassic_LDADD = $(top_builddir)/libnfc/libnfc.la \
libnfcutils.la
nfc_mfclassic_LDADD = libnfcutils.la \
$(top_builddir)/libnfc/libnfc.la
nfc_mfultralight_SOURCES = nfc-mfultralight.c mifare.c mifare.h nfc-utils.h
nfc_mfultralight_LDADD = $(top_builddir)/libnfc/libnfc.la
nfc_read_forum_tag3_SOURCES = nfc-read-forum-tag3.c nfc-utils.h
nfc_read_forum_tag3_LDADD = $(top_builddir)/libnfc/libnfc.la \
libnfcutils.la
nfc_read_forum_tag3_LDADD = libnfcutils.la \
$(top_builddir)/libnfc/libnfc.la
nfc_relay_picc_SOURCES = nfc-relay-picc.c nfc-utils.h
nfc_relay_picc_LDADD = $(top_builddir)/libnfc/libnfc.la \
libnfcutils.la
nfc_relay_picc_LDADD = libnfcutils.la \
$(top_builddir)/libnfc/libnfc.la
nfc_scan_device_SOURCES = nfc-scan-device.c nfc-utils.h
nfc_scan_device_LDADD = $(top_builddir)/libnfc/libnfc.la \
libnfcutils.la
nfc_scan_device_LDADD = libnfcutils.la \
$(top_builddir)/libnfc/libnfc.la
if WIN32
nfc_scan_device_SOURCES += stdlib-win32.c
endif
dist_man_MANS = \
nfc-emulate-forum-tag4.1 \

View File

@@ -58,6 +58,11 @@
# include "config.h"
#endif // HAVE_CONFIG_H
#ifdef _WIN32
// ENOTSUP
# include "contrib/windows.h"
#endif // _WIN32
#include <sys/types.h>
#include <sys/stat.h>

1
utils/stdlib-win32.c Symbolic link
View File

@@ -0,0 +1 @@
../contrib/win32/stdlib.c