git.y1.nz

commit ae62021cb466720489310036cf935b54de3f4e44
parent 288e4aed83c90bdd2ad11e4f46bb20f93cb4dbe7
Author: Toxa <56631470+untoxa@users.noreply.github.com>
Date:   Wed,  4 Nov 2020 14:11:55 +0300

Merge pull request #73 from bbbbbr/develop_docs_inmainrepo_tooling

Docs: Fix doxygen 'make docs' on Windows
Diffstat:
M
Makefile
3
++-
M
docs/config/gbdk-2020-doxyfile
12
++++++------

2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/Makefile b/Makefile
@@ -31,6 +31,7 @@ GBDKLIBDIR = $(TOPDIR)/gbdk-lib
 GBDKSUPPORTDIR = $(TOPDIR)/gbdk-support
 # Directory with docs config and output (via doxygen)
 GBDKDOCSDIR = $(TOPDIR)/docs
+DOXYGENCMD = doxygen
 
 # Base setup
 # Extension to add to executables
@@ -229,7 +230,7 @@ endif
 doxygen-generate:
 	rm -rf $(GBDKDOCSDIR)/api; \
 	  cd "$(GBDKLIBDIR)/include"; \
-	  GBDKDOCSDIR="$(GBDKDOCSDIR)" GBDKLIBDIR="$(GBDKLIBDIR)" doxygen "$(GBDKDOCSDIR)/config/gbdk-2020-doxyfile"
+	  GBDKDOCSDIR="$(GBDKDOCSDIR)" GBDKLIBDIR="$(GBDKLIBDIR)" $(DOXYGENCMD) "$(GBDKDOCSDIR)/config/gbdk-2020-doxyfile"
 
 doxygen-clean:
 	rm -rf $(GBDKDOCSDIR)/api
 
diff --git a/docs/config/gbdk-2020-doxyfile b/docs/config/gbdk-2020-doxyfile
@@ -58,7 +58,7 @@ PROJECT_LOGO           =
 # entered, it will be relative to the location where doxygen was started. If
 # left blank the current directory will be used.
 
-OUTPUT_DIRECTORY       = $(GBDKDOCS_GBDKPATH)/docs
+OUTPUT_DIRECTORY       = $(GBDKDOCSDIR)
 
 # If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub-
 # directories (in 2 levels) under the output directory of each output format and
@@ -744,7 +744,7 @@ FILE_VERSION_FILTER    =
 # tag is left empty.
 
 # LAYOUT_FILE            =
-LAYOUT_FILE            = "$(GBDKDOCS_GBDKPATH)/docs/config/github-markdown-theme/doxygen_layout.xml"
+LAYOUT_FILE            = "$(GBDKDOCSDIR)/config/github-markdown-theme/doxygen_layout.xml"
 
 # The CITE_BIB_FILES tag can be used to specify one or more bib files containing
 # the reference definitions. This must be a list of .bib files. The .bib
@@ -832,7 +832,7 @@ WARN_LOGFILE           =
 # spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
 # Note: If this tag is empty the current directory is searched.
 
-INPUT                  = $(GBDKDOCS_GBDKPATH)/gbdk-lib/include
+INPUT                  = $(GBDKLIBDIR)/include
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
@@ -1174,7 +1174,7 @@ HTML_FILE_EXTENSION    = .html
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
 # HTML_HEADER            =
-HTML_HEADER        = "$(GBDKDOCS_GBDKPATH)/docs/config/github-markdown-theme/doxygen_header.html"
+HTML_HEADER        = "$(GBDKDOCSDIR)/config/github-markdown-theme/doxygen_header.html"
 
 
 # The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each
@@ -1186,7 +1186,7 @@ HTML_HEADER        = "$(GBDKDOCS_GBDKPATH)/docs/config/github-markdown-theme/dox
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
 #HTML_FOOTER            =
-HTML_FOOTER        = "$(GBDKDOCS_GBDKPATH)/docs/config/github-markdown-theme/doxygen_footer.html"
+HTML_FOOTER        = "$(GBDKDOCSDIR)/config/github-markdown-theme/doxygen_footer.html"
 
 # The HTML_STYLESHEET tag can be used to specify a user-defined cascading style
 # sheet that is used by each HTML page. It can be used to fine-tune the look of
@@ -1214,7 +1214,7 @@ HTML_STYLESHEET        =
 # HTML_EXTRA_STYLESHEET  =
 
 # github-markdown-theme
-HTML_EXTRA_STYLESHEET    = "$(GBDKDOCS_GBDKPATH)/docs/config/github-markdown-theme/doxygen_extra.css"
+HTML_EXTRA_STYLESHEET    = "$(GBDKDOCSDIR)/config/github-markdown-theme/doxygen_extra.css"
 
 # The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
 # other source files which should be copied to the HTML output directory. Note

This webpage is intended to be an accessible preview of this repository. To get a fuller picture, clone it and use the git CLI.