From 31447d9a6e8c7e6b396da057c45f4fa7108a9ac6 Mon Sep 17 00:00:00 2001 From: stephena Date: Fri, 20 Jun 2008 12:19:42 +0000 Subject: [PATCH] Some minor fixes for the Win32 build. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1541 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba --- stella/src/emucore/Console.cxx | 6 +- stella/src/emucore/FrameBuffer.hxx | 8 +- stella/src/gui/VideoDialog.cxx | 4 +- stella/src/win32/Stella.vcproj | 178 ++++++++++++++--------------- 4 files changed, 98 insertions(+), 98 deletions(-) diff --git a/stella/src/emucore/Console.cxx b/stella/src/emucore/Console.cxx index e786aeb8a..a19b133bd 100644 --- a/stella/src/emucore/Console.cxx +++ b/stella/src/emucore/Console.cxx @@ -13,7 +13,7 @@ // See the file "license" for information on usage and redistribution of // this file, and for a DISCLAIMER OF ALL WARRANTIES. // -// $Id: Console.cxx,v 1.148 2008-05-30 19:07:55 stephena Exp $ +// $Id: Console.cxx,v 1.149 2008-06-20 12:19:42 stephena Exp $ //============================================================================ #include @@ -451,7 +451,7 @@ bool Console::initializeVideo(bool full) // VideoDialog box or on the commandline, but it can't be saved // (ie, framerate is now determined based on number of scanlines). int framerate = myOSystem->settings().getInt("framerate"); - if(framerate > 0) myFramerate = framerate; + if(framerate > 0) myFramerate = float(framerate); myOSystem->setFramerate(myFramerate); // Make sure auto-frame calculation is only enabled when necessary @@ -467,7 +467,7 @@ void Console::initializeAudio() // The # of channels can be overridden in the AudioDialog box or on // the commandline, but it can't be saved. int framerate = myOSystem->settings().getInt("framerate"); - if(framerate > 0) myFramerate = framerate; + if(framerate > 0) myFramerate = float(framerate); const string& sound = myProperties.get(Cartridge_Sound); uInt32 channels = (sound == "STEREO" ? 2 : 1); diff --git a/stella/src/emucore/FrameBuffer.hxx b/stella/src/emucore/FrameBuffer.hxx index 8f22b2cfb..09580fd43 100644 --- a/stella/src/emucore/FrameBuffer.hxx +++ b/stella/src/emucore/FrameBuffer.hxx @@ -13,7 +13,7 @@ // See the file "license" for information on usage and redistribution of // this file, and for a DISCLAIMER OF ALL WARRANTIES. // -// $Id: FrameBuffer.hxx,v 1.98 2008-06-19 12:01:30 stephena Exp $ +// $Id: FrameBuffer.hxx,v 1.99 2008-06-20 12:19:42 stephena Exp $ //============================================================================ #ifndef FRAMEBUFFER_HXX @@ -27,7 +27,7 @@ class Console; namespace GUI { class Font; - class Rect; + struct Rect; } #include "EventHandler.hxx" @@ -90,7 +90,7 @@ enum { turn drawn here as well. @author Stephen Anthony - @version $Id: FrameBuffer.hxx,v 1.98 2008-06-19 12:01:30 stephena Exp $ + @version $Id: FrameBuffer.hxx,v 1.99 2008-06-20 12:19:42 stephena Exp $ */ class FrameBuffer { @@ -426,7 +426,7 @@ class FrameBuffer FrameBuffer type. @author Stephen Anthony - @version $Id: FrameBuffer.hxx,v 1.98 2008-06-19 12:01:30 stephena Exp $ + @version $Id: FrameBuffer.hxx,v 1.99 2008-06-20 12:19:42 stephena Exp $ */ // Text alignment modes for drawString() enum TextAlignment { diff --git a/stella/src/gui/VideoDialog.cxx b/stella/src/gui/VideoDialog.cxx index d15eceb5b..ec59cccd0 100644 --- a/stella/src/gui/VideoDialog.cxx +++ b/stella/src/gui/VideoDialog.cxx @@ -13,7 +13,7 @@ // See the file "license" for information on usage and redistribution of // this file, and for a DISCLAIMER OF ALL WARRANTIES. // -// $Id: VideoDialog.cxx,v 1.51 2008-06-13 13:14:52 stephena Exp $ +// $Id: VideoDialog.cxx,v 1.52 2008-06-20 12:19:42 stephena Exp $ // // Based on code from ScummVM - Scumm Interpreter // Copyright (C) 2002-2004 The ScummVM project @@ -363,7 +363,7 @@ void VideoDialog::saveConfig() { // Make sure auto-frame calculation is only enabled when necessary instance().console().mediaSource().enableAutoFrame(i <= 0); - instance().console().setFramerate(i); + instance().console().setFramerate(float(i)); } // Fullscreen diff --git a/stella/src/win32/Stella.vcproj b/stella/src/win32/Stella.vcproj index 2869b12d2..68ccd08d9 100755 --- a/stella/src/win32/Stella.vcproj +++ b/stella/src/win32/Stella.vcproj @@ -99,87 +99,6 @@ Name="VCPostBuildEventTool" /> - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - @@ -825,6 +821,10 @@ RelativePath="..\gui\CommandMenu.cxx" > + + @@ -1271,10 +1271,6 @@ RelativePath="..\debugger\gui\ColorWidget.hxx" > - - @@ -1455,6 +1451,10 @@ RelativePath="..\gui\ConsoleFont.hxx" > + +