summaryrefslogtreecommitdiff
authorkergoth <kergoth>2002-11-06 07:19:29 (UTC)
committer kergoth <kergoth>2002-11-06 07:19:29 (UTC)
commit6e56bf9fbc047c51ffa8a9a7760d78dbe2e3cdef (patch) (side-by-side diff)
tree453feb2aed7f5a3b28b7488cbfb8330b96d1b7d3
parentb914ee28517e2be6b27a48e6d9fb9734c99d6e24 (diff)
downloadopie-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..
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/multimedia/opieplayer/libmad/libmad.pro4
-rw-r--r--core/multimedia/opieplayer/libmpeg3/libmpeg3.pro2
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
@@ -2,15 +2,13 @@ QMAKE_CFLAGS += $(if $(CONFIG_TARGET_X86),-DFPM_INTEL) \
$(if $(CONFIG_TARGET_IPAQ),-DFPM_ARM) \
$(if $(CONFIG_TARGET_SHARP),-DFPM_ARM)
TEMPLATE = lib
CONFIG += qt warn_on release
HEADERS = libmad_version.h fixed.h bit.h timer.h stream.h frame.h synth.h decoder.h \
layer12.h layer3.h huffman.h libmad_global.h mad.h libmadplugin.h libmadpluginimpl.h
-SOURCES = $(if $(CONFIG_TARGET_IPAQ),idmt_arm.S) \
- $(if $(CONFIG_TARGET_SHARP),idmt_arm.S) \
- version.c fixed.c bit.c timer.c stream.c frame.c synth.c decoder.c \
+SOURCES = version.c fixed.c bit.c timer.c stream.c frame.c synth.c decoder.c \
layer12.c layer3.c huffman.c libmadplugin.cpp libmadpluginimpl.cpp
TARGET = madplugin
DESTDIR = $(OPIEDIR)/plugins/codecs
INCLUDEPATH += $(OPIEDIR)/include ..
DEPENDPATH += ../$(OPIEDIR)/include ..
LIBS += -lqpe -lm
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
@@ -2,13 +2,13 @@ QMAKE_CFLAGS += $(if $(CONFIG_TARGET_X86),-DHAVE_MMX -DHAVE_CSS) \
$(if $(CONFIG_TARGET_IPAQ),-DUSE_FIXED_POINT) \
$(if $(CONFIG_TARGET_SHARP),-DUSE_FIXED_POINT)
QMAKE_CC = $(CXX)
TEMPLATE = lib
CONFIG += qt warn_on release
HEADERS = libmpeg3plugin.h libmpeg3pluginimpl.h
-SOURCES = $(if $(CONFIG_TARGET_X86),video/mmxidct.S video/reconmmx.s) libmpeg3plugin.cpp libmpeg3pluginimpl.cpp \
+SOURCES = libmpeg3plugin.cpp libmpeg3pluginimpl.cpp \
bitstream.c \
libmpeg3.c \
mpeg3atrack.c \
mpeg3css.c \
mpeg3demux.c \
mpeg3io.c \