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 | 742e806d737335cb62a2d471addf19fcbe220f49 (patch) | |
| tree | 6f573dc158324fc50b29d7d19e84656b632baf23 | |
| parent | ea1adebe31673917c957f455d3588b6486142128 (diff) | |
| download | openttd-742e806d737335cb62a2d471addf19fcbe220f49.tar.xz | |
(svn r4076) Back out r4074. It doesn't work and leads to make endlessly calling itself. NOTE: Delete Makefile.config to recover.
| -rw-r--r-- | Makefile | 7 | ||||
| -rw-r--r-- | makefiledir/Makefile.config_writer | 2 | ||||
| -rw-r--r-- | makefiledir/Makefile.libdetection | 9 | ||||
| -rw-r--r-- | makefiledir/iconv_detector.c | 18 | ||||
| -rw-r--r-- | os/macosx/Makefile.setup | 7 |
5 files changed, 4 insertions, 39 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:=10 +MAKEFILE_VERSION:=9 # CONFIG_WRITER has to be found even for manual configuration CONFIG_WRITER=makefiledir/Makefile.config_writer @@ -485,9 +485,10 @@ LIBS += $(shell $(LIBPNG-CONFIG) --L_opts $(PNGCONFIG_FLAGS)) endif endif -ifdef WITH_ICONV +ifdef OSX +ifndef JAGUAR LIBS += -liconv -CFLAGS += -DWITH_ICONV +endif endif # enables/disables assert() 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; -} diff --git a/os/macosx/Makefile.setup b/os/macosx/Makefile.setup index 92969ae43..159bf0aa5 100644 --- a/os/macosx/Makefile.setup +++ b/os/macosx/Makefile.setup @@ -84,10 +84,3 @@ $(shell $(CC) os/macosx/G5_detector.c -o os/macosx/G5_detector) endif endif endif - -# the OSX port need Apple's modified iconv to use the charset UTF-8-MAC. This was added by default in 10.3, but is not present in earlier versions -ifdef JAGUAR - WITH_ICONV:= -else - WITH_ICONV:=1 -endif |