diff options
| author | Darkvater <darkvater@openttd.org> | 2006-03-31 21:22:41 +0000 |
|---|---|---|
| committer | Darkvater <darkvater@openttd.org> | 2006-03-31 21:22:41 +0000 |
| commit | fdf4fa45ad6b0beed6c67a76001c0969e427e8f2 (patch) | |
| tree | 34805e5eb4958f93fa008df7f69434abe3975ed7 /Makefile | |
| parent | f4b492fa1ef0ac681416300f8d6782b248c849b1 (diff) | |
| download | openttd-fdf4fa45ad6b0beed6c67a76001c0969e427e8f2.tar.xz | |
(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
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 13 |
1 files changed, 11 insertions, 2 deletions
@@ -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() |