author | kergoth <kergoth> | 2002-01-28 23:28:04 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2002-01-28 23:28:04 (UTC) |
commit | f7b3193e5d2d9a211ce0b963dca571d82adecb71 (patch) (unidiff) | |
tree | 44f49bdc076dc299bba1a4dc8d5d517114be5701 /core/multimedia | |
parent | 77d110d35f75d63f5dc66c1dd2427daf7dc2e214 (diff) | |
download | opie-f7b3193e5d2d9a211ce0b963dca571d82adecb71.zip opie-f7b3193e5d2d9a211ce0b963dca571d82adecb71.tar.gz opie-f7b3193e5d2d9a211ce0b963dca571d82adecb71.tar.bz2 |
Committing in .
Modified Files:
configure mkipks addressbook/Makefile.in
addressbook/addressbook.pro calc2/calc.pro
calc2/binary/binary.pro calc2/simple/simple.pro
calculator/Makefile.in calculator/calculator.pro
cardmon/Makefile.in cardmon/cardmon.pro chess/chess.pro
citytime/Makefile.in citytime/citytime.pro clock/Makefile.in
clock/clock.pro datebook/Makefile.in datebook/datebook.pro
dictionary/dictionary.pro doc/qcop.doc doc/start.doc
embeddedkonsole/Makefile.in
embeddedkonsole/embeddedkonsole.pro etc/init.d/qpe
example/example.pro fifteen/Makefile.in fifteen/fifteen.pro
filebrowser/Makefile.in filebrowser/filebrowser.pro
freetype/freetype.pro go/Makefile.in go/go.pro
helpbrowser/Makefile.in helpbrowser/helpbrowser.pro
inputmethods/handwriting/Makefile.in
inputmethods/handwriting/handwriting.pro
inputmethods/keyboard/Makefile.in
inputmethods/keyboard/keyboard.pro
inputmethods/pickboard/Makefile.in
inputmethods/pickboard/pickboard.pro
inputmethods/unikeyboard/Makefile.in
inputmethods/unikeyboard/unikeyboard.pro keypebble/Makefile.in
keypebble/keypebble.pro library/Makefile.in library/global.cpp
library/library.pro library/qpeapplication.cpp
mindbreaker/Makefile.in mindbreaker/mindbreaker.pro
minesweep/Makefile.in minesweep/minesweep.pro
mpegplayer/Makefile.in mpegplayer/mpegplayer.pro
mpegplayer/libflash/libflash.pro mpegplayer/libmad/Makefile.in
mpegplayer/libmad/libmad.pro mpegplayer/libmpeg3/Makefile.in
mpegplayer/libmpeg3/libmpeg3.pro
mpegplayer/libmpeg3/audio/Makefile
mpegplayer/libmpeg3/video/Makefile
mpegplayer/wavplugin/Makefile.in
mpegplayer/wavplugin/wavplugin.pro netsetup/Makefile.in
netsetup/README netsetup/netsetup.pro
netsetup/dialup/Makefile.in netsetup/dialup/dialup.pro
netsetup/lan/Makefile.in netsetup/lan/lan.pro
parashoot/Makefile.in parashoot/parashoot.pro
qasteroids/Makefile.in qasteroids/qasteroids.pro
qcop/Makefile.in qcop/qcop.pro qipkg/Makefile.in
qipkg/qipkg.pro scripts/q_functions
settings/appearance/Makefile.in
settings/appearance/appearance.pro
settings/language/Makefile.in settings/language/language.pro
settings/light-and-power/Makefile.in
settings/light-and-power/light-and-power.pro
settings/rotation/Makefile.in settings/rotation/rotation.pro
settings/security/Makefile.in settings/security/security.pro
settings/sound/Makefile.in settings/sound/sound.pro
settings/systemtime/Makefile.in
settings/systemtime/systemtime.pro showimg/Makefile.in
showimg/showimg.pro single/Makefile.in single/single.pro
snake/Makefile.in snake/snake.pro solitaire/Makefile.in
solitaire/solitaire.pro spreadsheet/Makefile.in
spreadsheet/spreadsheet.pro sysinfo/Makefile.in
sysinfo/sysinfo.pro tableviewer/tableviewer.pro
taskbar/Makefile.in taskbar/main.cpp taskbar/taskbar.pro
taskbar/batteryapplet/Makefile.in
taskbar/batteryapplet/batteryapplet.pro
taskbar/clipboardapplet/clipboardapplet.pro
taskbar/clockapplet/Makefile.in
taskbar/clockapplet/clockapplet.pro
taskbar/netmonapplet/Makefile.in
taskbar/netmonapplet/netmonapplet.pro
taskbar/volumeapplet/Makefile.in
taskbar/volumeapplet/volumeapplet.pro tetrix/Makefile.in
tetrix/tetrix.pro textedit/Makefile.in textedit/textedit.pro
todo/Makefile.in todo/todo.pro tux/Makefile.in tux/tux.pro
website/htdocs/build.html website/htdocs/development.html
website/htdocs/refman/qcop.html
website/htdocs/refman/qpeapplication.html wordgame/Makefile.in
wordgame/wordgame.pro
Log Message:
Changed QPEDIR to OPIEDIR in .pro files, and documentation,
and regenerated all Makefile.in's that were affected.
-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 | |||
@@ -4,8 +4,8 @@ | |||
4 | 4 | ||
5 | CXX =$(SYSCONF_CXX) $(QT_CXX_MT) | 5 | CXX =$(SYSCONF_CXX) $(QT_CXX_MT) |
6 | CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) -DQCONFIG=\"qpe\" | 6 | CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) |
7 | CC =$(SYSCONF_CC) $(QT_C_MT) | 7 | CC =$(SYSCONF_CC) $(QT_C_MT) |
8 | CFLAGS =$(SYSCONF_CFLAGS) -DQCONFIG=\"qpe\" | 8 | CFLAGS =$(SYSCONF_CFLAGS) |
9 | INCPATH =-I$(QPEDIR)/include | 9 | INCPATH =-I$(OPIEDIR)/include |
10 | LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) | 10 | LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) |
11 | LIBS =$(SUBLIBS) -lqpe -lpthread $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP) | 11 | LIBS =$(SUBLIBS) -lqpe -lpthread $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS) $(SYSCONF_LIBS_QTAPP) |
@@ -15,5 +15,5 @@ UIC = $(SYSCONF_UIC) | |||
15 | ####### Target | 15 | ####### Target |
16 | 16 | ||
17 | DESTDIR = $(QPEDIR)/bin/ | 17 | DESTDIR = $(OPIEDIR)/bin/ |
18 | VER_MAJ = 1 | 18 | VER_MAJ = 1 |
19 | VER_MIN = 0 | 19 | VER_MIN = 0 |
@@ -136,39 +136,39 @@ REQUIRES= | |||
136 | 136 | ||
137 | main.o: main.cpp \ | 137 | main.o: main.cpp \ |
138 | $(QPEDIR)/include/qpe/qpeapplication.h \ | 138 | $(OPIEDIR)/include/qpe/qpeapplication.h \ |
139 | mediaplayerstate.h \ | 139 | mediaplayerstate.h \ |
140 | playlistwidget.h \ | 140 | playlistwidget.h \ |
141 | $(QPEDIR)/include/qpe/applnk.h \ | 141 | $(OPIEDIR)/include/qpe/applnk.h \ |
142 | audiowidget.h \ | 142 | audiowidget.h \ |
143 | videowidget.h \ | 143 | videowidget.h \ |
144 | loopcontrol.h \ | 144 | loopcontrol.h \ |
145 | mediaplayer.h \ | 145 | mediaplayer.h \ |
146 | $(QPEDIR)/include/qpe/qlibrary.h \ | 146 | $(OPIEDIR)/include/qpe/qlibrary.h \ |
147 | $(QPEDIR)/include/qpe/qcom.h \ | 147 | $(OPIEDIR)/include/qpe/qcom.h \ |
148 | $(QPEDIR)/include/qpe/quuid.h \ | 148 | $(OPIEDIR)/include/qpe/quuid.h \ |
149 | mediaplayerplugininterface.h | 149 | mediaplayerplugininterface.h |
150 | 150 | ||
151 | loopcontrol.o: loopcontrol.cpp \ | 151 | loopcontrol.o: loopcontrol.cpp \ |
152 | $(QPEDIR)/include/qpe/qpeapplication.h \ | 152 | $(OPIEDIR)/include/qpe/qpeapplication.h \ |
153 | $(QPEDIR)/include/qpe/qcopenvelope_qws.h \ | 153 | $(OPIEDIR)/include/qpe/qcopenvelope_qws.h \ |
154 | loopcontrol.h \ | 154 | loopcontrol.h \ |
155 | videowidget.h \ | 155 | videowidget.h \ |
156 | audiodevice.h \ | 156 | audiodevice.h \ |
157 | mediaplayerplugininterface.h \ | 157 | mediaplayerplugininterface.h \ |
158 | $(QPEDIR)/include/qpe/qcom.h \ | 158 | $(OPIEDIR)/include/qpe/qcom.h \ |
159 | $(QPEDIR)/include/qpe/quuid.h \ | 159 | $(OPIEDIR)/include/qpe/quuid.h \ |
160 | mediaplayerstate.h | 160 | mediaplayerstate.h |
161 | 161 | ||
162 | playlistselection.o: playlistselection.cpp \ | 162 | playlistselection.o: playlistselection.cpp \ |
163 | $(QPEDIR)/include/qpe/applnk.h \ | 163 | $(OPIEDIR)/include/qpe/applnk.h \ |
164 | $(QPEDIR)/include/qpe/resource.h \ | 164 | $(OPIEDIR)/include/qpe/resource.h \ |
165 | playlistselection.h | 165 | playlistselection.h |
166 | 166 | ||
167 | mediaplayerstate.o: mediaplayerstate.cpp \ | 167 | mediaplayerstate.o: mediaplayerstate.cpp \ |
168 | $(QPEDIR)/include/qpe/qpeapplication.h \ | 168 | $(OPIEDIR)/include/qpe/qpeapplication.h \ |
169 | $(QPEDIR)/include/qpe/qlibrary.h \ | 169 | $(OPIEDIR)/include/qpe/qlibrary.h \ |
170 | $(QPEDIR)/include/qpe/qcom.h \ | 170 | $(OPIEDIR)/include/qpe/qcom.h \ |
171 | $(QPEDIR)/include/qpe/quuid.h \ | 171 | $(OPIEDIR)/include/qpe/quuid.h \ |
172 | $(QPEDIR)/include/qpe/config.h \ | 172 | $(OPIEDIR)/include/qpe/config.h \ |
173 | mediaplayerplugininterface.h \ | 173 | mediaplayerplugininterface.h \ |
174 | mediaplayerstate.h \ | 174 | mediaplayerstate.h \ |
@@ -178,24 +178,24 @@ mediaplayerstate.o: mediaplayerstate.cpp \ | |||
178 | 178 | ||
179 | videowidget.o: videowidget.cpp \ | 179 | videowidget.o: videowidget.cpp \ |
180 | $(QPEDIR)/include/qpe/resource.h \ | 180 | $(OPIEDIR)/include/qpe/resource.h \ |
181 | videowidget.h \ | 181 | videowidget.h \ |
182 | mediaplayerplugininterface.h \ | 182 | mediaplayerplugininterface.h \ |
183 | $(QPEDIR)/include/qpe/qcom.h \ | 183 | $(OPIEDIR)/include/qpe/qcom.h \ |
184 | $(QPEDIR)/include/qpe/quuid.h \ | 184 | $(OPIEDIR)/include/qpe/quuid.h \ |
185 | mediaplayerstate.h | 185 | mediaplayerstate.h |
186 | 186 | ||
187 | audiowidget.o: audiowidget.cpp \ | 187 | audiowidget.o: audiowidget.cpp \ |
188 | $(QPEDIR)/include/qpe/resource.h \ | 188 | $(OPIEDIR)/include/qpe/resource.h \ |
189 | audiowidget.h \ | 189 | audiowidget.h \ |
190 | mediaplayerstate.h | 190 | mediaplayerstate.h |
191 | 191 | ||
192 | playlistwidget.o: playlistwidget.cpp \ | 192 | playlistwidget.o: playlistwidget.cpp \ |
193 | $(QPEDIR)/include/qpe/qpemenubar.h \ | 193 | $(OPIEDIR)/include/qpe/qpemenubar.h \ |
194 | $(QPEDIR)/include/qpe/qpetoolbar.h \ | 194 | $(OPIEDIR)/include/qpe/qpetoolbar.h \ |
195 | $(QPEDIR)/include/qpe/fileselector.h \ | 195 | $(OPIEDIR)/include/qpe/fileselector.h \ |
196 | $(QPEDIR)/include/qpe/applnk.h \ | 196 | $(OPIEDIR)/include/qpe/applnk.h \ |
197 | $(QPEDIR)/include/qpe/config.h \ | 197 | $(OPIEDIR)/include/qpe/config.h \ |
198 | $(QPEDIR)/include/qpe/global.h \ | 198 | $(OPIEDIR)/include/qpe/global.h \ |
199 | $(QPEDIR)/include/qpe/resource.h \ | 199 | $(OPIEDIR)/include/qpe/resource.h \ |
200 | playlistselection.h \ | 200 | playlistselection.h \ |
201 | playlistwidget.h \ | 201 | playlistwidget.h \ |
@@ -203,14 +203,14 @@ playlistwidget.o: playlistwidget.cpp \ | |||
203 | 203 | ||
204 | mediaplayer.o: mediaplayer.cpp \ | 204 | mediaplayer.o: mediaplayer.cpp \ |
205 | $(QPEDIR)/include/qpe/qpeapplication.h \ | 205 | $(OPIEDIR)/include/qpe/qpeapplication.h \ |
206 | $(QPEDIR)/include/qpe/qlibrary.h \ | 206 | $(OPIEDIR)/include/qpe/qlibrary.h \ |
207 | $(QPEDIR)/include/qpe/qcom.h \ | 207 | $(OPIEDIR)/include/qpe/qcom.h \ |
208 | $(QPEDIR)/include/qpe/quuid.h \ | 208 | $(OPIEDIR)/include/qpe/quuid.h \ |
209 | $(QPEDIR)/include/qpe/resource.h \ | 209 | $(OPIEDIR)/include/qpe/resource.h \ |
210 | $(QPEDIR)/include/qpe/config.h \ | 210 | $(OPIEDIR)/include/qpe/config.h \ |
211 | mediaplayer.h \ | 211 | mediaplayer.h \ |
212 | mediaplayerplugininterface.h \ | 212 | mediaplayerplugininterface.h \ |
213 | playlistwidget.h \ | 213 | playlistwidget.h \ |
214 | $(QPEDIR)/include/qpe/applnk.h \ | 214 | $(OPIEDIR)/include/qpe/applnk.h \ |
215 | audiowidget.h \ | 215 | audiowidget.h \ |
216 | loopcontrol.h \ | 216 | loopcontrol.h \ |
@@ -219,8 +219,8 @@ mediaplayer.o: mediaplayer.cpp \ | |||
219 | 219 | ||
220 | audiodevice.o: audiodevice.cpp \ | 220 | audiodevice.o: audiodevice.cpp \ |
221 | $(QPEDIR)/include/qpe/qpeapplication.h \ | 221 | $(OPIEDIR)/include/qpe/qpeapplication.h \ |
222 | $(QPEDIR)/include/qpe/config.h \ | 222 | $(OPIEDIR)/include/qpe/config.h \ |
223 | audiodevice.h \ | 223 | audiodevice.h \ |
224 | $(QPEDIR)/include/qpe/qcopenvelope_qws.h | 224 | $(OPIEDIR)/include/qpe/qcopenvelope_qws.h |
225 | 225 | ||
226 | moc_loopcontrol.o: moc_loopcontrol.cpp \ | 226 | moc_loopcontrol.o: moc_loopcontrol.cpp \ |
@@ -229,5 +229,5 @@ moc_loopcontrol.o: moc_loopcontrol.cpp \ | |||
229 | moc_playlistselection.o: moc_playlistselection.cpp \ | 229 | moc_playlistselection.o: moc_playlistselection.cpp \ |
230 | playlistselection.h \ | 230 | playlistselection.h \ |
231 | $(QPEDIR)/include/qpe/applnk.h | 231 | $(OPIEDIR)/include/qpe/applnk.h |
232 | 232 | ||
233 | moc_mediaplayerstate.o: moc_mediaplayerstate.cpp \ | 233 | moc_mediaplayerstate.o: moc_mediaplayerstate.cpp \ |
@@ -242,11 +242,11 @@ moc_audiowidget.o: moc_audiowidget.cpp \ | |||
242 | moc_playlistwidget.o: moc_playlistwidget.cpp \ | 242 | moc_playlistwidget.o: moc_playlistwidget.cpp \ |
243 | playlistwidget.h \ | 243 | playlistwidget.h \ |
244 | $(QPEDIR)/include/qpe/applnk.h | 244 | $(OPIEDIR)/include/qpe/applnk.h |
245 | 245 | ||
246 | moc_mediaplayer.o: moc_mediaplayer.cpp \ | 246 | moc_mediaplayer.o: moc_mediaplayer.cpp \ |
247 | mediaplayer.h \ | 247 | mediaplayer.h \ |
248 | $(QPEDIR)/include/qpe/qlibrary.h \ | 248 | $(OPIEDIR)/include/qpe/qlibrary.h \ |
249 | $(QPEDIR)/include/qpe/qcom.h \ | 249 | $(OPIEDIR)/include/qpe/qcom.h \ |
250 | $(QPEDIR)/include/qpe/quuid.h \ | 250 | $(OPIEDIR)/include/qpe/quuid.h \ |
251 | mediaplayerplugininterface.h | 251 | mediaplayerplugininterface.h |
252 | 252 | ||
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 \ | |||
9 | TARGET = flashplugin | 9 | TARGET = flashplugin |
10 | DESTDIR = ../../plugins/codecs | 10 | DESTDIR = ../../plugins/codecs |
11 | INCLUDEPATH += $(QPEDIR)/include .. | 11 | INCLUDEPATH += $(OPIEDIR)/include .. |
12 | DEPENDPATH += ../$(QPEDIR)/include .. | 12 | DEPENDPATH += ../$(OPIEDIR)/include .. |
13 | LIBS += -lqpe | 13 | LIBS += -lqpe |
14 | VERSION = 1.0.0 | 14 | 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 @@ | |||
4 | 4 | ||
5 | CXX =$(SYSCONF_CXX) $(QT_CXX_MT) | 5 | CXX =$(SYSCONF_CXX) $(QT_CXX_MT) |
6 | CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB) -DQCONFIG=\"qpe\" | 6 | CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB) |
7 | CC =$(SYSCONF_CC) $(QT_C_MT) | 7 | CC =$(SYSCONF_CC) $(QT_C_MT) |
8 | CFLAGS =$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB) -DQCONFIG=\"qpe\" | 8 | CFLAGS =$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB) |
9 | INCPATH =-I$(QPEDIR)/include -I.. | 9 | INCPATH =-I$(OPIEDIR)/include -I.. |
10 | LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) | 10 | LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) |
11 | LIBS =$(SUBLIBS) -lqpe -lm $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP) | 11 | 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 | |||
7 | TARGET = madplugin | 7 | TARGET = madplugin |
8 | DESTDIR = ../../plugins/codecs | 8 | DESTDIR = ../../plugins/codecs |
9 | INCLUDEPATH += $(QPEDIR)/include .. | 9 | INCLUDEPATH += $(OPIEDIR)/include .. |
10 | DEPENDPATH += ../$(QPEDIR)/include .. | 10 | DEPENDPATH += ../$(OPIEDIR)/include .. |
11 | LIBS += -lqpe -lm | 11 | LIBS += -lqpe -lm |
12 | VERSION = 1.0.0 | 12 | 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 @@ | |||
4 | 4 | ||
5 | CXX =$(SYSCONF_CXX) $(QT_CXX_MT) | 5 | CXX =$(SYSCONF_CXX) $(QT_CXX_MT) |
6 | CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB) -DQCONFIG=\"qpe\" | 6 | CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB) |
7 | CC =$(SYSCONF_CC) $(QT_C_MT) | 7 | CC =$(SYSCONF_CC) $(QT_C_MT) |
8 | CFLAGS =$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB) -DQCONFIG=\"qpe\" | 8 | CFLAGS =$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB) |
9 | INCPATH =-I$(QPEDIR)/include -I.. | 9 | INCPATH =-I$(OPIEDIR)/include -I.. |
10 | LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) | 10 | LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) |
11 | LIBS =$(SUBLIBS) -lqpe -lpthread -lm $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP) | 11 | 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 \ | |||
37 | TARGET = mpeg3plugin | 37 | TARGET = mpeg3plugin |
38 | DESTDIR = ../../plugins/codecs | 38 | DESTDIR = ../../plugins/codecs |
39 | INCLUDEPATH += $(QPEDIR)/include .. | 39 | INCLUDEPATH += $(OPIEDIR)/include .. |
40 | DEPENDPATH += ../$(QPEDIR)/include .. | 40 | DEPENDPATH += ../$(OPIEDIR)/include .. |
41 | LIBS += -lqpe -lpthread -lm | 41 | LIBS += -lqpe -lpthread -lm |
42 | VERSION = 1.0.0 | 42 | 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 @@ | |||
1 | TEMPLATE= app | 1 | TEMPLATE= app |
2 | CONFIG = qt warn_on release | 2 | CONFIG = qt warn_on release |
3 | DESTDIR = $(QPEDIR)/bin | 3 | DESTDIR = $(OPIEDIR)/bin |
4 | HEADERS = loopcontrol.h mediaplayerplugininterface.h playlistselection.h mediaplayerstate.h \ | 4 | HEADERS = loopcontrol.h mediaplayerplugininterface.h playlistselection.h mediaplayerstate.h \ |
5 | videowidget.h audiowidget.h playlistwidget.h mediaplayer.h audiodevice.h | 5 | videowidget.h audiowidget.h playlistwidget.h mediaplayer.h audiodevice.h |
@@ -8,14 +8,14 @@ SOURCES = main.cpp \ | |||
8 | videowidget.cpp audiowidget.cpp playlistwidget.cpp mediaplayer.cpp audiodevice.cpp | 8 | videowidget.cpp audiowidget.cpp playlistwidget.cpp mediaplayer.cpp audiodevice.cpp |
9 | TARGET = mpegplayer | 9 | TARGET = mpegplayer |
10 | INCLUDEPATH+= $(QPEDIR)/include | 10 | INCLUDEPATH+= $(OPIEDIR)/include |
11 | DEPENDPATH+= $(QPEDIR)/include | 11 | DEPENDPATH+= $(OPIEDIR)/include |
12 | LIBS += -lqpe -lpthread | 12 | LIBS += -lqpe -lpthread |
13 | 13 | ||
14 | # INTERFACES= | 14 | # INTERFACES= |
15 | # INCLUDEPATH += $(QPEDIR)/include | 15 | # INCLUDEPATH += $(OPIEDIR)/include |
16 | # CONFIG+=static | 16 | # CONFIG+=static |
17 | # TMAKE_CXXFLAGS += -DQPIM_STANDALONE | 17 | # TMAKE_CXXFLAGS += -DQPIM_STANDALONE |
18 | # LIBS += libmpeg3/libmpeg3.a -lpthread | 18 | # LIBS += libmpeg3/libmpeg3.a -lpthread |
19 | # LIBS += $(QPEDIR)/plugins/codecs/liblibmadplugin.so | 19 | # LIBS += $(OPIEDIR)/plugins/codecs/liblibmadplugin.so |
20 | 20 | ||
21 | TRANSLATIONS = ../i18n/de/mpegplayer.ts | 21 | 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 @@ | |||
4 | 4 | ||
5 | CXX =$(SYSCONF_CXX) $(QT_CXX_MT) | 5 | CXX =$(SYSCONF_CXX) $(QT_CXX_MT) |
6 | CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB) -DQCONFIG=\"qpe\" | 6 | CXXFLAGS=$(SYSCONF_CXXFLAGS_QT) $(SYSCONF_CXXFLAGS) $(SYSCONF_CXXFLAGS_LIB) |
7 | CC =$(SYSCONF_CC) $(QT_C_MT) | 7 | CC =$(SYSCONF_CC) $(QT_C_MT) |
8 | CFLAGS =$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB) -DQCONFIG=\"qpe\" | 8 | CFLAGS =$(SYSCONF_CFLAGS) $(SYSCONF_CFLAGS_LIB) |
9 | INCPATH =-I$(QPEDIR)/include -I.. | 9 | INCPATH =-I$(OPIEDIR)/include -I.. |
10 | LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) | 10 | LFLAGS =$(SYSCONF_LFLAGS_QT) $(SYSCONF_RPATH_QT) $(SYSCONF_LFLAGS) $(QT_LFLAGS_MT) |
11 | LIBS =$(SUBLIBS) -lqpe $(SYSCONF_LIBS_QT) $(SYSCONF_LIBS_QTAPP) | 11 | 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 | |||
5 | TARGET = wavplugin | 5 | TARGET = wavplugin |
6 | DESTDIR = ../../plugins/codecs | 6 | DESTDIR = ../../plugins/codecs |
7 | INCLUDEPATH += $(QPEDIR)/include .. | 7 | INCLUDEPATH += $(OPIEDIR)/include .. |
8 | DEPENDPATH += ../$(QPEDIR)/include .. | 8 | DEPENDPATH += ../$(OPIEDIR)/include .. |
9 | LIBS += -lqpe | 9 | LIBS += -lqpe |
10 | VERSION = 1.0.0 | 10 | VERSION = 1.0.0 |