OS compatibility and generic cleanup.

Removed bspatch/patchlib
Now builds and runs on Windows
This commit is contained in:
Petr Mrázek
2013-08-26 02:53:29 +02:00
parent c5725d653b
commit 00742af3a6
26 changed files with 72 additions and 5604 deletions

View File

@ -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)

View File

@ -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 */

View File

@ -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