summaryrefslogtreecommitdiff
path: root/build
diff options
context:
space:
mode:
authorJosh Coalson <jcoalson@users.sourceforce.net>2006-05-18 07:35:30 +0000
committerJosh Coalson <jcoalson@users.sourceforce.net>2006-05-18 07:35:30 +0000
commit85425426e8513d6a6655df66f359e3d14480da96 (patch)
treee4de14ab50d7bde2917106111d883425b50a07e9 /build
parent03f54be74c7cbb3719cba9936ba30bd7c9f5a26e (diff)
downloadflac-85425426e8513d6a6655df66f359e3d14480da96.tar.gz
update iconv settings
Diffstat (limited to 'build')
-rw-r--r--build/config.mk11
1 files changed, 5 insertions, 6 deletions
diff --git a/build/config.mk b/build/config.mk
index ce7afbe2..400949d4 100644
--- a/build/config.mk
+++ b/build/config.mk
@@ -44,14 +44,13 @@ all default: $(DEFAULT_BUILD)
VERSION=\"CVS\"
ifeq ($(DARWIN_BUILD),yes)
-#CONFIG_CFLAGS=-DHAVE_INTTYPES_H -DHAVE_ICONV -DHAVE_SOCKLEN_T -DFLAC__HAS_OGG -DFLAC__SYS_DARWIN
-CONFIG_CFLAGS=-DHAVE_INTTYPES_H -DHAVE_ICONV -DFLAC__HAS_OGG -DFLAC__SYS_DARWIN
-else
-CONFIG_CFLAGS=-DHAVE_INTTYPES_H -DHAVE_ICONV -DHAVE_SOCKLEN_T -DFLAC__HAS_OGG
-endif
-
+#CONFIG_CFLAGS=-DHAVE_INTTYPES_H -DHAVE_ICONV -DHAVE_LANGINFO_CODESET -DHAVE_SOCKLEN_T -DFLAC__HAS_OGG -DFLAC__SYS_DARWIN
+CONFIG_CFLAGS=-DHAVE_INTTYPES_H -DHAVE_ICONV -DHAVE_LANGINFO_CODESET -DFLAC__HAS_OGG -DFLAC__SYS_DARWIN
ICONV_INCLUDE_DIR=$(HOME)/local.i18n/include
ICONV_LIB_DIR=$(HOME)/local.i18n/lib
+else
+CONFIG_CFLAGS=-DHAVE_INTTYPES_H -DHAVE_ICONV -DHAVE_LANGINFO_CODESET -DHAVE_SOCKLEN_T -DFLAC__HAS_OGG
+endif
OGG_INCLUDE_DIR=$(HOME)/local/include
OGG_LIB_DIR=$(HOME)/local/lib