diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2010-12-30 23:00:18 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-12-30 23:00:18 +0100 |
commit | 5bfdfbcee97c930c3c14dc3745089ac28e76ca41 (patch) | |
tree | 723a2310434afd85f68b3437e17917fcc6c5d623 /package/ffmpeg | |
parent | 16d7827ef1aec4aab89033ed1d47ca82fa3a3ba7 (diff) | |
parent | 58d31896056e604185acf3606b99257cea519dd1 (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/ffmpeg')
-rw-r--r-- | package/ffmpeg/Makefile | 35 |
1 files changed, 14 insertions, 21 deletions
diff --git a/package/ffmpeg/Makefile b/package/ffmpeg/Makefile index 69538bc8e..bfcb74413 100644 --- a/package/ffmpeg/Makefile +++ b/package/ffmpeg/Makefile @@ -31,27 +31,20 @@ SUB_INSTALLS-y:= SUB_INSTALLS-m:= SUB_INSTALLS-${ADK_PACKAGE_FFPLAY}+= ffplay-install -ifeq ($(ADK_TARGET),alix) -CONFIGURE_CPU_OPTS:= --disable-ssse3 \ - --disable-sse \ - --enable-amd3dnow \ - --enable-amd3dnowext \ - --enable-mmx \ - --enable-mmx2 -else ifeq ($(ADK_HARDWARE_IBM_X40),y) -CONFIGURE_CPU_OPTS:= --disable-ssse3 \ - --enable-sse \ - --disable-amd3dnow \ - --disable-amd3dnowext \ - --enable-mmx \ - --enable-mmx2 +ifeq ($(ADK_TARGET_CPU_WITH_MMX),y) +CONFIGURE_CPU_OPTS:= --enable-mmx else -CONFIGURE_CPU_OPTS:= --disable-ssse3 \ - --disable-sse \ - --disable-amd3dnow \ - --disable-amd3dnowext \ - --disable-mmx \ - --disable-mmx2 +CONFIGURE_CPU_OPTS:= --disable-mmx +endif +ifeq ($(ADK_TARGET_CPU_WITH_MMXEXT),y) +CONFIGURE_CPU_OPTS:= --enable-mmx2 +else +CONFIGURE_CPU_OPTS:= --disable-mmx2 +endif +ifeq ($(ADK_TARGET_CPU_WITH_SSE),y) +CONFIGURE_CPU_OPTS:= --enable-sse +else +CONFIGURE_CPU_OPTS:= --disable-sse endif # gcc 4.5 produces internal compiler error with -Os @@ -63,7 +56,7 @@ CONFIGURE_ARGS:= --prefix=/usr \ --target-os=linux \ --arch=${CPU_ARCH} \ --enable-cross-compile \ - --sysroot=${STAGING_DIR} \ + --sysroot=${STAGING_TARGET_DIR} \ --source-path=${WRKSRC} \ --cross-prefix=${TARGET_CROSS} \ --cc=$(TARGET_CC) \ |