mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-02 09:48:59 +08:00
69 lines
2.0 KiB
Diff
69 lines
2.0 KiB
Diff
|
diff --git a/configure.ac b/configure.ac
|
||
|
|
index c8fea14..eb0a097 100644
|
||
|
|
--- a/configure.ac
|
||
|
|
+++ b/configure.ac
|
||
|
|
@@ -55,7 +55,7 @@ AC_DEFINE_UNQUOTED([LIB_VERSION_REVISION],
|
||
|
|
[Library revision])
|
||
|
|
|
||
|
|
AM_CPPFLAGS="-I\$(top_srcdir)/include"
|
||
|
|
-AM_CFLAGS="-Wall -Wno-parentheses"
|
||
|
|
+AM_CFLAGS="-Wall"
|
||
|
|
AM_CXXFLAGS="$AM_CFLAGS"
|
||
|
|
AC_SUBST([AM_CPPFLAGS])
|
||
|
|
AC_SUBST([AM_CFLAGS])
|
||
|
|
diff --git a/zbar/Makefile.am b/zbar/Makefile.am
|
||
|
|
index ca54d01..6c0cd83 100644
|
||
|
|
--- a/zbar/Makefile.am
|
||
|
|
+++ b/zbar/Makefile.am
|
||
|
|
@@ -68,7 +68,7 @@ if WIN32
|
||
|
|
|
||
|
|
libzbar_la_SOURCES += processor/win.c libzbar.rc
|
||
|
|
libzbar_la_CPPFLAGS += -mthreads
|
||
|
|
-libzbar_la_LDFLAGS += -mthreads
|
||
|
|
+libzbar_la_LDFLAGS += -mthreads -Xcompiler -Wl,-DEBUG
|
||
|
|
# FIXME broken
|
||
|
|
libzbar_la_LIBADD += libzbar-rc.lo
|
||
|
|
else
|
||
|
|
diff --git a/zbar/libzbar.rc b/zbar/libzbar.rc
|
||
|
|
index 413635b..c241f82 100644
|
||
|
|
--- a/zbar/libzbar.rc
|
||
|
|
+++ b/zbar/libzbar.rc
|
||
|
|
@@ -17,8 +17,7 @@ VS_VERSION_INFO VERSIONINFO
|
||
|
|
VALUE "InternalName", "libzbar"
|
||
|
|
VALUE "OriginalFilename", "libzbar-" XSTR(LIB_VERSION_MAJOR) ".dll"
|
||
|
|
|
||
|
|
- VALUE "FileVersion", XSTR(LIB_VERSION_MAJOR) "." \
|
||
|
|
- XSTR(LIB_VERSION_MINOR) "." XSTR(LIB_VERSION_REVISION)
|
||
|
|
+ VALUE "FileVersion", XSTR(LIB_VERSION_MAJOR) "." XSTR(LIB_VERSION_MINOR) "." XSTR(LIB_VERSION_REVISION)
|
||
|
|
VALUE "ProductVersion", PACKAGE_VERSION
|
||
|
|
|
||
|
|
VALUE "FileDescription", "Bar code reader library"
|
||
|
|
diff --git a/zbar/processor.h b/zbar/processor.h
|
||
|
|
index d5e9fef..54d6584 100644
|
||
|
|
--- a/zbar/processor.h
|
||
|
|
+++ b/zbar/processor.h
|
||
|
|
@@ -27,7 +27,9 @@
|
||
|
|
#ifdef HAVE_INTTYPES_H
|
||
|
|
# include <inttypes.h>
|
||
|
|
#endif
|
||
|
|
-#include <unistd.h>
|
||
|
|
+#ifndef WIN32
|
||
|
|
+# include <unistd.h>
|
||
|
|
+#endif
|
||
|
|
#include <stdlib.h>
|
||
|
|
#include <string.h>
|
||
|
|
|
||
|
|
diff --git a/zbar/thread.h b/zbar/thread.h
|
||
|
|
index 96d6415..252d3f2 100644
|
||
|
|
--- a/zbar/thread.h
|
||
|
|
+++ b/zbar/thread.h
|
||
|
|
@@ -35,7 +35,7 @@
|
||
|
|
# define HAVE_THREADS
|
||
|
|
# define ZTHREAD DWORD WINAPI
|
||
|
|
|
||
|
|
-typedef ZTHREAD (zbar_thread_proc_t)(void*);
|
||
|
|
+typedef ZTHREAD zbar_thread_proc_t(void*);
|
||
|
|
|
||
|
|
typedef DWORD zbar_thread_id_t;
|
||
|
|
|