Minor Changes

5 years ago · a0f918d1f1
parent 117da1f7e6
commit a0f918d1f1
4 changed files with 7 additions and 5 deletions
--- a/4
+++ b/4
@ -1,5 +1,9 @@
 2020-07-22  Priyesh Kumar   <priyeshkkumar@gmail.com>

+    * Reverted back to `-std=c99' flag in `unix-cc.in'
+
+    * Updated dlg's include path in `include/freetype/internal/ftdebug.h'.
+
    * Changed `builds/toplevel.mk' and `autogen.sh' to copy dlg's include
      files from `submodules/dlg' to `src/dlg/dlg' due to include path errors
      on windows.
--- a/builds/unix/unix-cc.in
+++ b/builds/unix/unix-cc.in
@ -79,7 +79,7 @@ T := -o$(space)
 #   We use our own FreeType configuration files overriding defaults.
 #
 CPPFLAGS := @CPPFLAGS@
-CFLAGS   := -c @XX_CFLAGS@ @CFLAGS@ \
+CFLAGS   := -c -std=c99 @XX_CFLAGS@ @CFLAGS@ \
            $DFT_CONFIG_CONFIG_H="<ftconfig.h>" \
            $DFT_CONFIG_MODULES_H="<ftmodule.h>" \
            $DFT_CONFIG_OPTIONS_H="<ftoption.h>"
--- a/include/freetype/internal/ftdebug.h
+++ b/include/freetype/internal/ftdebug.h
@ -37,8 +37,8 @@
   */ 
                                                                      
 #ifdef FT_LOGGING
-#include <../src/dlg/dlg.h>
-#include <../src/dlg/output.h>
+#include <../src/dlg/dlg/dlg.h>
+#include <../src/dlg/dlg/output.h>
 #include <freetype/ftlogging.h>
 #endif /* FT_LOGGING */

--- a/src/dlg/rules.mk
+++ b/src/dlg/rules.mk
@ -17,8 +17,6 @@
 #
 DLG_DIR := $(SRC_DIR)/dlg

-FT_CFLAGS += -std=c99
-
 DLG_COMPILE := $(CC) $(ANSIFLAGS)                            \
                     $I$(subst /,$(COMPILER_SEP),$(DLG_DIR)) \
                     $(INCLUDE_FLAGS)                        \