generic-library/openh264
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't concatenate $@ to AR_OPTS

Browse Source 
The MSVC version of AR_OPTS already contains $@, in a very specific
way.

This fixes MSVC builds after c8bed8a9.
This commit is contained in:
Martin Storsjö 2015-06-26 13:55:15 +03:00
parent 0f1371e461
commit 4c8347aa22
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -14,7 +14,7 @@ LIBSUFFIX=a
CCAS=$(CC) CCAS=$(CC)
CXX_O=-o $@ CXX_O=-o $@
CXX_LINK_O=-o $@ CXX_LINK_O=-o $@
AR_OPTS=cr AR_OPTS=cr $@
LINK_LOCAL_DIR=-L. LINK_LOCAL_DIR=-L.
LINK_LIB=-l$(1) LINK_LIB=-l$(1)
CFLAGS_OPT=-O3 CFLAGS_OPT=-O3
@ -70,7 +70,6 @@ include $(SRC_PATH)build/platform-$(OS).mk
CFLAGS += -DGENERATED_VERSION_HEADER CFLAGS += -DGENERATED_VERSION_HEADER
LDFLAGS += LDFLAGS +=
AR_OPTS += $@
ifeq (Yes, $(GCOV)) ifeq (Yes, $(GCOV))
CFLAGS += -fprofile-arcs -ftest-coverage CFLAGS += -fprofile-arcs -ftest-coverage

2
build/platform-linux.mk
View File

@ -4,7 +4,7 @@ SHAREDLIBSUFFIXVER=$(SHAREDLIBSUFFIX).$(SHAREDLIBVERSION)
SHLDFLAGS = -Wl,-soname,$(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIXVER) SHLDFLAGS = -Wl,-soname,$(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIXVER)
CFLAGS += -Wall -fno-strict-aliasing -fPIC -MMD -MP CFLAGS += -Wall -fno-strict-aliasing -fPIC -MMD -MP
LDFLAGS += -lpthread LDFLAGS += -lpthread
AR_OPTS += -D AR_OPTS = crD $@
ifeq ($(ASM_ARCH), x86) ifeq ($(ASM_ARCH), x86)
ifeq ($(ARCH), x86_64) ifeq ($(ARCH), x86_64)
ASMFLAGS += -f elf64 ASMFLAGS += -f elf64