diff options
author | Alexei Podtelezhnikov <apodtele@gmail.com> | 2021-01-07 00:13:23 -0500 |
---|---|---|
committer | Alexei Podtelezhnikov <apodtele@gmail.com> | 2021-01-07 00:13:23 -0500 |
commit | 6369058eee2e9d82de3c203a119600a769b485c8 (patch) | |
tree | 800aaaccc4dece3f69615267858d4a98e31e5f40 /builds/toplevel.mk | |
parent | f88c00e45a2f503f8a62bb9cc963ece5c46fc7d5 (diff) | |
download | freetype2-6369058eee2e9d82de3c203a119600a769b485c8.tar.gz |
[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.
Diffstat (limited to 'builds/toplevel.mk')
-rw-r--r-- | builds/toplevel.mk | 10 |
1 files changed, 5 insertions, 5 deletions
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 |