VNC back to DEV builds (not everybody has the libs) and double-declares vars in win/.

This commit is contained in:
waltje
2017-11-20 00:23:02 -05:00
parent 4484011767
commit 59624c0884
3 changed files with 147 additions and 58 deletions

View File

@@ -8,7 +8,7 @@
#
# Makefile for Win32 (MinGW32) environment.
#
# Version: @(#)Makefile.mingw 1.0.79 2017/11/19
# Version: @(#)Makefile.mingw 1.0.80 2017/11/19
#
# Authors: Miran Grca, <mgrca8@gmail.com>
# Fred N. van Kempen, <decwiz@yahoo.com>
@@ -50,7 +50,7 @@ ifndef USB
USB := n
endif
ifndef VNC
VNC := y
VNC := n
endif
ifndef RDP
RDP := n
@@ -102,6 +102,7 @@ CIRRUS := y
NE1000 := y
NV_RIVA := y
PAS16 := y
VNC := y
endif
# WxWidgets basic info. Extract using the config program.

View File

@@ -8,7 +8,7 @@
*
* user Interface module for WinAPI on Windows.
*
* Version: @(#)win_ui.c 1.0.2 2017/11/18
* Version: @(#)win_ui.c 1.0.3 2017/11/19
*
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com>
@@ -56,14 +56,10 @@
/* Platform Public data, specific. */
HINSTANCE hinstance; /* application instance */
HWND hwndMain, /* application main window */
hwndRender; /* machine render window */
HMENU menuMain; /* application main menu */
HANDLE ghMutex;
HICON hIcon[512]; /* icon data loaded from resources */
LCID lang_id; /* current language ID used */
DWORD dwSubLangID;
RECT oldclip; /* mouse rect */
int infocus = 1;
@@ -72,7 +68,6 @@ WCHAR wopenfilestring[260];
/* Local data. */
//static HANDLE thMain;
static wchar_t wTitle[512];
static RAWINPUTDEVICE device;
static HHOOK hKeyboardHook;