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 /makefiledir/Makefile.config_writer | |
| 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 'makefiledir/Makefile.config_writer')
| -rw-r--r-- | makefiledir/Makefile.config_writer | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/makefiledir/Makefile.config_writer b/makefiledir/Makefile.config_writer index 581411c54..60c6727ba 100644 --- a/makefiledir/Makefile.config_writer +++ b/makefiledir/Makefile.config_writer @@ -64,9 +64,11 @@ $(MAKE_CONFIG): $(call CONFIG_LINE,) $(call CONFIG_LINE,\# Libs) + $(call CONFIG_LINE,\# WITH_ICONV is not used on OSX since the flag is overwritten. It is always used unless the target OS is 10.2.8) $(call CONFIG_LINE,WITH_ZLIB:=$(WITH_ZLIB)) $(call CONFIG_LINE,WITH_SDL:=$(WITH_SDL)) $(call CONFIG_LINE,WITH_PNG:=$(WITH_PNG)) + $(call CONFIG_LINE,WITH_ICONV:=$(WITH_ICONV)) $(call CONFIG_LINE,STATIC_ZLIB_PATH:=$(STATIC_ZLIB_PATH)) $(call CONFIG_LINE,WITH_COCOA:=$(WITH_COCOA)) $(call CONFIG_LINE,) |