Merge pull request #131 from ianfixes/2019-12-02_remove_old_things

Remove old things AND fix the windows build

BasiliskII/BasiliskII.spec

@@ -39,8 +39,7 @@ Some features of Basilisk II:
   - Serial drivers
   - SCSI Manager (old-style) emulation
   - Emulates extended ADB keyboard and 3-button mouse
-  - Uses UAE 68k emulation or (under AmigaOS and NetBSD/m68k) real 68k
-    processor
+  - Uses UAE 68k emulation or real 68k processor
 
 %prep
 %setup -q

BasiliskII/CHANGELOG.md

@@ -14,6 +14,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/) after v1.0
 ### Deprecated
 
 ### Removed
+- BeOS support (can re-add if CI services can be found)
+- Amiga support (can re-add if CI services can be found)
 
 ### Fixed
 
@@ -341,7 +343,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/) after v1.0
 - BeOS `video_beos.cpp`: implemented `VideoQuitFullScreen()` (used by `ErrorAlert()`)
 
 ### Changed
-- Unix `video_x.cpp`: new hotkeys:  
+- Unix `video_x.cpp`: new hotkeys:
     Ctrl-Esc = emergency quit from DGA mode,
     Ctrl-Tab = suspend DGA mode
 

BasiliskII/INSTALL.md

@@ -6,18 +6,10 @@ To use Basilisk II, you need either a 512K Mac Classic ROM image or a 512K or 1M
 
 Depending on the platform you use, Basilisk II has additional requirements:
 
-### BeOS
-
-You need BeOS R4 or later versions. Basilisk II cannot do Mac Classic emulation.
-
 ### Unix
 
 You need X11R6 and a "make" utility with the VPATH feature (e.g. GNU make). For serial, ethernet and audio support, you need pthreads. To use the GUI preferences editor, you also need GTK+ version 1.2 or better. On Linux, you need glibc 2.0 or better.
 
-### AmigaOS
-
-You need at least a 68020 and AmigaOS 3.0 or better. To get the GUI preferences editor, you need gtlayout.library V39 or later. To get sound output, you need AHI V2 or later. Both items can be found on Aminet. You also need the "PrepareEmul" utility that somes with ShapeShifter (or any equivalent PrepareEmul substitute). The AmigaOS version of Basilisk II cannot do Mac Classic emulation.
-
 ### Windows
 
 You need at least Windows NT 4.0. Windows 95 and 98 can be used too, with a somewhat reduced set of features. Basilisk II supports DirectX version 5 or later, but version 3 may also work, depending on your graphics card.
