freetype-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[freetype2] master 4b8ccc5 2/2: [build] Enable VERSIONINFO resource for


From: Alexei Podtelezhnikov
Subject: [freetype2] master 4b8ccc5 2/2: [build] Enable VERSIONINFO resource for Cygwin/MinGW.
Date: Thu, 18 Jan 2018 04:34:07 -0500 (EST)

branch: master
commit 4b8ccc56d8b4971a4f0434f497d74c641402222d
Author: Alexei Podtelezhnikov <address@hidden>
Commit: Alexei Podtelezhnikov <address@hidden>

    [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.
---
 ChangeLog                 |  9 +++++++++
 builds/freetype.mk        | 16 ++++++++++++++++
 builds/unix/configure.raw |  1 +
 builds/unix/unix-cc.in    |  8 +++++++-
 src/base/ftver.rc         | 20 +++++++++++++++++++-
 5 files changed, 52 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0f03431..526c4e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2018-01-18  Alexei Podtelezhnikov  <address@hidden>
 
+       [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  <address@hidden>
+
        [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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]