diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-12-30 22:45:29 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-12-30 22:45:29 +0100 |
| commit | 220a96f9926788ed531717f78e44fdf1e7ab3b34 (patch) | |
| tree | 406f65eea71fabd8cf66c2bd1108ec63f8c349ee /package/ffmpeg | |
| parent | 38af8185ea05a1c5d1abb32a68a025e3b4afa4d6 (diff) | |
rework architecture / embedded systems concept
Make configuration of new targets cheap.
Just add a new file in target/arch/sys-enabled/foo.
See other files for syntax. While doing runtime tests
with the new infrastructure I've updated a lot of other
stuff:
- gcc 4.5.2
- uClibc 0.9.32-rc1 (NPTL)
- strongswan, php, miredo, parted, util-linux-ng, e2fsprogs
I promise, this is the last big fat commit this year ;)
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) \ |