summaryrefslogtreecommitdiff
path: root/core/multimedia/opieplayer
Side-by-side diff
Diffstat (limited to 'core/multimedia/opieplayer') (more/less context) (ignore whitespace changes)
-rw-r--r--core/multimedia/opieplayer/Makefile.in92
-rw-r--r--core/multimedia/opieplayer/libflash/libflash.pro4
-rw-r--r--core/multimedia/opieplayer/libmad/Makefile.in6
-rw-r--r--core/multimedia/opieplayer/libmad/libmad.pro4
-rw-r--r--core/multimedia/opieplayer/libmpeg3/Makefile.in6
-rw-r--r--core/multimedia/opieplayer/libmpeg3/libmpeg3.pro4
-rw-r--r--core/multimedia/opieplayer/mpegplayer.pro10
-rw-r--r--core/multimedia/opieplayer/wavplugin/Makefile.in6
-rw-r--r--core/multimedia/opieplayer/wavplugin/wavplugin.pro4
9 files changed, 68 insertions, 68 deletions
diff --git a/core/multimedia/opieplayer/Makefile.in b/core/multimedia/opieplayer/Makefile.in
index 5fca66e..6e007ec 100644
--- a/core/multimedia/opieplayer/Makefile.in
+++ b/core/multimedia/opieplayer/Makefile.in
@@ -4,8 +4,8 @@
CXX = $(SYSCONF_CXX) $(QT_CXX_MT)
-CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) -DQCONFIG=\"qpe\"
+CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS)
CC = $(SYSCONF_CC) $(QT_C_MT)
-CFLAGS = $(SYSCONF_CFLAGS) -DQCONFIG=\"qpe\"
-INCPATH = -I$(QPEDIR)/include
+CFLAGS = $(SYSCONF_CFLAGS)
+INCPATH = -I$(OPIEDIR)/include
LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
LIBS = $(SUBLIBS) -lqpe -lpthread $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP)
@@ -15,5 +15,5 @@ UIC = $(SYSCONF_UIC)
####### Target
-DESTDIR = $(QPEDIR)/bin/
+DESTDIR = $(OPIEDIR)/bin/
VER_MAJ = 1
VER_MIN = 0
@@ -136,39 +136,39 @@ REQUIRES=
main.o: main.cpp \
- $(QPEDIR)/include/qpe/qpeapplication.h \
+ $(OPIEDIR)/include/qpe/qpeapplication.h \
mediaplayerstate.h \
playlistwidget.h \
- $(QPEDIR)/include/qpe/applnk.h \
+ $(OPIEDIR)/include/qpe/applnk.h \
audiowidget.h \
videowidget.h \
loopcontrol.h \
mediaplayer.h \
- $(QPEDIR)/include/qpe/qlibrary.h \
- $(QPEDIR)/include/qpe/qcom.h \
- $(QPEDIR)/include/qpe/quuid.h \
+ $(OPIEDIR)/include/qpe/qlibrary.h \
+ $(OPIEDIR)/include/qpe/qcom.h \
+ $(OPIEDIR)/include/qpe/quuid.h \
mediaplayerplugininterface.h
loopcontrol.o: loopcontrol.cpp \
- $(QPEDIR)/include/qpe/qpeapplication.h \
- $(QPEDIR)/include/qpe/qcopenvelope_qws.h \
+ $(OPIEDIR)/include/qpe/qpeapplication.h \
+ $(OPIEDIR)/include/qpe/qcopenvelope_qws.h \
loopcontrol.h \
videowidget.h \
audiodevice.h \
mediaplayerplugininterface.h \
- $(QPEDIR)/include/qpe/qcom.h \
- $(QPEDIR)/include/qpe/quuid.h \
+ $(OPIEDIR)/include/qpe/qcom.h \
+ $(OPIEDIR)/include/qpe/quuid.h \
mediaplayerstate.h
playlistselection.o: playlistselection.cpp \
- $(QPEDIR)/include/qpe/applnk.h \
- $(QPEDIR)/include/qpe/resource.h \
+ $(OPIEDIR)/include/qpe/applnk.h \
+ $(OPIEDIR)/include/qpe/resource.h \
playlistselection.h
mediaplayerstate.o: mediaplayerstate.cpp \
- $(QPEDIR)/include/qpe/qpeapplication.h \
- $(QPEDIR)/include/qpe/qlibrary.h \
- $(QPEDIR)/include/qpe/qcom.h \
- $(QPEDIR)/include/qpe/quuid.h \
- $(QPEDIR)/include/qpe/config.h \
+ $(OPIEDIR)/include/qpe/qpeapplication.h \
+ $(OPIEDIR)/include/qpe/qlibrary.h \
+ $(OPIEDIR)/include/qpe/qcom.h \
+ $(OPIEDIR)/include/qpe/quuid.h \
+ $(OPIEDIR)/include/qpe/config.h \
mediaplayerplugininterface.h \
mediaplayerstate.h \
@@ -178,24 +178,24 @@ mediaplayerstate.o: mediaplayerstate.cpp \
videowidget.o: videowidget.cpp \
- $(QPEDIR)/include/qpe/resource.h \
+ $(OPIEDIR)/include/qpe/resource.h \
videowidget.h \
mediaplayerplugininterface.h \
- $(QPEDIR)/include/qpe/qcom.h \
- $(QPEDIR)/include/qpe/quuid.h \
+ $(OPIEDIR)/include/qpe/qcom.h \
+ $(OPIEDIR)/include/qpe/quuid.h \
mediaplayerstate.h
audiowidget.o: audiowidget.cpp \
- $(QPEDIR)/include/qpe/resource.h \
+ $(OPIEDIR)/include/qpe/resource.h \
audiowidget.h \
mediaplayerstate.h
playlistwidget.o: playlistwidget.cpp \
- $(QPEDIR)/include/qpe/qpemenubar.h \
- $(QPEDIR)/include/qpe/qpetoolbar.h \
- $(QPEDIR)/include/qpe/fileselector.h \
- $(QPEDIR)/include/qpe/applnk.h \
- $(QPEDIR)/include/qpe/config.h \
- $(QPEDIR)/include/qpe/global.h \
- $(QPEDIR)/include/qpe/resource.h \
+ $(OPIEDIR)/include/qpe/qpemenubar.h \
+ $(OPIEDIR)/include/qpe/qpetoolbar.h \
+ $(OPIEDIR)/include/qpe/fileselector.h \
+ $(OPIEDIR)/include/qpe/applnk.h \
+ $(OPIEDIR)/include/qpe/config.h \
+ $(OPIEDIR)/include/qpe/global.h \
+ $(OPIEDIR)/include/qpe/resource.h \
playlistselection.h \
playlistwidget.h \
@@ -203,14 +203,14 @@ playlistwidget.o: playlistwidget.cpp \
mediaplayer.o: mediaplayer.cpp \
- $(QPEDIR)/include/qpe/qpeapplication.h \
- $(QPEDIR)/include/qpe/qlibrary.h \
- $(QPEDIR)/include/qpe/qcom.h \
- $(QPEDIR)/include/qpe/quuid.h \
- $(QPEDIR)/include/qpe/resource.h \
- $(QPEDIR)/include/qpe/config.h \
+ $(OPIEDIR)/include/qpe/qpeapplication.h \
+ $(OPIEDIR)/include/qpe/qlibrary.h \
+ $(OPIEDIR)/include/qpe/qcom.h \
+ $(OPIEDIR)/include/qpe/quuid.h \
+ $(OPIEDIR)/include/qpe/resource.h \
+ $(OPIEDIR)/include/qpe/config.h \
mediaplayer.h \
mediaplayerplugininterface.h \
playlistwidget.h \
- $(QPEDIR)/include/qpe/applnk.h \
+ $(OPIEDIR)/include/qpe/applnk.h \
audiowidget.h \
loopcontrol.h \
@@ -219,8 +219,8 @@ mediaplayer.o: mediaplayer.cpp \
audiodevice.o: audiodevice.cpp \
- $(QPEDIR)/include/qpe/qpeapplication.h \
- $(QPEDIR)/include/qpe/config.h \
+ $(OPIEDIR)/include/qpe/qpeapplication.h \
+ $(OPIEDIR)/include/qpe/config.h \
audiodevice.h \
- $(QPEDIR)/include/qpe/qcopenvelope_qws.h
+ $(OPIEDIR)/include/qpe/qcopenvelope_qws.h
moc_loopcontrol.o: moc_loopcontrol.cpp \
@@ -229,5 +229,5 @@ moc_loopcontrol.o: moc_loopcontrol.cpp \
moc_playlistselection.o: moc_playlistselection.cpp \
playlistselection.h \
- $(QPEDIR)/include/qpe/applnk.h
+ $(OPIEDIR)/include/qpe/applnk.h
moc_mediaplayerstate.o: moc_mediaplayerstate.cpp \
@@ -242,11 +242,11 @@ moc_audiowidget.o: moc_audiowidget.cpp \
moc_playlistwidget.o: moc_playlistwidget.cpp \
playlistwidget.h \
- $(QPEDIR)/include/qpe/applnk.h
+ $(OPIEDIR)/include/qpe/applnk.h
moc_mediaplayer.o: moc_mediaplayer.cpp \
mediaplayer.h \
- $(QPEDIR)/include/qpe/qlibrary.h \
- $(QPEDIR)/include/qpe/qcom.h \
- $(QPEDIR)/include/qpe/quuid.h \
+ $(OPIEDIR)/include/qpe/qlibrary.h \
+ $(OPIEDIR)/include/qpe/qcom.h \
+ $(OPIEDIR)/include/qpe/quuid.h \
mediaplayerplugininterface.h
diff --git a/core/multimedia/opieplayer/libflash/libflash.pro b/core/multimedia/opieplayer/libflash/libflash.pro
index d144f0b..bf97fbf 100644
--- a/core/multimedia/opieplayer/libflash/libflash.pro
+++ b/core/multimedia/opieplayer/libflash/libflash.pro
@@ -9,6 +9,6 @@ SOURCES = libflashplugin.cpp libflashpluginimpl.cpp \
TARGET = flashplugin
DESTDIR = ../../plugins/codecs
-INCLUDEPATH += $(QPEDIR)/include ..
-DEPENDPATH += ../$(QPEDIR)/include ..
+INCLUDEPATH += $(OPIEDIR)/include ..
+DEPENDPATH += ../$(OPIEDIR)/include ..
LIBS += -lqpe
VERSION = 1.0.0
diff --git a/core/multimedia/opieplayer/libmad/Makefile.in b/core/multimedia/opieplayer/libmad/Makefile.in
index 9e17769..19ded26 100644
--- a/core/multimedia/opieplayer/libmad/Makefile.in
+++ b/core/multimedia/opieplayer/libmad/Makefile.in
@@ -4,8 +4,8 @@
CXX = $(SYSCONF_CXX) $(QT_CXX_MT)
-CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB) -DQCONFIG=\"qpe\"
+CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB)
CC = $(SYSCONF_CC) $(QT_C_MT)
-CFLAGS = $(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB) -DQCONFIG=\"qpe\"
-INCPATH = -I$(QPEDIR)/include -I..
+CFLAGS = $(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB)
+INCPATH = -I$(OPIEDIR)/include -I..
LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
LIBS = $(SUBLIBS) -lqpe -lm $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP)
diff --git a/core/multimedia/opieplayer/libmad/libmad.pro b/core/multimedia/opieplayer/libmad/libmad.pro
index e3f75b7..6c40a15 100644
--- a/core/multimedia/opieplayer/libmad/libmad.pro
+++ b/core/multimedia/opieplayer/libmad/libmad.pro
@@ -7,6 +7,6 @@ SOURCES = version.c fixed.c bit.c timer.c stream.c frame.c synth.c dec
TARGET = madplugin
DESTDIR = ../../plugins/codecs
-INCLUDEPATH += $(QPEDIR)/include ..
-DEPENDPATH += ../$(QPEDIR)/include ..
+INCLUDEPATH += $(OPIEDIR)/include ..
+DEPENDPATH += ../$(OPIEDIR)/include ..
LIBS += -lqpe -lm
VERSION = 1.0.0
diff --git a/core/multimedia/opieplayer/libmpeg3/Makefile.in b/core/multimedia/opieplayer/libmpeg3/Makefile.in
index 1817902..9881815 100644
--- a/core/multimedia/opieplayer/libmpeg3/Makefile.in
+++ b/core/multimedia/opieplayer/libmpeg3/Makefile.in
@@ -4,8 +4,8 @@
CXX = $(SYSCONF_CXX) $(QT_CXX_MT)
-CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB) -DQCONFIG=\"qpe\"
+CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB)
CC = $(SYSCONF_CC) $(QT_C_MT)
-CFLAGS = $(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB) -DQCONFIG=\"qpe\"
-INCPATH = -I$(QPEDIR)/include -I..
+CFLAGS = $(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB)
+INCPATH = -I$(OPIEDIR)/include -I..
LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
LIBS = $(SUBLIBS) -lqpe -lpthread -lm $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP)
diff --git a/core/multimedia/opieplayer/libmpeg3/libmpeg3.pro b/core/multimedia/opieplayer/libmpeg3/libmpeg3.pro
index e2c35d3..b1426d1 100644
--- a/core/multimedia/opieplayer/libmpeg3/libmpeg3.pro
+++ b/core/multimedia/opieplayer/libmpeg3/libmpeg3.pro
@@ -37,6 +37,6 @@ SOURCES = libmpeg3plugin.cpp libmpeg3pluginimpl.cpp \
TARGET = mpeg3plugin
DESTDIR = ../../plugins/codecs
-INCLUDEPATH += $(QPEDIR)/include ..
-DEPENDPATH += ../$(QPEDIR)/include ..
+INCLUDEPATH += $(OPIEDIR)/include ..
+DEPENDPATH += ../$(OPIEDIR)/include ..
LIBS += -lqpe -lpthread -lm
VERSION = 1.0.0
diff --git a/core/multimedia/opieplayer/mpegplayer.pro b/core/multimedia/opieplayer/mpegplayer.pro
index d6952f8..3b8d4b0 100644
--- a/core/multimedia/opieplayer/mpegplayer.pro
+++ b/core/multimedia/opieplayer/mpegplayer.pro
@@ -1,5 +1,5 @@
TEMPLATE = app
CONFIG = qt warn_on release
-DESTDIR = $(QPEDIR)/bin
+DESTDIR = $(OPIEDIR)/bin
HEADERS = loopcontrol.h mediaplayerplugininterface.h playlistselection.h mediaplayerstate.h \
videowidget.h audiowidget.h playlistwidget.h mediaplayer.h audiodevice.h
@@ -8,14 +8,14 @@ SOURCES = main.cpp \
videowidget.cpp audiowidget.cpp playlistwidget.cpp mediaplayer.cpp audiodevice.cpp
TARGET = mpegplayer
-INCLUDEPATH += $(QPEDIR)/include
-DEPENDPATH += $(QPEDIR)/include
+INCLUDEPATH += $(OPIEDIR)/include
+DEPENDPATH += $(OPIEDIR)/include
LIBS += -lqpe -lpthread
# INTERFACES =
-# INCLUDEPATH += $(QPEDIR)/include
+# INCLUDEPATH += $(OPIEDIR)/include
# CONFIG+=static
# TMAKE_CXXFLAGS += -DQPIM_STANDALONE
# LIBS += libmpeg3/libmpeg3.a -lpthread
-# LIBS += $(QPEDIR)/plugins/codecs/liblibmadplugin.so
+# LIBS += $(OPIEDIR)/plugins/codecs/liblibmadplugin.so
TRANSLATIONS = ../i18n/de/mpegplayer.ts
diff --git a/core/multimedia/opieplayer/wavplugin/Makefile.in b/core/multimedia/opieplayer/wavplugin/Makefile.in
index c9203f8..e9fec6c 100644
--- a/core/multimedia/opieplayer/wavplugin/Makefile.in
+++ b/core/multimedia/opieplayer/wavplugin/Makefile.in
@@ -4,8 +4,8 @@
CXX = $(SYSCONF_CXX) $(QT_CXX_MT)
-CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB) -DQCONFIG=\"qpe\"
+CXXFLAGS= $(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB)
CC = $(SYSCONF_CC) $(QT_C_MT)
-CFLAGS = $(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB) -DQCONFIG=\"qpe\"
-INCPATH = -I$(QPEDIR)/include -I..
+CFLAGS = $(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB)
+INCPATH = -I$(OPIEDIR)/include -I..
LFLAGS = $(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT)
LIBS = $(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP)
diff --git a/core/multimedia/opieplayer/wavplugin/wavplugin.pro b/core/multimedia/opieplayer/wavplugin/wavplugin.pro
index 4663813..2160431 100644
--- a/core/multimedia/opieplayer/wavplugin/wavplugin.pro
+++ b/core/multimedia/opieplayer/wavplugin/wavplugin.pro
@@ -5,6 +5,6 @@ SOURCES = wavplugin.cpp wavpluginimpl.cpp
TARGET = wavplugin
DESTDIR = ../../plugins/codecs
-INCLUDEPATH += $(QPEDIR)/include ..
-DEPENDPATH += ../$(QPEDIR)/include ..
+INCLUDEPATH += $(OPIEDIR)/include ..
+DEPENDPATH += ../$(OPIEDIR)/include ..
LIBS += -lqpe
VERSION = 1.0.0