CVS: rdesktop/uiports makefile_qt,1.3,1.4 qtwin.cpp,1.12,1.13 xxxwin.c,1.5,1.6

Update of /cvsroot/rdesktop/rdesktop/uiports
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20406

Modified Files:
	makefile_qt qtwin.cpp xxxwin.c 
Log Message:
get uiport compiling again

Index: makefile_qt
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/uiports/makefile_qt,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** makefile_qt	4 Apr 2005 02:06:24 -0000	1.3
--- makefile_qt	23 Mar 2006 01:32:49 -0000	1.4
***************
*** 4,9 ****
  #
  CC = g++
! CPPFLAGS = -O2 -Wall -I/usr/local/qt/include -DWITH_RDPSND
! RESTOBJ = ../tcp.o ../iso.o ../mcs.o ../secure.o ../rdp.o ../rdp5.o ../orders.o ../cache.o ../mppc.o ../licence.o ../bitmap.o ../channels.o ../pstcache.o ../rdpsnd.o ../rdpsnd_oss.o
  LD2FLAGS = -L/usr/local/qt/lib -L/usr/X11R6/lib
  LDFLAGS = -lcrypto -lqt -lXext -lX11 -lm
--- 4,15 ----
  #
  CC = g++
! CPPFLAGS = -O2 -Wall -I/usr/local/qt/include -I..
! # the next line is for sound
! CPPFLAGS += -DWITH_RDPSND
! RESTOBJ = tcp.o iso.o mcs.o secure.o rdp.o rdp5.o
! RESTOBJ += orders.o cache.o mppc.o licence.o bitmap.o
! RESTOBJ += channels.o pstcache.o
! # the next line is for sound
! RESTOBJ += rdpsnd.o rdpsnd_oss.o
  LD2FLAGS = -L/usr/local/qt/lib -L/usr/X11R6/lib
  LDFLAGS = -lcrypto -lqt -lXext -lX11 -lm
***************
*** 23,24 ****
--- 29,77 ----
  	rm -f ../*.o
  	rm -f moc_qtwin.cpp
+ 
+ # common files
+ 
+ tcp.o: ../tcp.c
+ 	$(CC) $(CPPFLAGS) -c ../tcp.c
+ 
+ iso.o: ../iso.c
+ 	$(CC) $(CPPFLAGS) -c ../iso.c
+ 
+ mcs.o: ../mcs.c
+ 	$(CC) $(CPPFLAGS) -c ../mcs.c
+ 
+ secure.o: ../secure.c
+ 	$(CC) $(CPPFLAGS) -c ../secure.c
+ 
+ rdp.o: ../rdp.c
+ 	$(CC) $(CPPFLAGS) -c ../rdp.c
+ 
+ rdp5.o: ../rdp5.c
+ 	$(CC) $(CPPFLAGS) -c ../rdp5.c
+ 
+ orders.o: ../orders.c
+ 	$(CC) $(CPPFLAGS) -c ../orders.c
+ 
+ cache.o: ../cache.c
+ 	$(CC) $(CPPFLAGS) -c ../cache.c
+ 
+ mppc.o: ../mppc.c
+ 	$(CC) $(CPPFLAGS) -c ../mppc.c
+ 
+ licence.o: ../licence.c
+ 	$(CC) $(CPPFLAGS) -c ../licence.c
+ 
+ bitmap.o: ../bitmap.c
+ 	$(CC) $(CPPFLAGS) -c ../bitmap.c
+ 
+ channels.o: ../channels.c
+ 	$(CC) $(CPPFLAGS) -c ../channels.c
+ 
+ pstcache.o: ../pstcache.c
+ 	$(CC) $(CPPFLAGS) -c ../pstcache.c
+ 
+ rdpsnd.o: ../rdpsnd.c
+ 	$(CC) $(CPPFLAGS) -c ../rdpsnd.c
+ 
+ rdpsnd_oss.o: ../rdpsnd_oss.c
+ 	$(CC) $(CPPFLAGS) -c ../rdpsnd_oss.c

Index: qtwin.cpp
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/uiports/qtwin.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** qtwin.cpp	22 Sep 2005 01:18:57 -0000	1.12
--- qtwin.cpp	23 Mar 2006 01:32:49 -0000	1.13
***************
*** 2,6 ****
     rdesktop: A Remote Desktop Protocol client.
     User interface services - QT Window System
!    Copyright (C) Jay Sorg 2004-2005
  
     This program is free software; you can redistribute it and/or modify
--- 2,6 ----
     rdesktop: A Remote Desktop Protocol client.
     User interface services - QT Window System
!    Copyright (C) Jay Sorg 2004-2006
  
     This program is free software; you can redistribute it and/or modify
***************
*** 19,23 ****
  */
  
