diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -120,7 +120,7 @@ ${box2d_SRCS} ) -add_library(kolfprivate SHARED ${kolf_LIB_SRCS}) +add_library(kolfprivate STATIC ${kolf_LIB_SRCS}) target_link_libraries(kolfprivate Qt5::Gui diff --git a/game.h b/game.h --- a/game.h +++ b/game.h @@ -20,7 +20,6 @@ #ifndef GAME_H #define GAME_H -#include #include "ball.h" #include "tagaro/scene.h" @@ -229,7 +228,7 @@ double ithickness, iwidth, iheight; }; -struct KOLFLIB_EXPORT CourseInfo +struct CourseInfo { CourseInfo(const QString &_name, const QString &_untranslatedName, const QString &_author, unsigned int _holes, unsigned int _par) { name = _name; untranslatedName = _untranslatedName, author = _author; holes = _holes; par = _par; } CourseInfo(); @@ -241,7 +240,7 @@ unsigned int par; }; -class KOLFLIB_EXPORT KolfGame : public QGraphicsView +class KolfGame : public QGraphicsView { Q_OBJECT diff --git a/kolf.h b/kolf.h --- a/kolf.h +++ b/kolf.h @@ -20,7 +20,6 @@ #ifndef KOLF_H #define KOLF_H -#include #include #include "game.h" @@ -34,7 +33,7 @@ class Editor; class ScoreBoard; -class KOLFLIB_EXPORT KolfWindow : public KXmlGuiWindow +class KolfWindow : public KXmlGuiWindow { Q_OBJECT diff --git a/kolflib_export.h b/kolflib_export.h deleted file mode 100644 --- a/kolflib_export.h +++ /dev/null @@ -1,37 +0,0 @@ -/* This file is part of the KDE project - Copyright (C) 2007 David Faure - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public License - along with this library; see the file COPYING.LIB. If not, write to - the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ - -#ifndef KOLFLIB_EXPORT_H -#define KOLFLIB_EXPORT_H - -#ifndef KOLFLIB_EXPORT -# if defined(MAKE_KOLFPRIVATE_LIB) - /* We are building this library */ -# define KOLFLIB_EXPORT Q_DECL_EXPORT -# else - /* We are using this library */ -# define KOLFLIB_EXPORT Q_DECL_IMPORT -# endif -#endif - -# ifndef KOLFLIB_EXPORT_DEPRECATED -# define KOLFLIB_EXPORT_DEPRECATED KDE_DEPRECATED KOLFLIB_EXPORT -# endif - -#endif