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

Merge pull request #1907 from mstorsjo/x86-64-arch-simplify

Browse Source 
Use ARCH instead of ENABLE64BIT for distinguishing between x86 and x86_64
This commit is contained in:
sijchen
2015-04-21 09:06:33 +08:00
parent dc59a7586f 9acca331c0
commit 15b7bc22c3
7 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
build/AutoBuildForWPAndWindows.bat
View File

@@ -369,10 +369,10 @@ rem ***********************************************
:Build :Build
set vConfiguration=%1 set vConfiguration=%1
cd %RootDir% cd %RootDir%
echo bash -c "make OS=%vOSType% ARCH=%vArcType% ENABLE64BIT=%vEnable64BitFlag% USE_ASM=%vASMFlag% BUILDTYPE=%vConfiguration% clean" echo bash -c "make OS=%vOSType% ARCH=%vArcType% USE_ASM=%vASMFlag% BUILDTYPE=%vConfiguration% clean"
echo bash -c "make OS=%vOSType% ARCH=%vArcType% ENABLE64BIT=%vEnable64BitFlag% USE_ASM=%vASMFlag% BUILDTYPE=%vConfiguration%" echo bash -c "make OS=%vOSType% ARCH=%vArcType% USE_ASM=%vASMFlag% BUILDTYPE=%vConfiguration%"
bash -c "make OS=%vOSType% ARCH=%vArcType% ENABLE64BIT=%vEnable64BitFlag% USE_ASM=%vASMFlag% BUILDTYPE=%vConfiguration% clean" bash -c "make OS=%vOSType% ARCH=%vArcType% USE_ASM=%vASMFlag% BUILDTYPE=%vConfiguration% clean"
bash -c "make OS=%vOSType% ARCH=%vArcType% ENABLE64BIT=%vEnable64BitFlag% USE_ASM=%vASMFlag% BUILDTYPE=%vConfiguration%" bash -c "make OS=%vOSType% ARCH=%vArcType% USE_ASM=%vASMFlag% BUILDTYPE=%vConfiguration%"
if not %ERRORLEVEL%==0 ( if not %ERRORLEVEL%==0 (
set BuildFlag=1 set BuildFlag=1
) )

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