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

Fixed minor compile issue for OSX build, and removed the non-Intel 

build files (sorry, there's no PPC support for Stella 4.0 using
SDL2).


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2851 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
This commit is contained in:
stephena 2014-02-15 22:55:36 +00:00
parent 5a48bf0311
commit b2370205ca
5 changed files with 18 additions and 2572 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/mainSDL.cxx
View File

@ -41,6 +41,12 @@
#include "CheatManager.hxx"
#endif
#if defined(BSPF_MAC_OSX)
extern "C" {
int stellaMain(int argc, char* argv[]);
}
#endif
// Pointer to the main parent osystem object or the null pointer
OSystem* theOSystem = (OSystem*) NULL;

8
src/emucore/EventHandler.cxx
View File

@ -87,7 +87,7 @@ EventHandler::~EventHandler()
free(ourMenuActionList[i].key);
delete myMouseControl;
for(int i = 0; i < myJoysticks.size(); ++i)
for(uInt32 i = 0; i < myJoysticks.size(); ++i)
delete myJoysticks[i];
}
@ -678,7 +678,7 @@ void EventHandler::handleMouseButtonEvent(MouseButton b, int x, int y)
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void EventHandler::handleJoyEvent(int stick, int button, uInt8 state)
{
if(stick >= myJoysticks.size())
if(stick >= (int)myJoysticks.size())
return;
// Stelladaptors handle buttons differently than regular joysticks
@ -739,7 +739,7 @@ void EventHandler::handleJoyEvent(int stick, int button, uInt8 state)
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void EventHandler::handleJoyAxisEvent(int stick, int axis, int value)
{
if(stick >= myJoysticks.size())
if(stick >= (int)myJoysticks.size())
return;
// Stelladaptors handle axis differently than regular joysticks
@ -847,7 +847,7 @@ void EventHandler::handleJoyAxisEvent(int stick, int axis, int value)
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void EventHandler::handleJoyHatEvent(int stick, int hat, int value)
{
if(stick >= myJoysticks.size())
if(stick >= (int)myJoysticks.size())
return;
const StellaJoystick& joy = *myJoysticks[stick];

12
src/macosx/stella.xcodeproj/TemplateInfo.plist
View File

@ -1,12 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>Description</key>
<string>This project builds an SDL-based application with Cocoa menus.</string>
<key>FilesToMacroExpand</key>
<array>
<string>English.lproj/InfoPlist.strings</string>
</array>
</dict>
</plist>

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

File diff suppressed because it is too large Load Diff

8
src/macosx/stella_intel.xcodeproj/project.pbxproj
View File

@ -486,6 +486,8 @@
DCF7B0DE10A762FC007A2870 /* CartF0.hxx in Headers */ = {isa = PBXBuildFile; fileRef = DCF7B0DA10A762FC007A2870 /* CartF0.hxx */; };
DCF7B0DF10A762FC007A2870 /* CartFA.cxx in Sources */ = {isa = PBXBuildFile; fileRef = DCF7B0DB10A762FC007A2870 /* CartFA.cxx */; };
DCF7B0E010A762FC007A2870 /* CartFA.hxx in Headers */ = {isa = PBXBuildFile; fileRef = DCF7B0DC10A762FC007A2870 /* CartFA.hxx */; };
DCFF14CD18B0260300A20364 /* EventHandlerSDL2.cxx in Sources */ = {isa = PBXBuildFile; fileRef = DCFF14CB18B0260300A20364 /* EventHandlerSDL2.cxx */; };
DCFF14CE18B0260300A20364 /* EventHandlerSDL2.hxx in Headers */ = {isa = PBXBuildFile; fileRef = DCFF14CC18B0260300A20364 /* EventHandlerSDL2.hxx */; };
DCFFE59D12100E1400DFA000 /* ComboDialog.cxx in Sources */ = {isa = PBXBuildFile; fileRef = DCFFE59B12100E1400DFA000 /* ComboDialog.cxx */; };
DCFFE59E12100E1400DFA000 /* ComboDialog.hxx in Headers */ = {isa = PBXBuildFile; fileRef = DCFFE59C12100E1400DFA000 /* ComboDialog.hxx */; };
/* End PBXBuildFile section */
@ -1020,6 +1022,8 @@
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; };
DCF7B0DC10A762FC007A2870 /* CartFA.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = CartFA.hxx; path = ../emucore/CartFA.hxx; sourceTree = SOURCE_ROOT; };
DCFF14CB18B0260300A20364 /* EventHandlerSDL2.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = EventHandlerSDL2.cxx; path = ../common/EventHandlerSDL2.cxx; sourceTree = SOURCE_ROOT; };
DCFF14CC18B0260300A20364 /* EventHandlerSDL2.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = EventHandlerSDL2.hxx; path = ../common/EventHandlerSDL2.hxx; sourceTree = SOURCE_ROOT; };
DCFFE59B12100E1400DFA000 /* ComboDialog.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ComboDialog.cxx; path = ../gui/ComboDialog.cxx; sourceTree = SOURCE_ROOT; };
DCFFE59C12100E1400DFA000 /* ComboDialog.hxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = ComboDialog.hxx; path = ../gui/ComboDialog.hxx; sourceTree = SOURCE_ROOT; };
F5A47A9D01A0482F01D3D55B /* SDLMain.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SDLMain.h; sourceTree = SOURCE_ROOT; };
@ -1268,6 +1272,8 @@
DC79F81017A88D9E00288B91 /* Base.cxx */,
DC79F81117A88D9E00288B91 /* Base.hxx */,
DCC527D810B9DA6A005E1287 /* bspf.hxx */,
DCFF14CB18B0260300A20364 /* EventHandlerSDL2.cxx */,
DCFF14CC18B0260300A20364 /* EventHandlerSDL2.hxx */,
DC3EE2D81417801800F9DA4A /* FBSurfaceTIA.cxx */,
DC3EE2D91417801800F9DA4A /* FBSurfaceTIA.hxx */,
DC368F4E18A2FB710084199C /* FBSurfaceUI.cxx */,
@ -1932,6 +1938,7 @@
DC368F5518A2FB710084199C /* FBSurfaceUI.hxx in Headers */,
DC368F5718A2FB710084199C /* FrameBufferSDL2.hxx in Headers */,
DC368F5918A2FB710084199C /* SoundSDL2.hxx in Headers */,
DCFF14CE18B0260300A20364 /* EventHandlerSDL2.hxx in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@ -2248,6 +2255,7 @@
DC368F5418A2FB710084199C /* FBSurfaceUI.cxx in Sources */,
DC368F5618A2FB710084199C /* FrameBufferSDL2.cxx in Sources */,
DC368F5818A2FB710084199C /* SoundSDL2.cxx in Sources */,
DCFF14CD18B0260300A20364 /* EventHandlerSDL2.cxx in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};