mirror of https://github.com/stella-emu/stella.git
Fixed some minor compile warnings for OSX.
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2853 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
This commit is contained in:
parent
14c8546ce1
commit
46733e32c0
|
@ -44,7 +44,7 @@ void EventHandlerSDL2::initializeJoysticks()
|
||||||
}
|
}
|
||||||
|
|
||||||
int numSticks = SDL_NumJoysticks();
|
int numSticks = SDL_NumJoysticks();
|
||||||
for(uInt32 i = 0; i < numSticks; ++i)
|
for(int i = 0; i < numSticks; ++i)
|
||||||
addJoystick(new JoystickSDL2(i), i);
|
addJoystick(new JoystickSDL2(i), i);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
|
@ -41,12 +41,6 @@
|
||||||
#include "CheatManager.hxx"
|
#include "CheatManager.hxx"
|
||||||
#endif
|
#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
|
// Pointer to the main parent osystem object or the null pointer
|
||||||
OSystem* theOSystem = (OSystem*) NULL;
|
OSystem* theOSystem = (OSystem*) NULL;
|
||||||
|
|
||||||
|
|
|
@ -31,6 +31,9 @@
|
||||||
#elif defined(BSPF_MAC_OSX)
|
#elif defined(BSPF_MAC_OSX)
|
||||||
#include "SettingsMACOSX.hxx"
|
#include "SettingsMACOSX.hxx"
|
||||||
#include "OSystemMACOSX.hxx"
|
#include "OSystemMACOSX.hxx"
|
||||||
|
extern "C" {
|
||||||
|
int stellaMain(int argc, char* argv[]);
|
||||||
|
}
|
||||||
#else
|
#else
|
||||||
#error Unsupported platform!
|
#error Unsupported platform!
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue