summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kplayer/Makefile.am6
-rw-r--r--kplayer/x11.cpp3
2 files changed, 4 insertions, 5 deletions
diff --git a/kplayer/Makefile.am b/kplayer/Makefile.am
index 95d8947..7b74d69 100644
--- a/kplayer/Makefile.am
+++ b/kplayer/Makefile.am
@@ -2,7 +2,7 @@ bin_PROGRAMS = kplayer
kplayer_SOURCES = kplayerpropertiesdevice.ui kplayernodeaction.cpp kplayernodeview.cpp kplayerplaylist.cpp kplayersettingsdialog.cpp kplayersettingssubtitles.ui kplayersettingsbrightness.ui kplayersettingsvolume.ui kplayersettingssaturation.ui kplayersettingsprogress.ui kplayersettingshue.ui kplayersettingscontrols.ui kplayersettingssliders.ui kplayersettingscontrast.ui kplayerlogwindow.cpp kplayersettingsvideo.ui kplayersettingsaudio.ui kplayersettingsadvanced.ui kplayersettingsgeneral.ui kplayer.cpp main.cpp
-kplayer_LDADD = libkplayernoinst.la $(LIB_KPARTS) $(LIB_KFILE) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) $(LIBSOCKET)
+kplayer_LDADD = libkplayernoinst.la $(LIB_KPARTS) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) $(LIBSOCKET) -lDCOP
# These paths are KDE specific. Use them:
# kde_appsdir Where your application's menu entry (.desktop) should go to.
@@ -39,13 +39,13 @@ kplayer_LDFLAGS = $(all_libraries) $(KDE_RPATH)
noinst_LTLIBRARIES = libkplayernoinst.la
libkplayernoinst_la_LDFLAGS = $(all_libraries) -no-undefined
libkplayernoinst_la_SOURCES = x11.cpp kplayerwidget.cpp kplayerslideraction.cpp kplayerprocess.cpp kplayersettings.cpp kplayerproperties.cpp kplayeractionlist.cpp kplayerengine.cpp kplayersource.cpp kplayernode.cpp kplayerpropertiesdialog.cpp kplayerpropertiesgeneral.ui kplayerpropertiessize.ui kplayerpropertiessubtitles.ui kplayerpropertiesaudio.ui kplayerpropertiesvideo.ui kplayerpropertiesadvanced.ui
-libkplayernoinst_la_LIBADD = $(LIB_KFILE) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)
+libkplayernoinst_la_LIBADD = $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)
libkplayernoinst_la_METASOURCES = kplayerwidget.moc kplayerslideraction.moc kplayerprocess.moc kplayersettings.moc kplayerproperties.moc kplayeractionlist.moc kplayerengine.moc kplayerpropertiesdialog.moc kplayersource.moc kplayernode.moc
kde_module_LTLIBRARIES = libkplayerpart.la
libkplayerpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -no-undefined
libkplayerpart_la_SOURCES = kplayerpart.cpp
-libkplayerpart_la_LIBADD = $(LIB_KPARTS) $(LIB_KFILE) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) libkplayernoinst.la
+libkplayerpart_la_LIBADD = $(LIB_KPARTS) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT) -lDCOP libkplayernoinst.la
libkplayerpart_la_METASOURCES = kplayerpart.moc
# Uncomment the following two lines if you add a ui.rc file for your application to make use of KDEs XML GUI builing
diff --git a/kplayer/x11.cpp b/kplayer/x11.cpp
index 6dfa6ec..63e4719 100644
--- a/kplayer/x11.cpp
+++ b/kplayer/x11.cpp
@@ -13,11 +13,10 @@
* (at your option) any later version. *
***************************************************************************/
-#include <X11/Xlib.h>
#include <kdebug.h>
+#include <X11/Xlib.h>
#ifdef DEBUG
-#include <kdebug.h>
kdbgstream kdDebugTime (void);
#define DEBUG_KPLAYER_GRAB
//#define DEBUG_KPLAYER_PROPERTY