diff options
| author | tron <tron@openttd.org> | 2006-03-24 06:40:49 +0000 |
|---|---|---|
| committer | tron <tron@openttd.org> | 2006-03-24 06:40:49 +0000 |
| commit | 6b40512a3c30970bbf094fb822197e3e07c38d73 (patch) | |
| tree | 6f573dc158324fc50b29d7d19e84656b632baf23 /makefiledir/Makefile.libdetection | |
| parent | fb48c3b4aa98540b03ef64410184547da70ea97c (diff) | |
| download | openttd-6b40512a3c30970bbf094fb822197e3e07c38d73.tar.xz | |
(svn r4076) Back out r4074. It doesn't work and leads to make endlessly calling itself. NOTE: Delete Makefile.config to recover.
Diffstat (limited to 'makefiledir/Makefile.libdetection')
| -rw-r--r-- | makefiledir/Makefile.libdetection | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/makefiledir/Makefile.libdetection b/makefiledir/Makefile.libdetection index 47d8edee1..237c02f98 100644 --- a/makefiledir/Makefile.libdetection +++ b/makefiledir/Makefile.libdetection @@ -121,12 +121,3 @@ WITH_PNG:= endif endif - -ifeq ($(shell expr $(CONFIG_VERSION) \< 10), 1) -# we need to test if iconv is present on the current system -# even though we test on OSX, the read data is actually not used since it relies on target OS and this flag will be overwritten later - -$(shell $(CC) -liconv -o makefiledir/iconv_detector makefiledir/iconv_detector.c 2>/dev/null) -WITH_ICONV:=$(shell makefiledir/iconv_detector 2>/dev/null) -$(shell rm makefiledir/iconv_detector 2>/dev/null) -endif |