mirror of https://github.com/stella-emu/stella.git
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
This commit is contained in:
stephena
parent
604217009c
commit
31447d9a6e
|
|
@ -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 <cassert>
|
||||
|
|
@ -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);
|
||||
|
||||
|
|
|
|||
|
|
@ -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 {
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -99,87 +99,6 @@
|
|||
Name="VCPostBuildEventTool"
|
||||
/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Release|Win32"
|
||||
OutputDirectory="Release"
|
||||
IntermediateDirectory="Release"
|
||||
ConfigurationType="1"
|
||||
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
|
||||
CharacterSet="2"
|
||||
>
|
||||
<Tool
|
||||
Name="VCPreBuildEventTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCMIDLTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
AdditionalOptions="/MP"
|
||||
OmitFramePointers="true"
|
||||
WholeProgramOptimization="false"
|
||||
AdditionalIncludeDirectories="..\yacc;..\emucore\m6502\src\bspf\src;..\emucore\m6502\src;..\emucore;..\common;..\gui;..\debugger\gui;..\debugger;..\win32;..\cheat"
|
||||
PreprocessorDefinitions="BSPF_WIN32;WIN32;ZLIB_WINAPI;NDEBUG;JOYSTICK_SUPPORT;DEBUGGER_SUPPORT;DISPLAY_OPENGL;WINDOWED_SUPPORT;SOUND_SUPPORT;CHEATCODE_SUPPORT"
|
||||
RuntimeLibrary="0"
|
||||
RuntimeTypeInfo="false"
|
||||
UsePrecompiledHeader="0"
|
||||
WarningLevel="2"
|
||||
Detect64BitPortabilityProblems="false"
|
||||
DebugInformationFormat="3"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCManagedResourceCompilerTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCResourceCompilerTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions="SDL.lib
SDLmain.lib
"
|
||||
AdditionalDependencies="sdl.lib sdlmain.lib zlibwapi.lib"
|
||||
OutputFile="$(OutDir)/Stella.exe"
|
||||
GenerateDebugInformation="true"
|
||||
SubSystem="1"
|
||||
OptimizeReferences="2"
|
||||
EnableCOMDATFolding="2"
|
||||
RandomizedBaseAddress="1"
|
||||
DataExecutionPrevention="0"
|
||||
TargetMachine="1"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCALinkTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCManifestTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXDCMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCBscMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCFxCopTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCAppVerifierTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"
|
||||
/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Debug|x64"
|
||||
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
|
||||
|
|
@ -262,6 +181,87 @@
|
|||
Name="VCPostBuildEventTool"
|
||||
/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Release|Win32"
|
||||
OutputDirectory="Release"
|
||||
IntermediateDirectory="Release"
|
||||
ConfigurationType="1"
|
||||
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
|
||||
CharacterSet="2"
|
||||
>
|
||||
<Tool
|
||||
Name="VCPreBuildEventTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCustomBuildTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXMLDataGeneratorTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCWebServiceProxyGeneratorTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCMIDLTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
AdditionalOptions="/MP"
|
||||
OmitFramePointers="true"
|
||||
WholeProgramOptimization="false"
|
||||
AdditionalIncludeDirectories="..\yacc;..\emucore\m6502\src\bspf\src;..\emucore\m6502\src;..\emucore;..\common;..\gui;..\debugger\gui;..\debugger;..\win32;..\cheat"
|
||||
PreprocessorDefinitions="BSPF_WIN32;WIN32;ZLIB_WINAPI;NDEBUG;JOYSTICK_SUPPORT;DEBUGGER_SUPPORT;DISPLAY_OPENGL;WINDOWED_SUPPORT;SOUND_SUPPORT;CHEATCODE_SUPPORT"
|
||||
RuntimeLibrary="0"
|
||||
RuntimeTypeInfo="false"
|
||||
UsePrecompiledHeader="0"
|
||||
WarningLevel="2"
|
||||
Detect64BitPortabilityProblems="false"
|
||||
DebugInformationFormat="3"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCManagedResourceCompilerTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCResourceCompilerTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPreLinkEventTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
AdditionalOptions="SDL.lib
SDLmain.lib
"
|
||||
AdditionalDependencies="sdl.lib sdlmain.lib zlibwapi.lib"
|
||||
OutputFile="$(OutDir)/Stella.exe"
|
||||
GenerateDebugInformation="true"
|
||||
SubSystem="1"
|
||||
OptimizeReferences="2"
|
||||
EnableCOMDATFolding="2"
|
||||
RandomizedBaseAddress="1"
|
||||
DataExecutionPrevention="0"
|
||||
TargetMachine="1"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCALinkTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCManifestTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCXDCMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCBscMakeTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCFxCopTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCAppVerifierTool"
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"
|
||||
/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
Name="Release|x64"
|
||||
OutputDirectory="$(PlatformName)\$(ConfigurationName)"
|
||||
|
|
@ -689,10 +689,6 @@
|
|||
RelativePath="..\debugger\gui\ColorWidget.cxx"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\debugger\gui\ContextMenu.cxx"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\debugger\CpuDebug.cxx"
|
||||
>
|
||||
|
|
@ -825,6 +821,10 @@
|
|||
RelativePath="..\gui\CommandMenu.cxx"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\gui\ContextMenu.cxx"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\gui\Dialog.cxx"
|
||||
>
|
||||
|
|
@ -1271,10 +1271,6 @@
|
|||
RelativePath="..\debugger\gui\ColorWidget.hxx"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\debugger\gui\ContextMenu.hxx"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\debugger\CpuDebug.hxx"
|
||||
>
|
||||
|
|
@ -1455,6 +1451,10 @@
|
|||
RelativePath="..\gui\ConsoleFont.hxx"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\gui\ContextMenu.hxx"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\gui\Dialog.hxx"
|
||||
>
|
||||
|
|
|
|||
Loading…
Reference in New Issue