Contribs: update postproc rules

csuchenpeng · Nov 20, 2012 · 3fe01ba · 3fe01ba
1 parent bf47f37
commit 3fe01ba
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/contrib/src/postproc/rules.mak b/contrib/src/postproc/rules.mak
@@ -11,7 +11,13 @@ POSTPROCCONF = \
 DEPS_postproc = ffmpeg
 
 ifdef ENABLE_SMALL
-POSTPROCCONF += --enable-small --optflags=-O2
+POSTPROCCONF += --enable-small
+ifeq ($(ARCH),arm)
+ifdef HAVE_ARMV7A
+# XXX: assumes > ARMv7-A, and thus thumb2-able
+FFMPEGCONF += --enable-thumb
+endif
+endif
 endif
 
 ifdef HAVE_CROSS_COMPILE
@@ -26,7 +32,7 @@ ifeq ($(ARCH),arm)
 POSTPROCCONF += --disable-runtime-cpudetect --arch=arm
 ifdef HAVE_NEON
 POSTPROCCONF += --cpu=cortex-a8 --enable-neon
-POSTPROC_CFLAGS +=-mfloat-abi=softfp -mfpu=neon
+POSTPROC_CFLAGS += -mfloat-abi=softfp -mfpu=neon
 endif
 endif
 
@@ -39,14 +45,13 @@ endif
 ifdef HAVE_DARWIN_OS
 POSTPROCCONF += --arch=$(ARCH) --target-os=darwin
 endif
+ifeq ($(ARCH),x86_64)
+POSTPROCCONF += --cpu=core2
+endif
 ifdef HAVE_IOS
 ifeq ($(ARCH),arm)
 POSTPROCCONF += --as="$(AS)"
-POSTPROCCONF += --cpu=cortex-a8
-endif
 endif
-ifeq ($(ARCH),x86_64)
-POSTPROCCONF += --cpu=core2
 endif
 
 # Linux