[freetype2-demos] master 9a19f88: * Makefile (COMPILE): Prioritize FreeType path.

[Alexei Podtelezhnikov]

branch: master
commit 9a19f8855651a949dc3a708f86cb5d0de626610d
Author: Jan Alexander Steffens <jan.steffens@gmail.com>
Commit: Alexei Podtelezhnikov <apodtele@gmail.com>

    * Makefile (COMPILE): Prioritize FreeType path.
    
    This ensures the includedir for the built FreeType comes first,
    before any flags for a system FreeType which might be pulled in
    through pkg-config for harfbuzz.
---
 ChangeLog | 8 ++++++++
 Makefile  | 8 ++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f245511..43bab9a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2020-06-24  Jan Alexander Steffens  <jan.steffens@gmail.com>
+
+       * Makefile (COMPILE): Prioritize FreeType path.
+
+       This ensures the includedir for the built FreeType comes first,
+       before any flags for a system FreeType which might be pulled in
+       through pkg-config for harfbuzz.
+
 2020-06-20  Alexei Podtelezhnikov  <apodtele@gmail.com>
 
        * graph/x11/grx11.c (gr_x11_device_init): Prioritize 32-bit formats.
diff --git a/Makefile b/Makefile
index 8e4ca56..e6ad0af 100644
--- a/Makefile
+++ b/Makefile
@@ -130,10 +130,10 @@ else
                  $(TOP_DIR)/include \
                  $(SRC_DIR)
 
-  COMPILE = $(CC) $(CPPFLAGS) \
-                  $(CFLAGS) \
-                  $(ANSIFLAGS) \
-                  $(INCLUDES:%=$I%)
+  COMPILE = $(CC) $(ANSIFLAGS) \
+                  $(INCLUDES:%=$I%) \
+                  $(CPPFLAGS) \
+                  $(CFLAGS)
 
   # Enable C99 for gcc to avoid warnings.
   # Note that clang++ aborts with an error if we use `-std=C99',