More cleanups, and integgrated support for VNC (and RDP) remote renderers.

src/Makefile.mingw

@@ -8,7 +8,7 @@
 #
 #		Modified Makefile for Win32 (MinGW32) environment.
 #
-# Version:	@(#)Makefile.mingw	1.0.57	2017/10/11
+# Version:	@(#)Makefile.mingw	1.0.58	2017/10/13
 #
 # Authors:	Miran Grca, <mgrca8@gmail.com>
 #               Fred N. van Kempen, <decwiz@yahoo.com>
@@ -59,6 +59,12 @@ endif
 ifndef USB
 USB		:= n
 endif
+ifndef VNC
+VNC		:= n
+endif
+ifndef RDP
+RDP		:= n
+endif
 ifndef DEV_BUILD
 DEV_BUILD	:= n
 endif
@@ -194,6 +200,22 @@ MUNTOBJ		:= midi_mt32.o \
 		    Tables.o TVA.o TVF.o TVP.o sha1.o c_interface.o
 endif
 
+ifeq ($(VNC), y)
+CFLAGS		+= -DUSE_VNC
+RFLAGS		+= -DUSE_VNC
+CFLAGS		+= -I$(VNC_PATH)\INCLUDE
+VNCLIB		:= $(VNC_PATH)\LIB\libvncserver.a
+VNCOBJ		:= win_vnc.o
+endif
+
+ifeq ($(RDP), y)
+CFLAGS		+= -DUSE_RDP
+RFLAGS		+= -DUSE_RDP
+CFLAGS		+= -I$(RDP_PATH)\INCLUDE
+RDPLIB		:= $(RDP_PATH)\LIB\librdp.a
+RDPOBJ		:= win_rdp.o
+endif
+
 # Options for the DEV branch.
 ifeq ($(DEV_BRANCH), y)
 CFLAGS		+= -DDEV_BRANCH
@@ -356,6 +378,7 @@ VIDOBJ		:= video.o \
 
 PLATOBJ		:= win.o \
 		    win_ddraw.o win_ddraw_fs.o win_d3d.o win_d3d_fs.o \
+		    $(VNCOBJ) $(RDPOBJ) \
 		    win_dynld.o win_thread.o $(WSERIAL) win_cdrom.o win_cdrom_ioctl.o \
 		    win_keyboard.o win_mouse.o win_joystick.o win_midi.o \
 		    win_dialog.o win_about.o win_status.o win_stbar.o \
@@ -376,6 +399,9 @@ LIBS		:= -mwindows \
 		   -lopenal.dll \
 		   -lddraw -ldinput8 -ldxguid -ld3d9 -ld3dx9 \
 		   -lcomctl32 -lwinmm
+ifeq ($(VNC), y)
+LIBS		+= $(VNCLIB) -lws2_32 -lz -lpthread
+endif
 LIBS		+= -lkernel32 -lwsock32 -liphlpapi -lpsapi
 LIBS		+= -static -lstdc++ -lgcc
 LIBS		+= -Wl,--large-address-aware