hashirama/uvg266
1
0
Fork 0
mirror of https://github.com/ultravideo/uvg266.git synced 2024-11-24 10:34:05 +00:00
Code Issues Actions Projects Releases Wiki Activity

Give ARCH_X86_64 to yasm on Mac.

Browse source 
- Issue raised in #85.
This commit is contained in:
Ari Koivula 2014-10-14 09:45:18 +03:00
parent 55ab08c213
commit 6f8a976b12
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/Makefile
View file

@ -27,12 +27,10 @@ LDFLAGS += -m$(TARGET_CPU_BITS)
ifneq ( ,$(findstring Windows, $(OS))) ifneq ( ,$(findstring Windows, $(OS)))
ifeq ($(ARCH), x86_64) ifeq ($(ARCH), x86_64)
ASMFLAGS += -f win64 ASMFLAGS += -f win64
ASMFLAGS += -DARCH_X86_64=1
ASMFLAGS += -DHAVE_ALIGNED_STACK=1 ASMFLAGS += -DHAVE_ALIGNED_STACK=1
else else
ASMFLAGS += -f win32 ASMFLAGS += -f win32
ASMFLAGS += -DPREFIX ASMFLAGS += -DPREFIX
ASMFLAGS += -DARCH_X86_64=0
ASMFLAGS += -DHAVE_ALIGNED_STACK=0 ASMFLAGS += -DHAVE_ALIGNED_STACK=0
endif endif
DFLAGS += -D__USE_MINGW_ANSI_STDIO=1 DFLAGS += -D__USE_MINGW_ANSI_STDIO=1
@ -43,17 +41,21 @@ else ifeq ($(SYSTEM),Darwin)
else else
ASMFLAGS += -f macho32 ASMFLAGS += -f macho32
endif endif
ASMFLAGS += -DPREFIX ASMFLAGS += -DPREFIX
# Default to Linux/elf specific flags # Default to Linux/elf specific flags
else else
ifeq ($(ARCH), x86_64) ifeq ($(ARCH), x86_64)
ASMFLAGS += -f elf64 ASMFLAGS += -f elf64
ASMFLAGS += -DARCH_X86_64=1
else else
ASMFLAGS += -f elf32 ASMFLAGS += -f elf32
ASMFLAGS += -DARCH_X86_64=0
endif endif
endif endif
# Flags shared across systems
ifeq ($(ARCH), x86_64)
ASMFLAGS += -DARCH_X86_64=1
else
ASMFLAGS += -DARCH_X86_64=0
endif
# Do not use variable length arrays because they don't work in Visual Studio 2013. # Do not use variable length arrays because they don't work in Visual Studio 2013.
WARNINGS = -Wall -Wtype-limits -Wvla WARNINGS = -Wall -Wtype-limits -Wvla