! #include "../rdesktop.h"
  
  #include <qapplication.h>
--- 19,23 ----
  */
  
! #include "rdesktop.h"
  
  #include <qapplication.h>
***************
*** 50,54 ****
  int g_height = 600;
  int g_width = 800;
! int g_server_bpp = 8;
  int g_encryption = 1;
  int g_desktop_save = 1;
--- 50,54 ----
  int g_height = 600;
  int g_width = 800;
! int g_server_depth = 8;
  int g_encryption = 1;
  int g_desktop_save = 1;
***************
*** 169,173 ****
  void SetColorx(QColor * Color, uint32 InColor)
  {
!   switch (g_server_bpp)
    {
      case 8:
--- 169,173 ----
  void SetColorx(QColor * Color, uint32 InColor)
  {
!   switch (g_server_depth)
    {
      case 8:
***************
*** 763,767 ****
    int i;
  
!   switch (g_server_bpp)
    {
      case 8:
--- 763,767 ----
    int i;
  
!   switch (g_server_depth)
    {
      case 8:
***************
*** 1187,1191 ****
    int i;
  
!   switch (g_server_bpp)
    {
      case 8:
--- 1187,1191 ----
    int i;
  
!   switch (g_server_depth)
    {
      case 8:
***************
*** 1767,1773 ****
      else if (strcmp(in_argv[i], "-a") == 0)
      {
!       g_server_bpp = strtol(in_argv[i + 1], &p, 10);
!       if (g_server_bpp != 8 && g_server_bpp != 15 &&
!           g_server_bpp != 16 && g_server_bpp != 24)
        {
          error("invalid bpp\n");
--- 1767,1773 ----
      else if (strcmp(in_argv[i], "-a") == 0)
      {
!       g_server_depth = strtol(in_argv[i + 1], &p, 10);
!       if (g_server_depth != 8 && g_server_depth != 15 &&
!           g_server_depth != 16 && g_server_depth != 24)
        {
          error("invalid bpp\n");

Index: xxxwin.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/uiports/xxxwin.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** xxxwin.c	22 Sep 2005 01:36:13 -0000	1.5
--- xxxwin.c	23 Mar 2006 01:32:49 -0000	1.6
***************
*** 2,6 ****
     rdesktop: A Remote Desktop Protocol client.
     User interface services - Generic
!    Copyright (C) Jay Sorg 2004-2005
  
     This program is free software; you can redistribute it and/or modify
--- 2,6 ----
     rdesktop: A Remote Desktop Protocol client.
     User interface services - Generic
!    Copyright (C) Jay Sorg 2004-2006
  
     This program is free software; you can redistribute it and/or modify
***************
*** 27,31 ****
  int g_height = 600;
  int g_width = 800;
! int g_server_bpp = 8;
  int g_encryption = 1;
  int g_desktop_save = 1;
--- 27,31 ----
  int g_height = 600;
  int g_width = 800;
! int g_server_depth = 8;
  int g_encryption = 1;
  int g_desktop_save = 1;



-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642