summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2015-10-17 10:27:35 -0300
committerJuan Linietsky <reduzio@gmail.com>2015-10-17 10:27:35 -0300
commit1d800a681b0837503b4b6f5860da9e68364018a0 (patch)
tree078b0ae85d3d7ed5ee2be60a7441194569bde94c
parentb217e1417aff2654282fc3c75b10159683b74a50 (diff)
parent0e60b959cd19e6971ee19851a340c13d28f228c1 (diff)
Merge pull request #2457 from firefly2442/doxygen-fix
Fix absolute paths used in doxygen, ignore generated documentation in Git
-rw-r--r--.gitignore3
-rw-r--r--Doxyfile6
2 files changed, 6 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore
index 6a04847f55..d7b988c464 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,6 +23,9 @@ tools/editor/editor_icons.cpp
make.bat
log.txt
+# Doxygen generated documentation
+doc/doxygen/*
+
# Javascript specific
*.bc
diff --git a/Doxyfile b/Doxyfile
index c32a1bf195..4268ed8c7d 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -51,14 +51,14 @@ PROJECT_BRIEF = "Game Engine MIT"
# pixels and the maximum width should not exceed 200 pixels. Doxygen will copy
# the logo to the output directory.
-PROJECT_LOGO = E:/development/godot/logo_small.png
+PROJECT_LOGO = ./logo_small.png
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
# into which the generated documentation will be written. If a relative path is
# entered, it will be relative to the location where doxygen was started. If
# left blank the current directory will be used.
-OUTPUT_DIRECTORY = E:/development/godot/doxygen
+OUTPUT_DIRECTORY = ./doc/doxygen/
# 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
@@ -768,7 +768,7 @@ WARN_LOGFILE =
# spaces.
# Note: If this tag is empty the current directory is searched.
-INPUT = E:/development/godot
+INPUT = ./core/ ./main/ ./scene/
# 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