From 00742af3a6f6d25fbd3b3b77744e8f39a8c14c71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Mon, 26 Aug 2013 02:53:29 +0200 Subject: OS compatibility and generic cleanup. Removed bspatch/patchlib Now builds and runs on Windows --- depends/util/include/cmdutils.h | 4 ++-- depends/util/include/libutil_config.h | 14 ++++++++------ 2 files changed, 10 insertions(+), 8 deletions(-) (limited to 'depends/util/include') diff --git a/depends/util/include/cmdutils.h b/depends/util/include/cmdutils.h index a6379397..93fef9ff 100644 --- a/depends/util/include/cmdutils.h +++ b/depends/util/include/cmdutils.h @@ -49,7 +49,7 @@ LIBUTIL_EXPORT QStringList splitArgs(QString args); namespace FlagStyle { -enum LIBUTIL_EXPORT Enum +enum Enum { GNU, /**< --option and -o (GNU Style) */ Unix, /**< -option and -o (Unix Style) */ @@ -67,7 +67,7 @@ enum LIBUTIL_EXPORT Enum */ namespace ArgumentStyle { -enum LIBUTIL_EXPORT Enum +enum Enum { Space, /**< --option=value */ Equals, /**< --option value */ diff --git a/depends/util/include/libutil_config.h b/depends/util/include/libutil_config.h index 4bf111e6..914337ed 100644 --- a/depends/util/include/libutil_config.h +++ b/depends/util/include/libutil_config.h @@ -13,15 +13,17 @@ * limitations under the License. */ -#ifndef LIBUTIL_CONFIG_H -#define LIBUTIL_CONFIG_H +#pragma once #include -#ifdef LIBUTIL_LIBRARY -# define LIBUTIL_EXPORT Q_DECL_EXPORT +#ifdef LIBUTIL_STATIC + #define LIBUTIL_EXPORT #else -# define LIBUTIL_EXPORT Q_DECL_IMPORT + #ifdef LIBUTIL_LIBRARY + #define LIBUTIL_EXPORT Q_DECL_EXPORT + #else + #define LIBUTIL_EXPORT Q_DECL_IMPORT + #endif #endif -#endif // LIBUTIL_CONFIG_H -- cgit v1.2.3