claunia/flac
1
0
Fork 0
mirror of https://github.com/claunia/flac.git synced 2025-12-16 18:54:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

More Makefile.lite fixes

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

15
build/config.mk
View File

@@ -42,15 +42,9 @@ endif
ifndef PROC ifndef PROC
ifeq ($(findstring Windows,$(OS)),Windows) ifeq ($(findstring Windows,$(OS)),Windows)
PROC := i386 # failsafe 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 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 ifeq ($(findstring x86_64,$(shell gcc -dumpmachine)),x86_64) # MinGW-w64: x86_64-w64-mingw32
PROC := x86_64 PROC := x86_64
F_PIC :=
endif endif
else else
ifeq ($(shell uname -p),amd64) ifeq ($(shell uname -p),amd64)
@@ -75,6 +69,15 @@ ifeq ($(OS),Linux)
USE_ICONV := 0 USE_ICONV := 0
endif 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 debug : BUILD = debug
valgrind : BUILD = debug valgrind : BUILD = debug
release : BUILD = release release : BUILD = release

1
src/share/Makefile.am
View File

@@ -46,6 +46,7 @@ EXTRA_DIST = \
utf8/utf8_static.vcproj \ utf8/utf8_static.vcproj \
utf8/utf8_static.vcxproj \ utf8/utf8_static.vcxproj \
utf8/utf8_static.vcxproj.filters \ utf8/utf8_static.vcxproj.filters \
win_utf8_io/Makefile.lite \
win_utf8_io/win_utf8_io_static.vcproj \ win_utf8_io/win_utf8_io_static.vcproj \
win_utf8_io/win_utf8_io_static.vcxproj \ win_utf8_io/win_utf8_io_static.vcxproj \
win_utf8_io/win_utf8_io_static.vcxproj.filters win_utf8_io/win_utf8_io_static.vcxproj.filters

1
src/utils/flactimer/Makefile.am
View File

@@ -17,6 +17,7 @@
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
EXTRA_DIST = \ EXTRA_DIST = \
Makefile.lite \
flactimer.vcproj \ flactimer.vcproj \
flactimer.vcxproj \ flactimer.vcxproj \
flactimer.vcxproj.filters \ flactimer.vcxproj.filters \