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 /Makefile | |
| 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 'Makefile')
| -rw-r--r-- | Makefile | 7 |
1 files changed, 4 insertions, 3 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() |