diff options
| author | Erik de Castro Lopo <erikd@mega-nerd.com> | 2016-12-21 16:14:46 +1100 |
|---|---|---|
| committer | Erik de Castro Lopo <erikd@mega-nerd.com> | 2016-12-21 16:14:50 +1100 |
| commit | 76c25ba87023b17c58ba0c6c20d81aabd932ac75 (patch) | |
| tree | 8b36ed3a95981c1317e8c5ea120f592905a0da82 | |
| parent | db3b3045f7e0fd851650087d70dd59066c72cae3 (diff) | |
| download | flac-76c25ba87023b17c58ba0c6c20d81aabd932ac75.tar.gz | |
More Makefile.lite fixes
Patch-from: Robert Kausch <robert.kausch@freac.org>
| -rw-r--r-- | build/config.mk | 15 | ||||
| -rw-r--r-- | src/share/Makefile.am | 1 | ||||
| -rw-r--r-- | src/utils/flactimer/Makefile.am | 1 |
3 files changed, 11 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 diff --git a/src/share/Makefile.am b/src/share/Makefile.am index d6bb1873..82d0fc96 100644 --- a/src/share/Makefile.am +++ b/src/share/Makefile.am @@ -46,6 +46,7 @@ EXTRA_DIST = \ utf8/utf8_static.vcproj \ utf8/utf8_static.vcxproj \ 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.vcxproj \ win_utf8_io/win_utf8_io_static.vcxproj.filters diff --git a/src/utils/flactimer/Makefile.am b/src/utils/flactimer/Makefile.am index 0dfe050b..3d9e91f4 100644 --- a/src/utils/flactimer/Makefile.am +++ b/src/utils/flactimer/Makefile.am @@ -17,6 +17,7 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. EXTRA_DIST = \ + Makefile.lite \ flactimer.vcproj \ flactimer.vcxproj \ flactimer.vcxproj.filters \ |