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

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Seth 2019-07-09 16:12:29 -05:00
commit c369f2048d
4 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -25,6 +25,8 @@ DerivedData/
*.perspectivev3 *.perspectivev3
!default.perspectivev3 !default.perspectivev3
xcuserdata/ xcuserdata/
xcschemes/
project.xcworkspace/
## Xcode, Other ## Xcode, Other
*.moved-aside *.moved-aside

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

@ -2105,7 +2105,7 @@ static int SDLCALL on_sdl_event_generated(void *userdata, SDL_Event * event)
SDL_Keysym const & ks = event->key.keysym; SDL_Keysym const & ks = event->key.keysym;
switch (ks.sym) { switch (ks.sym) {
case SDLK_F5: { case SDLK_F5: {
if (is_hotkey_down(ks)) { if (is_hotkey_down(ks) && !PrefsFindBool("hardcursor")) {
drv->toggle_mouse_grab(); drv->toggle_mouse_grab();
return EVENT_DROP_FROM_QUEUE; return EVENT_DROP_FROM_QUEUE;
} }

8
SheepShaver/src/MacOSX/SheepShaver.entitlements Normal file
View File

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>com.apple.security.cs.allow-unsigned-executable-memory</key>
<true/>
</dict>
</plist>

4
SheepShaver/src/MacOSX/SheepShaver_Xcode8.xcodeproj/project.pbxproj
View File

@ -3,7 +3,7 @@
archiveVersion = 1; archiveVersion = 1;
classes = { classes = {
}; };
objectVersion = 44; objectVersion = 45;
objects = { objects = {
/* Begin PBXBuildFile section */ /* Begin PBXBuildFile section */
@ -1214,6 +1214,7 @@
ALWAYS_SEARCH_USER_PATHS = NO; ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = "$(ARCHS_STANDARD_64_BIT)"; ARCHS = "$(ARCHS_STANDARD_64_BIT)";
CLANG_CXX_LIBRARY = "libc++"; CLANG_CXX_LIBRARY = "libc++";
CODE_SIGN_ENTITLEMENTS = SheepShaver.entitlements;
COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;
FRAMEWORK_SEARCH_PATHS = /Library/Frameworks; FRAMEWORK_SEARCH_PATHS = /Library/Frameworks;
GCC_CW_ASM_SYNTAX = NO; GCC_CW_ASM_SYNTAX = NO;
@ -1273,6 +1274,7 @@
ALWAYS_SEARCH_USER_PATHS = NO; ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = "$(ARCHS_STANDARD_64_BIT)"; ARCHS = "$(ARCHS_STANDARD_64_BIT)";
CLANG_CXX_LIBRARY = "libc++"; CLANG_CXX_LIBRARY = "libc++";
CODE_SIGN_ENTITLEMENTS = SheepShaver.entitlements;
COPY_PHASE_STRIP = NO; COPY_PHASE_STRIP = NO;
DEAD_CODE_STRIPPING = NO; DEAD_CODE_STRIPPING = NO;
FRAMEWORK_SEARCH_PATHS = /Library/Frameworks; FRAMEWORK_SEARCH_PATHS = /Library/Frameworks;