forked from minhngoc25a/freetype2
Updated builds/toplevel.mk for builds that don't use ./configure
This commit is contained in:
parent
df53385b67
commit
9bd35c7d91
|
@ -1,3 +1,15 @@
|
||||||
|
2020-07-22 Priyesh Kumar <priyeshkkumar@gmail.com>
|
||||||
|
|
||||||
|
* Updated `builds/toplevel.mk' so that for builds that do not use
|
||||||
|
`./configure' script dlg files are copied from `submodules/dlg' to
|
||||||
|
`src/dlg'.
|
||||||
|
|
||||||
|
* Removed `-std=c99' flag from `gcc.mk' and `unix-cc.in'.
|
||||||
|
|
||||||
|
* src/base/ftdebug.c: Minor changes
|
||||||
|
|
||||||
|
* src/dlg/rules.mk: Added `-std=c99' flag in `FT_CFLAGS' varialble
|
||||||
|
|
||||||
2020-07-21 Priyesh Kumar <priyeshkkumar@gmail.com>
|
2020-07-21 Priyesh Kumar <priyeshkkumar@gmail.com>
|
||||||
|
|
||||||
* builds/freetype.mk: Updates to build dlg along with rest of base and
|
* builds/freetype.mk: Updates to build dlg along with rest of base and
|
||||||
|
|
|
@ -61,7 +61,7 @@ T := -o$(space)
|
||||||
# Use the ANSIFLAGS variable to define the compiler flags used to enfore
|
# Use the ANSIFLAGS variable to define the compiler flags used to enfore
|
||||||
# ANSI compliance.
|
# ANSI compliance.
|
||||||
#
|
#
|
||||||
CFLAGS ?= -c -g -O3 -Wall -std=c99
|
CFLAGS ?= -c -g -O3 -Wall
|
||||||
|
|
||||||
# ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant.
|
# ANSIFLAGS: Put there the flags used to make your compiler ANSI-compliant.
|
||||||
#
|
#
|
||||||
|
|
|
@ -103,6 +103,22 @@ ifneq ($(findstring setup,$(MAKECMDGOALS)),)
|
||||||
check_platform := 1
|
check_platform := 1
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
# For builds that don't use `./configure' script we need to copy files
|
||||||
|
# from `submodule/dlg' to `src/dlg'
|
||||||
|
#
|
||||||
|
ifeq ($(wildcard src/dlg/dlg.*),)
|
||||||
|
ifeq ($(wildcard submodules/dlg/.*),)
|
||||||
|
$(info Submodule check out in `submodules/slg' )
|
||||||
|
$(shell git submodule init)
|
||||||
|
$(shell git submodule update)
|
||||||
|
endif
|
||||||
|
|
||||||
|
$(info Copying files from `submodules/dlg' to `src/dlg')
|
||||||
|
$(shell cp submodules/dlg/include/dlg/dlg.h src/dlg/)
|
||||||
|
$(shell cp submodules/dlg/include/dlg/output.h src/dlg/)
|
||||||
|
$(shell cp submodules/dlg/src/dlg/dlg.c src/dlg/)
|
||||||
|
endif
|
||||||
|
|
||||||
# Include the automatic host platform detection rules when we need to
|
# Include the automatic host platform detection rules when we need to
|
||||||
# check the platform.
|
# check the platform.
|
||||||
#
|
#
|
||||||
|
|
|
@ -79,7 +79,7 @@ T := -o$(space)
|
||||||
# We use our own FreeType configuration files overriding defaults.
|
# We use our own FreeType configuration files overriding defaults.
|
||||||
#
|
#
|
||||||
CPPFLAGS := @CPPFLAGS@
|
CPPFLAGS := @CPPFLAGS@
|
||||||
CFLAGS := -c -std=c99 @XX_CFLAGS@ @CFLAGS@ \
|
CFLAGS := -c @XX_CFLAGS@ @CFLAGS@ \
|
||||||
$DFT_CONFIG_CONFIG_H="<ftconfig.h>" \
|
$DFT_CONFIG_CONFIG_H="<ftconfig.h>" \
|
||||||
$DFT_CONFIG_MODULES_H="<ftmodule.h>" \
|
$DFT_CONFIG_MODULES_H="<ftmodule.h>" \
|
||||||
$DFT_CONFIG_OPTIONS_H="<ftoption.h>"
|
$DFT_CONFIG_OPTIONS_H="<ftoption.h>"
|
||||||
|
|
|
@ -306,7 +306,7 @@ else
|
||||||
p++;
|
p++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif
|
#endif /* FT_LOGGING */
|
||||||
/* read toggle name, followed by ':' */
|
/* read toggle name, followed by ':' */
|
||||||
q = p;
|
q = p;
|
||||||
while ( *p && *p != ':' )
|
while ( *p && *p != ':' )
|
||||||
|
@ -543,14 +543,14 @@ else
|
||||||
FT_BASE_DEF( void )
|
FT_BASE_DEF( void )
|
||||||
ft_add_tag( const char* tag )
|
ft_add_tag( const char* tag )
|
||||||
{
|
{
|
||||||
(void) tag;
|
FT_UNUSED(tag);
|
||||||
/* nothing */
|
/* nothing */
|
||||||
}
|
}
|
||||||
|
|
||||||
FT_BASE_DEF( void )
|
FT_BASE_DEF( void )
|
||||||
ft_remove_tag( const char* tag )
|
ft_remove_tag( const char* tag )
|
||||||
{
|
{
|
||||||
(void) tag;
|
FT_UNUSED (tag);
|
||||||
/* nothing */
|
/* nothing */
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -17,6 +17,7 @@
|
||||||
#
|
#
|
||||||
DLG_DIR := $(SRC_DIR)/dlg
|
DLG_DIR := $(SRC_DIR)/dlg
|
||||||
|
|
||||||
|
FT_CFLAGS += -std=c99
|
||||||
|
|
||||||
DLG_COMPILE := $(CC) $(ANSIFLAGS) \
|
DLG_COMPILE := $(CC) $(ANSIFLAGS) \
|
||||||
$I$(subst /,$(COMPILER_SEP),$(DLG_DIR)) \
|
$I$(subst /,$(COMPILER_SEP),$(DLG_DIR)) \
|
||||||
|
|
Loading…
Reference in New Issue