diff options
| author | Petr Mrázek <peterix@gmail.com> | 2013-08-26 02:53:29 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2013-08-26 02:53:29 +0200 |
| commit | 00742af3a6f6d25fbd3b3b77744e8f39a8c14c71 (patch) | |
| tree | 41631a8ec88cbe637f877f74115c961d61ebdea6 /depends/util | |
| parent | c5725d653bbe693148d1a34ddcd82f03fda5e8ff (diff) | |
| download | MultiMC-00742af3a6f6d25fbd3b3b77744e8f39a8c14c71.tar MultiMC-00742af3a6f6d25fbd3b3b77744e8f39a8c14c71.tar.gz MultiMC-00742af3a6f6d25fbd3b3b77744e8f39a8c14c71.tar.lz MultiMC-00742af3a6f6d25fbd3b3b77744e8f39a8c14c71.tar.xz MultiMC-00742af3a6f6d25fbd3b3b77744e8f39a8c14c71.zip | |
OS compatibility and generic cleanup.
Removed bspatch/patchlib
Now builds and runs on Windows
Diffstat (limited to 'depends/util')
| -rw-r--r-- | depends/util/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | depends/util/include/cmdutils.h | 4 | ||||
| -rw-r--r-- | depends/util/include/libutil_config.h | 14 |
3 files changed, 15 insertions, 8 deletions
diff --git a/depends/util/CMakeLists.txt b/depends/util/CMakeLists.txt index 86542c43..8e89aa74 100644 --- a/depends/util/CMakeLists.txt +++ b/depends/util/CMakeLists.txt @@ -43,8 +43,13 @@ src/cmdutils.cpp # Set the include dir path. SET(LIBUTIL_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/include" PARENT_SCOPE) +# Static link! +ADD_DEFINITIONS(-DLIBUTIL_STATIC) + add_definitions(-DLIBUTIL_LIBRARY) +set(CMAKE_POSITION_INDEPENDENT_CODE ON) + add_library(libUtil STATIC ${LIBUTIL_SOURCES} ${LIBUTIL_HEADERS}) # qt5_use_modules(libUtil Core Network) qt5_use_modules(libUtil Core) 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 <QtCore/QtGlobal> -#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 |