diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -44,7 +44,6 @@ GlobalAccel I18n IconThemes - Init Notifications Plasma Solid @@ -283,8 +282,8 @@ ${kmix_debug_SRCS} ) -kf5_add_kdeinit_executable(kmix ${kmix_SRCS}) -target_link_libraries(kdeinit_kmix +add_executable(kmix ${kmix_SRCS}) +target_link_libraries(kmix kmixcore kmixgui KF5::I18n @@ -296,8 +295,6 @@ KF5::WindowSystem ) -install(TARGETS kdeinit_kmix DESTINATION ${KDE_INSTALL_LIBDIR}) -target_link_libraries( kmix kdeinit_kmix) install(TARGETS kmix ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) install(FILES desktop/kmixui.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/kmix) @@ -337,15 +334,13 @@ ${kmix_debug_SRCS} ) -kf5_add_kdeinit_executable(kmixctrl ${kmixctrl_SRCS}) -target_link_libraries(kdeinit_kmixctrl +add_executable(kmixctrl ${kmixctrl_SRCS}) +target_link_libraries(kmixctrl kmixcore KF5::I18n KF5::CoreAddons ) -install(TARGETS kdeinit_kmixctrl DESTINATION ${KDE_INSTALL_LIBDIR}) -target_link_libraries(kmixctrl kdeinit_kmixctrl) install(TARGETS kmixctrl ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) install(FILES desktop/kmixctrl_restore.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR}) diff --git a/apps/kmixctrl.cpp b/apps/kmixctrl.cpp --- a/apps/kmixctrl.cpp +++ b/apps/kmixctrl.cpp @@ -35,9 +35,7 @@ static const char description[] = I18N_NOOP("kmixctrl - kmix volume save/restore utility"); -extern "C" int -Q_DECL_EXPORT -kdemain(int argc, char *argv[]) +int main(int argc, char *argv[]) { QCoreApplication app(argc, argv); diff --git a/apps/main.cpp b/apps/main.cpp --- a/apps/main.cpp +++ b/apps/main.cpp @@ -33,9 +33,7 @@ static const char description[] = I18N_NOOP("KMix - KDE's full featured mini mixer"); -extern "C" int -Q_DECL_EXPORT -kdemain(int argc, char *argv[]) +int main(int argc, char *argv[]) { QApplication qapp(argc, argv);