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

Use ARCH instead of ENABLE64BIT for distinguishing between x86 and x86_64

Browse Source 
Keep support for the ENABLE64BIT flag (as a flag for choosing between
32 and 64 bit, if the current arch happens to be x86) but avoid using
it in code that wants to know the exact architecture used.

This makes the platform build files more straightforward and
consistent.
This commit is contained in:
Martin Storsjö 2015-04-20 11:47:41 +03:00
parent 473f2e3d42
commit 24f8f2138a
6 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/msvc-common.mk
View File

@ -1,6 +1,6 @@
include $(SRC_PATH)build/arch.mk include $(SRC_PATH)build/arch.mk
ifeq ($(ASM_ARCH), x86) ifeq ($(ASM_ARCH), x86)
ifeq ($(ENABLE64BIT), Yes) ifeq ($(ARCH), x86_64)
ASMFLAGS += -f win64 ASMFLAGS += -f win64
ASMFLAGS_PLATFORM = -DWIN64 ASMFLAGS_PLATFORM = -DWIN64
else else

2
build/platform-darwin.mk
View File

@ -10,7 +10,7 @@ CFLAGS += -Wall -fPIC -MMD -MP
LDFLAGS += -lpthread LDFLAGS += -lpthread
ifeq ($(ASM_ARCH), x86) ifeq ($(ASM_ARCH), x86)
ASMFLAGS += -DPREFIX ASMFLAGS += -DPREFIX
ifeq ($(ENABLE64BIT), Yes) ifeq ($(ARCH), x86_64)
ASMFLAGS += -f macho64 ASMFLAGS += -f macho64
else else
ASMFLAGS += -f macho ASMFLAGS += -f macho

2
build/platform-freebsd.mk
View File

@ -5,7 +5,7 @@ SHLDFLAGS = -Wl,-soname,$(LIBPREFIX)$(PROJECT_NAME).$(SHAREDLIBSUFFIXVER)
CFLAGS += -fPIC CFLAGS += -fPIC
LDFLAGS += -lpthread LDFLAGS += -lpthread
ifeq ($(ASM_ARCH), x86) ifeq ($(ASM_ARCH), x86)
ifeq ($(ENABLE64BIT), Yes) ifeq ($(ARCH), x86_64)
ASMFLAGS += -f elf64 ASMFLAGS += -f elf64
else else
ASMFLAGS += -f elf ASMFLAGS += -f elf

2
build/platform-linux.mk
View File

@ -5,7 +5,7 @@ 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
ifeq ($(ASM_ARCH), x86) ifeq ($(ASM_ARCH), x86)
ifeq ($(ENABLE64BIT), Yes) ifeq ($(ARCH), x86_64)
ASMFLAGS += -f elf64 ASMFLAGS += -f elf64
else else
ASMFLAGS += -f elf ASMFLAGS += -f elf

2
build/platform-mingw_nt.mk
View File

@ -6,7 +6,7 @@ EXTRA_LIBRARY=$(LIBPREFIX)$(PROJECT_NAME).dll.a
SHLDFLAGS = -Wl,--out-implib,$(EXTRA_LIBRARY) SHLDFLAGS = -Wl,--out-implib,$(EXTRA_LIBRARY)
CFLAGS += -MMD -MP CFLAGS += -MMD -MP
LDFLAGS += LDFLAGS +=
ifeq ($(ENABLE64BIT), Yes) ifeq ($(ARCH), x86_64)
ASMFLAGS += -f win64 ASMFLAGS += -f win64
ASMFLAGS_PLATFORM = -DWIN64 ASMFLAGS_PLATFORM = -DWIN64
CC = x86_64-w64-mingw32-gcc CC = x86_64-w64-mingw32-gcc

14
build/x86-common.mk
View File

@ -1,12 +1,14 @@
CFLAGS_M32=-m32 CFLAGS_M32=-m32
CFLAGS_M64=-m64 CFLAGS_M64=-m64
ASM_INCLUDES = -I$(SRC_PATH)codec/common/x86/ ASM_INCLUDES = -I$(SRC_PATH)codec/common/x86/
ifeq (, $(ENABLE64BIT)) ifneq ($(ENABLE64BIT),)
ifeq ($(ARCH), x86_64)
ENABLE64BIT=Yes
endif
endif
ifeq ($(ENABLE64BIT), Yes) ifeq ($(ENABLE64BIT), Yes)
ARCH = x86_64
else
ARCH = x86
endif
endif
ifeq ($(ARCH), x86_64)
CFLAGS += $(CFLAGS_M64) CFLAGS += $(CFLAGS_M64)
LDFLAGS += $(CFLAGS_M64) LDFLAGS += $(CFLAGS_M64)
ASMFLAGS_PLATFORM = -DUNIX64 ASMFLAGS_PLATFORM = -DUNIX64
@ -17,7 +19,7 @@ ASMFLAGS_PLATFORM = -DX86_32
endif endif
ifeq ($(USE_ASM),Yes) ifeq ($(USE_ASM),Yes)
CFLAGS += -DX86_ASM CFLAGS += -DX86_ASM
ifneq ($(ENABLE64BIT), Yes) ifneq ($(ARCH), x86_64)
CFLAGS += -DX86_32_ASM CFLAGS += -DX86_32_ASM
endif endif
ASM_ARCH = x86 ASM_ARCH = x86