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..

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,32 +1,30 @@
 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
 VERSION   =   1.0.0
 
 TRANSLATIONS = ../../../../i18n/de/libmadplugin.ts \
          ../../../../i18n/en/libmadplugin.ts \
          ../../../../i18n/es/libmadplugin.ts \
          ../../../../i18n/fr/libmadplugin.ts \
          ../../../../i18n/hu/libmadplugin.ts \
          ../../../../i18n/ja/libmadplugin.ts \
          ../../../../i18n/ko/libmadplugin.ts \
          ../../../../i18n/no/libmadplugin.ts \
          ../../../../i18n/pl/libmadplugin.ts \
          ../../../../i18n/pt/libmadplugin.ts \
          ../../../../i18n/pt_BR/libmadplugin.ts \
          ../../../../i18n/sl/libmadplugin.ts \
          ../../../../i18n/zh_CN/libmadplugin.ts \
          ../../../../i18n/zh_TW/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,62 +1,62 @@
 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 \
         mpeg3title.c \
         mpeg3vtrack.c \
         audio/ac3.c \
         audio/bit_allocation.c \
         audio/dct.c \
         audio/exponents.c \
         audio/header.c \
         audio/layer2.c \
         audio/layer3.c \
         audio/mantissa.c \
         audio/mpeg3audio.c \
         audio/pcm.c \
         audio/synthesizers.c \
         audio/tables.c \
         video/getpicture.c \
         video/headers.c \
         video/idct.c \
         video/macroblocks.c \
         video/mmxtest.c \
         video/motion.c \
         video/mpeg3video.c \
         video/output.c \
         video/reconstruct.c \
         video/seek.c \
         video/slice.c \
         video/vlc.c
 TARGET    =   mpeg3plugin
 TMAKE_CC=$(CXX)
 DESTDIR   =   $(OPIEDIR)/plugins/codecs
 INCLUDEPATH += $(OPIEDIR)/include ..
 DEPENDPATH      +=  ../$(OPIEDIR)/include ..
 LIBS            +=  -lqpe -lpthread -lm
 VERSION   =   1.0.0
 
 TRANSLATIONS = ../../../../i18n/de/libmpeg3plugin.ts \
          ../../../../i18n/en/libmpeg3plugin.ts \
          ../../../../i18n/es/libmpeg3plugin.ts \
          ../../../../i18n/fr/libmpeg3plugin.ts \
          ../../../../i18n/hu/libmpeg3plugin.ts \
          ../../../../i18n/ja/libmpeg3plugin.ts \
          ../../../../i18n/ko/libmpeg3plugin.ts \
          ../../../../i18n/no/libmpeg3plugin.ts \
          ../../../../i18n/pl/libmpeg3plugin.ts \
          ../../../../i18n/pt/libmpeg3plugin.ts \
          ../../../../i18n/pt_BR/libmpeg3plugin.ts \
          ../../../../i18n/sl/libmpeg3plugin.ts \
          ../../../../i18n/zh_CN/libmpeg3plugin.ts \
          ../../../../i18n/zh_TW/libmpeg3plugin.ts