Re-enable Cygwin with a couple of tweaks to ifdefs

This commit is contained in:
David Schmidt 2013-05-28 20:05:37 +00:00
parent 9d3d750f98
commit 369871df3f
4 changed files with 11 additions and 11 deletions

View File

@ -1777,7 +1777,7 @@ adb_physical_key_update(int a2code, int is_up)
break;
case 0x0a: /* F10 - change a2vid paletter */
if (SHIFT_DOWN) {
#ifdef WIN32
#if defined(WIN32) || defined(__CYGWIN__)
extern void x_toggle_status_lines();
x_toggle_status_lines();
#endif

View File

@ -1,6 +1,6 @@
/*
GSport - an Apple //gs Emulator
Copyright (C) 2010 - 2012 by GSport contributors
Copyright (C) 2010 - 2013 by GSport contributors
Based on the KEGS emulator written by and Copyright (C) 2003 Kent Dickey
@ -92,7 +92,7 @@ extern char* g_printer_font_courier;
extern char* g_printer_font_script;
extern char* g_printer_font_ocra;
extern int g_printer_timeout;
#ifdef _WIN32
#if defined(_WIN32) || defined(__CYGWIN__)
extern int g_win_show_console_request;
extern int g_win_status_debug_request;
#endif
@ -279,7 +279,7 @@ Cfg_menu g_cfg_printer_menu[] = {
{ 0, 0, 0, 0, 0 },
};
#ifdef _WIN32
#if defined(_WIN32) || defined(__CYGWIN__)
Cfg_menu g_cfg_debug_menu[] = {
{ "Debugging Options", g_cfg_debug_menu, 0, 0, CFGTYPE_MENU },
{ "Status lines,0,Hide,1,Show", KNMP(g_win_status_debug_request), CFGTYPE_INT },
@ -302,7 +302,7 @@ Cfg_menu g_cfg_main_menu[] = {
#ifndef _WIN32
{ "Force X-windows display depth", KNMP(g_force_depth), CFGTYPE_INT },
#endif
#ifdef _WIN32
#if defined(_WIN32) || defined(__CYGWIN__)
{ "Debugging Options", g_cfg_debug_menu, 0, 0, CFGTYPE_MENU },
#endif
{ "Auto-update configuration file,0,Manual,1,Immediately",
@ -582,7 +582,7 @@ cfg_get_tfe_name()
}
else
{
#ifdef _WIN32
#if defined(_WIN32) || defined(__CYGWIN__)
cfg_printf("ERROR: Install/Enable WinPcap for Ethernet Support!!");
#else
cfg_printf("ERROR: Install/Enable LibPcap for Ethernet Support!!");

View File

@ -1,6 +1,6 @@
/*
GSport - an Apple //gs Emulator
Copyright (C) 2010 - 2012 by GSport contributors
Copyright (C) 2010 - 2013 by GSport contributors
Based on the KEGS emulator written by and Copyright (C) 2003 Kent Dickey
@ -112,12 +112,12 @@ void x_toggle_status_lines()
void x_show_console(int show)
{
HWND hWnd = ::GetConsoleWindow();
HWND hWnd = GetConsoleWindow();
if (hWnd)
::ShowWindow(hWnd, show ? SW_SHOW : SW_HIDE);
ShowWindow(hWnd, show ? SW_SHOW : SW_HIDE);
if (g_hwnd_main)
::SetFocus(g_hwnd_main);
SetFocus(g_hwnd_main);
}
int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nShowCmd)

View File

@ -1,6 +1,6 @@
/*
GSport - an Apple //gs Emulator
Copyright (C) 2010 - 2012 by GSport contributors
Copyright (C) 2010 - 2013 by GSport contributors
Based on the KEGS emulator written by and Copyright (C) 2003 Kent Dickey