From d86520ef4920a9a47a4d6e33eadfc62b8b983748 Mon Sep 17 00:00:00 2001 From: Dimitri van Heesch Date: Sun, 12 Jan 2014 20:45:41 +0100 Subject: Minor fixes for the new build locations --- Doxyfile | 2 +- src/libdoxygen.pro.in | 67 ++++++++++++++++++----------------- tmake/lib/macosx-c++/tmake.conf | 2 +- tmake/lib/macosx-intel-c++/tmake.conf | 2 +- tmake/lib/macosx-uni-c++/tmake.conf | 2 +- winbuild/Doxygen.vcproj | 8 ++--- 6 files changed, 42 insertions(+), 41 deletions(-) diff --git a/Doxyfile b/Doxyfile index 308fa51..3b175c4 100644 --- a/Doxyfile +++ b/Doxyfile @@ -102,7 +102,7 @@ FILE_PATTERNS = *.h \ *.cpp \ *.md RECURSIVE = NO -EXCLUE = src/logos.cpp \ +EXCLUDE = src/logos.cpp \ src/lodepng.cpp EXCLUDE_SYMLINKS = NO EXCLUDE_SYMBOLS = diff --git a/src/libdoxygen.pro.in b/src/libdoxygen.pro.in index 7a54744..573d7c5 100644 --- a/src/libdoxygen.pro.in +++ b/src/libdoxygen.pro.in @@ -17,7 +17,6 @@ TEMPLATE = libdoxygen.t CONFIG = console warn_on staticlib $extraopts HEADERS = arguments.h \ - ../generated_src/doxygen/bib2xhtml.pl.h \ bufstr.h \ cite.h \ clangparser.h \ @@ -27,7 +26,6 @@ HEADERS = arguments.h \ code.h \ commentcnv.h \ commentscan.h \ - ../generated_src/doxygen/compound.xsd.h \ condparser.h \ config.h \ context.h \ @@ -47,20 +45,15 @@ HEADERS = arguments.h \ docvisitor.h \ dot.h \ doxygen.h \ - ../generated_src/doxygen/doxygen.bst.h \ - ../generated_src/doxygen/doxygen.css.h \ - ../generated_src/doxygen/doxygen.sty.h \ eclipsehelp.h \ entry.h \ example.h \ filedef.h \ filename.h \ - ../generated_src/doxygen/footer.html.h \ formula.h \ ftextstream.h \ ftvhelp.h \ groupdef.h \ - ../generated_src/doxygen/header.html.h \ htags.h \ htmlattrib.h \ htmldocvisitor.h \ @@ -68,20 +61,10 @@ HEADERS = arguments.h \ htmlhelp.h \ image.h \ index.h \ - ../generated_src/doxygen/index.xsd.h \ - ../generated_src/doxygen/jquery_p1.js.h \ - ../generated_src/doxygen/jquery_p2.js.h \ - ../generated_src/doxygen/jquery_p3.js.h \ - ../generated_src/doxygen/jquery_ui.js.h \ - ../generated_src/doxygen/jquery_fx.js.h \ - ../generated_src/doxygen/jquery_pt.js.h \ - ../generated_src/doxygen/svgpan.js.h \ - ../generated_src/doxygen/dynsections.js.h \ language.h \ latexdocvisitor.h \ latexgen.h \ layout.h \ - ../generated_src/doxygen/layout_default.xml.h \ logos.h \ mandocvisitor.h \ mangen.h \ @@ -96,8 +79,6 @@ HEADERS = arguments.h \ msc.h \ dia.h \ namespacedef.h \ - ../generated_src/doxygen/navtree.css.h \ - ../generated_src/doxygen/navtree.js.h \ objcache.h \ outputgen.h \ outputlist.h \ @@ -114,17 +95,11 @@ HEADERS = arguments.h \ qhp.h \ qhpxmlwriter.h \ reflist.h \ - ../generated_src/doxygen/resize.js.h \ rtfdocvisitor.h \ rtfgen.h \ rtfstyle.h \ scanner.h \ searchindex.h \ - ../generated_src/doxygen/search.css.h \ - ../generated_src/doxygen/search.js.h \ - ../generated_src/doxygen/extsearch.js.h \ - ../generated_src/doxygen/search_functions.php.h \ - ../generated_src/doxygen/search_opensearch.php.h \ section.h \ sortdict.h \ store.h \ @@ -143,11 +118,35 @@ HEADERS = arguments.h \ xmldocvisitor.h \ xmlgen.h \ docbookvisitor.h \ - docbookgen.h + docbookgen.h \ + ../generated_src/doxygen/bib2xhtml.pl.h \ + ../generated_src/doxygen/compound.xsd.h \ + ../generated_src/doxygen/doxygen.bst.h \ + ../generated_src/doxygen/doxygen.css.h \ + ../generated_src/doxygen/doxygen.sty.h \ + ../generated_src/doxygen/footer.html.h \ + ../generated_src/doxygen/header.html.h \ + ../generated_src/doxygen/index.xsd.h \ + ../generated_src/doxygen/settings.h \ + ../generated_src/doxygen/jquery_p1.js.h \ + ../generated_src/doxygen/jquery_p2.js.h \ + ../generated_src/doxygen/jquery_p3.js.h \ + ../generated_src/doxygen/jquery_ui.js.h \ + ../generated_src/doxygen/jquery_fx.js.h \ + ../generated_src/doxygen/jquery_pt.js.h \ + ../generated_src/doxygen/svgpan.js.h \ + ../generated_src/doxygen/dynsections.js.h \ + ../generated_src/doxygen/layout_default.xml.h \ + ../generated_src/doxygen/navtree.css.h \ + ../generated_src/doxygen/navtree.js.h \ + ../generated_src/doxygen/resize.js.h \ + ../generated_src/doxygen/search.css.h \ + ../generated_src/doxygen/search.js.h \ + ../generated_src/doxygen/extsearch.js.h \ + ../generated_src/doxygen/search_functions.php.h \ + ../generated_src/doxygen/search_opensearch.php.h SOURCES = arguments.cpp \ - ../generated_src/doxygen/ce_parse.cpp \ - ../generated_src/doxygen/constexp.cpp \ cite.cpp \ clangparser.cpp \ classdef.cpp \ @@ -218,14 +217,16 @@ SOURCES = arguments.cpp \ textdocvisitor.cpp \ tooltip.cpp \ util.cpp \ - ../generated_src/doxygen/vhdlcode.cpp \ vhdldocgen.cpp \ - ../generated_src/doxygen/vhdlparser.cpp \ - ../generated_src/doxygen/vhdlscanner.cpp \ xmldocvisitor.cpp \ xmlgen.cpp \ docbookvisitor.cpp \ docbookgen.cpp \ + ../generated_src/doxygen/ce_parse.cpp \ + ../generated_src/doxygen/constexp.cpp \ + ../generated_src/doxygen/vhdlcode.cpp \ + ../generated_src/doxygen/vhdlparser.cpp \ + ../generated_src/doxygen/vhdlscanner.cpp \ ../generated_src/doxygen/code.cpp \ ../generated_src/doxygen/commentcnv.cpp \ ../generated_src/doxygen/commentscan.cpp \ @@ -234,11 +235,11 @@ SOURCES = arguments.cpp \ ../generated_src/doxygen/doctokenizer.cpp \ ../generated_src/doxygen/pre.cpp \ ../generated_src/doxygen/pycode.cpp \ - ../generated_src/doxygen/pyscanner.cpp \ + ../generated_src/doxygen/pyscanner.cpp \ ../generated_src/doxygen/scanner.cpp \ ../generated_src/doxygen/tclscanner.cpp \ ../generated_src/doxygen/fortrancode.cpp \ - ../generated_src/doxygen/fortranscanner.cpp \ + ../generated_src/doxygen/fortranscanner.cpp \ ../generated_src/doxygen/version.cpp win32:TMAKE_CXXFLAGS += -DQT_NODLL diff --git a/tmake/lib/macosx-c++/tmake.conf b/tmake/lib/macosx-c++/tmake.conf index 1162b76..8aebf31 100644 --- a/tmake/lib/macosx-c++/tmake.conf +++ b/tmake/lib/macosx-c++/tmake.conf @@ -17,7 +17,7 @@ TMAKE_CFLAGS_SHLIB = -fPIC TMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses TMAKE_CXX = c++ -TMAKE_CXXFLAGS = $$TMAKE_CFLAGS -D__FreeBSD__=6 -DYY_TYPEDEF_YY_SIZE_T -Dyy_size_t=int +TMAKE_CXXFLAGS = $$TMAKE_CFLAGS -DYY_TYPEDEF_YY_SIZE_T -Dyy_size_t=int TMAKE_CXXFLAGS_WARN_ON = $$TMAKE_CFLAGS_WARN_ON TMAKE_CXXFLAGS_WARN_OFF = $$TMAKE_CFLAGS_WARN_OFF TMAKE_CXXFLAGS_RELEASE = $$TMAKE_CFLAGS_RELEASE diff --git a/tmake/lib/macosx-intel-c++/tmake.conf b/tmake/lib/macosx-intel-c++/tmake.conf index 878e122..ddc024d 100644 --- a/tmake/lib/macosx-intel-c++/tmake.conf +++ b/tmake/lib/macosx-intel-c++/tmake.conf @@ -17,7 +17,7 @@ TMAKE_CFLAGS_SHLIB = -fPIC TMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses TMAKE_CXX = c++ -TMAKE_CXXFLAGS = $$TMAKE_CFLAGS -D__FreeBSD__=6 -mmacosx-version-min=10.5 -DYY_TYPEDEF_YY_SIZE_T -Dyy_size_t=int +TMAKE_CXXFLAGS = $$TMAKE_CFLAGS -mmacosx-version-min=10.5 -DYY_TYPEDEF_YY_SIZE_T -Dyy_size_t=int TMAKE_CXXFLAGS_WARN_ON = $$TMAKE_CFLAGS_WARN_ON TMAKE_CXXFLAGS_WARN_OFF = $$TMAKE_CFLAGS_WARN_OFF TMAKE_CXXFLAGS_RELEASE = $$TMAKE_CFLAGS_RELEASE diff --git a/tmake/lib/macosx-uni-c++/tmake.conf b/tmake/lib/macosx-uni-c++/tmake.conf index d2e3a40..9d7a4a8 100644 --- a/tmake/lib/macosx-uni-c++/tmake.conf +++ b/tmake/lib/macosx-uni-c++/tmake.conf @@ -17,7 +17,7 @@ TMAKE_CFLAGS_SHLIB = -fPIC TMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses TMAKE_CXX = c++ -TMAKE_CXXFLAGS = $$TMAKE_CFLAGS -D__FreeBSD__=6 -mmacosx-version-min=10.5 -DYY_TYPEDEF_YY_SIZE_T -Dyy_size_t=int +TMAKE_CXXFLAGS = $$TMAKE_CFLAGS -mmacosx-version-min=10.5 -DYY_TYPEDEF_YY_SIZE_T -Dyy_size_t=int TMAKE_CXXFLAGS_WARN_ON = $$TMAKE_CFLAGS_WARN_ON TMAKE_CXXFLAGS_WARN_OFF = $$TMAKE_CFLAGS_WARN_OFF TMAKE_CXXFLAGS_RELEASE = $$TMAKE_CFLAGS_RELEASE diff --git a/winbuild/Doxygen.vcproj b/winbuild/Doxygen.vcproj index 3609e63..2b8f313 100644 --- a/winbuild/Doxygen.vcproj +++ b/winbuild/Doxygen.vcproj @@ -95,7 +95,7 @@ Name="VCCLCompilerTool" AdditionalOptions="/Zm200 " Optimization="0" - AdditionalIncludeDirectories="$(IntDir),..\src,..\qtools,..\libpng,..\libmd5,." + AdditionalIncludeDirectories="..\src,..\qtools,..\libpng,..\libmd5,$(IntDir),." PreprocessorDefinitions="_CONSOLE;WIN32;_DEBUG; _CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;LIBICONV_STATIC;CHARSET_STATIC" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -217,7 +217,7 @@ Name="VCCLCompilerTool" AdditionalOptions="/Zm200 /bigobj" Optimization="0" - AdditionalIncludeDirectories="$(IntDir),..\src,..\qtools,..\libpng,..\libmd5,." + AdditionalIncludeDirectories="..\src,..\qtools,..\libpng,..\libmd5,$(IntDir),." PreprocessorDefinitions="_CONSOLE;WIN32;_DEBUG; _CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;LIBICONV_STATIC;CHARSET_STATIC" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -340,7 +340,7 @@ InlineFunctionExpansion="2" OmitFramePointers="true" WholeProgramOptimization="true" - AdditionalIncludeDirectories="$(IntDir),..\src,..\qtools,..\libpng,..\libmd5,." + AdditionalIncludeDirectories="..\src,..\qtools,..\libpng,..\libmd5,$(IntDir),." PreprocessorDefinitions="WIN32;_CINDEX_LIB_;_CINDEX_LIB_;NDEBUG;_CONSOLE; _CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;LIBICONV_STATIC;CHARSET_STATIC" StringPooling="true" RuntimeLibrary="0" @@ -463,7 +463,7 @@ InlineFunctionExpansion="2" OmitFramePointers="true" WholeProgramOptimization="true" - AdditionalIncludeDirectories="$(IntDir),..\src,..\qtools,..\libpng,..\libmd5,." + AdditionalIncludeDirectories="..\src,..\qtools,..\libpng,..\libmd5,$(IntDir),." PreprocessorDefinitions="WIN32;_CINDEX_LIB_;_CINDEX_LIB_;NDEBUG;_CONSOLE; _CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;LIBICONV_STATIC;CHARSET_STATIC" StringPooling="true" RuntimeLibrary="0" -- cgit v0.12