1
0
Fork 0

(svn r7662) -Backport from trunk (r7557, r7624):

- [OSX] makefile fixes (static libfontconfig) (r7557).
 - [FS#470] Install openttd.32.bmp on install so that SDL window has icon (r76240.
release/0.5
Darkvater 2006-12-30 22:55:31 +00:00
parent bbdbdf3818
commit dfab8c779b
1 changed files with 13 additions and 0 deletions

View File

@ -101,6 +101,8 @@
# CYGWIN: build in Cygwin environment
# MINGW: build with MingW compiler, link with MingW libraries
#
# CUSTOM_FONTCONFIG: use a custom name/path to the libfontconfig library. Useful for static linking
#
# VERBOSE: show full compiler invocations instead of brief progress messages
#
# Special for crosscompiling there are some commands available:
@ -523,6 +525,13 @@ ifdef WITH_FONTCONFIG
CDEFS += -DWITH_FONTCONFIG
CCFLAGS_FONTCONFIG := $(shell $(FONTCONFIG_CONFIG) --cflags)
LDFLAGS_FONTCONFIG := $(shell $(FONTCONFIG_CONFIG) --libs)
ifdef CUSTOM_FONTCONFIG
# To allow usage of non-default libs, such as absolute path to static libs
# not stored in Makefile.config
LDFLAGS_FONTCONFIG := $(CUSTOM_FONTCONFIG)
endif
CFLAGS += $(CCFLAGS_FONTCONFIG)
LIBS += $(LDFLAGS_FONTCONFIG)
endif
@ -1031,8 +1040,12 @@ endif
install -m 644 lang/*.lng $(DATA_DIR_INSTALL)/lang
install -m 644 data/*.grf $(DATA_DIR_INSTALL)/data
install -m 644 data/opntitle.dat $(DATA_DIR_INSTALL)/data
# Generic menu icon
install -m 644 media/openttd.64.png $(ICON_DIR_INSTALL)
# Debian menu icon
install -m 644 media/openttd.32.xpm $(ICON_DIR_INSTALL)
# Window icon
install -m 644 media/openttd.32.bmp $(ICON_DIR_INSTALL)
else #MorphOS
install:
$(error make install is not supported on MorphOS)