More Makefile.lite fixes

Patch-from: Robert Kausch <robert.kausch@freac.org>
This commit is contained in:
Erik de Castro Lopo
2016-12-21 16:14:46 +11:00
parent db3b3045f7
commit 76c25ba870
3 changed files with 11 additions and 6 deletions

View File

@@ -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