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

@ -44,8 +44,13 @@ src/stubkeyring.cpp
SET(LIBSETTINGS_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/include" PARENT_SCOPE)
include_directories(${LIBSETTINGS_INCLUDE_DIR})
# Static link!
ADD_DEFINITIONS(-DLIBSETTINGS_STATIC)
add_definitions(-DLIBSETTINGS_LIBRARY)
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
add_library(libSettings STATIC ${LIBSETTINGS_SOURCES} ${LIBSETTINGS_HEADERS} ${LIBSETTINGS_HEADERS_PRIVATE})
qt5_use_modules(libSettings Core)
target_link_libraries(libSettings)

View File

@ -13,15 +13,16 @@
* limitations under the License.
*/
#ifndef LIBINSTANCE_CONFIG_H
#define LIBINSTANCE_CONFIG_H
#pragma once
#include <QtCore/QtGlobal>
#ifdef LIBSETTINGS_LIBRARY
# define LIBSETTINGS_EXPORT Q_DECL_EXPORT
#ifdef LIBSETTINGS_STATIC
#define LIBSETTINGS_EXPORT
#else
# define LIBSETTINGS_EXPORT Q_DECL_IMPORT
#ifdef LIBSETTINGS_LIBRARY
#define LIBSETTINGS_EXPORT Q_DECL_EXPORT
#else
#define LIBSETTINGS_EXPORT Q_DECL_IMPORT
#endif
#endif
#endif // LIBINSTANCE_CONFIG_H