From 2253b49ead5971b53e48832ff130a127b92f6157 Mon Sep 17 00:00:00 2001 From: Albert Date: Sun, 20 Oct 2013 18:25:17 +0200 Subject: Doxysearch under Cygwin should not have extension cgi.exe but just .cgi --- addon/doxysearch/doxysearch.pro.in | 2 +- 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") ) { -- cgit v0.12