diff options
| author | Hendricks266 <Hendricks266@gmail.com> | 2012-12-29 04:22:59 -0600 |
|---|---|---|
| committer | Erik de Castro Lopo <erikd@mega-nerd.com> | 2013-01-02 21:35:47 +1100 |
| commit | 96d081c1c9b96743631f3a90d4798150ead43d47 (patch) | |
| tree | 9a5f9a46f2826352fe2577301ec690d429fc8f3c /build/lib.mk | |
| parent | 0da96d3cfd13931439324785ca1b89bb788a4a49 (diff) | |
| download | flac-96d081c1c9b96743631f3a90d4798150ead43d47.tar.gz | |
Fix building with MSYS and MinGW(-w64); Improve Makefile.lite build system
This is a patch to allow building of the project using MSYS, MinGW, and MinGW-w64 with the following invocation:
make -f Makefile.lite libFLAC libFLAC++ flac metaflac test_libs_common test_libFLAC test_libFLAC++ test_grabbag test_seeking test_streams utils examples
This patch addresses eight points:
1. `uname -p` in MSYS returns "unknown" so we must use `gcc -dumpmachine` to gain information about the target, 32-bit or 64-bit.
2. MinGW-w64 does not ship with a working iconv.h, so we must disable it under this specific compiler.
3. The code requires <inttypes.h> in a handful of C files, but config.mk did not contain -DHAVE_INTTYPES_H, which under the full build process (I assume) is added by autoconf.
4. The compiler complained when lround() in lpc.c was static, so it is no longer static.
5. Additional scattered linking directives (and reordering) (particularly FLAC, grabbag, and replaygain_analysis) were necessary to build some of the components.
6. The Makefile.lite build system benefited from some cleanup, particularly by rigorously defining all entries, factoring redundancy, and establishing dependencies. (Some typos were fixed too.)
7. Shared objects on Windows use .dll, not .so. (Added *.dll, *.dylib, and *.exe to .gitignore.)
8. To allow more freedom using Makefile.lite without configure, I added the variables USE_OGG and USE_ICONV which can toggle these two components in the build process.
ex: make -f Makefile.lite examples USE_OGG=0 USE_ICONV=0
These improvements make use of some use-time Makefile variable expansion.
Signed-off-by: Erik de Castro Lopo <erikd@mega-nerd.com>
Diffstat (limited to 'build/lib.mk')
| -rw-r--r-- | build/lib.mk | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/build/lib.mk b/build/lib.mk index 32f9a220..cce311eb 100644 --- a/build/lib.mk +++ b/build/lib.mk @@ -22,11 +22,11 @@ include $(topdir)/build/config.mk ifeq ($(OS),Darwin) -CC = cc -CCC = c++ + CC = cc + CCC = c++ else -CC = gcc -CCC = g++ + CC = gcc + CCC = g++ endif AS = as NASM = nasm @@ -36,11 +36,14 @@ LIBPATH = $(OBJPATH)/$(BUILD)/lib DEBUG_LIBPATH = $(OBJPATH)/debug/lib RELEASE_LIBPATH = $(OBJPATH)/release/lib ifeq ($(OS),Darwin) -STATIC_LIB_SUFFIX = a -DYNAMIC_LIB_SUFFIX = dylib + STATIC_LIB_SUFFIX = a + DYNAMIC_LIB_SUFFIX = dylib +else ifeq ($(findstring MINGW,$(OS)),MINGW) + STATIC_LIB_SUFFIX = a + DYNAMIC_LIB_SUFFIX = dll else -STATIC_LIB_SUFFIX = a -DYNAMIC_LIB_SUFFIX = so + STATIC_LIB_SUFFIX = a + DYNAMIC_LIB_SUFFIX = so endif STATIC_LIB_NAME = $(LIB_NAME).$(STATIC_LIB_SUFFIX) DYNAMIC_LIB_NAME = $(LIB_NAME).$(DYNAMIC_LIB_SUFFIX) @@ -51,9 +54,9 @@ DEBUG_DYNAMIC_LIB = $(DEBUG_LIBPATH)/$(DYNAMIC_LIB_NAME) RELEASE_STATIC_LIB = $(RELEASE_LIBPATH)/$(STATIC_LIB_NAME) RELEASE_DYNAMIC_LIB = $(RELEASE_LIBPATH)/$(DYNAMIC_LIB_NAME) ifeq ($(OS),Darwin) -LINKD = $(CC) -dynamiclib -flat_namespace -undefined suppress -install_name $(DYNAMIC_LIB) + LINKD = $(CC) -dynamiclib -flat_namespace -undefined suppress -install_name $(DYNAMIC_LIB) else -LINKD = $(CC) -shared + LINKD = $(CC) -shared endif debug : CFLAGS = -g -O0 -DDEBUG $(CONFIG_CFLAGS) $(DEBUG_CFLAGS) -W -Wall -Wmissing-prototypes -Wstrict-prototypes -DVERSION=$(VERSION) $(DEFINES) $(INCLUDES) |