1 files changed, 30 insertions, 39 deletions

diff --git a/core/multimedia/opieplayer/libmad/libmad.pro b/core/multimedia/opieplayer/libmad/libmad.pro
index 46af87f..7c41a8f 100644
--- a/core/multimedia/opieplayer/libmad/libmad.pro
+++ b/core/multimedia/opieplayer/libmad/libmad.pro
@@ -1,3 +1,13 @@
+QMAKE_CFLAGS += $(if $(CONFIG_TARGET_X86),-DFPM_INTEL) \
+                $(if $(CONFIG_TARGET_64BIT),-DFPM_64BIT) \
+                $(if $(CONFIG_TARGET_IPAQ),-DFPM_ARM) \
+                $(if $(CONFIG_TARGET_SHARP),-DFPM_ARM)
+QMAKE_CXXFLAGS += $(if $(CONFIG_TARGET_X86),-DFPM_INTEL) \
+                $(if $(CONFIG_TARGET_64BIT),-DFPM_64BIT) \
+                $(if $(CONFIG_TARGET_IPAQ),-DFPM_ARM) \
+                $(if $(CONFIG_TARGET_SHARP),-DFPM_ARM)
+
+
         TEMPLATE = lib
-        CONFIG   +=  qt warn_on 
+        CONFIG   +=  qt warn_on release
         HEADERS   = libmad_version.h fixed.h bit.h timer.h stream.h frame.h synth.h decoder.h \
@@ -9,3 +19,3 @@ DESTDIR   	= $(OPIEDIR)/plugins/codecs
 INCLUDEPATH += $(OPIEDIR)/include ..
-DEPENDPATH      +=  ..
+DEPENDPATH      += ../$(OPIEDIR)/include ..
 LIBS            += -lqpe -lm
@@ -13,41 +23,22 @@ VERSION   =   1.0.0
 
-include( $(OPIEDIR)/include.pro )
-        
-DEFINES += FPM_INTEL
-
-system(echo $QMAKESPEC | grep -s sharp) {
-        DEFINES -= FPM_INTEL
-        DEFINES += FPM_ARM
-}
-
-system(echo $QMAKESPEC | grep -s ipaq) {
-        DEFINES -= FPM_INTEL
-        DEFINES += FPM_ARM
-}
+TRANSLATIONS = ../../../../i18n/de/libmadplugin.ts \
+         ../../../../i18n/nl/libmadplugin.ts \
+         ../../../../i18n/da/libmadplugin.ts \
+         ../../../../i18n/xx/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
 
-system(echo $QMAKESPEC | grep -s mipsel) {
-        DEFINES -= FPM_INTEL
-        DEFINES += FPM_MIPS
-}
-
-system(echo $QMAKESPEC | grep -s ramses) {
-        DEFINES -= FPM_INTEL
-        DEFINES += FPM_ARM
-}
-
-system(echo $QMAKESPEC | grep -s arm) {
-        DEFINES -= FPM_INTEL
-        DEFINES += FPM_ARM
-}
-
-system(echo $QMAKESPEC | grep -s simpad) {
-        DEFINES -= FPM_INTEL
-        DEFINES += FPM_ARM
-}
-
-system(echo $QMAKESPEC | grep -s yopy) {
-        DEFINES -= FPM_INTEL
-        DEFINES += FPM_ARM
-}
 
 
+include ( $(OPIEDIR)/include.pro )