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 | |
| 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')
| -rw-r--r-- | makefiledir/Makefile.config_writer | 2 | ||||
| -rw-r--r-- | makefiledir/Makefile.libdetection | 9 | ||||
| -rw-r--r-- | makefiledir/iconv_detector.c | 18 |
3 files changed, 0 insertions, 29 deletions
diff --git a/makefiledir/Makefile.config_writer b/makefiledir/Makefile.config_writer index 60c6727ba..581411c54 100644 --- a/makefiledir/Makefile.config_writer +++ b/makefiledir/Makefile.config_writer @@ -64,11 +64,9 @@ $(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,) 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 diff --git a/makefiledir/iconv_detector.c b/makefiledir/iconv_detector.c deleted file mode 100644 index 709656cb9..000000000 --- a/makefiledir/iconv_detector.c +++ /dev/null @@ -1,18 +0,0 @@ -/* $Id$ */ - -#include <stdlib.h> -#include <iconv.h> -#include <stdio.h> - -/* this is a pretty simple app, that will return 1 if it manages to compile and execute - * This means that it can be used by the makefile to detect if iconv is present on the current system - * no iconv means this file fails and will return nothing */ - -int main () -{ - iconv_t cd = iconv_open("",""); - iconv(cd,NULL,NULL,NULL,NULL); - iconv_close(cd); - printf("1\n"); - return 0; -} |