projects / packages / rdesktop.git / blame
| Commit | Line | Data |
|---|---|---|
| 3201456a JB |
1 | --- rdesktop-1.1.0/Makefile.orig Fri Jun 14 11:46:27 2002 |
| 2 | +++ rdesktop-1.1.0/Makefile Fri Jun 14 11:48:46 2002 | |
| 3 | @@ -104,8 +104,8 @@ | |
| 4 | rdesktop: $(RDPOBJ) $(SSL_OBJ) ${GUI_OBJ} ${GNUOBJ} | |
| 5 | $(CC) $(CFLAGS) $(LDFLAGSOPT) -o rdesktop $(RDPOBJ) $(SSL_OBJ) $(LDDIRS) $(LDLIBS) ${GNUOBJ} ${GUI_OBJ} ${GUI_LIBS} ${SSL_LIBS} | |
| 6 | ||
| 7 | -rdp-srvr: $(RDPSOBJ) ${SSL_OBJ} ${GUI_OBJ} $(GNUOBJ) | |
| 8 | - $(CC) $(CFLAGS) $(LDFLAGSOPT) -o rdp-srvr $(RDPSOBJ) $(SSL_OBJ) $(LDDIRS) $(LDLIBS) ${GNUOBJ} ${GUI_OBJ} ${GUI_LIBS} ${SSL_LIBS} | |
| 9 | +rdp-srvr: $(RDPSOBJ) ${SSL_OBJ} $(GNUOBJ) | |
| 10 | + $(CC) $(CFLAGS) $(LDFLAGSOPT) -o rdp-srvr $(RDPSOBJ) $(SSL_OBJ) $(LDDIRS) $(LDLIBS) ${GNUOBJ} ${GUI_LIBS} ${SSL_LIBS} | |
| 11 | ||
| 12 | Makeconf: | |
| 13 | ./configure | |
| 14 | @@ -130,25 +130,25 @@ | |
| 15 | rm -f gl/*.o | |
| 16 | ||
| 17 | rdp-srvr.o: rdesktop.c | |
| 18 | - $(CC) $(CFLAGS) -DSERVER -o $@ -c $< | |
| 19 | + $(CC) $(CFLAGS) $(SSL_INCLUDES) $(INCLUDES) -DSERVER -o $@ -c $< | |
| 20 | ||
| 21 | iso-s.o: iso.c | |
| 22 | - $(CC) $(CFLAGS) -DSERVER -o $@ -c $< | |
| 23 | + $(CC) $(CFLAGS) $(SSL_INCLUDES) $(INCLUDES) -DSERVER -o $@ -c $< | |
| 24 | ||
| 25 | mcs-s.o: mcs.c | |
| 26 | - $(CC) $(CFLAGS) -DSERVER -o $@ -c $< | |
| 27 | + $(CC) $(CFLAGS) $(SSL_INCLUDES) $(INCLUDES) -DSERVER -o $@ -c $< | |
| 28 | ||
| 29 | rdp-s.o: rdp.c | |
| 30 | - $(CC) $(CFLAGS) -DSERVER -o $@ -c $< | |
| 31 | + $(CC) $(CFLAGS) $(SSL_INCLUDES) $(INCLUDES) -DSERVER -o $@ -c $< | |
| 32 | ||
| 33 | secure-s.o: secure.c | |
| 34 | - $(CC) $(CFLAGS) -DSERVER -o $@ -c $< | |
| 35 | + $(CC) $(CFLAGS) $(SSL_INCLUDES) $(INCLUDES) -DSERVER -o $@ -c $< | |
| 36 | ||
| 37 | tcp-s.o: tcp.c | |
| 38 | - $(CC) $(CFLAGS) -DSERVER -o $@ -c $< | |
| 39 | + $(CC) $(CFLAGS) $(SSL_INCLUDES) $(INCLUDES) -DSERVER -o $@ -c $< | |
| 40 | ||
| 41 | -xwin-s.o: xwin.c keymap_wrap.c keymap.c | |
| 42 | - $(CC) $(CFLAGS) -DSERVER -o $@ -c $< | |
| 43 | +xwin-s.o: gl/xwin.c keymap_wrap.c keymap.h | |
| 44 | + $(CC) $(CFLAGS) $(SSL_INCLUDES) $(INCLUDES) -DSERVER -o $@ -c $< | |
| 45 | ||
| 46 | .SUFFIXES: | |
| 47 | .SUFFIXES: .c .o | |
| 48 | --- rdesktop-1.1.0/gl/xwin.c.orig Fri Jun 14 11:56:33 2002 | |
| 49 | +++ rdesktop-1.1.0/gl/xwin.c Fri Jun 14 11:59:53 2002 | |
| 50 | @@ -33,6 +33,7 @@ | |
| 51 | #include <sys/time.h> | |
| 52 | #include <rdesktop.h> | |
| 53 | #include <stdlib.h> | |
| 54 | +#include <time.h> | |
| 55 | ||
| 56 | #include <keymap_wrap.c> | |
| 57 | ||
| 58 | @@ -1803,6 +1804,7 @@ | |
| 59 | ||
| 60 | #include <X11/keysym.h> | |
| 61 | ||
| 62 | +unsigned int | |
| 63 | x_key_to_sym(key, down) | |
| 64 | int key; | |
| 65 | int down; |