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

More fixes to VS project file for SDL2 update. 

git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2865 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
This commit is contained in:
stephena 2014-03-07 17:45:49 +00:00
parent 2ac3042d09
commit 90fbea8286
4 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/mainSDL.cxx
View File

@ -164,10 +164,12 @@ int main(int argc, char* argv[])
#endif #endif
} }
#if 0
// Swallow any spurious events in the queue // Swallow any spurious events in the queue
// These are normally caused by joystick/mouse jitter // These are normally caused by joystick/mouse jitter
SDL_Event event; SDL_Event event;
while(SDL_PollEvent(&event)) /* swallow event */ ; while(SDL_PollEvent(&event)) /* swallow event */ ;
#endif
// Start the main loop, and don't exit until the user issues a QUIT command // Start the main loop, and don't exit until the user issues a QUIT command
theOSystem->logMessage("Starting main loop ...", 2); theOSystem->logMessage("Starting main loop ...", 2);

3
src/common/tv_filters/NTSCFilter.cxx
View File

@ -22,9 +22,6 @@
#include "NTSCFilter.hxx" #include "NTSCFilter.hxx"
#define SCALE_FROM_100(x) ((x/50.0)-1.0)
#define SCALE_TO_100(x) (uInt32)(50*(x+1.0))
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NTSCFilter::NTSCFilter() NTSCFilter::NTSCFilter()
: mySetup(atari_ntsc_composite), : mySetup(atari_ntsc_composite),

3
src/common/tv_filters/NTSCFilter.hxx
View File

@ -26,6 +26,9 @@ class Settings;
#include "bspf.hxx" #include "bspf.hxx"
#include "atari_ntsc.h" #include "atari_ntsc.h"
#define SCALE_FROM_100(x) ((x/50.0)-1.0)
#define SCALE_TO_100(x) (uInt32)(50*(x+1.0))
/** /**
This class is based on the Blargg NTSC filter code from Atari800, This class is based on the Blargg NTSC filter code from Atari800,
and is derived from 'filter_ntsc.(h|c)'. Original code based on and is derived from 'filter_ntsc.(h|c)'. Original code based on

6
src/windows/Stella.vcxproj
View File

@ -120,9 +120,6 @@
<DebugInformationFormat>EditAndContinue</DebugInformationFormat> <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalOptions>SDL.lib
SDLmain.lib
%(AdditionalOptions)</AdditionalOptions>
<AdditionalDependencies>SDL2.lib;SDL2main.lib;SDL2main.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>SDL2.lib;SDL2main.lib;SDL2main.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)Stella.exe</OutputFile> <OutputFile>$(OutDir)Stella.exe</OutputFile>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>
@ -152,9 +149,6 @@ SDLmain.lib
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat> <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalOptions>SDL.lib
SDLmain.lib
%(AdditionalOptions)</AdditionalOptions>
<AdditionalDependencies>SDL2.lib;SDL2main.lib;SDL2main.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>SDL2.lib;SDL2main.lib;SDL2main.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)Stella.exe</OutputFile> <OutputFile>$(OutDir)Stella.exe</OutputFile>
<GenerateDebugInformation>true</GenerateDebugInformation> <GenerateDebugInformation>true</GenerateDebugInformation>