Commit 8f4dffe8 authored by Thomas Zander's avatar Thomas Zander Committed by Erik de Castro Lopo

Silence -finline-functions warning

This warning flag is gcc-specfic.
Signed-off-by: Erik de Castro Lopo's avatarErik de Castro Lopo <erikd@mega-nerd.com>
parent 1ab8a51c
...@@ -34,6 +34,9 @@ else ...@@ -34,6 +34,9 @@ else
CCC = g++ CCC = g++
endif endif
endif endif
ifeq ($(CC),gcc)
GCC_INLINE = -finline-functions
endif
NASM = nasm NASM = nasm
LINK = $(CC) $(LINKAGE) LINK = $(CC) $(LINKAGE)
OBJPATH = $(topdir)/objs OBJPATH = $(topdir)/objs
...@@ -60,8 +63,8 @@ CXXFLAGS := -g -O0 -DDEBUG -DDEBUG -DFLAC__VALGRIND_TESTING $(CXXFLAGS) $(BASE_C ...@@ -60,8 +63,8 @@ CXXFLAGS := -g -O0 -DDEBUG -DDEBUG -DFLAC__VALGRIND_TESTING $(CXXFLAGS) $(BASE_C
endif endif
ifeq ($(DEFAULT_BUILD),release) ifeq ($(DEFAULT_BUILD),release)
CFLAGS := -O3 -fomit-frame-pointer -funroll-loops -finline-functions -DFLaC__INLINE=__inline__ -DNDEBUG $(CFLAGS) $(BASE_CFLAGS) -Wmissing-prototypes -Wstrict-prototypes CFLAGS := -O3 -fomit-frame-pointer -funroll-loops $(GCC_INLINE) -DFLaC__INLINE=__inline__ -DNDEBUG $(CFLAGS) $(BASE_CFLAGS) -Wmissing-prototypes -Wstrict-prototypes
CXXFLAGS := -O3 -fomit-frame-pointer -funroll-loops -finline-functions -DFLaC__INLINE=__inline__ -DNDEBUG $(CXXFLAGS) $(BASE_CFLAGS) CXXFLAGS := -O3 -fomit-frame-pointer -funroll-loops $(GCC_INLINE) -DFLaC__INLINE=__inline__ -DNDEBUG $(CXXFLAGS) $(BASE_CFLAGS)
endif endif
LFLAGS = -L$(LIBPATH) LFLAGS = -L$(LIBPATH)
......
...@@ -34,6 +34,9 @@ else ...@@ -34,6 +34,9 @@ else
CCC = g++ CCC = g++
endif endif
endif endif
ifeq ($(CC),gcc)
GCC_INLINE = -finline-functions
endif
NASM = nasm NASM = nasm
LINK = ar cru LINK = ar cru
OBJPATH = $(topdir)/objs OBJPATH = $(topdir)/objs
...@@ -79,8 +82,8 @@ CXXFLAGS := -g -O0 -DDEBUG -DDEBUG -DFLAC__VALGRIND_TESTING $(CFLAGS) $(BASE_CFL ...@@ -79,8 +82,8 @@ CXXFLAGS := -g -O0 -DDEBUG -DDEBUG -DFLAC__VALGRIND_TESTING $(CFLAGS) $(BASE_CFL
endif endif
ifeq ($(DEFAULT_BUILD),release) ifeq ($(DEFAULT_BUILD),release)
CFLAGS := -O3 -fomit-frame-pointer -funroll-loops -finline-functions -DFLaC__INLINE=__inline__ -DNDEBUG $(CFLAGS) $(BASE_CFLAGS) -Wmissing-prototypes -Wstrict-prototypes CFLAGS := -O3 -fomit-frame-pointer -funroll-loops $(GCC_INLINE) -DFLaC__INLINE=__inline__ -DNDEBUG $(CFLAGS) $(BASE_CFLAGS) -Wmissing-prototypes -Wstrict-prototypes
CXXFLAGS := -O3 -fomit-frame-pointer -funroll-loops -finline-functions -DFLaC__INLINE=__inline__ -DNDEBUG $(CFLAGS) $(BASE_CFLAGS) CXXFLAGS := -O3 -fomit-frame-pointer -funroll-loops $(GCC_INLINE) -DFLaC__INLINE=__inline__ -DNDEBUG $(CFLAGS) $(BASE_CFLAGS)
endif endif
LFLAGS = -L$(LIBPATH) LFLAGS = -L$(LIBPATH)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment