author | mickeyl <mickeyl> | 2004-12-24 12:58:59 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2004-12-24 12:58:59 (UTC) |
commit | dc57cb439c6c9256f76f78a487942a4d1b2a2e27 (patch) (unidiff) | |
tree | f2b1dc69283c3de30930a650c87be834e04998c9 /core/multimedia | |
parent | 3236db49b0718764bcfe211442354202725a6ff6 (diff) | |
download | opie-dc57cb439c6c9256f76f78a487942a4d1b2a2e27.zip opie-dc57cb439c6c9256f76f78a487942a4d1b2a2e27.tar.gz opie-dc57cb439c6c9256f76f78a487942a4d1b2a2e27.tar.bz2 |
qmake 1.08a has more rigid syntax checking and chokes on our .pro files
-rw-r--r-- | core/multimedia/opieplayer/libflash/libflash.pro | 36 | ||||
-rw-r--r-- | core/multimedia/opieplayer/libmad/libmad.pro | 36 | ||||
-rw-r--r-- | core/multimedia/opieplayer/libmpeg3/libmpeg3.pro | 36 | ||||
-rw-r--r-- | core/multimedia/opieplayer/modplug/modplug.pro | 32 | ||||
-rw-r--r-- | core/multimedia/opieplayer/opieplayer.pro | 36 | ||||
-rw-r--r-- | core/multimedia/opieplayer/vorbis/libtremor.pro | 36 | ||||
-rw-r--r-- | core/multimedia/opieplayer/vorbis/tremor/tremor.pro | 36 | ||||
-rw-r--r-- | core/multimedia/opieplayer/vorbis/vorbis.pro | 36 | ||||
-rw-r--r-- | core/multimedia/opieplayer/wavplugin/wavplugin.pro | 36 |
9 files changed, 311 insertions, 9 deletions
diff --git a/core/multimedia/opieplayer/libflash/libflash.pro b/core/multimedia/opieplayer/libflash/libflash.pro index eacd391..ac3cd8c 100644 --- a/core/multimedia/opieplayer/libflash/libflash.pro +++ b/core/multimedia/opieplayer/libflash/libflash.pro | |||
@@ -4,13 +4,47 @@ HEADERS = libflashplugin.h libflashpluginimpl.h | |||
4 | SOURCES = libflashplugin.cpp libflashpluginimpl.cpp \ | 4 | SOURCES = libflashplugin.cpp libflashpluginimpl.cpp \ |
5 | adpcm.cc character.cc flash.cc graphic16.cc matrix.cc script.cc \ | 5 | adpcm.cc character.cc flash.cc graphic16.cc matrix.cc script.cc \ |
6 | sprite.cc bitmap.cc cxform.cc font.cc graphic24.cc movie.cc \ | 6 | sprite.cc bitmap.cc cxform.cc font.cc graphic24.cc movie.cc \ |
7 | shape.cc sqrt.cc button.cc displaylist.cc graphic.cc graphic32.cc \ | 7 | shape.cc sqrt.cc button.cc displaylist.cc graphic.cc graphic32.cc \ |
8 | program.cc sound.cc text.cc | 8 | program.cc sound.cc text.cc |
9 | TARGET = flashplugin | 9 | TARGET = flashplugin |
10 | DESTDIR = ../../plugins/codecs | 10 | DESTDIR = ../../plugins/codecs |
11 | INCLUDEPATH += $(OPIEDIR)/include .. | 11 | INCLUDEPATH += $(OPIEDIR)/include .. |
12 | DEPENDPATH += .. | 12 | DEPENDPATH += .. |
13 | LIBS += -lqpe | 13 | LIBS += -lqpe |
14 | VERSION = 1.0.0 | 14 | VERSION = 1.0.0 |
15 | 15 | ||
16 | include ( $(OPIEDIR)/include.pro ) | 16 | include( |
17 | |||
18 | |||
19 | |||
20 | |||
21 | |||
22 | |||
23 | |||
24 | |||
25 | |||
26 | |||
27 | |||
28 | |||
29 | |||
30 | |||
31 | |||
32 | |||
33 | |||
34 | |||
35 | |||
36 | |||
37 | |||
38 | |||
39 | |||
40 | |||
41 | |||
42 | |||
43 | |||
44 | |||
45 | |||
46 | |||
47 | |||
48 | |||
49 | |||
50 | $(OPIEDIR)/include.pro ) | ||
diff --git a/core/multimedia/opieplayer/libmad/libmad.pro b/core/multimedia/opieplayer/libmad/libmad.pro index 646726c..21d3ffd 100644 --- a/core/multimedia/opieplayer/libmad/libmad.pro +++ b/core/multimedia/opieplayer/libmad/libmad.pro | |||
@@ -2,25 +2,59 @@ TEMPLATE = lib | |||
2 | CONFIG += qt warn_on | 2 | CONFIG += qt warn_on |
3 | HEADERS = libmad_version.h fixed.h bit.h timer.h stream.h frame.h synth.h decoder.h \ | 3 | HEADERS = libmad_version.h fixed.h bit.h timer.h stream.h frame.h synth.h decoder.h \ |
4 | layer12.h layer3.h huffman.h libmad_global.h mad.h libmadplugin.h libmadpluginimpl.h | 4 | layer12.h layer3.h huffman.h libmad_global.h mad.h libmadplugin.h libmadpluginimpl.h |
5 | SOURCES = version.c fixed.c bit.c timer.c stream.c frame.c synth.c decoder.c \ | 5 | SOURCES = version.c fixed.c bit.c timer.c stream.c frame.c synth.c decoder.c \ |
6 | layer12.c layer3.c huffman.c libmadplugin.cpp libmadpluginimpl.cpp | 6 | layer12.c layer3.c huffman.c libmadplugin.cpp libmadpluginimpl.cpp |
7 | TARGET = madplugin | 7 | TARGET = madplugin |
8 | DESTDIR = $(OPIEDIR)/plugins/codecs | 8 | DESTDIR = $(OPIEDIR)/plugins/codecs |
9 | INCLUDEPATH += $(OPIEDIR)/include .. | 9 | INCLUDEPATH += $(OPIEDIR)/include .. |
10 | DEPENDPATH += .. | 10 | DEPENDPATH += .. |
11 | LIBS += -lqpe -lm | 11 | LIBS += -lqpe -lm |
12 | VERSION = 1.0.0 | 12 | VERSION = 1.0.0 |
13 | 13 | ||
14 | include ( $(OPIEDIR)/include.pro ) | 14 | include( |
15 | |||
16 | |||
17 | |||
18 | |||
19 | |||
20 | |||
21 | |||
22 | |||
23 | |||
24 | |||
25 | |||
26 | |||
27 | |||
28 | |||
29 | |||
30 | |||
31 | |||
32 | |||
33 | |||
34 | |||
35 | |||
36 | |||
37 | |||
38 | |||
39 | |||
40 | |||
41 | |||
42 | |||
43 | |||
44 | |||
45 | |||
46 | |||
47 | |||
48 | $(OPIEDIR)/include.pro ) | ||
15 | 49 | ||
16 | DEFINES += FPM_INTEL | 50 | DEFINES += FPM_INTEL |
17 | 51 | ||
18 | system(echo $QMAKESPEC | grep -s sharp) { | 52 | system(echo $QMAKESPEC | grep -s sharp) { |
19 | DEFINES -= FPM_INTEL | 53 | DEFINES -= FPM_INTEL |
20 | DEFINES += FPM_ARM | 54 | DEFINES += FPM_ARM |
21 | } | 55 | } |
22 | 56 | ||
23 | system(echo $QMAKESPEC | grep -s ipaq) { | 57 | system(echo $QMAKESPEC | grep -s ipaq) { |
24 | DEFINES -= FPM_INTEL | 58 | DEFINES -= FPM_INTEL |
25 | DEFINES += FPM_ARM | 59 | DEFINES += FPM_ARM |
26 | } | 60 | } |
diff --git a/core/multimedia/opieplayer/libmpeg3/libmpeg3.pro b/core/multimedia/opieplayer/libmpeg3/libmpeg3.pro index deb0cc2..8211182 100644 --- a/core/multimedia/opieplayer/libmpeg3/libmpeg3.pro +++ b/core/multimedia/opieplayer/libmpeg3/libmpeg3.pro | |||
@@ -37,13 +37,47 @@ SOURCES = libmpeg3plugin.cpp libmpeg3pluginimpl.cpp \ | |||
37 | video/reconstruct.c \ | 37 | video/reconstruct.c \ |
38 | video/seek.c \ | 38 | video/seek.c \ |
39 | video/slice.c \ | 39 | video/slice.c \ |
40 | video/vlc.c | 40 | video/vlc.c |
41 | TARGET = mpeg3plugin | 41 | TARGET = mpeg3plugin |
42 | TMAKE_CC=$(CXX) | 42 | TMAKE_CC=$(CXX) |
43 | DESTDIR = $(OPIEDIR)/plugins/codecs | 43 | DESTDIR = $(OPIEDIR)/plugins/codecs |
44 | INCLUDEPATH += $(OPIEDIR)/include .. | 44 | INCLUDEPATH += $(OPIEDIR)/include .. |
45 | DEPENDPATH += .. | 45 | DEPENDPATH += .. |
46 | LIBS += -lqpe -lpthread -lm | 46 | LIBS += -lqpe -lpthread -lm |
47 | VERSION = 1.0.0 | 47 | VERSION = 1.0.0 |
48 | 48 | ||
49 | include ( $(OPIEDIR)/include.pro ) | 49 | include( |
50 | |||
51 | |||
52 | |||
53 | |||
54 | |||
55 | |||
56 | |||
57 | |||
58 | |||
59 | |||
60 | |||
61 | |||
62 | |||
63 | |||
64 | |||
65 | |||
66 | |||
67 | |||
68 | |||
69 | |||
70 | |||
71 | |||
72 | |||
73 | |||
74 | |||
75 | |||
76 | |||
77 | |||
78 | |||
79 | |||
80 | |||
81 | |||
82 | |||
83 | $(OPIEDIR)/include.pro ) | ||
diff --git a/core/multimedia/opieplayer/modplug/modplug.pro b/core/multimedia/opieplayer/modplug/modplug.pro index 05c28a4..d6c4522 100644 --- a/core/multimedia/opieplayer/modplug/modplug.pro +++ b/core/multimedia/opieplayer/modplug/modplug.pro | |||
@@ -11,13 +11,43 @@ SOURCES = fastmix.cpp load_669.cpp load_amf.cpp load_ams.cpp \ | |||
11 | snd_flt.cpp snd_fx.cpp sndfile.cpp sndmix.cpp tables.cpp \ | 11 | snd_flt.cpp snd_fx.cpp sndfile.cpp sndmix.cpp tables.cpp \ |
12 | memfile.cpp | 12 | memfile.cpp |
13 | TARGET = modplugin | 13 | TARGET = modplugin |
14 | DESTDIR = $(OPIEDIR)/plugins/codecs | 14 | DESTDIR = $(OPIEDIR)/plugins/codecs |
15 | INCLUDEPATH += $(OPIEDIR)/include | 15 | INCLUDEPATH += $(OPIEDIR)/include |
16 | DEPENDPATH += $(OPIEDIR)/include | 16 | DEPENDPATH += $(OPIEDIR)/include |
17 | LIBS += -lqpe -lm | 17 | LIBS += -lqpe -lm |
18 | VERSION = 1.0.0 | 18 | VERSION = 1.0.0 |
19 | 19 | ||
20 | 20 | ||
21 | 21 | ||
22 | 22 | ||
23 | include ( $(OPIEDIR)/include.pro ) | 23 | include( |
24 | |||
25 | |||
26 | |||
27 | |||
28 | |||
29 | |||
30 | |||
31 | |||
32 | |||
33 | |||
34 | |||
35 | |||
36 | |||
37 | |||
38 | |||
39 | |||
40 | |||
41 | |||
42 | |||
43 | |||
44 | |||
45 | |||
46 | |||
47 | |||
48 | |||
49 | |||
50 | |||
51 | |||
52 | |||
53 | $(OPIEDIR)/include.pro ) | ||
diff --git a/core/multimedia/opieplayer/opieplayer.pro b/core/multimedia/opieplayer/opieplayer.pro index 6ec9075..a13ba38 100644 --- a/core/multimedia/opieplayer/opieplayer.pro +++ b/core/multimedia/opieplayer/opieplayer.pro | |||
@@ -9,13 +9,47 @@ HEADERS = loopcontrol.h mediaplayerplugininterface.h \ | |||
9 | SOURCES = main.cpp \ | 9 | SOURCES = main.cpp \ |
10 | loopcontrol.cpp playlistselection.cpp mediaplayerstate.cpp \ | 10 | loopcontrol.cpp playlistselection.cpp mediaplayerstate.cpp \ |
11 | videowidget.cpp audiowidget.cpp playlistwidget.cpp \ | 11 | videowidget.cpp audiowidget.cpp playlistwidget.cpp \ |
12 | mediaplayer.cpp audiodevice.cpp inputDialog.cpp om3u.cpp | 12 | mediaplayer.cpp audiodevice.cpp inputDialog.cpp om3u.cpp |
13 | TARGET = opieplayer | 13 | TARGET = opieplayer |
14 | INCLUDEPATH += $(OPIEDIR)/include | 14 | INCLUDEPATH += $(OPIEDIR)/include |
15 | DEPENDPATH += $(OPIEDIR)/include | 15 | DEPENDPATH += $(OPIEDIR)/include |
16 | LIBS += -lqpe -lpthread -lopiecore2 -lopieui2 -lqtaux2 | 16 | LIBS += -lqpe -lpthread -lopiecore2 -lopieui2 -lqtaux2 |
17 | 17 | ||
18 | INCLUDEPATH += $(OPIEDIR)/include | 18 | INCLUDEPATH += $(OPIEDIR)/include |
19 | DEPENDPATH += $(OPIEDIR)/include | 19 | DEPENDPATH += $(OPIEDIR)/include |
20 | 20 | ||
21 | include ( $(OPIEDIR)/include.pro ) | 21 | include( |
22 | |||
23 | |||
24 | |||
25 | |||
26 | |||
27 | |||
28 | |||
29 | |||
30 | |||
31 | |||
32 | |||
33 | |||
34 | |||
35 | |||
36 | |||
37 | |||
38 | |||
39 | |||
40 | |||
41 | |||
42 | |||
43 | |||
44 | |||
45 | |||
46 | |||
47 | |||
48 | |||
49 | |||
50 | |||
51 | |||
52 | |||
53 | |||
54 | |||
55 | $(OPIEDIR)/include.pro ) | ||
diff --git a/core/multimedia/opieplayer/vorbis/libtremor.pro b/core/multimedia/opieplayer/vorbis/libtremor.pro index dda5f6f..4a9f08b 100644 --- a/core/multimedia/opieplayer/vorbis/libtremor.pro +++ b/core/multimedia/opieplayer/vorbis/libtremor.pro | |||
@@ -1,12 +1,46 @@ | |||
1 | TEMPLATE = lib | 1 | TEMPLATE = lib |
2 | CONFIG += qt warn_on | 2 | CONFIG += qt warn_on |
3 | HEADERS = libtremorplugin.h libtremorinimpl.h | 3 | HEADERS = libtremorplugin.h libtremorinimpl.h |
4 | SOURCES = libtremorplugin.cpp libtremorpluginimpl.cpp | 4 | SOURCES = libtremorplugin.cpp libtremorpluginimpl.cpp |
5 | TARGET = tremorplugin | 5 | TARGET = tremorplugin |
6 | DESTDIR = $(OPIEDIR)/plugins/codecs | 6 | DESTDIR = $(OPIEDIR)/plugins/codecs |
7 | INCLUDEPATH += $(OPIEDIR)/include .. tremor | 7 | INCLUDEPATH += $(OPIEDIR)/include .. tremor |
8 | DEPENDPATH += $(OPIEDIR)/include .. tremor | 8 | DEPENDPATH += $(OPIEDIR)/include .. tremor |
9 | LIBS += -lqpe -lm -ltremor | 9 | LIBS += -lqpe -lm -ltremor |
10 | #-lvorbisidec | 10 | #-lvorbisidec |
11 | VERSION = 1.0.0 | 11 | VERSION = 1.0.0 |
12 | include ( $(OPIEDIR)/include.pro ) | 12 | include( |
13 | |||
14 | |||
15 | |||
16 | |||
17 | |||
18 | |||
19 | |||
20 | |||
21 | |||
22 | |||
23 | |||
24 | |||
25 | |||
26 | |||
27 | |||
28 | |||
29 | |||
30 | |||
31 | |||
32 | |||
33 | |||
34 | |||
35 | |||
36 | |||
37 | |||
38 | |||
39 | |||
40 | |||
41 | |||
42 | |||
43 | |||
44 | |||
45 | |||
46 | $(OPIEDIR)/include.pro ) | ||
diff --git a/core/multimedia/opieplayer/vorbis/tremor/tremor.pro b/core/multimedia/opieplayer/vorbis/tremor/tremor.pro index 2f406d4..4a3d017 100644 --- a/core/multimedia/opieplayer/vorbis/tremor/tremor.pro +++ b/core/multimedia/opieplayer/vorbis/tremor/tremor.pro | |||
@@ -31,13 +31,47 @@ SOURCES = bitwise.c \ | |||
31 | sharedbook.c \ | 31 | sharedbook.c \ |
32 | synthesis.c \ | 32 | synthesis.c \ |
33 | vorbisfile.c \ | 33 | vorbisfile.c \ |
34 | window.c | 34 | window.c |
35 | INTERFACES = | 35 | INTERFACES = |
36 | DESTDIR = $(OPIEDIR)/lib$(PROJMAK) | 36 | DESTDIR = $(OPIEDIR)/lib$(PROJMAK) |
37 | #DESTDIR = $(OPIEDIR)/root/usr/lib | 37 | #DESTDIR = $(OPIEDIR)/root/usr/lib |
38 | INCLUDEPATH += $(OPIEDIR)/include .. | 38 | INCLUDEPATH += $(OPIEDIR)/include .. |
39 | DEPENDPATH += $(OPIEDIR)/include .. | 39 | DEPENDPATH += $(OPIEDIR)/include .. |
40 | #LIBS += -lqpe | 40 | #LIBS += -lqpe |
41 | VERSION = 1.0.0 | 41 | VERSION = 1.0.0 |
42 | QMAKE_LINK=$$QMAKE_CC | 42 | QMAKE_LINK=$$QMAKE_CC |
43 | include ( $(OPIEDIR)/include.pro ) | 43 | include( |
44 | |||
45 | |||
46 | |||
47 | |||
48 | |||
49 | |||
50 | |||
51 | |||
52 | |||
53 | |||
54 | |||
55 | |||
56 | |||
57 | |||
58 | |||
59 | |||
60 | |||
61 | |||
62 | |||
63 | |||
64 | |||
65 | |||
66 | |||
67 | |||
68 | |||
69 | |||
70 | |||
71 | |||
72 | |||
73 | |||
74 | |||
75 | |||
76 | |||
77 | $(OPIEDIR)/include.pro ) | ||
diff --git a/core/multimedia/opieplayer/vorbis/vorbis.pro b/core/multimedia/opieplayer/vorbis/vorbis.pro index 5862dd0..3b577bd 100644 --- a/core/multimedia/opieplayer/vorbis/vorbis.pro +++ b/core/multimedia/opieplayer/vorbis/vorbis.pro | |||
@@ -1,11 +1,45 @@ | |||
1 | TEMPLATE = lib | 1 | TEMPLATE = lib |
2 | CONFIG += qt warn_on | 2 | CONFIG += qt warn_on |
3 | HEADERS = libtremorplugin.h libtremorpluginimpl.h | 3 | HEADERS = libtremorplugin.h libtremorpluginimpl.h |
4 | SOURCES = libtremorplugin.cpp libtremorpluginimpl.cpp | 4 | SOURCES = libtremorplugin.cpp libtremorpluginimpl.cpp |
5 | TARGET = tremorplugin | 5 | TARGET = tremorplugin |
6 | DESTDIR = $(OPIEDIR)/plugins/codecs | 6 | DESTDIR = $(OPIEDIR)/plugins/codecs |
7 | INCLUDEPATH += $(OPIEDIR)/include .. tremor | 7 | INCLUDEPATH += $(OPIEDIR)/include .. tremor |
8 | DEPENDPATH += $(OPIEDIR)/include .. tremor | 8 | DEPENDPATH += $(OPIEDIR)/include .. tremor |
9 | LIBS += -lqpe -lm -ltremor | 9 | LIBS += -lqpe -lm -ltremor |
10 | VERSION = 1.0.0 | 10 | VERSION = 1.0.0 |
11 | include ( $(OPIEDIR)/include.pro ) | 11 | include( |
12 | |||
13 | |||
14 | |||
15 | |||
16 | |||
17 | |||
18 | |||
19 | |||
20 | |||
21 | |||
22 | |||
23 | |||
24 | |||
25 | |||
26 | |||
27 | |||
28 | |||
29 | |||
30 | |||
31 | |||
32 | |||
33 | |||
34 | |||
35 | |||
36 | |||
37 | |||
38 | |||
39 | |||
40 | |||
41 | |||
42 | |||
43 | |||
44 | |||
45 | $(OPIEDIR)/include.pro ) | ||
diff --git a/core/multimedia/opieplayer/wavplugin/wavplugin.pro b/core/multimedia/opieplayer/wavplugin/wavplugin.pro index 76aa736..0ab1a39 100644 --- a/core/multimedia/opieplayer/wavplugin/wavplugin.pro +++ b/core/multimedia/opieplayer/wavplugin/wavplugin.pro | |||
@@ -1,12 +1,46 @@ | |||
1 | TEMPLATE= lib | 1 | TEMPLATE= lib |
2 | CONFIG += qt plugin warn_on | 2 | CONFIG += qt plugin warn_on |
3 | HEADERS = wavplugin.h wavpluginimpl.h | 3 | HEADERS = wavplugin.h wavpluginimpl.h |
4 | SOURCES = wavplugin.cpp wavpluginimpl.cpp | 4 | SOURCES = wavplugin.cpp wavpluginimpl.cpp |
5 | TARGET = wavplugin | 5 | TARGET = wavplugin |
6 | DESTDIR = $(OPIEDIR)/plugins/codecs | 6 | DESTDIR = $(OPIEDIR)/plugins/codecs |
7 | INCLUDEPATH += $(OPIEDIR)/include .. | 7 | INCLUDEPATH += $(OPIEDIR)/include .. |
8 | DEPENDPATH += .. | 8 | DEPENDPATH += .. |
9 | LIBS += -lqpe | 9 | LIBS += -lqpe |
10 | VERSION = 1.0.0 | 10 | VERSION = 1.0.0 |
11 | 11 | ||
12 | include ( $(OPIEDIR)/include.pro ) | 12 | include( |
13 | |||
14 | |||
15 | |||
16 | |||
17 | |||
18 | |||
19 | |||
20 | |||
21 | |||
22 | |||
23 | |||
24 | |||
25 | |||
26 | |||
27 | |||
28 | |||
29 | |||
30 | |||
31 | |||
32 | |||
33 | |||
34 | |||
35 | |||
36 | |||
37 | |||
38 | |||
39 | |||
40 | |||
41 | |||
42 | |||
43 | |||
44 | |||
45 | |||
46 | $(OPIEDIR)/include.pro ) | ||