diff options
Diffstat (limited to 'src/part')
-rw-r--r-- | src/part/CMakeLists.txt | 36 | ||||
-rw-r--r-- | src/part/SConscript | 12 | ||||
-rw-r--r-- | src/part/part.cpp | 8 | ||||
-rw-r--r-- | src/part/toolbar.cpp | 6 | ||||
-rw-r--r-- | src/part/videoWindow.cpp | 8 | ||||
-rw-r--r-- | src/part/videoWindow.h | 4 | ||||
-rw-r--r-- | src/part/xineEngine.cpp | 12 |
7 files changed, 56 insertions, 30 deletions
diff --git a/src/part/CMakeLists.txt b/src/part/CMakeLists.txt new file mode 100644 index 0000000..d544001 --- /dev/null +++ b/src/part/CMakeLists.txt @@ -0,0 +1,36 @@ +include_directories( + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_BINARY_DIR} + ${TDE_INCLUDE_DIR} + ${TQT_INCLUDE_DIRS} + ${XINE_INCLUDE_DIRS} + ${X11_INCLUDE_DIR} +) + +link_directories( + ${TQT_LIBRARY_DIRS} + ${TDE_LIB_DIR} +) + + + +##### codeine (shared) + +tde_add_library( ${PROJECT_NAME} SHARED AUTOMOC + + SOURCES + part.cpp + xineEngine.cpp + videoWindow.cpp + toolbar.cpp + ../mxcl.library.cpp + LINK + tdecore-shared + tdeui-shared + tdeparts-shared + ${XINE_LIBRARIES} + ${X11_LIBRARIES} + + DESTINATION ${LIB_INSTALL_DIR} +) diff --git a/src/part/SConscript b/src/part/SConscript deleted file mode 100644 index ff2d085..0000000 --- a/src/part/SConscript +++ /dev/null @@ -1,12 +0,0 @@ -# Copyright 2005 Max Howell <[email protected]> - -Import( "*" ) -myenv=env.Copy() - -## Additional paths for compiling the source files -## Always add '../' (top-level directory) because moc makes code that needs it -KDEaddpaths( ['./', '../', '../../'], myenv ) - -KDEaddlibs( ['tqt-mt', 'tdecore', 'tdeui', 'tdeparts', 'xine'], myenv ) - -KDEshlib( "libcodeine", Split( "part.cpp xineEngine.cpp videoWindow.cpp toolbar.cpp ../mxcl.library.cpp" ), myenv ) diff --git a/src/part/part.cpp b/src/part/part.cpp index f251731..6490e67 100644 --- a/src/part/part.cpp +++ b/src/part/part.cpp @@ -1,17 +1,17 @@ // Author: Max Howell <[email protected]>, (C) 2005
// Copyright: See COPYING file that comes with this distribution
-#include "codeine.h"
-#include "debug.h"
+#include "../codeine.h"
+#include "../debug.h"
#include <tdeaboutdata.h>
#include <tdeparts/genericfactory.h>
#include "part.h"
-#include <ntqtimer.h>
+#include <tqtimer.h>
#include "toolbar.h"
#include "videoWindow.h"
#include <tdeaction.h>
-#include <ntqslider.h>
+#include <tqslider.h>
namespace Codeine
{
diff --git a/src/part/toolbar.cpp b/src/part/toolbar.cpp index 87caa62..cdf85c3 100644 --- a/src/part/toolbar.cpp +++ b/src/part/toolbar.cpp @@ -2,8 +2,8 @@ // See COPYING file for licensing information #include <kpushbutton.h> -#include <ntqapplication.h> -#include <ntqevent.h> +#include <tqapplication.h> +#include <tqevent.h> #include "toolbar.h" @@ -41,4 +41,4 @@ MouseOverToolBar::eventFilter( TQObject *o, TQEvent *e ) } return false; -}
\ No newline at end of file +} diff --git a/src/part/videoWindow.cpp b/src/part/videoWindow.cpp index 53cd0dd..79d09ae 100644 --- a/src/part/videoWindow.cpp +++ b/src/part/videoWindow.cpp @@ -4,10 +4,10 @@ #define CODEINE_DEBUG_PREFIX "videoWindow" #include <cstdlib> -#include "debug.h" -#include <ntqapplication.h> //sendEvent() -#include <ntqcursor.h> -#include <ntqevent.h> +#include "../debug.h" +#include <tqapplication.h> //sendEvent() +#include <tqcursor.h> +#include <tqevent.h> #include "videoWindow.h" #include <X11/Xlib.h> //TODO this breaks compile for lots of people due to excessive macro content #include <xine.h> //x11_visual_t diff --git a/src/part/videoWindow.h b/src/part/videoWindow.h index 0d0e4d5..76d2b6c 100644 --- a/src/part/videoWindow.h +++ b/src/part/videoWindow.h @@ -5,8 +5,8 @@ #define CODEINE_VIDEO_WINDOW_H #include "../codeine.h" -#include <ntqtimer.h> -#include <ntqwidget.h> +#include <tqtimer.h> +#include <tqwidget.h> #include <kurl.h> typedef struct xine_s xine_t; diff --git a/src/part/xineEngine.cpp b/src/part/xineEngine.cpp index 8424f37..5069e40 100644 --- a/src/part/xineEngine.cpp +++ b/src/part/xineEngine.cpp @@ -3,13 +3,13 @@ #define CODEINE_DEBUG_PREFIX "engine" -#include "debug.h" +#include "../debug.h" #include <tdeglobalsettings.h> #include <tdelocale.h> -#include "mxcl.library.h" -#include <ntqapplication.h> //::sendEvent() -#include <ntqdatetime.h> //::play() -#include <ntqdir.h> //TQDir::homeDir() +#include "../mxcl.library.h" +#include <tqapplication.h> //::sendEvent() +#include <tqdatetime.h> //::play() +#include <tqdir.h> //TQDir::homeDir() #include <xine.h> #include "videoWindow.h" @@ -343,3 +343,5 @@ VideoWindow::xineEventListener( void *p, const xine_event_t* xineEvent ) } } //namespace Codeine + +#include "videoWindow.moc" |