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/settings | |
| 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/settings')
| -rw-r--r-- | depends/settings/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | depends/settings/include/libsettings_config.h | 15 |
2 files changed, 13 insertions, 7 deletions
diff --git a/depends/settings/CMakeLists.txt b/depends/settings/CMakeLists.txt index 911b604b..3de1d792 100644 --- a/depends/settings/CMakeLists.txt +++ b/depends/settings/CMakeLists.txt @@ -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) diff --git a/depends/settings/include/libsettings_config.h b/depends/settings/include/libsettings_config.h index dc8e6228..2ecfe1c1 100644 --- a/depends/settings/include/libsettings_config.h +++ b/depends/settings/include/libsettings_config.h @@ -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 |