Isolated BasiliskII from original macemu repo via https://stackoverfl…

…ow.com/a/17824718/2063546
emaculation · Mar 27, 2019 · 1968051 · 1968051
1 parent 5b32723
commit 1968051
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 63 deletions.
diff --git a/BasiliskII/.travis.yml b/BasiliskII/.travis.yml
@@ -10,11 +10,11 @@ matrix:
 addons:
   apt:
     packages:
-      - libsdl1.2-dev 
+      - libsdl1.2-dev
       - libgtk2.0-dev
 
 script:
-  - cd BasiliskII/src/Unix
+  - cd src/Unix
   - NO_CONFIGURE=1 ./autogen.sh
   - ./configure --enable-sdl-video --enable-sdl-audio --disable-vosf --disable-jit-compiler --with-x --with-gtk --with-mon
   - make -j 4
diff --git a/BasiliskII/COPYING → BasiliskII/LICENSE b/BasiliskII/COPYING → BasiliskII/LICENSE
diff --git a/BasiliskII/README → BasiliskII/README.md b/BasiliskII/README → BasiliskII/README.md
@@ -1,15 +1,16 @@
+[![Build Status](https://travis-ci.org/emaculation/BasiliskII.svg)](https://travis-ci.org/emaculation/BasiliskII)
 
-  Basilisk II
-  A 68k Macintosh emulator
+# BasiliskII
+A 68k Macintosh emulator
 
-  Copyright (C) 1997-2008 Christian Bauer et al.
+Copyright (C) 1997-2008 Christian Bauer et al.
 
 
 License
 -------
 
 Basilisk II is available under the terms of the GNU General Public License.
-See the file "COPYING" that is included in the distribution for details.
+See the file "LICENSE" that is included in the distribution for details.
 
 
 Overview
@@ -548,7 +549,7 @@ udpport <IP port number>
 
 redir <port redirection description>
 
-  This item defines a port to be forwarded from the host to the client. 
+  This item defines a port to be forwarded from the host to the client.
   The format is "[protocol]:hostport:[clientaddress]:clientport", where
   protocol is "udp" or "tcp" (default), hostport is the port on your
   computer to forward to the Mac, clientaddress is the IP address of the Mac
@@ -750,7 +751,7 @@ Windows:
 
     If true (default), tries to automatically detect new media.
     Applies to all "floppy", "cd" or "disk" removable media except
-    1.44 MB floppies. May cause modest slow down. If unchecked, 
+    1.44 MB floppies. May cause modest slow down. If unchecked,
     use Ctrl-Shift-F11 to manually mount new media.
     If you have auto-insert notification (AIN) enabled, you may turn this
     option off. Note that some CD related software require AIN,
@@ -916,7 +917,7 @@ Acknowledgements
 
 Contributions by (in alphabetical order):
  - Orlando Bassotto <future@powercube.mediabit.net>: FreeBSD support
- - Gwenol� Beauchesne <gb@dial.oleane.com>: SPARC assembly optimizations,
+ - Gwenol� Beauchesne <gb@dial.oleane.com>: SPARC assembly optimizations,
    lots of work on the Unix video code, fixes and improvements to the
    JIT compiler
  - Marc Chabanas <Marc.Chabanas@france.sun.com>: Solaris sound support
@@ -925,7 +926,7 @@ Contributions by (in alphabetical order):
  - Bill Huey <billh@mag.ucsd.edu>: 15/16 bit DGA and 15/16/32 bit X11
    window support
  - Brian J. Johnson <bjohnson@sgi.com>: IRIX support
- - J�rgen Lachmann <juergen_lachmann@t-online.de>: AmigaOS CyberGraphX support
+ - J�rgen Lachmann <juergen_lachmann@t-online.de>: AmigaOS CyberGraphX support
  - Samuel Lander <blair_sp@hotmail.com>: tile-based window refresh code
  - David Lawrence <davidl@jlab.org>: incremental window refresh code
  - Bernie Meyer <bmeyer@csse.monash.edu.au>: original UAE-JIT code

diff --git a/BasiliskII/src/MacOSX/utils_macosx.mm b/BasiliskII/src/MacOSX/utils_macosx.mm
@@ -19,13 +19,7 @@
  */
 
 #include <Cocoa/Cocoa.h>
-#include "sysdeps.h"
 #include "utils_macosx.h"
-#include <SDL.h>
-
-#if SDL_VERSION_ATLEAST(2,0,0)
-#include <SDL_syswm.h>
-#endif
 
 // This is used from video_sdl.cpp.
 void NSAutoReleasePool_wrap(void (*fn)(void))
@@ -34,50 +28,3 @@ void NSAutoReleasePool_wrap(void (*fn)(void))
 	fn();
 	[pool release];
 }
-
-#if SDL_VERSION_ATLEAST(2,0,0)
-
-void disable_SDL2_macosx_menu_bar_keyboard_shortcuts() {
-	for (NSMenuItem * menu_item in [NSApp mainMenu].itemArray) {
-		if (menu_item.hasSubmenu) {
-			for (NSMenuItem * sub_item in menu_item.submenu.itemArray) {
-				sub_item.keyEquivalent = @"";
-				sub_item.keyEquivalentModifierMask = 0;
-			}
-		}
-		if ([menu_item.title isEqualToString:@"View"]) {
-			[[NSApp mainMenu] removeItem:menu_item];
-			break;
-		}
-	}
-}
-
-bool is_fullscreen_osx(SDL_Window * window)
-{
-	if (!window) {
-		return false;
-	}
-
-	SDL_SysWMinfo wmInfo;
-	SDL_VERSION(&wmInfo.version);
-	if (!SDL_GetWindowWMInfo(window, &wmInfo)) {
-		return false;
-	}
-
-	const NSWindowStyleMask styleMask = [wmInfo.info.cocoa.window styleMask];
-	return (styleMask & NSWindowStyleMaskFullScreen) != 0;
-}
-#endif
-
-void set_menu_bar_visible_osx(bool visible)
-{
-	[NSMenu setMenuBarVisible:(visible ? YES : NO)];
-}
-
-void set_current_directory()
-{
-	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
-	chdir([[[[NSBundle mainBundle] bundlePath] stringByDeletingLastPathComponent] UTF8String]);
-	[pool release];
-}
-
diff --git a/BasiliskII/src/Unix/Linux/NetDriver/config.h b/BasiliskII/src/Unix/Linux/NetDriver/config.h
@@ -0,0 +1 @@
+../../../../../SheepShaver/src/Unix/config.h