Macintosh-Tools/macemu
1
0
Fork 0
mirror of https://github.com/kanjitalk755/macemu.git synced 2024-11-28 08:49:32 +00:00
Code Issues Projects Releases Wiki Activity

fix for SDL 2.0.14

Browse Source
This commit is contained in:
kanjitalk755 2021-08-01 09:55:43 +09:00
parent ab586a5a09
commit b2df4fed1f
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
BasiliskII/src/MacOSX/uae_cpu.xcodeproj/project.pbxproj
View File

@ -362,7 +362,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES; GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.11; MACOSX_DEPLOYMENT_TARGET = 10.7;
MTL_ENABLE_DEBUG_INFO = YES; MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES; ONLY_ACTIVE_ARCH = YES;
SDKROOT = macosx; SDKROOT = macosx;
@ -403,7 +403,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES; GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.11; MACOSX_DEPLOYMENT_TARGET = 10.7;
MTL_ENABLE_DEBUG_INFO = NO; MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = macosx; SDKROOT = macosx;
}; };

8
BasiliskII/src/SDL/video_sdl2.cpp
View File

@ -2350,14 +2350,10 @@ static void handle_events(void)
code = event2keycode(event.key, true); code = event2keycode(event.key, true);
if (code >= 0) { if (code >= 0) {
if (!emul_suspended) { if (!emul_suspended) {
#ifdef __MACOSX__
ADBKeyDown(code);
#else
if (code == 0x39) if (code == 0x39)
(SDL_GetModState() & KMOD_CAPS ? ADBKeyDown : ADBKeyUp)(code); (SDL_GetModState() & KMOD_CAPS ? ADBKeyDown : ADBKeyUp)(code);
else else
ADBKeyDown(code); ADBKeyDown(code);
#endif
if (code == 0x36) if (code == 0x36)
ctrl_down = true; ctrl_down = true;
if (code == (swap_opt_cmd() ? 0x37 : 0x3a)) if (code == (swap_opt_cmd() ? 0x37 : 0x3a))
@ -2379,12 +2375,8 @@ static void handle_events(void)
if (code == CODE_INVALID) if (code == CODE_INVALID)
code = event2keycode(event.key, false); code = event2keycode(event.key, false);
if (code >= 0) { if (code >= 0) {
#ifdef __MACOSX__
ADBKeyUp(code);
#else
if (code != 0x39) if (code != 0x39)
ADBKeyUp(code); ADBKeyUp(code);
#endif
if (code == 0x36) if (code == 0x36)
ctrl_down = false; ctrl_down = false;
if (code == (swap_opt_cmd() ? 0x37 : 0x3a)) if (code == (swap_opt_cmd() ? 0x37 : 0x3a))