Commit 4b8ccc56d8b4971a4f0434f497d74c641402222d
2018-01-18T04:32:52
[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.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115
diff --git a/ChangeLog b/ChangeLog
index 0f03431..526c4e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
2018-01-18 Alexei Podtelezhnikov <apodtele@gmail.com>
+ [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.
+
+2018-01-18 Alexei Podtelezhnikov <apodtele@gmail.com>
+
[build] Move VERSIONINFO resource.
* builds/windows/vc2010/freetype.vcxproj: Updated.
diff --git a/builds/freetype.mk b/builds/freetype.mk
index f2e7e60..447b4a3 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 20157b9..d76c324 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 a06246d..5675866 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@
diff --git a/src/base/ftver.rc b/src/base/ftver.rc
index 1093109..498e599 100644
--- a/src/base/ftver.rc
+++ b/src/base/ftver.rc
@@ -1,3 +1,21 @@
+/***************************************************************************/
+/* */
+/* ftver.rc */
+/* */
+/* FreeType VERSIONINFO resource for Windows DLLs. */
+/* */
+/* Copyright 2018 by */
+/* David Turner, Robert Wilhelm, and Werner Lemberg. */
+/* */
+/* This file is part of the FreeType project, and may only be used, */
+/* modified, and distributed under the terms of the FreeType project */
+/* license, LICENSE.TXT. By continuing to use, modify, or distribute */
+/* this file you indicate that you have read the license and */
+/* understand and accept it fully. */
+/* */
+/***************************************************************************/
+
+
#include<Windows.h>
#define FT_VERSION 2,9,0,0
@@ -27,7 +45,7 @@ BEGIN
VALUE "FileVersion", FT_VERSION_STR
VALUE "ProductName", "FreeType"
VALUE "ProductVersion", FT_VERSION_STR
- VALUE "LegalCopyright", "© 2017 The FreeType Project www.freetype.org. All rights reserved."
+ VALUE "LegalCopyright", "© 2018 The FreeType Project www.freetype.org. All rights reserved."
VALUE "InternalName", "freetype"
VALUE "OriginalFilename", FT_FILENAME
END