dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
tron
2006-03-24 06:40:49 +00:00
parent ea1adebe31
commit 742e806d73
5 changed files with 4 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile
View File

@@ -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()