@@ -28,31 +20,6 @@ Versions 10.0 thru 10.2 can be used, and 10.3 will probably be no problem. (OS X
 
 ## Installation
 
-### BeOS
-
-If you have a binary distribution of Basilisk II for BeOS, there are executables for BeOS/PPC and/or BeOS/x86 included. Basilisk II cannot run concurrently with SheepShaver. Trying to do so will crash Basilisk II, or SheepShaver, or both.
-
-If you have the source distribution, do the following:
-
-```shell
-cd src/BeOS
-make
-```
-
-This will produce an executable "BasiliskII" in the "obj.ppc" or "obj.x86" directory. To use Ethernet, you also have to do:
-
-```shell
-cd SheepNet
-make install
-```
-
-On a PowerPC system, you also have to do:
-
-```shell
-cd SheepDriver
-make install
-```
-
 ### Unix
 
 To compile Basilisk II, do the following:
@@ -82,7 +49,7 @@ Current (as of July 2000) versions of the NetBSD/mac68k kernel have a bug that n
 --- macromasm.s.orig    Wed Jul  5 19:29:01 2000
 +++ macromasm.s Wed Jul  5 19:12:34 2000
 @@ -37,6 +37,8 @@
- 
+
  #include "opt_adb.h"
  #include "assym.h"
 +#include <machine/asm.h>
@@ -104,17 +71,6 @@ Current (as of July 2000) versions of the NetBSD/mac68k kernel have a bug that n
         movl    sp@(FR_PC + 4), a0      | retrieve PC
 ```
 
-### AmigaOS
-
-If you have a binary distribution of Basilisk II for AmigaOS, there is an executable included. You must also have the "PrepareEmul" utility installed that comes with ShapeShifter (or any equivalent PrepareEmul substitute, see the ShapeShifter docs). If you have the source distribution, do the following:
-
-```
-cd src/AmigaOS
-make
-```
-
-To recompile Basilisk II, you need the GeekGadgets development suite and PhxAss (which can be found on Aminet).
-
 ### Windows NT
 
 If you have a binary distribution of Basilisk II for Windows, there is a Windows NT binary included. To access CD-ROMs under Windows NT, the driver "cdenable.sys" must be copied to your "\WinNT\System32\drivers" directory. To access CD-ROMs under Windows 9x, the driver "cdenable.vxd" must be copied to the "\Windows\System" directory. To recompile Basilisk II, you need MS Visual V++ 5.0 or later. Symantec C++ should work, too, with some modifications. See the "sysdeps.h" file in the "Windows" directory.

BasiliskII/Makefile

@@ -6,9 +6,6 @@ RELEASE := $(shell sed <BasiliskII.spec -n '/^\%define release */s///p')
 VERNAME := BasiliskII-$(VERSION)
 
 SRCARCHIVE := $(shell date +BasiliskII_src_%d%m%Y.tar.gz)
-AMIGAARCHIVE := $(VERNAME)-$(RELEASE).amiga.lzh
-BEOSPPCARCHIVE := $(VERNAME)-$(RELEASE).beosppc.zip
-BEOSX86ARCHIVE := $(VERNAME)-$(RELEASE).beosx86.zip
 MACOSXARCHIVE := $(VERNAME)-$(RELEASE).tar.gz
 
 TMPDIR := $(shell date +/tmp/build%M%S)
@@ -27,14 +24,10 @@ help:
 	@echo "The following targets are available:"
 	@echo "  tarball  source tarball ($(SRCARCHIVE))"
 	@echo "  rpm      source and binary RPMs"
-	@echo "  amiga    AmigaOS binary archive ($(AMIGAARCHIVE))"
-	@echo "  beosppc  BeOS/ppc binary archive ($(BEOSPPCARCHIVE))"
-	@echo "  beosx86  BeOS/x86 binary archive ($(BEOSX86ARCHIVE))"
 	@echo "  macosx   MacOS X binary archive ($(MACOSXARCHIVE))"
 
 clean:
 	-rm -f $(SRCARCHIVE)
-	-rm -f $(AMIGAARCHIVE) $(BEOSPPCARCHIVE) $(BEOSX86ARCHIVE)
 
 #
 # Source tarball
@@ -59,55 +52,6 @@ $(SRCARCHIVE): $(SRCS) $(DOCS)
 rpm: $(SRCARCHIVE)
 	rpmbuild -ta --clean $(SRCARCHIVE)
 
-#
-# Binary archive for AmigaOS
-#
-amiga: $(AMIGAARCHIVE)
-
-$(AMIGAARCHIVE): $(SRCS) $(DOCS) src/AmigaOS/BasiliskII
-	-rm -rf $(TMPDIR)
-	mkdir $(TMPDIR)
-	mkdir $(TMPDIR)/$(VERNAME)
-	cp $(DOCS) $(TMPDIR)/$(VERNAME)
-	cp src/AmigaOS/BasiliskII $(TMPDIR)/$(VERNAME)
-	cp src/AmigaOS/BasiliskII.info $(TMPDIR)/$(VERNAME)
-	chmod 775 $(TMPDIR)/$(VERNAME)/BasiliskII
-	cd $(TMPDIR); lha a $@ $(VERNAME)
-	mv $(TMPDIR)/$@ .
-	rm -rf $(TMPDIR)
-
-#
-# Binary archive for BeOS/ppc
-#
-beosppc: $(BEOSPPCARCHIVE)
-
-$(BEOSPPCARCHIVE): $(SRCS) $(DOCS) src/BeOS/obj.ppc/BasiliskII
-	-rm -rf $(TMPDIR)
-	mkdir $(TMPDIR)
-	mkdir $(TMPDIR)/$(VERNAME)
-	cp $(DOCS) $(TMPDIR)/$(VERNAME)
-	cp src/BeOS/obj.ppc/BasiliskII $(TMPDIR)/$(VERNAME)
-	mimeset -f $(TMPDIR)
-	cd $(TMPDIR); zip -ry $@ $(VERNAME)/
-	mv $(TMPDIR)/$@ .
-	rm -rf $(TMPDIR)
-
-#
-# Binary archive for BeOS/x86
-#
-beosx86: $(BEOSX86ARCHIVE)
-
-$(BEOSX86ARCHIVE): $(SRCS) $(DOCS) src/BeOS/obj.x86/BasiliskII
-	-rm -rf $(TMPDIR)
-	mkdir $(TMPDIR)
-	mkdir $(TMPDIR)/$(VERNAME)
-	cp $(DOCS) $(TMPDIR)/$(VERNAME)
-	cp src/BeOS/obj.x86/BasiliskII $(TMPDIR)/$(VERNAME)
-	mimeset -f $(TMPDIR)
-	cd $(TMPDIR); zip -ry $@ $(VERNAME)/
-	mv $(TMPDIR)/$@ .
-	rm -rf $(TMPDIR)
-
 #
 # Binary archive for MacOS X
 #