empathicqubit/AppleWin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Some small changes to ensure code compiles with GCC. (PR #877)

Browse source
This commit is contained in:
Andrea 2020-11-27 20:57:35 +00:00 • committed by GitHub
parent 8ef34d7d76
commit 3d70a9dd35
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/Core.cpp
View file

@ -44,7 +44,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#include "Speech.h" #include "Speech.h"
#endif #endif
static const UINT VERSIONSTRING_SIZE = 16; static const UINT VERSIONSTRING_SIZE = 16;
static UINT16 g_OldAppleWinVersion[4] = {0}; static UINT16 g_OldAppleWinVersion[4] = {0};
UINT16 g_AppleWinVersion[4] = { 0 }; UINT16 g_AppleWinVersion[4] = { 0 };
TCHAR VERSIONSTRING[VERSIONSTRING_SIZE] = "xx.yy.zz.ww"; TCHAR VERSIONSTRING[VERSIONSTRING_SIZE] = "xx.yy.zz.ww";

1
source/Memory.h
View file

@ -1,6 +1,7 @@
#pragma once #pragma once
#include "Common.h" #include "Common.h"
#include "Card.h"
// Memory Flag // Memory Flag
#define MF_80STORE 0x00000001 #define MF_80STORE 0x00000001

2
source/NTSC.h
View file

@ -1,5 +1,7 @@
#pragma once #pragma once
#include "Video.h"
// Globals (Public) // Globals (Public)
extern uint16_t g_nVideoClockVert; extern uint16_t g_nVideoClockVert;
extern uint16_t g_nVideoClockHorz; extern uint16_t g_nVideoClockHorz;

2
source/Utilities.cpp
View file

@ -45,7 +45,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#include "Mockingboard.h" #include "Mockingboard.h"
#include "Windows/WinFrame.h" #include "Windows/WinFrame.h"
#include "Configuration/PropertySheet.h" #include "Configuration/IPropertySheet.h"
#include "Tfe/Tfe.h" #include "Tfe/Tfe.h"
// Backwards compatibility with AppleWin <1.24.0 // Backwards compatibility with AppleWin <1.24.0

2
source/Video.cpp
View file

@ -100,7 +100,7 @@ static bool g_bVideoScannerNTSC = true; // NTSC video scanning (or PAL)
// NOTE: KEEP IN SYNC: VideoType_e g_aVideoChoices g_apVideoModeDesc // NOTE: KEEP IN SYNC: VideoType_e g_aVideoChoices g_apVideoModeDesc
// The window title will be set to this. // The window title will be set to this.
const char *g_apVideoModeDesc[ NUM_VIDEO_MODES ] = static const char *g_apVideoModeDesc[ NUM_VIDEO_MODES ] =
{ {
"Monochrome (Custom)" "Monochrome (Custom)"
, "Color (Composite Idealized)" , "Color (Composite Idealized)"