get uiport compiling again

git-svn-id: svn://svn.code.sf.net/p/rdesktop/code/trunk/rdesktop@1194 423420c4-83ab-492f-b58f-81f9feb106b5

uiports/makefile_qt

@@ -3,8 +3,14 @@
 # qt should be installed in /usr/local/qt
 #
 CC = g++
-CPPFLAGS = -O2 -Wall -I/usr/local/qt/include -DWITH_RDPSND
+CPPFLAGS = -O2 -Wall -I/usr/local/qt/include -I..
-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
+# 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
 MOCFILE = /usr/local/qt/bin/moc
@@ -22,3 +28,50 @@ clean:
 	rm -f *.o
 	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

uiports/qtwin.cpp

@@ -1,7 +1,7 @@
 /* -*- c-basic-offset: 8 -*-
    rdesktop: A Remote Desktop Protocol client.
    User interface services - QT Window System
-   Copyright (C) Jay Sorg 2004-2005
+   Copyright (C) Jay Sorg 2004-2006
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,7 +18,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include "../rdesktop.h"
+#include "rdesktop.h"
 
 #include <qapplication.h>
 #include <qmainwindow.h>
@@ -49,7 +49,7 @@ char g_hostname[16];
 char g_username[64];
 int g_height = 600;
 int g_width = 800;
-int g_server_bpp = 8;
+int g_server_depth = 8;
 int g_encryption = 1;
 int g_desktop_save = 1;
 int g_polygon_ellipse_orders = 0;
@@ -168,7 +168,7 @@ uint32 Color24to32(uint32 InColor)
 //*****************************************************************************
 void SetColorx(QColor * Color, uint32 InColor)
 {
-  switch (g_server_bpp)
+  switch (g_server_depth)
   {
     case 8:
       if (g_CM == NULL || InColor > 255)
@@ -762,7 +762,7 @@ HBITMAP ui_create_bitmap(int width, int height, uint8 * data)
   uint16 * s;
   int i;
 
-  switch (g_server_bpp)
+  switch (g_server_depth)
   {
     case 8:
       Image = new QImage(data, width, height, 8, (QRgb*)&g_CM->RGBColors,
@@ -1186,7 +1186,7 @@ void ui_paint_bitmap(int x, int y, int cx, int cy,
   uint16 * s;
   int i;
 
-  switch (g_server_bpp)
+  switch (g_server_depth)
   {
     case 8:
       Image = new QImage(data, width, height, 8, (QRgb*)&g_CM->RGBColors,
@@ -1766,9 +1766,9 @@ int parse_parameters(int in_argc, char ** in_argv)
     }
     else if (strcmp(in_argv[i], "-a") == 0)
     {
-      g_server_bpp = strtol(in_argv[i + 1], &p, 10);
+      g_server_depth = strtol(in_argv[i + 1], &p, 10);
-      if (g_server_bpp != 8 && g_server_bpp != 15 &&
+      if (g_server_depth != 8 && g_server_depth != 15 &&
-          g_server_bpp != 16 && g_server_bpp != 24)
+          g_server_depth != 16 && g_server_depth != 24)
       {
         error("invalid bpp\n");
         return 0;

uiports/xxxwin.c

@@ -1,7 +1,7 @@
 /* -*- c-basic-offset: 8 -*-
    rdesktop: A Remote Desktop Protocol client.
    User interface services - Generic
-   Copyright (C) Jay Sorg 2004-2005
+   Copyright (C) Jay Sorg 2004-2006
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -26,7 +26,7 @@ char g_hostname[16];
 char g_username[64];
 int g_height = 600;
 int g_width = 800;
-int g_server_bpp = 8;
+int g_server_depth = 8;
 int g_encryption = 1;
 int g_desktop_save = 1;
 int g_polygon_ellipse_orders = 0;