freetype-commit
[Top][All Lists]
Advanced

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

[freetype2-demos] master c9442f6 1/2: Fix compilation under Windows.


From: Werner LEMBERG
Subject: [freetype2-demos] master c9442f6 1/2: Fix compilation under Windows.
Date: Tue, 14 Apr 2020 01:15:43 -0400 (EDT)

branch: master
commit c9442f6c4d216c50fdccfa3459639f407ce25ed4
Author: Anuj Verma <address@hidden>
Commit: Werner Lemberg <address@hidden>

    Fix compilation under Windows.
    
    * Makefile (FT_INCLUDES): Add configuration directory.  Without
    that, the file `ftoption.h' that is added to the $(COMPILE) variable
    gets found only if it is located in $(DEVEL_DIR), this is, if we do
    a `make devel' build.
    
    * graph/win32/rules.mk: s/win32/windows/ to synchronize test for
    Windows platform with FreeType's build system.
---
 ChangeLog            | 12 ++++++++++++
 Makefile             |  1 +
 graph/win32/rules.mk |  2 +-
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 934c324..262872b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2020-04-14  Anuj Verma  <address@hidden>
+
+       Fix compilation under Windows.
+
+       * Makefile (FT_INCLUDES): Add configuration directory.  Without
+       that, the file `ftoption.h' that is added to the $(COMPILE) variable
+       gets found only if it is located in $(DEVEL_DIR), this is, if we do
+       a `make devel' build.
+
+       * graph/win32/rules.mk: s/win32/windows/ to synchronize test for
+       Windows platform with FreeType's build system.
+
 2020-03-08  Thomas E. Dickey  <address@hidden>
 
        [ftdump] Show max-advance width/height and underline info.
diff --git a/Makefile b/Makefile
index b9f0dfe..7466b96 100644
--- a/Makefile
+++ b/Makefile
@@ -125,6 +125,7 @@ else
                  $(BUILD_DIR) \
                  $(DEVEL_DIR) \
                  $(TOP_DIR)/include \
+                 $(TOP_DIR)/include/freetype/config \
                  $(SRC_DIR)
 
   COMPILE = $(CC) $(CPPFLAGS) \
diff --git a/graph/win32/rules.mk b/graph/win32/rules.mk
index ef4e749..2dd0f14 100644
--- a/graph/win32/rules.mk
+++ b/graph/win32/rules.mk
@@ -5,7 +5,7 @@
 #*
 #**************************************************************************
 
-ifeq ($(PLATFORM),win32)
+ifeq ($(PLATFORM),windows)
 
   # directory of the Win32 graphics driver
   #



reply via email to

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