ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixes to the Win32 port for the latest video mode revamping. 

git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1324 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
This commit is contained in:
stephena 2007-06-20 20:36:28 +00:00
parent 6abcac4597
commit 66eff3b9d8
5 changed files with 9 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
stella/src/debugger/Debugger.cxx
View File

@ -13,7 +13,7 @@
// See the file "license" for information on usage and redistribution of // See the file "license" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES. // this file, and for a DISCLAIMER OF ALL WARRANTIES.
// //
// $Id: Debugger.cxx,v 1.109 2007-01-01 18:04:41 stephena Exp $ // $Id: Debugger.cxx,v 1.110 2007-06-20 20:36:28 stephena Exp $
//============================================================================ //============================================================================
#include "bspf.hxx" #include "bspf.hxx"
@ -156,7 +156,7 @@ void Debugger::initializeVideo()
GUI::Rect r = getDialogBounds(); GUI::Rect r = getDialogBounds();
string title = string("Stella ") + STELLA_VERSION + ": Debugger mode"; string title = string("Stella ") + STELLA_VERSION + ": Debugger mode";
myOSystem->frameBuffer().initialize(title, r.width(), r.height(), false); myOSystem->frameBuffer().initialize(title, r.width(), r.height());
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

3
stella/src/emucore/Settings.cxx
View File

@ -13,12 +13,13 @@
// See the file "license" for information on usage and redistribution of // See the file "license" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES. // this file, and for a DISCLAIMER OF ALL WARRANTIES.
// //
// $Id: Settings.cxx,v 1.117 2007-06-20 16:33:22 stephena Exp $ // $Id: Settings.cxx,v 1.118 2007-06-20 20:36:28 stephena Exp $
//============================================================================ //============================================================================
#include <cassert> #include <cassert>
#include <sstream> #include <sstream>
#include <fstream> #include <fstream>
#include <algorithm>
#include "OSystem.hxx" #include "OSystem.hxx"
#include "Version.hxx" #include "Version.hxx"

9
stella/src/win32/OSystemWin32.cxx
View File

@ -13,7 +13,7 @@
// See the file "license" for information on usage and redistribution of // See the file "license" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES. // this file, and for a DISCLAIMER OF ALL WARRANTIES.
// //
// $Id: OSystemWin32.cxx,v 1.17 2007-01-01 18:04:56 stephena Exp $ // $Id: OSystemWin32.cxx,v 1.18 2007-06-20 20:36:28 stephena Exp $
//============================================================================ //============================================================================
#include <sstream> #include <sstream>
@ -67,10 +67,3 @@ uInt32 OSystemWin32::getTicks()
{ {
return (uInt32) SDL_GetTicks() * 1000; return (uInt32) SDL_GetTicks() * 1000;
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void OSystemWin32::getScreenDimensions(int& width, int& height)
{
width = (int) GetSystemMetrics(SM_CXSCREEN);
height = (int) GetSystemMetrics(SM_CYSCREEN);
}

9
stella/src/win32/OSystemWin32.hxx
View File

@ -13,7 +13,7 @@
// See the file "license" for information on usage and redistribution of // See the file "license" for information on usage and redistribution of
// this file, and for a DISCLAIMER OF ALL WARRANTIES. // this file, and for a DISCLAIMER OF ALL WARRANTIES.
// //
// $Id: OSystemWin32.hxx,v 1.9 2007-01-01 18:04:56 stephena Exp $ // $Id: OSystemWin32.hxx,v 1.10 2007-06-20 20:36:28 stephena Exp $
//============================================================================ //============================================================================
#ifndef OSYSTEM_WIN32_HXX #ifndef OSYSTEM_WIN32_HXX
@ -25,7 +25,7 @@
This class defines Windows system specific settings. This class defines Windows system specific settings.
@author Stephen Anthony @author Stephen Anthony
@version $Id: OSystemWin32.hxx,v 1.9 2007-01-01 18:04:56 stephena Exp $ @version $Id: OSystemWin32.hxx,v 1.10 2007-06-20 20:36:28 stephena Exp $
*/ */
class OSystemWin32 : public OSystem class OSystemWin32 : public OSystem
{ {
@ -47,11 +47,6 @@ class OSystemWin32 : public OSystem
@return Current time in microseconds. @return Current time in microseconds.
*/ */
virtual uInt32 getTicks(); virtual uInt32 getTicks();
/**
This method queries the dimensions of the screen for this hardware.
*/
virtual void getScreenDimensions(int& width, int& height);
}; };
#endif #endif

4
stella/src/win32/Stella.vcproj
View File

@ -21,7 +21,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="..\yacc;..\debugger;..\gui;..\emucore\m6502\src\bspf\src;..\emucore\m6502\src;..\emucore;..\common;..\win32;..\debugger\gui;..\cheat" AdditionalIncludeDirectories="..\yacc;..\debugger;..\gui;..\emucore\m6502\src\bspf\src;..\emucore\m6502\src;..\emucore;..\common;..\win32;..\debugger\gui;..\cheat"
PreprocessorDefinitions="BSPF_WIN32;WIN32;_DEBUG;JOYSTICK_SUPPORT;DEBUGGER_SUPPORT;DISPLAY_OPENGL;SOUND_SUPPORT;CHEATCODE_SUPPORT" PreprocessorDefinitions="BSPF_WIN32;WIN32;_DEBUG;JOYSTICK_SUPPORT;DEBUGGER_SUPPORT;DISPLAY_OPENGL;WINDOWED_SUPPORT;SOUND_SUPPORT;CHEATCODE_SUPPORT"
MinimalRebuild="TRUE" MinimalRebuild="TRUE"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="2" RuntimeLibrary="2"
@ -73,7 +73,7 @@ SDLmain.lib
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..\yacc;..\emucore\m6502\src\bspf\src;..\emucore\m6502\src;..\emucore;..\common;..\gui;..\debugger\gui;..\debugger;..\win32;..\cheat" AdditionalIncludeDirectories="..\yacc;..\emucore\m6502\src\bspf\src;..\emucore\m6502\src;..\emucore;..\common;..\gui;..\debugger\gui;..\debugger;..\win32;..\cheat"
PreprocessorDefinitions="BSPF_WIN32;WIN32;NDEBUG;JOYSTICK_SUPPORT;DEBUGGER_SUPPORT;DISPLAY_OPENGL;SOUND_SUPPORT;CHEATCODE_SUPPORT" PreprocessorDefinitions="BSPF_WIN32;WIN32;NDEBUG;JOYSTICK_SUPPORT;DEBUGGER_SUPPORT;DISPLAY_OPENGL;WINDOWED_SUPPORT;SOUND_SUPPORT;CHEATCODE_SUPPORT"
RuntimeLibrary="2" RuntimeLibrary="2"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
WarningLevel="2" WarningLevel="2"