diff options
| author | peter1138 <peter1138@openttd.org> | 2006-11-16 22:05:33 +0000 |
|---|---|---|
| committer | peter1138 <peter1138@openttd.org> | 2006-11-16 22:05:33 +0000 |
| commit | 1a4f1c8177f7ee351cb0096e3456d055b97dc60a (patch) | |
| tree | 4fb6c0fac873efffc85cef437baa70d50d51fdfb /makefiledir | |
| parent | 40d647ddde652bb8f1c7b4215279cc82d01ca38f (diff) | |
| download | openttd-1a4f1c8177f7ee351cb0096e3456d055b97dc60a.tar.xz | |
(svn r7182) -Feature: Merge utf8 branch. This brings us support for Unicode/UTF-8 and the option for fonts rendered by FreeType. Language changes to come.
Diffstat (limited to 'makefiledir')
| -rw-r--r-- | makefiledir/Makefile.config_writer | 2 | ||||
| -rw-r--r-- | makefiledir/Makefile.libdetection | 6 |
2 files changed, 8 insertions, 0 deletions
diff --git a/makefiledir/Makefile.config_writer b/makefiledir/Makefile.config_writer index 166973b53..fad5c78f2 100644 --- a/makefiledir/Makefile.config_writer +++ b/makefiledir/Makefile.config_writer @@ -73,6 +73,7 @@ $(MAKE_CONFIG): $(call CONFIG_LINE,WITH_ICONV_PATH:=$(WITH_ICONV_PATH)) $(call CONFIG_LINE,STATIC_ZLIB_PATH:=$(STATIC_ZLIB_PATH)) $(call CONFIG_LINE,WITH_COCOA:=$(WITH_COCOA)) + $(call CONFIG_LINE,WITH_FREETYPE:=$(WITH_FREETYPE)) $(call CONFIG_LINE,) $(call CONFIG_LINE,\# OS flags) @@ -100,6 +101,7 @@ $(MAKE_CONFIG): $(call CONFIG_LINE,\# misc) $(call CONFIG_LINE,SDL_CONFIG:=$(SDL_CONFIG)) $(call CONFIG_LINE,LIBPNG_CONFIG:=$(LIBPNG_CONFIG)) + $(call CONFIG_LINE,FREETYPE_CONFIG:=$(FREETYPE_CONFIG)) $(call CONFIG_LINE,BEOS_NET_SERVER:=$(BEOS_NET_SERVER)) $(call CONFIG_LINE,CONFIG_INCLUDED:=yes) $(call CONFIG_LINE,PATH_SET:=$(PATH_SET)) diff --git a/makefiledir/Makefile.libdetection b/makefiledir/Makefile.libdetection index c85ad0acc..a5160a309 100644 --- a/makefiledir/Makefile.libdetection +++ b/makefiledir/Makefile.libdetection @@ -66,6 +66,9 @@ SDL_CONFIG:=sdl-config # set libpng-config to the default value LIBPNG_CONFIG :=libpng-config +# set freetype-config to the default value +FREETYPE_CONFIG:=freetype-config + # Networking, enabled by default WITH_NETWORK:=1 @@ -75,6 +78,9 @@ WITH_SDL:=$(shell $(SDL_CONFIG) --version 2>/dev/null) # libpng detection WITH_PNG:=$(shell $(LIBPNG_CONFIG) --version 2>/dev/null) +# Freetype detection +WITH_FREETYPE:=$(shell $(FREETYPE_CONFIG) --ftversion 2>/dev/null) + ifdef WITH_PNG # LibPNG depends on Zlib WITH_ZLIB:=1 |