mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r4076) Back out r4074. It doesn't work and leads to make endlessly calling itself. NOTE: Delete Makefile.config to recover.

release/0.5
tron 2006-03-24 06:40:49 +00:00
parent ea1adebe31
commit 742e806d73
5 changed files with 4 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile
View File

@ -130,7 +130,7 @@
# Makefile version tag # Makefile version tag
# it checks if the version tag in Makefile.config is the same and force update outdated config files # 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 has to be found even for manual configuration
CONFIG_WRITER=makefiledir/Makefile.config_writer CONFIG_WRITER=makefiledir/Makefile.config_writer
@ -485,9 +485,10 @@ LIBS += $(shell $(LIBPNG-CONFIG) --L_opts $(PNGCONFIG_FLAGS))
endif endif
endif endif
ifdef WITH_ICONV ifdef OSX
ifndef JAGUAR
LIBS += -liconv LIBS += -liconv
CFLAGS += -DWITH_ICONV endif
endif endif
# enables/disables assert() # enables/disables assert()

2
makefiledir/Makefile.config_writer
View File

@ -64,11 +64,9 @@ $(MAKE_CONFIG):
$(call CONFIG_LINE,) $(call CONFIG_LINE,)
$(call CONFIG_LINE,\# Libs) $(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_ZLIB:=$(WITH_ZLIB))
$(call CONFIG_LINE,WITH_SDL:=$(WITH_SDL)) $(call CONFIG_LINE,WITH_SDL:=$(WITH_SDL))
$(call CONFIG_LINE,WITH_PNG:=$(WITH_PNG)) $(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,STATIC_ZLIB_PATH:=$(STATIC_ZLIB_PATH))
$(call CONFIG_LINE,WITH_COCOA:=$(WITH_COCOA)) $(call CONFIG_LINE,WITH_COCOA:=$(WITH_COCOA))
$(call CONFIG_LINE,) $(call CONFIG_LINE,)

9
makefiledir/Makefile.libdetection
View File

@ -121,12 +121,3 @@ WITH_PNG:=
endif endif
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

18
makefiledir/iconv_detector.c
View File

@ -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;
}

7
os/macosx/Makefile.setup
View File

@ -84,10 +84,3 @@ $(shell $(CC) os/macosx/G5_detector.c -o os/macosx/G5_detector)
endif endif
endif 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