diff options
author | Evan Ramos <Hendricks266@gmail.com> | 2014-06-23 16:24:49 -0500 |
---|---|---|
committer | Erik de Castro Lopo <erikd@mega-nerd.com> | 2014-06-24 21:02:24 +1000 |
commit | 9df6736ec09f9de05425ba38d7f63648b1242f98 (patch) | |
tree | b247c41a4c3b550e673016416dd9c0a849611ebe /build | |
parent | 731655ad23b4393c7a0d1c69a755e1a9e369d920 (diff) | |
download | flac-9df6736ec09f9de05425ba38d7f63648b1242f98.tar.gz |
Update Makefile.lite build system.
Signed-off-by: Erik de Castro Lopo <erikd@mega-nerd.com>
Diffstat (limited to 'build')
-rw-r--r-- | build/compile.mk | 12 | ||||
-rw-r--r-- | build/config.mk | 19 | ||||
-rw-r--r-- | build/exe.mk | 11 | ||||
-rw-r--r-- | build/lib.mk | 11 |
4 files changed, 34 insertions, 19 deletions
diff --git a/build/compile.mk b/build/compile.mk index 205cb304..a2636c48 100644 --- a/build/compile.mk +++ b/build/compile.mk @@ -23,21 +23,21 @@ %.debug.o %.release.o : %.c $(CC) $(CFLAGS) -c $< -o $@ %.debug.o %.release.o : %.cc - $(CCC) $(CFLAGS) -c $< -o $@ + $(CCC) $(CXXFLAGS) -c $< -o $@ %.debug.o %.release.o : %.cpp - $(CCC) $(CFLAGS) -c $< -o $@ + $(CCC) $(CXXFLAGS) -c $< -o $@ %.debug.pic.o %.release.pic.o : %.c $(CC) $(CFLAGS) -fPIC -DPIC -c $< -o $@ %.debug.pic.o %.release.pic.o : %.cc - $(CCC) $(CFLAGS) -fPIC -DPIC -c $< -o $@ + $(CCC) $(CXXFLAGS) -fPIC -DPIC -c $< -o $@ %.debug.pic.o %.release.pic.o : %.cpp - $(CCC) $(CFLAGS) -fPIC -DPIC -c $< -o $@ + $(CCC) $(CXXFLAGS) -fPIC -DPIC -c $< -o $@ %.debug.i %.release.i : %.c $(CC) $(CFLAGS) -E $< -o $@ %.debug.i %.release.i : %.cc - $(CCC) $(CFLAGS) -E $< -o $@ + $(CCC) $(CXXFLAGS) -E $< -o $@ %.debug.i %.release.i : %.cpp - $(CCC) $(CFLAGS) -E $< -o $@ + $(CCC) $(CXXFLAGS) -E $< -o $@ %.debug.o %.release.o : %.s ifeq ($(OS),Darwin) diff --git a/build/config.mk b/build/config.mk index 64161935..916c5415 100644 --- a/build/config.mk +++ b/build/config.mk @@ -22,6 +22,8 @@ USE_OGG ?= 1 USE_ICONV ?= 1 +USE_LROUND ?= 1 +USE_FSEEKO ?= 1 # # debug/release selection @@ -41,11 +43,10 @@ ifdef PROC_OVERRIDE else ifeq ($(findstring MINGW,$(OS)),MINGW) PROC := i386 # failsafe + USE_ICONV := 0 # ifeq (mingw32,$(shell gcc -dumpmachine)) # MinGW (mainline): mingw32 - ifeq ($(findstring i686,$(shell gcc -dumpmachine)),i686) # MinGW-w64: i686-w64-mingw32 - USE_ICONV := 0 - else ifeq ($(findstring x86_64,$(shell gcc -dumpmachine)),x86_64) # MinGW-w64: x86_64-w64-mingw32 - USE_ICONV := 0 + # ifeq ($(findstring i686,$(shell gcc -dumpmachine)),i686) # MinGW-w64: i686-w64-mingw32 + ifeq ($(findstring x86_64,$(shell gcc -dumpmachine)),x86_64) # MinGW-w64: x86_64-w64-mingw32 PROC := x86_64 endif else @@ -82,7 +83,7 @@ all default: $(DEFAULT_BUILD) VERSION=\"1.3.0\" -CONFIG_CFLAGS=-DHAVE_STDINT_H -DHAVE_INTTYPES_H -DHAVE_CXX_VARARRAYS -DHAVE_LANGINFO_CODESET -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 +CONFIG_CFLAGS=$(CUSTOM_CFLAGS) -DHAVE_STDINT_H -DHAVE_INTTYPES_H -DHAVE_CXX_VARARRAYS -DHAVE_LANGINFO_CODESET -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 ifeq ($(OS),Darwin) CONFIG_CFLAGS += -DFLAC__SYS_DARWIN -arch $(PROC) @@ -125,3 +126,11 @@ endif OGG_INCLUDE_DIR=$(HOME)/local/include OGG_LIB_DIR=$(HOME)/local/lib + +ifneq (0,$(USE_LROUND)) + CONFIG_CFLAGS += -DHAVE_LROUND +endif + +ifneq (0,$(USE_FSEEKO)) + CONFIG_CFLAGS += -DHAVE_FSEEKO +endif diff --git a/build/exe.mk b/build/exe.mk index 8c52f8a8..576c3c0d 100644 --- a/build/exe.mk +++ b/build/exe.mk @@ -42,11 +42,14 @@ PROGRAM = $(BINPATH)/$(PROGRAM_NAME) DEBUG_PROGRAM = $(DEBUG_BINPATH)/$(PROGRAM_NAME) RELEASE_PROGRAM = $(RELEASE_BINPATH)/$(PROGRAM_NAME) -debug : CFLAGS = -g -O0 -DDEBUG $(CONFIG_CFLAGS) $(DEBUG_CFLAGS) -W -Wall -Wmissing-prototypes -Wstrict-prototypes -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES) -valgrind: CFLAGS = -g -O0 -DDEBUG $(CONFIG_CFLAGS) $(DEBUG_CFLAGS) -DFLAC__VALGRIND_TESTING -W -Wall -Wmissing-prototypes -Wstrict-prototypes -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES) -release : CFLAGS = -O3 -fomit-frame-pointer -funroll-loops -finline-functions -DNDEBUG $(CONFIG_CFLAGS) $(RELEASE_CFLAGS) -W -Wall -Wmissing-prototypes -Wstrict-prototypes -Winline -DFLaC__INLINE=__inline__ -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES) +debug : CFLAGS = -g -O0 -DDEBUG $(CONFIG_CFLAGS) $(DEBUG_CFLAGS) -W -Wall -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES) +valgrind: CFLAGS = -g -O0 -DDEBUG $(CONFIG_CFLAGS) $(DEBUG_CFLAGS) -DFLAC__VALGRIND_TESTING -W -Wall -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES) +release : CFLAGS = -O3 -fomit-frame-pointer -funroll-loops -finline-functions -DNDEBUG $(CONFIG_CFLAGS) $(RELEASE_CFLAGS) -W -Wall -Winline -DFLaC__INLINE=__inline__ -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES) -LFLAGS = -L$(LIBPATH) +CFLAGS = $(CFLAGS) -Wmissing-prototypes -Wstrict-prototypes +CXXFLAGS = $(CFLAGS) + +LFLAGS = -L$(LIBPATH) DEBUG_OBJS = $(SRCS_C:%.c=%.debug.o) $(SRCS_CC:%.cc=%.debug.o) $(SRCS_CPP:%.cpp=%.debug.o) $(SRCS_NASM:%.nasm=%.debug.o) $(SRCS_S:%.s=%.debug.o) RELEASE_OBJS = $(SRCS_C:%.c=%.release.o) $(SRCS_CC:%.cc=%.release.o) $(SRCS_CPP:%.cpp=%.release.o) $(SRCS_NASM:%.nasm=%.release.o) $(SRCS_S:%.s=%.release.o) diff --git a/build/lib.mk b/build/lib.mk index d5645b7f..bb52b1a6 100644 --- a/build/lib.mk +++ b/build/lib.mk @@ -60,11 +60,14 @@ else LINKD = $(CC) -shared endif -debug : CFLAGS = -g -O0 -DDEBUG $(CONFIG_CFLAGS) $(DEBUG_CFLAGS) -W -Wall -Wmissing-prototypes -Wstrict-prototypes -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES) -valgrind: CFLAGS = -g -O0 -DDEBUG $(CONFIG_CFLAGS) $(DEBUG_CFLAGS) -DFLAC__VALGRIND_TESTING -W -Wall -Wmissing-prototypes -Wstrict-prototypes -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES) -release : CFLAGS = -O3 -fomit-frame-pointer -funroll-loops -finline-functions -DNDEBUG $(CONFIG_CFLAGS) $(RELEASE_CFLAGS) -W -Wall -Wmissing-prototypes -Wstrict-prototypes -Winline -DFLaC__INLINE=__inline__ -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES) +debug : CFLAGS = -g -O0 -DDEBUG $(CONFIG_CFLAGS) $(DEBUG_CFLAGS) -W -Wall -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES) +valgrind: CFLAGS = -g -O0 -DDEBUG $(CONFIG_CFLAGS) $(DEBUG_CFLAGS) -DFLAC__VALGRIND_TESTING -W -Wall -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES) +release : CFLAGS = -O3 -fomit-frame-pointer -funroll-loops -finline-functions -DNDEBUG $(CONFIG_CFLAGS) $(RELEASE_CFLAGS) -W -Wall -Winline -DFLaC__INLINE=__inline__ -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES) -LFLAGS = -L$(LIBPATH) +CFLAGS = $(CFLAGS) -Wmissing-prototypes -Wstrict-prototypes +CXXFLAGS = $(CFLAGS) + +LFLAGS = -L$(LIBPATH) DEBUG_OBJS = $(SRCS_C:%.c=%.debug.o) $(SRCS_CC:%.cc=%.debug.o) $(SRCS_CPP:%.cpp=%.debug.o) $(SRCS_NASM:%.nasm=%.debug.o) $(SRCS_S:%.s=%.debug.o) RELEASE_OBJS = $(SRCS_C:%.c=%.release.o) $(SRCS_CC:%.cc=%.release.o) $(SRCS_CPP:%.cpp=%.release.o) $(SRCS_NASM:%.nasm=%.release.o) $(SRCS_S:%.s=%.release.o) |