summaryrefslogtreecommitdiff
path: root/build/config.mk
diff options
context:
space:
mode:
authorJosh Coalson <jcoalson@users.sourceforce.net>2004-10-30 00:03:21 +0000
committerJosh Coalson <jcoalson@users.sourceforce.net>2004-10-30 00:03:21 +0000
commit2757af6c1d5fe20459b3c46c9f42a536e9118427 (patch)
tree11034fa4d9b9d9957245ae30159e24c78bb10a18 /build/config.mk
parent4f4d9675dec927272e307bc2c6329f7c6bda5f30 (diff)
downloadflac-2757af6c1d5fe20459b3c46c9f42a536e9118427.tar.gz
get Makefile.lite system (with asm) working on Darwin, better handling of libogg paths and linkage
Diffstat (limited to 'build/config.mk')
-rw-r--r--build/config.mk10
1 files changed, 9 insertions, 1 deletions
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