diff options
| author | bjarni <bjarni@openttd.org> | 2006-03-23 23:54:43 +0000 |
|---|---|---|
| committer | bjarni <bjarni@openttd.org> | 2006-03-23 23:54:43 +0000 |
| commit | 10936e70345e4d462517e35511f0e56b69c444e9 (patch) | |
| tree | 6ffab345b4e5937c329ed5663a3b4bd2a268b369 /Makefile | |
| parent | 541703a2f6687fcb7d9f4d1453f84d80b67cd58c (diff) | |
| download | openttd-10936e70345e4d462517e35511f0e56b69c444e9.tar.xz | |
(svn r4074) -Feature: [Makefile] the makefile can now detect if iconv is present in the system
if detected, WITH_ICONV will be defined in the C code
WITH_ICONV is also added to Makefile.config
OSX do not use this flag setting in Makefile.config, as it is set at compile time based on target OS version
the actual C code is not changed as the current iconv code is hardcoded for OSX and would break if any other OS got iconv
This detection system is by request of Darkvater
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 7 |
1 files changed, 3 insertions, 4 deletions
@@ -130,7 +130,7 @@ # Makefile version tag # it checks if the version tag in Makefile.config is the same and force update outdated config files -MAKEFILE_VERSION:=9 +MAKEFILE_VERSION:=10 # CONFIG_WRITER has to be found even for manual configuration CONFIG_WRITER=makefiledir/Makefile.config_writer @@ -485,10 +485,9 @@ LIBS += $(shell $(LIBPNG-CONFIG) --L_opts $(PNGCONFIG_FLAGS)) endif endif -ifdef OSX -ifndef JAGUAR +ifdef WITH_ICONV LIBS += -liconv -endif +CFLAGS += -DWITH_ICONV endif # enables/disables assert() |