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

Added some missing ifdefs so we can properly compile without ATARIVOX 

support.  Changed the configure script to not build AtariVox support by
default, since it's still a work in progress (and requires extra code
that isn't in CVS yet).


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1118 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
This commit is contained in:
stephena 2006-08-11 12:50:22 +00:00
parent bf1399919f
commit 6d139cea9d
5 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
stella/configure vendored
View File

@ -27,7 +27,7 @@ _build_joystick=yes
_build_cheats=yes _build_cheats=yes
_build_static=no _build_static=no
_build_profile=no _build_profile=no
_build_atarivox=yes _build_atarivox=no
# more defaults # more defaults
_ranlib=ranlib _ranlib=ranlib

6
stella/src/emucore/AtariVox.cxx
View File

@ -13,9 +13,11 @@
// 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: AtariVox.cxx,v 1.2 2006-06-11 07:13:19 urchlay Exp $ // $Id: AtariVox.cxx,v 1.3 2006-08-11 12:50:22 stephena Exp $
//============================================================================ //============================================================================
#ifdef ATARIVOX_SUPPORT
#include "Event.hxx" #include "Event.hxx"
#include "AtariVox.hxx" #include "AtariVox.hxx"
#include "SpeakJet.hxx" #include "SpeakJet.hxx"
@ -174,3 +176,5 @@ void AtariVox::write(DigitalPin pin, bool value)
break; break;
} }
} }
#endif

4
stella/src/emucore/FrameBuffer.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: FrameBuffer.cxx,v 1.89 2006-05-24 17:37:33 stephena Exp $ // $Id: FrameBuffer.cxx,v 1.90 2006-08-11 12:50:22 stephena Exp $
//============================================================================ //============================================================================
#include <sstream> #include <sstream>
@ -311,7 +311,7 @@ inline void FrameBuffer::drawMessage()
myOSystem->eventHandler().refreshDisplay(true); myOSystem->eventHandler().refreshDisplay(true);
} }
else else
addDirtyRect(myMessage.x, myMessage.y, myMessage.w, myMessage.h); addDirtyRect(myMessage.x, myMessage.y, myMessage.w, myMessage.h);
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

6
stella/src/emucore/SpeakJet.cxx
View File

@ -13,9 +13,11 @@
// 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: SpeakJet.cxx,v 1.3 2006-06-11 22:43:55 urchlay Exp $ // $Id: SpeakJet.cxx,v 1.4 2006-08-11 12:50:22 stephena Exp $
//============================================================================ //============================================================================
#ifdef ATARIVOX_SUPPORT
#include "SpeakJet.hxx" #include "SpeakJet.hxx"
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@ -339,3 +341,5 @@ const char *SpeakJet::ourPhonemeTable[] = {
"p", // 198 PE People, Computer "p", // 198 PE People, Computer
"p" // 199 PO Paw, Copy ??? "p" // 199 PO Paw, Copy ???
}; };
#endif

8
stella/src/emucore/SpeakJet.hxx
View File

@ -13,9 +13,11 @@
// 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: SpeakJet.hxx,v 1.4 2006-08-09 02:38:03 bwmott Exp $ // $Id: SpeakJet.hxx,v 1.5 2006-08-11 12:50:22 stephena Exp $
//============================================================================ //============================================================================
#ifdef ATARIVOX_SUPPORT
#ifndef SPEAKJET_HXX #ifndef SPEAKJET_HXX
#define SPEAKJET_HXX #define SPEAKJET_HXX
@ -75,7 +77,7 @@
anyway). anyway).
@author B. Watson @author B. Watson
@version $Id: SpeakJet.hxx,v 1.4 2006-08-09 02:38:03 bwmott Exp $ @version $Id: SpeakJet.hxx,v 1.5 2006-08-11 12:50:22 stephena Exp $
*/ */
#include "bspf.hxx" #include "bspf.hxx"
@ -233,3 +235,5 @@ static SpeechBuffer *ourCurrentWriteBuffer;
static uInt8 ourCurrentWritePosition; static uInt8 ourCurrentWritePosition;
#endif #endif
#endif