diff options
| author | Alexei Podtelezhnikov <apodtele@gmail.com> | 2018-01-18 04:32:52 -0500 |
|---|---|---|
| committer | Alexei Podtelezhnikov <apodtele@gmail.com> | 2018-01-18 04:32:52 -0500 |
| commit | 4b8ccc56d8b4971a4f0434f497d74c641402222d (patch) | |
| tree | 9e491425c3f692c6881d0553f0a7f6437f2e0288 /builds | |
| parent | fd8000f0402d48fd22f774170c74d585a82d7508 (diff) | |
| download | freetype2-4b8ccc56d8b4971a4f0434f497d74c641402222d.tar.gz | |
[build] Enable VERSIONINFO resource for Cygwin/MinGW.
* builds/unix/configure.raw: Check for resource compiler.
* builds/unix/unix-cc.in: Conditionally set up resource compiler.
* builds/freetype.mk: Add conditional rule for `ftver.rc'.
* src/base/ftver.rc: Copyright notice and year update.
Diffstat (limited to 'builds')
| -rw-r--r-- | builds/freetype.mk | 16 | ||||
| -rw-r--r-- | builds/unix/configure.raw | 1 | ||||
| -rw-r--r-- | builds/unix/unix-cc.in | 8 |
3 files changed, 24 insertions, 1 deletions
diff --git a/builds/freetype.mk b/builds/freetype.mk index f2e7e608e..447b4a352 100644 --- a/builds/freetype.mk +++ b/builds/freetype.mk @@ -248,6 +248,22 @@ $(FTINIT_OBJ): $(FTINIT_SRC) $(FREETYPE_H) $(FT_COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $<) +# ftver component +# +# The VERSIONINFO resource `ftver.rc' contains version and copyright +# to be compiled by windres and tagged into DLL usually. +# +ifneq ($(RC),) + FTVER_SRC := $(BASE_DIR)/ftver.rc + FTVER_OBJ := $(OBJ_DIR)/ftver.$O + + OBJECTS_LIST += $(FTVER_OBJ) + + $(FTVER_OBJ): $(FTVER_SRC) + $(RC) -o $@ $< +endif + + # All FreeType library objects. # OBJ_M := $(BASE_OBJ_M) $(BASE_EXT_OBJ) $(DRV_OBJS_M) diff --git a/builds/unix/configure.raw b/builds/unix/configure.raw index 20157b9be..d76c32452 100644 --- a/builds/unix/configure.raw +++ b/builds/unix/configure.raw @@ -37,6 +37,7 @@ AC_SUBST(EXEEXT) PKG_PROG_PKG_CONFIG([0.24]) LT_INIT(win32-dll) +LT_PROG_RC # checks for native programs to generate building tool diff --git a/builds/unix/unix-cc.in b/builds/unix/unix-cc.in index a06246d63..5675866ea 100644 --- a/builds/unix/unix-cc.in +++ b/builds/unix/unix-cc.in @@ -87,10 +87,16 @@ ANSIFLAGS := @XX_ANSIFLAGS@ # C compiler to use -- we use libtool! # -# CCraw := $(CC) CC := $(LIBTOOL) --mode=compile $(CCraw) +# Resource compiler to use on Cygwin/MinGW, usually windres. +# +RCraw := @RC@ +ifneq ($(RCraw),) + RC := $(LIBTOOL) --tag=RC --mode=compile $(RCraw) +endif + # Linker flags. # LDFLAGS := @LDFLAGS@ |