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

Updated OSX project file, fixed some minor compile warnings, 

and bumped version # to 4.5 for the next release (whenever it
may happen).


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@3057 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
This commit is contained in:
stephena 2014-11-08 22:40:50 +00:00
parent 874c88a9d2
commit b89dfa7436
27 changed files with 60 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Announce.txt
View File

@ -29,8 +29,8 @@ distributions currently available are:
Stella-4.2-x64.exe (64-bit EXE installer)
Stella-4.2-windows.zip (32/64 bit versions)
* Binary distribution for MacOS X 10.5 and above :
Stella-4.2-macosx.dmg (32/64-bit Intel Universal Binary)
* Binary distribution for MacOS X 10.7 and above :
Stella-4.2-macosx.dmg (64-bit Intel)
* Binary distribution in 32-bit & 64-bit Ubuntu DEB format :
stella_4.2-1_i386.deb

10
Changes.txt
View File

@ -12,12 +12,16 @@
Release History
===========================================================================
4.2 to 4.3: (December xx, 2014)
4.2 to 4.5: (December xx, 2014)
* The conversion to C++11 has begun :) From this point on, to build
Stella you will need a C++11 compatible compiler (Visual Studio 2013,
Clang 3.5, gcc 4.9, etc). Eventually, this will bring more bug-free
and (hopefully) faster code.
Clang 3.5, gcc 4.9, Xcode 5, etc). Eventually, this will bring more
bug-free and (hopefully) faster code.
* The minimum supported version for the OSX port is now OSX 10.7.
Because of this, the 32-bit version is also discontinued, as 10.7
is 64-bit only.
-Have fun!

2
src/common/PNGLibrary.cxx
View File

