author | kergoth <kergoth> | 2002-11-06 07:19:29 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2002-11-06 07:19:29 (UTC) |
commit | 6e56bf9fbc047c51ffa8a9a7760d78dbe2e3cdef (patch) (unidiff) | |
tree | 453feb2aed7f5a3b28b7488cbfb8330b96d1b7d3 | |
parent | b914ee28517e2be6b27a48e6d9fb9734c99d6e24 (diff) | |
download | opie-6e56bf9fbc047c51ffa8a9a7760d78dbe2e3cdef.zip opie-6e56bf9fbc047c51ffa8a9a7760d78dbe2e3cdef.tar.gz opie-6e56bf9fbc047c51ffa8a9a7760d78dbe2e3cdef.tar.bz2 |
Removed ifs within the sources line, qmake doesnt like that at -all- .. need to find a workaround to pass .pro changes based on config system..
-rw-r--r-- | core/multimedia/opieplayer/libmad/libmad.pro | 4 | ||||
-rw-r--r-- | core/multimedia/opieplayer/libmpeg3/libmpeg3.pro | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/core/multimedia/opieplayer/libmad/libmad.pro b/core/multimedia/opieplayer/libmad/libmad.pro index 976b626..999d1ed 100644 --- a/core/multimedia/opieplayer/libmad/libmad.pro +++ b/core/multimedia/opieplayer/libmad/libmad.pro | |||
@@ -1,22 +1,20 @@ | |||
1 | QMAKE_CFLAGS += $(if $(CONFIG_TARGET_X86),-DFPM_INTEL) \ | 1 | QMAKE_CFLAGS += $(if $(CONFIG_TARGET_X86),-DFPM_INTEL) \ |
2 | $(if $(CONFIG_TARGET_IPAQ),-DFPM_ARM) \ | 2 | $(if $(CONFIG_TARGET_IPAQ),-DFPM_ARM) \ |
3 | $(if $(CONFIG_TARGET_SHARP),-DFPM_ARM) | 3 | $(if $(CONFIG_TARGET_SHARP),-DFPM_ARM) |
4 | TEMPLATE = lib | 4 | TEMPLATE = lib |
5 | CONFIG += qt warn_on release | 5 | CONFIG += qt warn_on release |
6 | HEADERS = libmad_version.h fixed.h bit.h timer.h stream.h frame.h synth.h decoder.h \ | 6 | HEADERS = libmad_version.h fixed.h bit.h timer.h stream.h frame.h synth.h decoder.h \ |
7 | layer12.h layer3.h huffman.h libmad_global.h mad.h libmadplugin.h libmadpluginimpl.h | 7 | layer12.h layer3.h huffman.h libmad_global.h mad.h libmadplugin.h libmadpluginimpl.h |
8 | SOURCES = $(if $(CONFIG_TARGET_IPAQ),idmt_arm.S) \ | 8 | SOURCES = version.c fixed.c bit.c timer.c stream.c frame.c synth.c decoder.c \ |
9 | $(if $(CONFIG_TARGET_SHARP),idmt_arm.S) \ | ||
10 | version.c fixed.c bit.c timer.c stream.c frame.c synth.c decoder.c \ | ||
11 | layer12.c layer3.c huffman.c libmadplugin.cpp libmadpluginimpl.cpp | 9 | layer12.c layer3.c huffman.c libmadplugin.cpp libmadpluginimpl.cpp |
12 | TARGET = madplugin | 10 | TARGET = madplugin |
13 | DESTDIR = $(OPIEDIR)/plugins/codecs | 11 | DESTDIR = $(OPIEDIR)/plugins/codecs |
14 | INCLUDEPATH += $(OPIEDIR)/include .. | 12 | INCLUDEPATH += $(OPIEDIR)/include .. |
15 | DEPENDPATH += ../$(OPIEDIR)/include .. | 13 | DEPENDPATH += ../$(OPIEDIR)/include .. |
16 | LIBS += -lqpe -lm | 14 | LIBS += -lqpe -lm |
17 | VERSION = 1.0.0 | 15 | VERSION = 1.0.0 |
18 | 16 | ||
19 | TRANSLATIONS = ../../../../i18n/de/libmadplugin.ts \ | 17 | TRANSLATIONS = ../../../../i18n/de/libmadplugin.ts \ |
20 | ../../../../i18n/en/libmadplugin.ts \ | 18 | ../../../../i18n/en/libmadplugin.ts \ |
21 | ../../../../i18n/es/libmadplugin.ts \ | 19 | ../../../../i18n/es/libmadplugin.ts \ |
22 | ../../../../i18n/fr/libmadplugin.ts \ | 20 | ../../../../i18n/fr/libmadplugin.ts \ |
diff --git a/core/multimedia/opieplayer/libmpeg3/libmpeg3.pro b/core/multimedia/opieplayer/libmpeg3/libmpeg3.pro index 586bb1c..338fe29 100644 --- a/core/multimedia/opieplayer/libmpeg3/libmpeg3.pro +++ b/core/multimedia/opieplayer/libmpeg3/libmpeg3.pro | |||
@@ -1,20 +1,20 @@ | |||
1 | QMAKE_CFLAGS += $(if $(CONFIG_TARGET_X86),-DHAVE_MMX -DHAVE_CSS) \ | 1 | QMAKE_CFLAGS += $(if $(CONFIG_TARGET_X86),-DHAVE_MMX -DHAVE_CSS) \ |
2 | $(if $(CONFIG_TARGET_IPAQ),-DUSE_FIXED_POINT) \ | 2 | $(if $(CONFIG_TARGET_IPAQ),-DUSE_FIXED_POINT) \ |
3 | $(if $(CONFIG_TARGET_SHARP),-DUSE_FIXED_POINT) | 3 | $(if $(CONFIG_TARGET_SHARP),-DUSE_FIXED_POINT) |
4 | QMAKE_CC = $(CXX) | 4 | QMAKE_CC = $(CXX) |
5 | TEMPLATE = lib | 5 | TEMPLATE = lib |
6 | CONFIG += qt warn_on release | 6 | CONFIG += qt warn_on release |
7 | HEADERS = libmpeg3plugin.h libmpeg3pluginimpl.h | 7 | HEADERS = libmpeg3plugin.h libmpeg3pluginimpl.h |
8 | SOURCES = $(if $(CONFIG_TARGET_X86),video/mmxidct.S video/reconmmx.s) libmpeg3plugin.cpp libmpeg3pluginimpl.cpp \ | 8 | SOURCES = libmpeg3plugin.cpp libmpeg3pluginimpl.cpp \ |
9 | bitstream.c \ | 9 | bitstream.c \ |
10 | libmpeg3.c \ | 10 | libmpeg3.c \ |
11 | mpeg3atrack.c \ | 11 | mpeg3atrack.c \ |
12 | mpeg3css.c \ | 12 | mpeg3css.c \ |
13 | mpeg3demux.c \ | 13 | mpeg3demux.c \ |
14 | mpeg3io.c \ | 14 | mpeg3io.c \ |
15 | mpeg3title.c \ | 15 | mpeg3title.c \ |
16 | mpeg3vtrack.c \ | 16 | mpeg3vtrack.c \ |
17 | audio/ac3.c \ | 17 | audio/ac3.c \ |
18 | audio/bit_allocation.c \ | 18 | audio/bit_allocation.c \ |
19 | audio/dct.c \ | 19 | audio/dct.c \ |
20 | audio/exponents.c \ | 20 | audio/exponents.c \ |