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/groupview | |
| 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/groupview')
| -rw-r--r-- | depends/groupview/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | depends/groupview/include/groupview_config.h | 15 |
2 files changed, 13 insertions, 7 deletions
diff --git a/depends/groupview/CMakeLists.txt b/depends/groupview/CMakeLists.txt index c3a3dafa..417b1d3a 100644 --- a/depends/groupview/CMakeLists.txt +++ b/depends/groupview/CMakeLists.txt @@ -35,7 +35,12 @@ SET(LIBGROUPVIEW_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/include" PARENT_SCOPE) include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include) include_directories(${CMAKE_BINARY_DIR}/include) +# Static link! +ADD_DEFINITIONS(-DLIBGROUPVIEW_STATIC) + add_definitions(-DLIBGROUPVIEW_LIBRARY) +set(CMAKE_POSITION_INDEPENDENT_CODE ON) + add_library(libGroupView STATIC ${LIBGROUPVIEW_SOURCES} ${LIBGROUPVIEW_HEADERS}) qt5_use_modules(libGroupView Core Widgets) diff --git a/depends/groupview/include/groupview_config.h b/depends/groupview/include/groupview_config.h index 86bed139..c63acbde 100644 --- a/depends/groupview/include/groupview_config.h +++ b/depends/groupview/include/groupview_config.h @@ -13,15 +13,16 @@ * limitations under the License. */ -//#ifndef LIBINSTANCE_CONFIG_H -//#define LIBINSTANCE_CONFIG_H +#pragma once #include <QtCore/QtGlobal> -#ifdef LIBGROUPVIEW_LIBRARY -# define LIBGROUPVIEW_EXPORT Q_DECL_EXPORT +#ifdef LIBGROUPVIEW_STATIC + #define LIBGROUPVIEW_EXPORT #else -# define LIBGROUPVIEW_EXPORT Q_DECL_IMPORT + #ifdef LIBGROUPVIEW_LIBRARY + #define LIBGROUPVIEW_EXPORT Q_DECL_EXPORT + #else + #define LIBGROUPVIEW_EXPORT Q_DECL_IMPORT + #endif #endif - -//#endif // LIBINSTANCE_CONFIG_H |