@ -307,7 +307,7 @@ void PNGLibrary::loadImagetoSurface(FBSurface& surface)
void PNGLibrary::writeComments(png_structp png_ptr, png_infop info_ptr,
const VariantList& comments)
{
uInt32 numComments = comments.size();
uInt32 numComments = (int)comments.size();
if(numComments == 0)
return;

2
src/common/Version.hxx
View File

@ -22,7 +22,7 @@
#include <cstdlib>
#define STELLA_VERSION "4.3_svn"
#define STELLA_VERSION "4.5_svn"
#define STELLA_BUILD atoi("$Rev$" + 6)
#endif

4
src/debugger/CartDebug.cxx
View File

@ -350,7 +350,7 @@ string CartDebug::disassemble(uInt16 start, uInt16 lines) const
ostringstream buffer;
// First find the lines in the range, and determine the longest string
uInt32 list_size = myDisassembly.list.size();
uInt32 list_size = (int)myDisassembly.list.size();
uInt32 begin = list_size, end = 0, length = 0;
for(end = 0; end < list_size && lines > 0; ++end)
{
@ -393,7 +393,7 @@ bool CartDebug::addDirective(CartDebug::DisasmType type,
return false;
if(bank < 0) // Do we want the current bank or ZP RAM?
bank = (myDebugger.cpuDebug().pc() & 0x1000) ? getBank() : myBankInfo.size()-1;
bank = (myDebugger.cpuDebug().pc() & 0x1000) ? getBank() : (int)myBankInfo.size()-1;
bank = BSPF_min(bank, bankCount());
BankInfo& info = myBankInfo[bank];

2
src/debugger/Debugger.cxx
View File

@ -284,7 +284,7 @@ string Debugger::setRAM(IntArray& args)
{
ostringstream buf;
int count = args.size();
int count = (int)args.size();
int address = args[0];
for(int i = 1; i < count; ++i)
mySystem.poke(address++, args[i]);

4
src/debugger/DebuggerParser.cxx
View File

@ -386,7 +386,7 @@ bool DebuggerParser::getArgs(const string& command, string& verb)
if(curArg != "")
argStrings.push_back(curArg);
argCount = argStrings.size();
argCount = (int)argStrings.size();
/*
cerr << "verb = " << verb << endl;
cerr << "arguments (" << argCount << "):\n";
@ -1289,7 +1289,7 @@ void DebuggerParser::executeRunTo()
const CartDebug& cartdbg = debugger.cartDebug();
const CartDebug::DisassemblyList& list = cartdbg.disassembly().list;
uInt32 count = 0, max_iterations = list.size();
uInt32 count = 0, max_iterations = (uInt32)list.size();
// Create a progress dialog box to show the progress searching through the
// disassembly, since this may be a time-consuming operation

2
src/debugger/gui/CartDebugWidget.hxx
View File

@ -82,7 +82,7 @@ class CartDebugWidget : public Widget, public CommandSender
StringParser bs(desc, (fwidth - kScrollBarWidth) / myFontWidth);
const StringList& sl = bs.stringList();
uInt32 lines = sl.size();
uInt32 lines = (uInt32)sl.size();
if(lines < 3) lines = 3;
if(lines > maxlines) lines = maxlines;

2
src/debugger/gui/CartRamWidget.cxx
View File

@ -63,7 +63,7 @@ CartRamWidget::CartRamWidget(
const uInt16 maxlines = 6;
StringParser bs(desc, (fwidth - kScrollBarWidth) / myFontWidth);
const StringList& sl = bs.stringList();
uInt32 lines = sl.size();
uInt32 lines = (int)sl.size();
if(lines < 3) lines = 3;
if(lines > maxlines) lines = maxlines;

2
src/debugger/gui/DataGridWidget.cxx
View File

@ -99,7 +99,7 @@ cerr << "alist.size() = " << alist.size()
<< ", changed.size() = " << changed.size()
<< ", _rows*_cols = " << _rows * _cols << endl << endl;
*/
int size = vlist.size(); // assume the alist is the same size
int size = (int)vlist.size(); // assume the alist is the same size
assert(size == _rows * _cols);
_addrList.clear();

2
src/debugger/gui/RamWidget.cxx
View File

@ -294,7 +294,7 @@ void RamWidget::fillGrid(bool updateOld)
changed.push_back(state.ram[i] != oldstate.ram[i]);
}
myRamGrid->setNumRows(state.ram.size() / 128);
myRamGrid->setNumRows((int)state.ram.size() / 128);
myRamGrid->setList(alist, vlist, changed);
if(updateOld)
{

14
src/debugger/gui/RomListWidget.cxx
View File

@ -110,7 +110,7 @@ void RomListWidget::setList(const CartDebug::Disassembly& disasm,
// Then turn off any extras
if((int)myDisasm->list.size() < _rows)
for(int i = myDisasm->list.size(); i < _rows; ++i)
for(int i = (int)myDisasm->list.size(); i < _rows; ++i)
myCheckList[i]->clearFlags(WIDGET_ENABLED);
recalc();
@ -175,7 +175,7 @@ int RomListWidget::findItem(int x, int y) const
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void RomListWidget::recalc()
{
int size = myDisasm->list.size();
int size = (int)myDisasm->list.size();
if (_currentPos >= size)
_currentPos = size - 1;
@ -187,7 +187,7 @@ void RomListWidget::recalc()
_editMode = false;
myScrollBar->_numEntries = myDisasm->list.size();
myScrollBar->_numEntries = (int)myDisasm->list.size();
myScrollBar->_entriesPerPage = _rows;
// Reset to normal data entry
@ -212,7 +212,7 @@ void RomListWidget::scrollToCurrent(int item)
if (_currentPos < 0 || _rows > (int)myDisasm->list.size())
_currentPos = 0;
else if (_currentPos + _rows > (int)myDisasm->list.size())
_currentPos = myDisasm->list.size() - _rows;
_currentPos = (int)myDisasm->list.size() - _rows;
myScrollBar->_currentPos = _currentPos;
myScrollBar->recalc();
@ -371,7 +371,7 @@ bool RomListWidget::handleEvent(Event::Type e)
case Event::UIPgDown:
_selectedItem += _rows - 1;
if (_selectedItem >= (int)myDisasm->list.size())
_selectedItem = myDisasm->list.size() - 1;
_selectedItem = (int)myDisasm->list.size() - 1;
break;
case Event::UIHome:
@ -379,7 +379,7 @@ bool RomListWidget::handleEvent(Event::Type e)
break;
case Event::UIEnd:
_selectedItem = myDisasm->list.size() - 1;
_selectedItem = (int)myDisasm->list.size() - 1;
break;
default:
@ -436,7 +436,7 @@ void RomListWidget::drawWidget(bool hilite)
//cerr << "RomListWidget::drawWidget\n";
FBSurface& s = _boss->dialog().surface();
const CartDebug::DisassemblyList& dlist = myDisasm->list;
int i, pos, xpos, ypos, len = dlist.size();
int i, pos, xpos, ypos, len = (int)dlist.size();
const GUI::Rect& r = getEditRect();
const GUI::Rect& l = getLineRect();

2
src/debugger/gui/ToggleBitWidget.cxx
View File

@ -60,7 +60,7 @@ void ToggleBitWidget::setList(const StringList& off, const StringList& on)
_onList.clear();
_onList = on;
int size = _offList.size(); // assume _onList is the same size
int size = (int)_offList.size(); // assume _onList is the same size
assert(size == _rows * _cols);
}

2
src/debugger/gui/TogglePixelWidget.cxx
View File

@ -92,7 +92,7 @@ void TogglePixelWidget::setIntState(int value, bool swap)
int TogglePixelWidget::getIntState()
{
// Construct int based on current state and swap
unsigned int value = 0, size = _stateList.size();
unsigned int value = 0, size = (int)_stateList.size();
for(unsigned int i = 0; i < size; ++i)
{

2
src/emucore/EventHandler.hxx
View File

@ -430,7 +430,7 @@ class EventHandler
int add(StellaJoystick* stick);
int remove(int id);
uInt32 numSticks() const { return mySticks.size(); }
uInt32 numSticks() const { return (uInt32)mySticks.size(); }
void mapStelladaptors(const string& saport);
void setDefaultMapping(Event::Type type, EventMode mode);
void eraseMapping(Event::Type event, EventMode mode);

6
src/emucore/FrameBuffer.cxx
View File

@ -737,7 +737,7 @@ void FrameBuffer::setAvailableVidModes(uInt32 baseWidth, uInt32 baseHeight)
for(auto& mode: myFullscreenModeLists)
mode.clear();
for(uInt32 i = myFullscreenModeLists.size(); i < myDisplays.size(); ++i)
for(int i = (int)myFullscreenModeLists.size(); i < myDisplays.size(); ++i)
myFullscreenModeLists.push_back(VideoModeList());
// Check if zooming is allowed for this state (currently only allowed
@ -951,14 +951,14 @@ bool FrameBuffer::VideoModeList::empty() const
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
uInt32 FrameBuffer::VideoModeList::size() const
{
return myModeList.size();
return (uInt32)myModeList.size();
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void FrameBuffer::VideoModeList::previous()
{
--myIdx;
if(myIdx < 0) myIdx = myModeList.size() - 1;
if(myIdx < 0) myIdx = (int)myModeList.size() - 1;
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

2
src/emucore/M6502.cxx
View File

@ -436,7 +436,7 @@ uInt32 M6502::addCondBreak(Expression *e, const string& name)
{
myBreakConds.push_back(e);
myBreakCondNames.push_back(name);
return myBreakConds.size() - 1;
return (uInt32)myBreakConds.size() - 1;
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

4
src/emucore/Settings.cxx
View File

@ -611,7 +611,7 @@ int Settings::setInternal(const string& key, const Variant& value,
if(useAsInitial) setting.initialValue = value;
myInternalSettings.push_back(setting);
idx = myInternalSettings.size() - 1;
idx = int(myInternalSettings.size()) - 1;
/*cerr << "insert internal: key = " << key
<< ", value = " << value
@ -665,7 +665,7 @@ int Settings::setExternal(const string& key, const Variant& value,
if(useAsInitial) setting.initialValue = value;
myExternalSettings.push_back(setting);
idx = myExternalSettings.size() - 1;
idx = int(myExternalSettings.size()) - 1;
/*cerr << "insert external: key = " << key
<< ", value = " << value

4
src/gui/CheckListWidget.cxx
View File

@ -65,7 +65,7 @@ void CheckListWidget::setList(const StringList& list, const BoolArray& state)
// Then turn off any extras
if((int)_stateList.size() < _rows)
for(int i = _stateList.size(); i < _rows; ++i)
for(int i = (int)_stateList.size(); i < _rows; ++i)
_checkList[i]->clearFlags(WIDGET_ENABLED);
ListWidget::recalc();
@ -86,7 +86,7 @@ void CheckListWidget::drawWidget(bool hilite)
{
//cerr << "CheckListWidget::drawWidget\n";
FBSurface& s = _boss->dialog().surface();
int i, pos, len = _list.size();
int i, pos, len = (int)_list.size();
string buffer;
// Draw a thin frame around the list and to separate columns

14
src/gui/ContextMenu.cxx
View File

@ -120,8 +120,8 @@ void ContextMenu::recalc(const GUI::Rect& image)
}
else
{
_numEntries = _entries.size();
_h = _entries.size() * _rowHeight + 4;
_numEntries = (int)_entries.size();
_h = (int)_entries.size() * _rowHeight + 4;
_showScroll = false;
}
_isScrolling = false;
@ -165,7 +165,7 @@ void ContextMenu::setSelected(const Variant& tag, const Variant& defaultTag)
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void ContextMenu::setSelectedMax()
{
setSelectedIndex(_entries.size() - 1);
setSelectedIndex((int)_entries.size() - 1);
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@ -231,7 +231,7 @@ bool ContextMenu::sendSelectionLast()
if(isVisible())
return false;
_selectedItem = _entries.size() - 1;
_selectedItem = (int)_entries.size() - 1;
sendCommand(_cmd ? _cmd : ContextMenu::kItemSelectedCmd, _selectedItem, -1);
return true;
}
@ -467,7 +467,7 @@ void ContextMenu::moveToFirst()
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void ContextMenu::moveToLast()
{
_firstEntry = _entries.size() - _numEntries;
_firstEntry = (int)_entries.size() - _numEntries;
_scrollUpColor = kScrollColor;
_scrollDnColor = kColor;
@ -486,7 +486,7 @@ void ContextMenu::moveToSelected()
// Now check if we've gone past the current 'window' size, and scale
// back accordingly
int max_offset = _entries.size() - _numEntries;
int max_offset = (int)_entries.size() - _numEntries;
if(_firstEntry > max_offset)
{
offset = _firstEntry - max_offset;
@ -515,7 +515,7 @@ void ContextMenu::scrollUp(int distance)
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void ContextMenu::scrollDown(int distance)
{
int max_offset = _entries.size() - _numEntries;
int max_offset = (int)_entries.size() - _numEntries;
if(_firstEntry == max_offset)
return;

2
src/gui/InputTextDialog.cxx
View File

@ -73,7 +73,7 @@ void InputTextDialog::initialize(const GUI::Font& lfont, const GUI::Font& nfont,
// Calculate real dimensions
_w = fontWidth * 30;
_h = lineHeight * 4 + labels.size() * (lineHeight + 5);
_h = lineHeight * 4 + (int)labels.size() * (lineHeight + 5);
// Determine longest label
for(i = 0; i < labels.size(); ++i)

12
src/gui/ListWidget.cxx
View File

@ -144,7 +144,7 @@ const string& ListWidget::getSelectedString() const
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void ListWidget::scrollTo(int item)
{
int size = _list.size();
int size = (int)_list.size();
if (item >= size)
item = size - 1;
if (item < 0)
@ -160,7 +160,7 @@ void ListWidget::scrollTo(int item)
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void ListWidget::recalc()
{
int size = _list.size();
int size = (int)_list.size();
if (_currentPos >= size)
_currentPos = size - 1;
@ -172,7 +172,7 @@ void ListWidget::recalc()
_editMode = false;
_scrollBar->_numEntries = _list.size();
_scrollBar->_numEntries = (int)_list.size();
_scrollBar->_entriesPerPage = _rows;
// Reset to normal data entry
@ -369,7 +369,7 @@ bool ListWidget::handleEvent(Event::Type e)
case Event::UIPgDown:
_selectedItem += _rows - 1;
if (_selectedItem >= (int)_list.size() )
_selectedItem = _list.size() - 1;
_selectedItem = (int)_list.size() - 1;
break;
case Event::UIHome:
@ -377,7 +377,7 @@ bool ListWidget::handleEvent(Event::Type e)
break;
case Event::UIEnd:
_selectedItem = _list.size() - 1;
_selectedItem = (int)_list.size() - 1;
break;
case Event::UIPrevDir:
@ -444,7 +444,7 @@ void ListWidget::scrollToCurrent(int item)
if (_currentPos < 0 || _rows > (int)_list.size())
_currentPos = 0;
else if (_currentPos + _rows > (int)_list.size())
_currentPos = _list.size() - _rows;
_currentPos = (int)_list.size() - _rows;
int oldScrollPos = _scrollBar->_currentPos;
_scrollBar->_currentPos = _currentPos;

2
src/gui/RomAuditDialog.cxx
View File

@ -131,7 +131,7 @@ void RomAuditDialog::auditRoms()
// the ROMs, since this is usually a time-consuming operation
ProgressDialog progress(this, instance().frameBuffer().font(),
"Auditing ROM files ...");
progress.setRange(0, files.size() - 1, 5);
progress.setRange(0, (int)files.size() - 1, 5);
// Create a entry for the GameList for each file
Properties props;

2
src/gui/StringListWidget.cxx
View File

@ -47,7 +47,7 @@ void StringListWidget::drawWidget(bool hilite)
{
//cerr << "StringListWidget::drawWidget\n";
FBSurface& s = _boss->dialog().surface();
int i, pos, len = _list.size();
int i, pos, len = (int)_list.size();
string buffer;
// Draw a thin frame around the list.

2
src/gui/TabWidget.cxx
View File

@ -70,7 +70,7 @@ int TabWidget::addTab(const string& title)
{
// Add a new tab page
_tabs.push_back(Tab(title));
int numTabs = _tabs.size();
int numTabs = (int)_tabs.size();
// Determine the new tab width
int newWidth = _font.getStringWidth(title) + 2 * kTabPadding;

2
src/gui/Widget.cxx
View File

@ -204,7 +204,7 @@ Widget* Widget::setFocusForChain(GuiObject* boss, WidgetArray& arr,
Widget* wid, int direction)
{
FBSurface& s = boss->dialog().surface();
int size = arr.size(), pos = -1;
int size = (int)arr.size(), pos = -1;
Widget* tmp;
for(int i = 0; i < size; ++i)
{

12
src/macosx/stella.xcodeproj/project.pbxproj
View File

@ -333,7 +333,6 @@
DC73BD861915E5B1003FAFAD /* FBSurfaceSDL2.hxx in Headers */ = {isa = PBXBuildFile; fileRef = DC73BD841915E5B1003FAFAD /* FBSurfaceSDL2.hxx */; };
DC73BD891915E5E3003FAFAD /* FBSurface.cxx in Sources */ = {isa = PBXBuildFile; fileRef = DC73BD871915E5E3003FAFAD /* FBSurface.cxx */; };
DC73BD8A1915E5E3003FAFAD /* FBSurface.hxx in Headers */ = {isa = PBXBuildFile; fileRef = DC73BD881915E5E3003FAFAD /* FBSurface.hxx */; };
DC74D6A1138D4D7E00F05C5C /* StringList.hxx in Headers */ = {isa = PBXBuildFile; fileRef = DC74D69F138D4D7E00F05C5C /* StringList.hxx */; };
DC74D6A2138D4D7E00F05C5C /* StringParser.hxx in Headers */ = {isa = PBXBuildFile; fileRef = DC74D6A0138D4D7E00F05C5C /* StringParser.hxx */; };
DC74E5C6198AF12700F37E36 /* CartDASHWidget.cxx in Sources */ = {isa = PBXBuildFile; fileRef = DC74E5C4198AF12700F37E36 /* CartDASHWidget.cxx */; };
DC74E5C7198AF12700F37E36 /* CartDASHWidget.hxx in Headers */ = {isa = PBXBuildFile; fileRef = DC74E5C5198AF12700F37E36 /* CartDASHWidget.hxx */; };
@ -489,13 +488,13 @@
DCE6EB230DD9ADA00047AC28 /* TrackBall.hxx in Headers */ = {isa = PBXBuildFile; fileRef = DCE6EB210DD9ADA00047AC28 /* TrackBall.hxx */; };
DCEECE560B5E5E540021D754 /* Cart0840.cxx in Sources */ = {isa = PBXBuildFile; fileRef = DCEECE540B5E5E540021D754 /* Cart0840.cxx */; };
DCEECE570B5E5E540021D754 /* Cart0840.hxx in Headers */ = {isa = PBXBuildFile; fileRef = DCEECE550B5E5E540021D754 /* Cart0840.hxx */; };
DCF467B50F93993B00B25D7A /* Array.hxx in Headers */ = {isa = PBXBuildFile; fileRef = DCF467B10F93993B00B25D7A /* Array.hxx */; };
DCF467B80F93993B00B25D7A /* SoundNull.hxx in Headers */ = {isa = PBXBuildFile; fileRef = DCF467B40F93993B00B25D7A /* SoundNull.hxx */; };
DCF467BD0F9399F500B25D7A /* Version.hxx in Headers */ = {isa = PBXBuildFile; fileRef = DCF467BC0F9399F500B25D7A /* Version.hxx */; };
DCF467C20F939A1400B25D7A /* CartEF.cxx in Sources */ = {isa = PBXBuildFile; fileRef = DCF467BE0F939A1400B25D7A /* CartEF.cxx */; };
DCF467C30F939A1400B25D7A /* CartEF.hxx in Headers */ = {isa = PBXBuildFile; fileRef = DCF467BF0F939A1400B25D7A /* CartEF.hxx */; };
DCF467C40F939A1400B25D7A /* CartEFSC.cxx in Sources */ = {isa = PBXBuildFile; fileRef = DCF467C00F939A1400B25D7A /* CartEFSC.cxx */; };
DCF467C50F939A1400B25D7A /* CartEFSC.hxx in Headers */ = {isa = PBXBuildFile; fileRef = DCF467C10F939A1400B25D7A /* CartEFSC.hxx */; };
DCF4907A1A0ECE5B00A67AA9 /* Vec.hxx in Headers */ = {isa = PBXBuildFile; fileRef = DCF490791A0ECE5B00A67AA9 /* Vec.hxx */; };
DCF7B0DD10A762FC007A2870 /* CartF0.cxx in Sources */ = {isa = PBXBuildFile; fileRef = DCF7B0D910A762FC007A2870 /* CartF0.cxx */; };
DCF7B0DE10A762FC007A2870 /* CartF0.hxx in Headers */ = {isa = PBXBuildFile; fileRef = DCF7B0DA10A762FC007A2870 /* CartF0.hxx */; };
DCF7B0DF10A762FC007A2870 /* CartFA.cxx in Sources */ = {isa = PBXBuildFile; fileRef = DCF7B0DB10A762FC007A2870 /* CartFA.cxx */; };
@ -882,7 +881,6 @@
DC73BD841915E5B1003FAFAD /* FBSurfaceSDL2.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = FBSurfaceSDL2.hxx; path = ../common/FBSurfaceSDL2.hxx; sourceTree = "<group>"; };
DC73BD871915E5E3003FAFAD /* FBSurface.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = FBSurface.cxx; path = ../emucore/FBSurface.cxx; sourceTree = "<group>"; };
DC73BD881915E5E3003FAFAD /* FBSurface.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = FBSurface.hxx; path = ../emucore/FBSurface.hxx; sourceTree = "<group>"; };
DC74D69F138D4D7E00F05C5C /* StringList.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = StringList.hxx; path = ../common/StringList.hxx; sourceTree = SOURCE_ROOT; };
DC74D6A0138D4D7E00F05C5C /* StringParser.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = StringParser.hxx; path = ../common/StringParser.hxx; sourceTree = SOURCE_ROOT; };
DC74E5C4198AF12700F37E36 /* CartDASHWidget.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CartDASHWidget.cxx; path = ../debugger/gui/CartDASHWidget.cxx; sourceTree = "<group>"; };
DC74E5C5198AF12700F37E36 /* CartDASHWidget.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = CartDASHWidget.hxx; path = ../debugger/gui/CartDASHWidget.hxx; sourceTree = "<group>"; };
@ -1040,13 +1038,13 @@
DCE6EB210DD9ADA00047AC28 /* TrackBall.hxx */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; name = TrackBall.hxx; path = ../emucore/TrackBall.hxx; sourceTree = SOURCE_ROOT; };
DCEECE540B5E5E540021D754 /* Cart0840.cxx */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = Cart0840.cxx; path = ../emucore/Cart0840.cxx; sourceTree = SOURCE_ROOT; };
DCEECE550B5E5E540021D754 /* Cart0840.hxx */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; name = Cart0840.hxx; path = ../emucore/Cart0840.hxx; sourceTree = SOURCE_ROOT; };
DCF467B10F93993B00B25D7A /* Array.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Array.hxx; path = ../common/Array.hxx; sourceTree = SOURCE_ROOT; };
DCF467B40F93993B00B25D7A /* SoundNull.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = SoundNull.hxx; path = ../common/SoundNull.hxx; sourceTree = SOURCE_ROOT; };
DCF467BC0F9399F500B25D7A /* Version.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Version.hxx; path = ../common/Version.hxx; sourceTree = SOURCE_ROOT; };
DCF467BE0F939A1400B25D7A /* CartEF.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CartEF.cxx; path = ../emucore/CartEF.cxx; sourceTree = SOURCE_ROOT; };
DCF467BF0F939A1400B25D7A /* CartEF.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = CartEF.hxx; path = ../emucore/CartEF.hxx; sourceTree = SOURCE_ROOT; };
DCF467C00F939A1400B25D7A /* CartEFSC.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CartEFSC.cxx; path = ../emucore/CartEFSC.cxx; sourceTree = SOURCE_ROOT; };
DCF467C10F939A1400B25D7A /* CartEFSC.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = CartEFSC.hxx; path = ../emucore/CartEFSC.hxx; sourceTree = SOURCE_ROOT; };
DCF490791A0ECE5B00A67AA9 /* Vec.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = Vec.hxx; path = ../common/Vec.hxx; sourceTree = "<group>"; };
DCF7B0D910A762FC007A2870 /* CartF0.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CartF0.cxx; path = ../emucore/CartF0.cxx; sourceTree = SOURCE_ROOT; };
DCF7B0DA10A762FC007A2870 /* CartF0.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = CartF0.hxx; path = ../emucore/CartF0.hxx; sourceTree = SOURCE_ROOT; };
DCF7B0DB10A762FC007A2870 /* CartFA.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CartFA.cxx; path = ../emucore/CartFA.cxx; sourceTree = SOURCE_ROOT; };
@ -1310,7 +1308,6 @@
2D6050C5089876F300C6DE89 /* common */ = {
isa = PBXGroup;
children = (
DCF467B10F93993B00B25D7A /* Array.hxx */,
DC79F81017A88D9E00288B91 /* Base.cxx */,
DC79F81117A88D9E00288B91 /* Base.hxx */,
DCC527D810B9DA6A005E1287 /* bspf.hxx */,
@ -1333,10 +1330,10 @@
DC368F5318A2FB710084199C /* SoundSDL2.hxx */,
DC5D1AA6102C6FC900E59AC1 /* Stack.hxx */,
DC5C768E14C26F7C0031EBC7 /* StellaKeys.hxx */,
DC74D69F138D4D7E00F05C5C /* StringList.hxx */,
DC74D6A0138D4D7E00F05C5C /* StringParser.hxx */,
DCC467EA14FBEC9600E15508 /* tv_filters */,
DC7A24D4173B1CF600B20FE9 /* Variant.hxx */,
DCF490791A0ECE5B00A67AA9 /* Vec.hxx */,
DCF467BC0F9399F500B25D7A /* Version.hxx */,
DCE395ED16CB0B5F008DB1E5 /* ZipHandler.cxx */,
DCE395EE16CB0B5F008DB1E5 /* ZipHandler.hxx */,
@ -1778,6 +1775,7 @@
2D9173FC09BA90380026E9FF /* SettingsMACOSX.hxx in Headers */,
2D9173FF09BA90380026E9FF /* OSystemMACOSX.hxx in Headers */,
2D91740009BA90380026E9FF /* AboutDialog.hxx in Headers */,
DCF4907A1A0ECE5B00A67AA9 /* Vec.hxx in Headers */,
2D91740109BA90380026E9FF /* AudioDialog.hxx in Headers */,
2D91740209BA90380026E9FF /* BrowserDialog.hxx in Headers */,
2D91740309BA90380026E9FF /* Command.hxx in Headers */,
@ -1883,7 +1881,6 @@
DCB20ECD1A0C50930048F595 /* atari_ntsc.hxx in Headers */,
DC932D480F278A5200FEFEFC /* TIATables.hxx in Headers */,
DC9EA8880F729A36000452B5 /* KidVid.hxx in Headers */,
DCF467B50F93993B00B25D7A /* Array.hxx in Headers */,
DCF467B80F93993B00B25D7A /* SoundNull.hxx in Headers */,
DCF467BD0F9399F500B25D7A /* Version.hxx in Headers */,
DCF467C30F939A1400B25D7A /* CartEF.hxx in Headers */,
@ -1912,7 +1909,6 @@
DC69670C1361FD0A0036499D /* pnginfo.h in Headers */,
DC69670D1361FD0A0036499D /* pnglibconf.h in Headers */,
DC69670E1361FD0A0036499D /* pngstruct.h in Headers */,
DC74D6A1138D4D7E00F05C5C /* StringList.hxx in Headers */,
DC74D6A2138D4D7E00F05C5C /* StringParser.hxx in Headers */,
DC6C726313CDEA0A008A5975 /* LoggerDialog.hxx in Headers */,
DC8C1BAE14B25DE7006440EE /* CartCM.hxx in Headers */,