diff --git a/.gitignore b/.gitignore index e4e0227ce..aef9d93c5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ build config.mk objs/vc2010/ -src/dlg/dlg/ +include/dlg/ src/dlg/dlg.c diff --git a/ChangeLog b/ChangeLog index 12c2c0793..0c038ea16 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2021-01-07 Alexei Podtelezhnikov + + [dlg] Move the headers to include/dlg to simplify their use. + + * autogen.sh, builds/toplevel.mk: Copy headers to incluide/dlg. + * builds/freetype.mk, builds/windows/vc2010/freetype.vcxproj: + Simplify included path. + * include/freetype/internal/ftdebug.h: Simplify #include. + * src/dlg/rules.mk, .gitignore: Updated. + 2021-01-06 Werner Lemberg * meson.build: Add summary. diff --git a/autogen.sh b/autogen.sh index fd5fa1f93..77656d661 100755 --- a/autogen.sh +++ b/autogen.sh @@ -165,10 +165,10 @@ chmod +x ./configure # Copy all necessary 'dlg' files. copy_submodule_files () { - echo "Copying files from \`submodules/dlg' to \`src/dlg'" - mkdir src/dlg/dlg 2> /dev/null - cp $DLG_INC_DIR/dlg.h src/dlg/dlg - cp $DLG_INC_DIR/output.h src/dlg/dlg + echo "Copying files from \`submodules/dlg' to \`src/dlg' and \`include/dlg'" + mkdir include/dlg 2> /dev/null + cp $DLG_INC_DIR/output.h include/dlg + cp $DLG_INC_DIR/dlg.h include/dlg cp $DLG_SRC_DIR/* src/dlg } diff --git a/builds/freetype.mk b/builds/freetype.mk index 91455ea3e..71d3a48c8 100644 --- a/builds/freetype.mk +++ b/builds/freetype.mk @@ -101,7 +101,6 @@ PUBLIC_DIR := $(TOP_DIR)/include/freetype INTERNAL_DIR := $(PUBLIC_DIR)/internal SERVICES_DIR := $(INTERNAL_DIR)/services CONFIG_DIR := $(PUBLIC_DIR)/config -DLG_DIR := $(TOP_DIR)/src/dlg # The documentation directory. # @@ -123,7 +122,6 @@ PROJECT_LIBRARY := $(LIB_DIR)/$(LIBRARY).$A INCLUDES := $(subst /,$(COMPILER_SEP),$(OBJ_DIR) \ $(DEVEL_DIR) \ $(BUILD_DIR) \ - $(DLG_DIR) \ $(TOP_DIR)/include) INCLUDE_FLAGS := $(INCLUDES:%=$I%) diff --git a/builds/toplevel.mk b/builds/toplevel.mk index b24980675..0cad54333 100644 --- a/builds/toplevel.mk +++ b/builds/toplevel.mk @@ -113,7 +113,7 @@ ifdef check_platform include $(TOP_DIR)/builds/detect.mk # For builds directly from the git repository we need to copy files - # from `submodule/dlg' to `src/dlg'. + # from `submodule/dlg' to `src/dlg' and `include/dlg'. # ifeq ($(wildcard src/dlg/dlg.*),) ifeq ($(wildcard submodules/dlg/*),) @@ -122,12 +122,12 @@ ifdef check_platform $(shell git submodule update) endif - $(info Copying files from `submodules/dlg' to `src/dlg') - $(shell mkdir $(subst /,$(SEP),src/dlg/dlg) $(NO_OUTPUT)) + $(info Copying files from `submodules/dlg' to `src/dlg' and `include/dlg') + $(shell mkdir $(subst /,$(SEP),include/dlg) $(NO_OUTPUT)) $(shell $(COPY) \ - $(subst /,$(SEP),submodules/dlg/include/dlg/dlg.h src/dlg/dlg)) + $(subst /,$(SEP),submodules/dlg/include/dlg/output.h include/dlg)) $(shell $(COPY) \ - $(subst /,$(SEP),submodules/dlg/include/dlg/output.h src/dlg/dlg)) + $(subst /,$(SEP),submodules/dlg/include/dlg/dlg.h include/dlg)) $(shell $(COPY) \ $(subst /,$(SEP),submodules/dlg/src/dlg/dlg.c src/dlg)) endif diff --git a/builds/windows/vc2010/freetype.vcxproj b/builds/windows/vc2010/freetype.vcxproj index 6178a563e..6f63ff9bf 100644 --- a/builds/windows/vc2010/freetype.vcxproj +++ b/builds/windows/vc2010/freetype.vcxproj @@ -89,8 +89,8 @@ Disabled - ..\..\..\src\dlg\;$(UserOptionDirectory);..\..\..\include;$(UserIncludeDirectories);%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;FT_DEBUG_LEVEL_ERROR;FT_DEBUG_LEVEL_TRACE;FT2_BUILD_LIBRARY;DLL_EXPORT;FT_DEBUG_LOGGING;$(UserDefines);%(PreprocessorDefinitions) + $(UserOptionDirectory);..\..\..\include;$(UserIncludeDirectories);%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;FT_DEBUG_LEVEL_ERROR;FT_DEBUG_LEVEL_TRACE;FT_DEBUG_LOGGING;FT2_BUILD_LIBRARY;DLL_EXPORT;$(UserDefines);%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL false @@ -118,8 +118,8 @@ Disabled - ..\..\..\src\dlg\;$(UserOptionDirectory);..\..\..\include;$(UserIncludeDirectories);%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;FT_DEBUG_LEVEL_ERROR;FT_DEBUG_LEVEL_TRACE;FT2_BUILD_LIBRARY;DLL_EXPORT;FT_DEBUG_LOGGING;$(UserDefines);%(PreprocessorDefinitions) + $(UserOptionDirectory);..\..\..\include;$(UserIncludeDirectories);%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;FT_DEBUG_LEVEL_ERROR;FT_DEBUG_LEVEL_TRACE;FT_DEBUG_LOGGING;FT2_BUILD_LIBRARY;DLL_EXPORT;$(UserDefines);%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL false @@ -147,8 +147,8 @@ Disabled - ..\..\..\src\dlg;$(UserOptionDirectory);..\..\..\include;$(UserIncludeDirectories);%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;FT_DEBUG_LEVEL_ERROR;FT_DEBUG_LEVEL_TRACE;FT2_BUILD_LIBRARY;FT_DEBUG_LOGGING;DLG_STATIC;$(UserDefines);%(PreprocessorDefinitions) + $(UserOptionDirectory);..\..\..\include;$(UserIncludeDirectories);%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;FT_DEBUG_LEVEL_ERROR;FT_DEBUG_LEVEL_TRACE;FT_DEBUG_LOGGING;DLG_STATIC;FT2_BUILD_LIBRARY;$(UserDefines);%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug false @@ -176,8 +176,8 @@ Disabled - ..\..\..\src\dlg;$(UserOptionDirectory);..\..\..\include;$(UserIncludeDirectories);%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;FT_DEBUG_LEVEL_ERROR;FT_DEBUG_LEVEL_TRACE;FT2_BUILD_LIBRARY;FT_DEBUG_LOGGING;DLG_STATIC;$(UserDefines);%(PreprocessorDefinitions) + $(UserOptionDirectory);..\..\..\include;$(UserIncludeDirectories);%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;FT_DEBUG_LEVEL_ERROR;FT_DEBUG_LEVEL_TRACE;FT_DEBUG_LOGGING;DLG_STATIC;FT2_BUILD_LIBRARY;$(UserDefines);%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug false diff --git a/devel/ftoption.h b/devel/ftoption.h index a84520799..fa707568c 100644 --- a/devel/ftoption.h +++ b/devel/ftoption.h @@ -287,7 +287,7 @@ FT_BEGIN_HEADER * options set by those programs have precedence, overwriting the value * here with the configured one. */ -#define FT_CONFIG_OPTION_USE_HARFBUZZ +/* #define FT_CONFIG_OPTION_USE_HARFBUZZ */ /************************************************************************** diff --git a/include/freetype/internal/ftdebug.h b/include/freetype/internal/ftdebug.h index 655b50abd..96aa55099 100644 --- a/include/freetype/internal/ftdebug.h +++ b/include/freetype/internal/ftdebug.h @@ -32,8 +32,8 @@ #include "compiler-macros.h" #ifdef FT_DEBUG_LOGGING -#include <../src/dlg/dlg/dlg.h> -#include <../src/dlg/dlg/output.h> +#include +#include #include #endif /* FT_DEBUG_LOGGING */ diff --git a/src/dlg/rules.mk b/src/dlg/rules.mk index 6df60ad00..7a29e16ad 100644 --- a/src/dlg/rules.mk +++ b/src/dlg/rules.mk @@ -32,8 +32,8 @@ DLG_SRC := $(DLG_DIR)/dlgwrap.c # dlg logging library headers # -DLG_H := $(DLG_DIR)/dlg/dlg.h \ - $(DLG_DIR)/dlg/output.h +DLG_H := $(TOP_DIR)/include/dlg/dlg.h \ + $(TOP_DIR)/include/dlg/output.h # dlg logging library object(s)