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/config.mk | |
| 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/config.mk')
| -rw-r--r-- | build/config.mk | 19 |
1 files changed, 14 insertions, 5 deletions
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 |