diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-12-05 11:49:44 +0100 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-12-05 12:21:33 +0100 |
| commit | 3b0f63e110d47fbd856297bd2e322f5e3b6881ee (patch) | |
| tree | a9c40edb07df32aa19ce9ad85ddab4de1f2fb6fb /common.mak | |
| parent | a16243a4aa5fffff9d4cb0f20ceab47c80a2c4dc (diff) | |
| parent | 9f57f134c19773d54269b6cb9ee455ff87c2e9e1 (diff) | |
| download | ffmpeg-3b0f63e110d47fbd856297bd2e322f5e3b6881ee.tar.gz | |
Merge commit '9f57f134c19773d54269b6cb9ee455ff87c2e9e1'
* commit '9f57f134c19773d54269b6cb9ee455ff87c2e9e1':
configure: ObjC support
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'common.mak')
| -rw-r--r-- | common.mak | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/common.mak b/common.mak index d611ef8cad..c3a8b93095 100644 --- a/common.mak +++ b/common.mak @@ -18,7 +18,7 @@ ifndef SUBDIR ifndef V Q = @ ECHO = printf "$(1)\t%s\n" $(2) -BRIEF = CC CXX HOSTCC HOSTLD AS YASM AR LD STRIP CP WINDRES +BRIEF = CC CXX OBJCC HOSTCC HOSTLD AS YASM AR LD STRIP CP WINDRES SILENT = DEPCC DEPHOSTCC DEPAS DEPYASM RANLIB RM MSG = $@ @@ -36,6 +36,8 @@ IFLAGS := -I. -I$(SRC_PATH)/ CPPFLAGS := $(IFLAGS) $(CPPFLAGS) CFLAGS += $(ECFLAGS) CCFLAGS = $(CPPFLAGS) $(CFLAGS) +OBJCFLAGS += $(EOBJCFLAGS) +OBJCCFLAGS = $(CPPFLAGS) $(CFLAGS) $(OBJCFLAGS) ASFLAGS := $(CPPFLAGS) $(ASFLAGS) CXXFLAGS += $(CPPFLAGS) $(CFLAGS) YASMFLAGS += $(IFLAGS:%=%/) -Pconfig.asm @@ -51,6 +53,7 @@ endef COMPILE_C = $(call COMPILE,CC) COMPILE_CXX = $(call COMPILE,CXX) COMPILE_S = $(call COMPILE,AS) +COMPILE_M = $(call COMPILE,OBJCC) COMPILE_HOSTC = $(call COMPILE,HOSTCC) %.o: %.c @@ -60,7 +63,7 @@ COMPILE_HOSTC = $(call COMPILE,HOSTCC) $(COMPILE_CXX) %.o: %.m - $(COMPILE_C) + $(COMPILE_M) %.s: %.c $(CC) $(CPPFLAGS) $(CFLAGS) -S -o $@ $< |