Started working on build process

This commit is contained in:
Priyeshkkumar 2020-07-20 18:13:17 +05:30
parent b3deaa037e
commit 1e1912dbac
7 changed files with 110 additions and 4 deletions

5
.gitmodules vendored
View File

@ -1,3 +1,4 @@
[submodule "src/dlg"]
path = src/dlg
[submodule "submodules/dlg"]
path = submodules/dlg
url = https://github.com/nyorain/dlg.git

View File

@ -1,3 +1,17 @@
2020-07-20 Priyesh Kumar <priyeshkkumar@gmail.com>
* Changed git submodule(dlg) from `src/dlg` to `submodules/dlg`
* Updated autogen.sh file:
For copying the necessary files from `submodules/dlg` to `src\dlg`.
If the git submodule(dlg) is not checked-out, first it runs necessary
git commands for checking out the submodule(dlg) ad then it copies
the files.
* include/freetype/internal/ftdebug.h:
Updated the include path for dlg.
* Added a new file `src/dlg/rules.mk`
2020-07-15 Priyesh Kumar <priyeshkkumar@gmail.com>
* builds/compiler/gcc.mk: Added a flag -std=c99 for using dlg on windows

View File

@ -162,4 +162,25 @@ cd ../..
chmod +x ./configure
copy_submodule_files()
{
echo "Copying files from \`submodules/dlg' to \`src/dlg'"
cp $DLG_INC_DIR/dlg.h src/dlg
cp $DLG_INC_DIR/output.h src/dlg
cp $DLG_SRC_DIR/* src/dlg
}
DLG_INC_DIR=submodules/dlg/include/dlg
DLG_SRC_DIR=submodules/dlg/src/dlg
if ! test -d "$DLG_INC_DIR"; then
echo "Submodule check out:"
git submodule init
git submodule update
copy_submodule_files
else
copy_submodule_files
fi
# EOF

View File

@ -37,8 +37,8 @@
*/
#ifdef FT_LOGGING
#include <../src/dlg/include/dlg/dlg.h>
#include <../src/dlg/include/dlg/output.h>
#include <../src/dlg/dlg.h>
#include <../src/dlg/output.h>
#include <freetype/ftlogging.h>
#endif /* FT_LOGGING */

View File

@ -543,12 +543,14 @@ else
FT_BASE_DEF( void )
ft_add_tag( const char* tag )
{
(void) tag;
/* nothing */
}
FT_BASE_DEF( void )
ft_remove_tag( const char* tag )
{
(void) tag;
/* nothing */
}

68
src/dlg/rules.mk Normal file
View File

@ -0,0 +1,68 @@
#
# FreeType 2 dlg logging library configuration rules
#
# Copyright (C) 1996-2020 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.
# dlg logging library directory
#
DLG_DIR := $(SRC_DIR)/dlg
DLG_COMPILE := $(CC) $(ANSIFLAGS) \
$I$(subst /,$(COMPILER_SEP),$(DLG_DIR)) \
$(INCLUDE_FLAGS) \
$(FT_CFLAGS)
# dlg logging library sources (i.e., C files)
#
DLG_SRC := $(DLG_DIR)/dlg.c
# dlg logging library headers
#
DLG_H := $(DLG_SRC:%.c=%.h) \
$(DLG_DIR)/output.h
# dlg logging library object(s)
#
# DLG_OBJ_M is used during `multi' builds
# DLG_OBJ_S is used during `single' builds
#
DLG_OBJ_M := $(DLG_SRC:$(DLG_DIR)/%.c=$(OBJ_DIR)/%.$O)
DLG_OBJ_S := $(OBJ_DIR)/dlg.$O
# dlg logging library source file for single build
#
DLG_SRC_S := $(DLG_DIR)/dlg.c
# dlg logging library - single object
#
$(DLG_OBJ_S): $(DLG_SRC_S) $(DLG_SRC) $(FREETYPE_H) $(DLG_H)
$(DLG_COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $(DLG_SRC_S))
# dlg logging library - multiple objects
#
$(OBJ_DIR)/%.$O: $(DLG_DIR)/%.c $(FREETYPE_H) $(DLG_H)
$(DLG_COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $<)
# update main object lists
#
DLG_OBJS_S += $(DLG_OBJ_S)
DLG_OBJS_M += $(DLG_OBJ_M)
# EOF