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 | f660d48e6ad59e7cca747c27cadeb06b483e1969 (patch) | |
| tree | 4fb6c0fac873efffc85cef437baa70d50d51fdfb /Makefile | |
| parent | 1b0e95539fdaa72fcb07fb7a216bf1fde5502633 (diff) | |
| download | openttd-f660d48e6ad59e7cca747c27cadeb06b483e1969.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 'Makefile')
| -rw-r--r-- | Makefile | 18 |
1 files changed, 17 insertions, 1 deletions
@@ -235,6 +235,12 @@ $(error WITH_PNG can't be used when LIBPNG_CONFIG is not set. Edit Makefile.conf endif endif +ifdef WITH_FREETYPE + ifndef FREETYPE_CONFIG +$(error WITH_FREETYPE can't be used when FREETYPE_CONFIG is not set. Edit Makefile.config to correct this) + endif +endif + ############################################################################## # # Compiler configuration @@ -493,6 +499,15 @@ ifndef MINGW LIBS += -lc endif +# freetype config +ifdef WITH_FREETYPE +CDEFS += -DWITH_FREETYPE +CCFLAGS_FREETYPE := $(shell $(FREETYPE_CONFIG) --cflags) +LDFLAGS_FREETYPE := $(shell $(FREETYPE_CONFIG) --libs) +CFLAGS += $(CCFLAGS_FREETYPE) +LIBS += $(LDFLAGS_FREETYPE) +endif + # iconv is enabled defaultly on OSX >= 10.3 ifdef OSX ifndef JAGUAR @@ -670,6 +685,7 @@ SRCS += engine.c SRCS += engine_gui.c SRCS += fileio.c SRCS += fios.c +SRCS += fontcache.c SRCS += genworld.c SRCS += genworld_gui.c SRCS += gfx.c @@ -884,7 +900,7 @@ $(TTD): $(OBJS) $(MAKE_CONFIG) $(Q)$(CXX_TARGET) $(LDFLAGS) $(TTDLDFLAGS) $(OBJS) $(LIBS) -o $@ endif -$(STRGEN): strgen/strgen.c string.c endian_host.h +$(STRGEN): strgen/strgen.c string.c endian_host.h table/control_codes.h @echo '===> Compiling and Linking $@' $(Q)$(CC_HOST) $(CFLAGS_HOST) -DSTRGEN strgen/strgen.c string.c -o $@ |