diff options
| author | Dimitri van Heesch <dimitri@stack.nl> | 2013-10-21 17:45:04 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <dimitri@stack.nl> | 2013-10-21 17:45:04 (GMT) |
| commit | 33ce9c337c8c7f5f60e6d8cdb5fcae03fd7598c1 (patch) | |
| tree | 54d022a4f122f18eb0814e77bf99bcc01478e3ec | |
| parent | f95564c94b46e958683aa84fd336c6210104db85 (diff) | |
| parent | 2253b49ead5971b53e48832ff130a127b92f6157 (diff) | |
| download | Doxygen-33ce9c337c8c7f5f60e6d8cdb5fcae03fd7598c1.zip Doxygen-33ce9c337c8c7f5f60e6d8cdb5fcae03fd7598c1.tar.gz Doxygen-33ce9c337c8c7f5f60e6d8cdb5fcae03fd7598c1.tar.bz2 | |
Merge pull request #49 from albert-github/feature_build_cgi
Doxysearch under Cygwin should not have extension cgi.exe but just .cgi
| -rw-r--r-- | addon/doxysearch/doxysearch.pro.in | 2 | ||||
| -rw-r--r-- | tmake/lib/win32-g++/generic.t | 18 |
2 files changed, 12 insertions, 8 deletions
diff --git a/addon/doxysearch/doxysearch.pro.in b/addon/doxysearch/doxysearch.pro.in index c9654b0..c860fd1 100644 --- a/addon/doxysearch/doxysearch.pro.in +++ b/addon/doxysearch/doxysearch.pro.in @@ -1,5 +1,5 @@ TEMPLATE = app.t -CONFIG = console warn_on debug +CONFIG = console warn_on debug cgi HEADERS = SOURCES = doxysearch.cpp LIBS += -lxapian diff --git a/tmake/lib/win32-g++/generic.t b/tmake/lib/win32-g++/generic.t index 5f6289f..83fc890 100644 --- a/tmake/lib/win32-g++/generic.t +++ b/tmake/lib/win32-g++/generic.t @@ -80,13 +80,17 @@ $project{"TARGET_EXT"} = ".dll"; } } else { - Project('TMAKE_LFLAGS_CONSOLE_ANY = $$TMAKE_LFLAGS_CONSOLE'); - Project('TMAKE_LFLAGS_WINDOWS_ANY = $$TMAKE_LFLAGS_WINDOWS'); - if ( Project("TMAKE_APP_FLAG") ) { - $project{"TARGET_EXT"} = ".exe"; - } else { - $project{"TARGET_EXT"} = ".a"; - } + if ( Config("cgi") ) { + Project('TMAKE_LFLAGS_CONSOLE_ANY = $$TMAKE_LFLAGS_CONSOLE'); + Project('TMAKE_LFLAGS_WINDOWS_ANY = $$TMAKE_LFLAGS_WINDOWS'); + $project{"TARGET_EXT"} = ""; + } else { + if ( Project("TMAKE_APP_FLAG") ) { + $project{"TARGET_EXT"} = ".exe"; + } else { + $project{"TARGET_EXT"} = ".a"; + } + } } if ( Config("windows") ) { if ( Config("console") ) { |