-rw-r--r-- | core/multimedia/opieplayer/Makefile.in | 92 | ||||
-rw-r--r-- | core/multimedia/opieplayer/libflash/libflash.pro | 4 | ||||
-rw-r--r-- | core/multimedia/opieplayer/libmad/Makefile.in | 6 | ||||
-rw-r--r-- | core/multimedia/opieplayer/libmad/libmad.pro | 4 | ||||
-rw-r--r-- | core/multimedia/opieplayer/libmpeg3/Makefile.in | 6 | ||||
-rw-r--r-- | core/multimedia/opieplayer/libmpeg3/libmpeg3.pro | 4 | ||||
-rw-r--r-- | core/multimedia/opieplayer/mpegplayer.pro | 10 | ||||
-rw-r--r-- | core/multimedia/opieplayer/wavplugin/Makefile.in | 6 | ||||
-rw-r--r-- | core/multimedia/opieplayer/wavplugin/wavplugin.pro | 4 |
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 @@ -5,6 +5,6 @@ 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) @@ -16,3 +16,3 @@ UIC = $(SYSCONF_UIC) -DESTDIR = $(QPEDIR)/bin/ +DESTDIR = $(OPIEDIR)/bin/ VER_MAJ = 1 @@ -137,6 +137,6 @@ 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 \ @@ -145,5 +145,5 @@ main.o: main.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 @@ -151,4 +151,4 @@ main.o: main.cpp \ 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 \ @@ -157,4 +157,4 @@ loopcontrol.o: loopcontrol.cpp \ mediaplayerplugininterface.h \ - $(QPEDIR)/include/qpe/qcom.h \ - $(QPEDIR)/include/qpe/quuid.h \ + $(OPIEDIR)/include/qpe/qcom.h \ + $(OPIEDIR)/include/qpe/quuid.h \ mediaplayerstate.h @@ -162,4 +162,4 @@ loopcontrol.o: loopcontrol.cpp \ 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 @@ -167,7 +167,7 @@ playlistselection.o: playlistselection.cpp \ 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 \ @@ -179,7 +179,7 @@ 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 @@ -187,3 +187,3 @@ videowidget.o: videowidget.cpp \ audiowidget.o: audiowidget.cpp \ - $(QPEDIR)/include/qpe/resource.h \ + $(OPIEDIR)/include/qpe/resource.h \ audiowidget.h \ @@ -192,9 +192,9 @@ audiowidget.o: audiowidget.cpp \ 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 \ @@ -204,8 +204,8 @@ 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 \ @@ -213,3 +213,3 @@ mediaplayer.o: mediaplayer.cpp \ playlistwidget.h \ - $(QPEDIR)/include/qpe/applnk.h \ + $(OPIEDIR)/include/qpe/applnk.h \ audiowidget.h \ @@ -220,6 +220,6 @@ 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 @@ -230,3 +230,3 @@ moc_playlistselection.o: moc_playlistselection.cpp \ playlistselection.h \ - $(QPEDIR)/include/qpe/applnk.h + $(OPIEDIR)/include/qpe/applnk.h @@ -243,3 +243,3 @@ moc_playlistwidget.o: moc_playlistwidget.cpp \ playlistwidget.h \ - $(QPEDIR)/include/qpe/applnk.h + $(OPIEDIR)/include/qpe/applnk.h @@ -247,5 +247,5 @@ 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 @@ -10,4 +10,4 @@ TARGET = flashplugin DESTDIR = ../../plugins/codecs -INCLUDEPATH += $(QPEDIR)/include .. -DEPENDPATH += ../$(QPEDIR)/include .. +INCLUDEPATH += $(OPIEDIR)/include .. +DEPENDPATH += ../$(OPIEDIR)/include .. LIBS += -lqpe 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 @@ -5,6 +5,6 @@ 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) 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 @@ -8,4 +8,4 @@ TARGET = madplugin DESTDIR = ../../plugins/codecs -INCLUDEPATH += $(QPEDIR)/include .. -DEPENDPATH += ../$(QPEDIR)/include .. +INCLUDEPATH += $(OPIEDIR)/include .. +DEPENDPATH += ../$(OPIEDIR)/include .. LIBS += -lqpe -lm 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 @@ -5,6 +5,6 @@ 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) 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 @@ -38,4 +38,4 @@ TARGET = mpeg3plugin DESTDIR = ../../plugins/codecs -INCLUDEPATH += $(QPEDIR)/include .. -DEPENDPATH += ../$(QPEDIR)/include .. +INCLUDEPATH += $(OPIEDIR)/include .. +DEPENDPATH += ../$(OPIEDIR)/include .. LIBS += -lqpe -lpthread -lm 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 @@ -2,3 +2,3 @@ TEMPLATE = app CONFIG = qt warn_on release -DESTDIR = $(QPEDIR)/bin +DESTDIR = $(OPIEDIR)/bin HEADERS = loopcontrol.h mediaplayerplugininterface.h playlistselection.h mediaplayerstate.h \ @@ -9,4 +9,4 @@ SOURCES = main.cpp \ TARGET = mpegplayer -INCLUDEPATH += $(QPEDIR)/include -DEPENDPATH += $(QPEDIR)/include +INCLUDEPATH += $(OPIEDIR)/include +DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe -lpthread @@ -14,3 +14,3 @@ LIBS += -lqpe -lpthread # INTERFACES = -# INCLUDEPATH += $(QPEDIR)/include +# INCLUDEPATH += $(OPIEDIR)/include # CONFIG+=static @@ -18,3 +18,3 @@ LIBS += -lqpe -lpthread # LIBS += libmpeg3/libmpeg3.a -lpthread -# LIBS += $(QPEDIR)/plugins/codecs/liblibmadplugin.so +# LIBS += $(OPIEDIR)/plugins/codecs/liblibmadplugin.so 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 @@ -5,6 +5,6 @@ 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) 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 @@ -6,4 +6,4 @@ TARGET = wavplugin DESTDIR = ../../plugins/codecs -INCLUDEPATH += $(QPEDIR)/include .. -DEPENDPATH += ../$(QPEDIR)/include .. +INCLUDEPATH += $(OPIEDIR)/include .. +DEPENDPATH += ../$(OPIEDIR)/include .. LIBS += -lqpe |