[wpdev-commits] wolfpack console_unix.cpp,1.1,1.2 wolfpack.pro,1.156,1.157

[<thi...@us...>]

Update of /cvsroot/wpdev/wolfpack
In directory sc8-pr-cvs1:/tmp/cvs-serv29053

Modified Files:
	console_unix.cpp wolfpack.pro 
Log Message:
Linux compile fixes

Index: console_unix.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/console_unix.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** console_unix.cpp	9 Sep 2003 20:56:53 -0000	1.1
--- console_unix.cpp	9 Sep 2003 22:04:48 -0000	1.2
***************
*** 29,34 ****
--- 29,42 ----
  //	Wolfpack Homepage: http://wpdev.sf.net/
  //==================================================================================
+ // Qt Includes
+ #include <qthread.h>
  
+ // Wolfpack includes
  #include "console.h"
+ #include "globals.h"
+ 
+ #include <iostream>
+ 
+ using namespace std;
  
  class cConsoleThread : public QThread
***************
*** 41,45 ****
  			while( serverState < SHUTDOWN )
  			{
! 				char c = getch();
  				
  				if( c > 0 && serverState == RUNNING )
--- 49,53 ----
  			while( serverState < SHUTDOWN )
  			{
! 				char c = cin.peek();
  				
  				if( c > 0 && serverState == RUNNING )
***************
*** 49,53 ****
  				else
  				{	
! 					Sleep( 100 );
  				}
  			}
--- 57,61 ----
  				else
  				{	
! 					msleep( 100 );
  				}
  			}
***************
*** 179,183 ****
  }
  
! void cConsole::setAttributes( bool bold, bool italic, unsigned char r, unsigned char g, unsigned char b, unsigned char size )
  {
  }
--- 187,192 ----
  }
  
! void cConsole::setAttributes( bool bold, bool italic, bool, unsigned char r, unsigned char g, unsigned char b, unsigned char, eFontType )
  {
  }
+ 

Index: wolfpack.pro
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/wolfpack.pro,v
retrieving revision 1.156
retrieving revision 1.157
diff -C2 -d -r1.156 -r1.157
*** wolfpack.pro	9 Sep 2003 20:56:54 -0000	1.156
--- wolfpack.pro	9 Sep 2003 22:04:48 -0000	1.157
***************
*** 13,27 ****
  unix {
  
! # Common unix settings
! 	INCLUDEPATH += /usr/local/include/stlport lib/Python sqlite /usr/include/mysql /usr/local/lib/mysql/include/mysql lib/Python/Include network
  	LIBS  += -L/usr/local/lib/mysql/lib/mysql -L/usr/local/lib -Llib/Python -L/usr/lib/mysql -ldl -lpython2.2 -lmysqlclient -lutil
  	
  	# Optional compile modes	
! 	release:debug:error(You can't have release and debug at the same time!)
  	
  	release {
  		CONFIG += warn_off
  		linux {
! 			QMAKE_CXXFLAGS -= -O2
  			QMAKE_CXXFLAGS += -march=athlon-xp -O3 -pipe -fomit-frame-pointer -falign-functions=16 -falign-labels=8 -falign-loops=8 -falign-jumps=8 -fsched-spec-load -frerun-loop-opt -finline-limit=800 -funroll-loops -fprefetch-loop-arrays -ffast-math -mfpmath=sse -msse -m3dnow -fschedule-insns2 -fexpensive-optimizations -fmove-all-movables -fdelete-null-pointer-checks
  			
--- 13,42 ----
  unix {
  
! 	# Common unix settings
! 	# Lets try to figure some paths
! 
! 	# MySQL includes first
! 	exists(/usr/include/mysql/mysql.h) {
! 		message("MySQL files found, support enabled")
! 		INCLUDEPATH += /usr/include/mysql
! 		DEFINES += MYSQL_DRIVER
! 	} 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
! 	}
! 	
! 	INCLUDEPATH += /usr/local/include/stlport lib/Python sqlite lib/Python/Include network
  	LIBS  += -L/usr/local/lib/mysql/lib/mysql -L/usr/local/lib -Llib/Python -L/usr/lib/mysql -ldl -lpython2.2 -lmysqlclient -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 {
  		CONFIG += warn_off
  		linux {
! 			QMAKE_CFLAGS_RELEASE = -O3
  			QMAKE_CXXFLAGS += -march=athlon-xp -O3 -pipe -fomit-frame-pointer -falign-functions=16 -falign-labels=8 -falign-loops=8 -falign-jumps=8 -fsched-spec-load -frerun-loop-opt -finline-limit=800 -funroll-loops -fprefetch-loop-arrays -ffast-math -mfpmath=sse -msse -m3dnow -fschedule-insns2 -fexpensive-optimizations -fmove-all-movables -fdelete-null-pointer-checks
  			
***************
*** 51,56 ****
  win32-borland:LIBS += ws2_32.lib 
  
- DEFINES += MYSQL_DRIVER
- 
  # Common files
  
--- 66,69 ----
***************
*** 135,138 ****
--- 148,152 ----
  		combat.cpp \
  		commands.cpp \
+ 		console.cpp \
  		contextmenu.cpp \		  		  
  		coord.cpp \