(svn r4219) - Add support for WITH_ICONV. It is enabled by default for OSX > 10.3 for all others set it with WITH_ICONV in Makefile.config or with --with-iconv with configure. --with-config=/somedir will search for iconv include files somewhere (or in Makefile.config with WITH_ICONV_PATH). Custom library loading is not (yet) supported
This commit is contained in:
13
Makefile
13
Makefile
@@ -448,10 +448,19 @@ LIBS += $(shell $(LIBPNG_CONFIG) --L_opts $(PNGCONFIG_FLAGS))
|
||||
endif
|
||||
endif
|
||||
|
||||
# iconv is enabled defaultly on OSX > 10.3
|
||||
ifdef OSX
|
||||
ifndef JAGUAR
|
||||
LIBS += -liconv
|
||||
ifndef JAGUAR
|
||||
WITH_ICONV=1
|
||||
LIBS += -liconv
|
||||
endif
|
||||
endif
|
||||
|
||||
ifdef WITH_ICONV
|
||||
CDEFS += -DWITH_ICONV
|
||||
ifdef WITH_ICONV_PATH
|
||||
CFLAGS += -I$(WITH_ICONV_PATH)
|
||||
endif
|
||||
endif
|
||||
|
||||
# enables/disables assert()
|
||||
|
||||
Reference in New Issue
Block a user