Fixed some minor compile issues, and updated UNIX build files to

actually use SDL2.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2882 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba

debian/control

@@ -3,7 +3,7 @@ Section: games
 Priority: optional
 Maintainer: Stephen Anthony <stephena@users.sourceforge.net>
 Standards-Version: 3.7.2
-Build-Depends: debhelper (>= 5.0.0), libsdl1.2-dev, zlib1g-dev
+Build-Depends: debhelper (>= 5.0.0), libsdl2-dev
 
 Package: stella
 Architecture: any

src/emucore/FrameBuffer.cxx

@@ -105,8 +105,8 @@ bool FrameBuffer::initialize()
   //       We can probably add ifdefs to take care of corner cases,
   //       but that means we've failed to abstract it enough ...
   ////////////////////////////////////////////////////////////////////
-  bool smallScreen = myDesktopSize.w < (uInt32)kFBMinW ||
-                     myDesktopSize.h < (uInt32)kFBMinH;
+  bool smallScreen = myDesktopSize.w < kFBMinW ||
+                     myDesktopSize.h < kFBMinH;
 
   // This font is used in a variety of situations when a really small
   // font is needed; we let the specific widget/dialog decide when to
@@ -176,8 +176,7 @@ FBInitStatus FrameBuffer::createDisplay(const string& title,
   // we're running on a 'large' system, and the window size requirements
   // can be relaxed
   // Otherwise, we treat the system as if WINDOWED_SUPPORT is not defined
-  if(myDesktopSize.w < (uInt32)kFBMinW &&
-     myDesktopSize.h < (uInt32)kFBMinH &&
+  if(myDesktopSize.w < kFBMinW && myDesktopSize.h < kFBMinH &&
      (myDesktopSize.w < width || myDesktopSize.h < height))
     return kFailTooLarge;
 
@@ -207,7 +206,7 @@ FBInitStatus FrameBuffer::createDisplay(const string& title,
   const VideoMode& mode = getSavedVidMode(useFullscreen);
   myImageRect = mode.image;
   myScreenSize = mode.screen;
-  if(width <= myScreenSize.w && height <= myScreenSize.h)
+  if(width <= (uInt32)myScreenSize.w && height <= (uInt32)myScreenSize.h)
   {
     if(setVideoMode(myScreenTitle, mode, useFullscreen))
     {

src/unix/stella.spec

@@ -20,7 +20,7 @@ License:        GPL
 URL:            http://stella.sourceforge.net
 Source:         %{name}-%{version}.tar.bz2
 BuildRoot:      %_tmppath/%name-%version-%release-root
-BuildRequires:  SDL-devel MesaGLU-devel
+BuildRequires:  SDL2-devel MesaGLU-devel
 
 %description
 The Atari 2600 Video Computer System (VCS), introduced in 1977, was the most