From 2757af6c1d5fe20459b3c46c9f42a536e9118427 Mon Sep 17 00:00:00 2001 From: Josh Coalson Date: Sat, 30 Oct 2004 00:03:21 +0000 Subject: get Makefile.lite system (with asm) working on Darwin, better handling of libogg paths and linkage --- build/config.mk | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'build/config.mk') diff --git a/build/config.mk b/build/config.mk index eaba1829..ac7f8941 100644 --- a/build/config.mk +++ b/build/config.mk @@ -25,9 +25,14 @@ debug : BUILD = debug valgrind : BUILD = debug release : BUILD = release +# override LINKAGE on OS X until we figure out how to get 'cc -static' to work +ifeq ($(DARWIN_BUILD),yes) +LINKAGE = +else debug : LINKAGE = -static valgrind : LINKAGE = -dynamic release : LINKAGE = -static +endif all default: $(DEFAULT_BUILD) @@ -37,4 +42,7 @@ all default: $(DEFAULT_BUILD) VERSION=\"1.1.1\" -CONFIG_CFLAGS=-D_GNU_SOURCE -DHAVE_INTTYPES_H -DHAVE_WCSDUP -DHAVE_WCSCASECMP +CONFIG_CFLAGS=-D_GNU_SOURCE -DHAVE_INTTYPES_H -DHAVE_WCSDUP -DHAVE_WCSCASECMP -DFLAC__HAS_OGG + +OGG_INCLUDE_DIR=$(HOME)/local.ogg/include +OGG_LIB_DIR=$(HOME)/local.ogg/lib -- cgit v1.2.1