summaryrefslogtreecommitdiff
path: root/build
diff options
context:
space:
mode:
authorErik de Castro Lopo <erikd@mega-nerd.com>2016-12-21 16:14:46 +1100
committerErik de Castro Lopo <erikd@mega-nerd.com>2016-12-21 16:14:50 +1100
commit76c25ba87023b17c58ba0c6c20d81aabd932ac75 (patch)
tree8b36ed3a95981c1317e8c5ea120f592905a0da82 /build
parentdb3b3045f7e0fd851650087d70dd59066c72cae3 (diff)
downloadflac-76c25ba87023b17c58ba0c6c20d81aabd932ac75.tar.gz
More Makefile.lite fixes
Patch-from: Robert Kausch <robert.kausch@freac.org>
Diffstat (limited to 'build')
-rw-r--r--build/config.mk15
1 files changed, 9 insertions, 6 deletions
diff --git a/build/config.mk b/build/config.mk
index 6771db8e..376982d6 100644
--- a/build/config.mk
+++ b/build/config.mk
@@ -42,15 +42,9 @@ endif
ifndef PROC
ifeq ($(findstring Windows,$(OS)),Windows)
PROC := i386 # failsafe
- USE_ICONV := 0
- USE_LANGINFO_CODESET := 0
- ifeq (mingw32,$(shell gcc -dumpmachine)) # MinGW (mainline): mingw32
- USE_FSEEKO := 0
- endif
# 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
- F_PIC :=
endif
else
ifeq ($(shell uname -p),amd64)
@@ -75,6 +69,15 @@ ifeq ($(OS),Linux)
USE_ICONV := 0
endif
+ifeq ($(findstring Windows,$(OS)),Windows)
+ F_PIC :=
+ USE_ICONV := 0
+ USE_LANGINFO_CODESET := 0
+ ifeq (mingw32,$(shell gcc -dumpmachine)) # MinGW (mainline): mingw32
+ USE_FSEEKO := 0
+ endif
+endif
+
debug : BUILD = debug
valgrind : BUILD = debug
release : BUILD = release