[wpdev-commits] wolfpack log.cpp,1.3,1.4 log.h,1.2,1.3 wolfpack.pro,1.162,1.163
Brought to you by:
rip,
thiagocorrea
|
From: <thi...@us...> - 2003-09-15 02:00:46
|
Update of /cvsroot/wpdev/wolfpack
In directory sc8-pr-cvs1:/tmp/cvs-serv20079
Modified Files:
log.cpp log.h wolfpack.pro
Log Message:
Improved linux build
:
Index: log.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/log.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** log.cpp 8 Sep 2003 10:58:47 -0000 1.3
--- log.cpp 15 Sep 2003 02:00:41 -0000 1.4
***************
*** 69,74 ****
if ( !d.exists(path) )
{
! Console::instance()->send( QString("Warning: log path (%1) doesn't exist, creating\n").arg(path) );
! QDir d;
d.mkdir( path );
}
--- 69,76 ----
if ( !d.exists(path) )
{
! Console::instance()->ChangeColor( WPC_YELLOW );
! Console::instance()->send( "WARNING: " );
! Console::instance()->ChangeColor( WPC_NORMAL );
! Console::instance()->send( QString("log path (%1) doesn't exist, creating\n").arg(path) );
d.mkdir( path );
}
***************
*** 81,85 ****
if( !logfile.open( IO_WriteOnly | IO_Append | IO_Translate ) )
{
! Console::instance()->send( QString( "Couldn't open logfile '%1'\n" ).arg( path ) );
return false;
}
--- 83,90 ----
if( !logfile.open( IO_WriteOnly | IO_Append | IO_Translate ) )
{
! Console::instance()->ChangeColor( WPC_RED );
! Console::instance()->send( "ERROR: " );
! Console::instance()->ChangeColor( WPC_NORMAL );
! Console::instance()->send( QString( "Couldn't open logfile '%1'\n" ).arg( path + filename ) );
return false;
}
***************
*** 187,188 ****
--- 192,194 ----
Console::instance()->send( string );
}
+
Index: log.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/log.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** log.h 8 Sep 2003 10:58:47 -0000 1.2
--- log.h 15 Sep 2003 02:00:41 -0000 1.3
***************
*** 52,56 ****
public:
cLog(): loglevel( LOG_DEBUG ) {}
! virtual ~cLog();
// Prints to the logfile only
--- 52,56 ----
public:
cLog(): loglevel( LOG_DEBUG ) {}
! ~cLog();
// Prints to the logfile only
***************
*** 67,68 ****
--- 67,69 ----
#endif
+
Index: wolfpack.pro
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/wolfpack.pro,v
retrieving revision 1.162
retrieving revision 1.163
diff -C2 -d -r1.162 -r1.163
*** wolfpack.pro 13 Sep 2003 01:15:03 -0000 1.162
--- wolfpack.pro 15 Sep 2003 02:00:41 -0000 1.163
***************
*** 1,7 ****
! #
! # Wolfpack qmake project
! #
! #
! #
PROJECT = wolfpack
--- 1,8 ----
! #################################################################
! # ) (\_ # Wolfpack 13.0.0 Build Script #
! # (( _/{ "-; # Created by: Wolfpack Development Team #
! # )).-" {{ ;"` # Revised by: Wolfpack Development Team #
! # ( ( ;._ \\ ctr # Last Modification: check cvs logs #
! #################################################################
PROJECT = wolfpack
***************
*** 10,13 ****
--- 11,15 ----
CONFIG += qt console thread exceptions rtti
INCLUDEPATH += lib/Python/include
+ OPTIONS += mysql
unix {
***************
*** 17,39 ****
# MySQL includes first
! exists(/usr/include/mysql/mysql.h) {
! message("MySQL files found, support enabled")
! INCLUDEPATH += /usr/include/mysql
! DEFINES += MYSQL_DRIVER
! LIBS += -lmysqlclient
! } exists(/usr/local/lib/mysql/include/mysql/mysql.h) {
! message("MySQL files found, support enabled")
! INCLUDEPATH += /usr/local/lib/mysql/include/mysql
! DEFINES += MYSQL_DRIVER
! LIBS += -lmysqlclient
}
INCLUDEPATH += /usr/local/include/stlport lib/Python sqlite lib/Python/Include network
! LIBS += -L. -L/usr/local/lib/mysql/lib/mysql -L/usr/local/lib -Llib/Python -L/usr/lib/mysql -ldl -lpython2.3 -lutil
# we dont use those.
QMAKE_LIBS_X11 -= -lX11 -lXext -lm
# Optional compile modes
! release:debug:error(You cant have release and debug at the same time!)
release {
--- 19,62 ----
# MySQL includes first
! contains( OPTIONS, mysql ) {
! message("MySQL support specified, trying to locate required files")
! exists(/usr/include/mysql/mysql.h) {
! MYSQL_INCLUDE = /usr/include/mysql
! } exists(/usr/local/lib/mysql/include/mysql/mysql.h) {
! message("MySQL files found, support enabled")
! INCLUDEPATH += /usr/local/lib/mysql/include/mysql
! DEFINES += MYSQL_DRIVER
! LIBS += -lmysqlclient
! }
!
! !isEmpty(MYSQL_INCLUDE) {
! message("MySQL include path........: ($$MYSQL_INCLUDE)")
! INCLUDEPATH += $$MYSQL_INCLUDE
! DEFINES += MYSQL_DRIVER
!
! exists(/usr/lib/mysql/mysqlclient*) {
! MYSQL_LIB = /usr/lib/mysql
! } exists (/usr/local/lib/mysql/lib/mysql/mysqlclient*) {
! MYSQL_LIB = /usr/local/lib/mysql/lib/mysql
! } exists (/usr/local/lib/mysqlclient*) {
! MYSQL_LIB = /usr/local/lib
! }
!
! !isEmpty(MYSQL_LIB) {
! message("MySQL library path.........: ($$MYSQL_LIB)")
! LIBS += -L$$MYSQL_LIB
! }
! LIBS += -lmysqlclient
! }
}
INCLUDEPATH += /usr/local/include/stlport lib/Python sqlite lib/Python/Include network
! LIBS += -L. -L/usr/local/lib -Llib/Python -ldl -lpython2.3 -lutil
!
# we dont use those.
QMAKE_LIBS_X11 -= -lX11 -lXext -lm
# Optional compile modes
! # release:debug:error(You cant have release and debug at the same time!)
release {
***************
*** 58,61 ****
--- 81,85 ----
RC_FILE = res.rc
OBJECTS_DIR = obj
+ MOC_DIR = obj
win32:DEFINES += WIN32
***************
*** 285,286 ****
--- 309,314 ----
console_win.cpp
+ DISTFILES += AUTHORS.txt \
+ COPYING.txt \
+ LICENSE.GPL
+
|