Update of /cvsroot/kde-cygwin/qt-3/misc/configure
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12388/misc/configure
Modified Files:
Tag: QT_WIN32_3_3_BRANCH
main.cpp
Log Message:
fixed use of rtti and exceptions - flags
Index: main.cpp
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/misc/configure/Attic/main.cpp,v
retrieving revision 1.1.2.6.2.34
retrieving revision 1.1.2.6.2.35
diff -u -r1.1.2.6.2.34 -r1.1.2.6.2.35
--- main.cpp 3 Apr 2005 16:11:09 -0000 1.1.2.6.2.34
+++ main.cpp 24 Apr 2005 13:52:15 -0000 1.1.2.6.2.35
@@ -380,27 +380,27 @@
{ "thread", "no-thread", 0 },
{ "largefile", "no-largefile", 1 },
{ "gif", "no-gif", 1 },
- { "opengl", "no-opengl", 1 },
{ "tablet", "no-tablet", 1 },
- { "exception", "no-exception", 1 },
- { "rtti", "no-rtti", 1 },
+ { "exceptions", "no-exceptions", 0 },
+ { "rtti", "no-rtti", 0 },
{ "pch", "no-pch", 1 },
- { "sound", "no-sound", 0 },
- { "big-codecs", "no-big-codecs", 0 },
{ NULL, NULL, 0 } };
+/* this are normally much more (see qglobal.h) */
static struct // option 2 has to be the "no-xxxx"
{
const char* option[ 2 ];
const char* define;
int prefered;
- int remove
- ;
+ int remove; // remove 'no-xxx' from qconfig to reduce the qconfig output
}
config_struct2[] =
{ { "stl", "no-stl", "QT_NO_STL", 0, 1 },
{ "ipv6", "no-ipv6", "QT_NO_IPV6", 0, 1 },
{ "zlib", "no-zlib", "QT_NO_COMPRESS", 0, 0 },
+ { "opengl", "no-opengl", "QT_NO_OPENGL", 1, 0 },
+ { "sound", "no-sound", "QT_NO_SOUND", 0, 0 },
+ { "big-codecs", "no-big-codecs", "QT_NO_BIG_CODECS", 1, 1 },
{ NULL, NULL, 0 } };
/* Check for opposed config options and insert standard values if none set */
@@ -502,7 +502,7 @@
options.QModules = QStringList::split( " ", "styles tools thread kernel widgets dialogs iconview workspace network canvas table xml opengl sql accessibility tablet sound" );
options.QNoModules = QStringList::split( " ", "" );
- options.QConfig = QStringList::split( " ", "enterprise nocrosscompiler warn_off create_prl link_prl minimal-config small-config medium-config large-config full-config" );
+ options.QConfig = QStringList::split( " ", "enterprise nocrosscompiler stl rtti pch warn_off create_prl link_prl minimal-config small-config medium-config large-config full-config" );
options.QStyles = options.QStylesAvailable = getAvailableStyle();
options.QImageFmts = options.QImageFmtsAvailable = QStringList::split( " " , "png mng jpeg" );
options.sqlDriverAvailable = getAvailableSqlDriver();
@@ -652,7 +652,7 @@
arg == "thread" || arg == "no-thread" || arg == "largefile" || arg == "no-largefile" ||
arg == "gif" || arg == "no-gif" ||
arg == "zlib" || arg == "no-zlib" || arg == "opengl" || arg == "no-opengl" ||
- arg == "tablet" || arg == "no-tablet" || arg == "exception" || arg == "no-exception" ||
+ arg == "tablet" || arg == "no-tablet" || arg == "exceptions" || arg == "no-exceptions" ||
arg == "rtti" || arg == "no-rtti" || arg == "stl" || arg == "no-stl" ||
arg == "pch" || arg == "no-pch" || arg == "ipv6" || arg == "no-ipv6" ||
arg == "sound" || arg == "no-sound" || arg == "big-codecs" || arg == "no-big-codecs" )
@@ -791,7 +791,7 @@
fprintf( out, "\n" );
fprintf( out, "OpenGL support ...... " + HasConfig( "opengl" ) );
fprintf( out, "Tablet support ...... " + HasConfig( "tablet" ) );
- fprintf( out, "Exception support.... " + HasConfig( "exception" ) );
+ fprintf( out, "Exception support.... " + HasConfig( "exceptions" ) );
fprintf( out, "RTTI support......... " + HasConfig( "rtti" ) );
fprintf( out, "SOUND support ....... " + HasConfig( "sound" ) );
fprintf( out, "\n" );
@@ -976,7 +976,7 @@
f.setName ( options.install_prefix + "/.qtwinconfig" );
if ( f.open( IO_WriteOnly | IO_Translate ) ) {
- /* only shared/static, thread/no-thread, release/debug, stl/no-stl */
+ /* only shared/static, thread, release/debug, stl, rtti and exceptions */
QTextStream s( &f );
s << "CONFIG += ";
if ( options.QConfig.contains( "shared" ) )
@@ -986,8 +986,6 @@
if ( options.QConfig.contains( "thread" ) )
s << "thread ";
- else
- s << "no-thread ";
if ( options.QConfig.contains( "debug" ) )
s << "debug ";
@@ -996,8 +994,12 @@
if ( options.QConfig.contains( "stl" ) )
s << "stl ";
- else
- s << "no-stl ";
+
+ if ( options.QConfig.contains( "rtti" ) )
+ s << "rtti ";
+
+ if ( options.QConfig.contains( "exceptions" ) )
+ s << "exceptions ";
s << endl;
@@ -1148,8 +1150,6 @@
// fprintf(out," -system-zlib ....... Use zlib from the operating system. \n");
// fprintf(out," See http://www.info-zip.org/pub/infozip/zlib \n");
fprintf( out, "\n" );
- fprintf( out, " -no-exceptions ..... Disable exceptions on platforms that support it. \n" );
- fprintf( out, " \n" );
fprintf( out, " -platform target ... The operating system and compiler you are building on.\n" );
fprintf( out, " See the PLATFORMS file for a list of supported \n" );
fprintf( out, " operating systems and compilers. \n" );
@@ -1186,12 +1186,18 @@
fprintf( out, " Possible values for <style>: \n" );
fprintf( out, " [ %s ] \n", options.QStyles.join( " " ).latin1() );
fprintf( out, " \n" );
- fprintf( out, " * -no-pch ............ Do not use precompiled header support. \n" );
- fprintf( out, " -pch ............... Use precompiled header support. \n" );
+ fprintf( out, " -no-pch ............ Do not use precompiled header support. \n" );
+ fprintf( out, " * -pch ............... Use precompiled header support. \n" );
fprintf( out, " \n" );
fprintf( out, " -no-stl ............ Do not compile STL support. \n" );
fprintf( out, " * -stl ............... Compile STL support. \n" );
fprintf( out, " \n" );
+ fprintf( out, " -no-rtti ........... Do not compile RTTI support. \n" );
+ fprintf( out, " * -rtti .............. Compile RTTI support. \n" );
+ fprintf( out, " \n" );
+ fprintf( out, " -no-exceptions ..... Enable exceptions on platforms that support it. \n" );
+ fprintf( out, " -exceptions ........ Disable exceptions on platforms that support it. \n" );
+ fprintf( out, " \n" );
fprintf( out, " -verbose ........... Print verbose information about each step of the \n" );
fprintf( out, " -v ................. configure process. \n" );
fprintf( out, " \n" );
|