X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=build%2Fconfig.mk;h=5dd72bbe3a0bcd0271e9abb96c9589243fbf3738;hb=bf632684258421c329e572c647d06e76399bd258;hp=b87433f75d740d2ea680cd329ce5829468915f4e;hpb=95b8968389fe9f428ad6b02d955c7a150f6c8f65;p=platform%2Fupstream%2Fflac.git

diff --git a/build/config.mk b/build/config.mk
index b87433f..5dd72bb 100644
--- a/build/config.mk
+++ b/build/config.mk
@@ -1,5 +1,5 @@
 #  FLAC - Free Lossless Audio Codec
-#  Copyright (C) 2001,2002,2003,2004,2005,2006 Josh Coalson
+#  Copyright (C) 2001,2002,2003,2004,2005,2006,2007,2008,2009  Josh Coalson
 #
 #  This file is part the FLAC project.  FLAC is comprised of several
 #  components distributed under difference licenses.  The codec libraries
@@ -16,18 +16,57 @@
 #  distribution.
 
 #
+# customizable settings from the make invocation
+#
+
+USE_OGG     ?= 1
+USE_ICONV   ?= 1
+
+#
 # debug/release selection
 #
 
 DEFAULT_BUILD = release
 
+# returns Linux, Darwin, FreeBSD, etc.
+ifdef OS_OVERRIDE
+    OS := $(OS_OVERRIDE)
+else
+    OS := $(shell uname -s)
+endif
+# returns i386, x86_64, powerpc, etc.
+ifdef PROC_OVERRIDE
+    PROC := $(PROC_OVERRIDE)
+else
+    ifeq ($(findstring MINGW,$(OS)),MINGW)
+        PROC := i386 # failsafe
+        # ifeq (mingw32,$(shell gcc -dumpmachine)) # MinGW (mainline): mingw32
+        ifeq ($(findstring i686,$(shell gcc -dumpmachine)),i686) # MinGW-w64: i686-w64-mingw32
+            USE_ICONV := 0
+        else ifeq ($(findstring x86_64,$(shell gcc -dumpmachine)),x86_64) # MinGW-w64: x86_64-w64-mingw32
+            USE_ICONV := 0
+            PROC := x86_64
+        endif
+    else
+        PROC := $(shell uname -p)
+    endif
+endif
+ifeq ($(PROC),powerpc)
+    PROC := ppc
+endif
+
+ifeq ($(OS),Linux)
+    PROC := $(shell uname -m)
+    USE_ICONV := 0
+endif
+
 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 = 
+ifeq ($(OS),Darwin)
+LINKAGE = -arch $(PROC)
 else
 debug    : LINKAGE = -static
 valgrind : LINKAGE = -dynamic
@@ -40,15 +79,47 @@ all default: $(DEFAULT_BUILD)
 # GNU makefile fragment for emulating stuff normally done by configure
 #
 
-VERSION=\"1.1.3\"
+VERSION=\"1.2.1\"
+
+CONFIG_CFLAGS=-DHAVE_STDINT_H -DHAVE_INTTYPES_H -DHAVE_CXX_VARARRAYS -DHAVE_LANGINFO_CODESET -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
+
+ifeq ($(OS),Darwin)
+    CONFIG_CFLAGS += -DFLAC__SYS_DARWIN -arch $(PROC)
+else
+    CONFIG_CFLAGS += -DHAVE_SOCKLEN_T
+endif
+
+ifeq ($(PROC),ppc)
+    CONFIG_CFLAGS += -DWORDS_BIGENDIAN=1
+else
+    CONFIG_CFLAGS += -DWORDS_BIGENDIAN=0
+endif
+
+ifeq ($(OS),Linux)
+	ifeq ($(PROC),x86_64)
+        CONFIG_CFLAGS += -fPIC
+	endif
+endif
+
+ifneq (0,$(USE_ICONV))
+    CONFIG_CFLAGS += -DHAVE_ICONV
+    ICONV_LIBS = -liconv
+else
+    ICONV_LIBS =
+endif
 
-ifeq ($(DARWIN_BUILD),yes)
-#CONFIG_CFLAGS=-DHAVE_INTTYPES_H -DHAVE_ICONV -DHAVE_LANGINFO_CODESET -DHAVE_SOCKLEN_T -DFLAC__HAS_OGG -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -DFLAC__SYS_DARWIN
-CONFIG_CFLAGS=-DHAVE_INTTYPES_H -DHAVE_ICONV -DHAVE_LANGINFO_CODESET -DFLAC__HAS_OGG -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -DFLAC__SYS_DARWIN
-ICONV_INCLUDE_DIR=$(HOME)/local.i18n/include
-ICONV_LIB_DIR=$(HOME)/local.i18n/lib
+ifneq (0,$(USE_OGG))
+    CONFIG_CFLAGS += -DFLAC__HAS_OGG=1
+    OGG_INCLUDES = -I$(OGG_INCLUDE_DIR)
+    OGG_EXPLICIT_LIBS = $(OGG_LIB_DIR)/libogg.a
+    OGG_LIBS = -L$(OGG_LIB_DIR) -logg
+    OGG_SRCS = $(OGG_SRCS_C)
 else
-CONFIG_CFLAGS=-DHAVE_INTTYPES_H -DHAVE_ICONV -DHAVE_LANGINFO_CODESET -DHAVE_SOCKLEN_T -DFLAC__HAS_OGG -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
+    CONFIG_CFLAGS += -DFLAC__HAS_OGG=0
+    OGG_INCLUDES =
+    OGG_EXPLICIT_LIBS =
+    OGG_LIBS =
+    OGG_SRCS =
 endif
 
 OGG_INCLUDE_DIR=$(HOME)/local/include