64bit fixes from Flatpak release

.appveyor.yml

@@ -0,0 +1,100 @@
+image:
+  - Visual Studio 2019
+  - macOS
+
+environment:
+  matrix:
+    - MACEMU_PROJECT: BasiliskII
+    - MACEMU_PROJECT: SheepShaver
+
+for:
+-
+  matrix:
+    only:
+      - image: Visual Studio 2019
+
+  environment:
+    MSYS2_DIR: C:\msys64
+    MSYS2_BIN: $(MSYS2_DIR)\usr\bin
+    MSYS2_PLATFORM: MINGW32
+
+  install:
+    - '%MSYS2_BIN%\env %MSYS2_BIN%\bash -lc ''/usr/bin/pacman -Sy --noconfirm'' '
+    # After installing a package with pacman -S, check that it is actually installed with pacman -Qi 
+    # because pacman -S reports success even if the package install failed when some necessary package downloads timed out
+    - '%MSYS2_BIN%\env %MSYS2_BIN%\bash -lc ''/usr/bin/pacman -S --noconfirm mingw-w64-i686-gtk2'' '
+    - '%MSYS2_BIN%\env %MSYS2_BIN%\bash -lc ''/usr/bin/pacman -Qi mingw-w64-i686-gtk2'' '
+    - '%MSYS2_BIN%\env %MSYS2_BIN%\bash -lc ''/usr/bin/pacman -S --noconfirm mingw-w64-i686-SDL2'' '
+    - '%MSYS2_BIN%\env %MSYS2_BIN%\bash -lc ''/usr/bin/pacman -Qi mingw-w64-i686-SDL2'' '
+
+  cache:
+    - $(MSYS2_DIR)\var\cache\pacman\pkg  # downloaded MSYS2 pacman packages
+
+  build_script:
+    - if %MACEMU_PROJECT%==SheepShaver %MSYS2_BIN%\env MSYSTEM=%MSYS2_PLATFORM% %MSYS2_BIN%\bash -lc 'cd /c/projects/%APPVEYOR_PROJECT_NAME%/%MACEMU_PROJECT%; make links'
+    - '%MSYS2_BIN%\env MSYSTEM=%MSYS2_PLATFORM% %MSYS2_BIN%\bash -lc ''cd /c/projects/%APPVEYOR_PROJECT_NAME%/%MACEMU_PROJECT%/src/Windows; ../Unix/autogen.sh'' '
+    - '%MSYS2_BIN%\env MSYSTEM=%MSYS2_PLATFORM% %MSYS2_BIN%\bash -lc ''cd /c/projects/%APPVEYOR_PROJECT_NAME%/%MACEMU_PROJECT%/src/Windows; make'' '
+
+  after_build:
+    - cd %MACEMU_PROJECT%\src\Windows
+    - 7z a ..\..\..\%MACEMU_PROJECT%.zip %MACEMU_PROJECT%*.exe
+
+  artifacts:
+    - path: $(MACEMU_PROJECT)\src\Windows\config.log
+    - path: $(MACEMU_PROJECT).zip
+      name: $(MACEMU_PROJECT)
+
+-
+  matrix:
+    only:
+      - image: macOS
+        MACEMU_PROJECT: BasiliskII
+
+  environment:
+    SDL_VERSION: 2.0.14
+
+  install:
+    - test -e "SDL2-$SDL_VERSION.dmg" || curl -O http://www.libsdl.org/release/SDL2-$SDL_VERSION.dmg
+    - sudo hdiutil attach SDL2-$SDL_VERSION.dmg
+    - sudo cp -r /Volumes/SDL2/SDL2.framework /Library/Frameworks/
+#   - brew update
+#   - HOMEBREW_NO_AUTO_UPDATE=1 brew install mpfr
+
+  cache:
+    - SDL2-$SDL_VERSION.dmg
+
+  build_script:
+    - cd $MACEMU_PROJECT/src/MacOSX
+    - xcodebuild -project $MACEMU_PROJECT.xcodeproj -scheme $MACEMU_PROJECT -configuration Release build SYMROOT=. CODE_SIGNING_REQUIRED=NO CODE_SIGN_IDENTITY= ARCHS=x86_64 ONLY_ACTIVE_ARCH=NO
+    - rm -rf Release/gencpu_output* Release/*.a
+    - hdiutil create ../../../$MACEMU_PROJECT.dmg -ov -volname $MACEMU_PROJECT -fs HFS+ -srcfolder Release/
+
+  artifacts:
+    - path: $MACEMU_PROJECT.dmg
+      name: $MACEMU_PROJECT
+
+-
+  matrix:
+    only:
+      - image: macOS
+        MACEMU_PROJECT: SheepShaver
+
+  install:
+#   - brew update
+    - HOMEBREW_NO_AUTO_UPDATE=1 brew install sdl2 gtk+
+    - HOMEBREW_NO_AUTO_UPDATE=1 brew link sdl2 gtk+
+
+  cache:
+    - /usr/local/Cellar
+
+  build_script:
+    - cd $MACEMU_PROJECT
+    - make links
+    - cd src/Unix
+    - ./autogen.sh
+    - make
+    - tar -cJvf ../../../$MACEMU_PROJECT.tar.xz $MACEMU_PROJECT
+
+  artifacts:
+    - path: $MACEMU_PROJECT.tar.xz
+      name: $MACEMU_PROJECT

.gitignore

@@ -6,3 +6,34 @@
 
 # Mac OS X metadata
 *.DS_Store
+
+#
+# Xcode gitignore settings are from https://github.com/github/gitignore/blob/master/Global/Xcode.gitignore
+#
+
+## Xcode, Build generated
+build/
+DerivedData/
+
+## Xcode, Various settings
+*.pbxuser
+!default.pbxuser
+*.mode1v3
+!default.mode1v3
+*.mode2v3
+!default.mode2v3
+*.perspectivev3
+!default.perspectivev3
+xcuserdata/
+xcschemes/
+project.xcworkspace/
+
+## Xcode, Other
+*.moved-aside
+*.xccheckout
+*.xcscmblueprint
+
+#
+# JetBrains IDE settings
+#
+*.idea

.travis.yml

@@ -1,100 +1,61 @@
 language: cpp
 
-matrix:
+# Do not build branches of the form "pr/*". By prefixing pull requests coming
+# from branches inside the repository with pr/, this avoids building both the
+# branch push _and_ the pull request.
+# Based on https://github.com/boostorg/hana/blob/master/.travis.yml
+branches:
+  except: /pr\/.*/
+
+jobs:
   include:
     - os: linux
+      arch: amd64
       dist: bionic
       sudo: required
       compiler: gcc
-      env :
-        - WITH_SDL=1
-        - SDL_MAJOR_VERSION=1
-        - ADDRESSING_MODE=direct
-    - os: linux
-      dist: bionic
-      sudo: required
-      compiler: gcc
-      env :
-        - WITH_SDL=1
-        - SDL_MAJOR_VERSION=1
-        - ADDRESSING_MODE=banks
-    - os: linux
-      dist: bionic
-      sudo: required
-      compiler: gcc
-      env :
-        - WITH_SDL=1
-        - SDL_MAJOR_VERSION=2
-        - ADDRESSING_MODE=direct
+      env: BADGE=amd64-linux-basiliskii
+      addons:
+        apt:
+          packages:
+            - libgtk2.0-dev
+            - libsdl2-dev
+      script:
+        - cd BasiliskII/src/Unix
+        - NO_CONFIGURE=1 ./autogen.sh
+        - ./configure --with-mon
+        - make
     - os: linux
+      arch: arm64
       dist: bionic
       sudo: required
       compiler: gcc
-      env :
-        - WITH_SDL=1
-        - SDL_MAJOR_VERSION=2
-        - ADDRESSING_MODE=banks
+      env: BADGE=arm64-linux-basiliskii
+      addons:
+        apt:
+          packages:
+            - libgtk2.0-dev
+            - libsdl2-dev
+      script:
+        - cd BasiliskII/src/Unix
+        - NO_CONFIGURE=1 ./autogen.sh
+        - ./configure --with-mon
+        - make
     - os: linux
+      arch: amd64
       dist: bionic
       sudo: required
       compiler: gcc
-      env :
-        - WITH_SDL=0
-        - ADDRESSING_MODE=direct
-    - os: linux
-      dist: bionic
-      sudo: required
-      compiler: gcc
-      env :
-        - WITH_SDL=0
-        - ADDRESSING_MODE=banks
-    - os: osx
-      compiler: clang
-      osx_image: xcode12
-      env :
-        - WITH_SDL=0
-    - os: osx
-      compiler: clang
-      osx_image: xcode12
-      env :
-        - WITH_SDL=1
-
-addons:
-  apt:
-    packages:
-      - libsdl1.2-dev
-      - libgtk2.0-dev
-      - libsdl2-dev
-  homebrew:
-    packages:
-      - sdl2
-      - autoconf
-      - make
-
-script:
-  - ERR_CODE=0
-  - cd BasiliskII/src/Unix
-  - NO_CONFIGURE=1 ./autogen.sh
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
-        if [[ $WITH_SDL == *"1"* ]]; then
-          if [[ $SDL_MAJOR_VERSION == *"1"* ]]; then
-              ./configure --enable-sdl-video --enable-sdl-audio --disable-vosf --disable-jit-compiler --with-x --with-gtk --with-mon --enable-addressing=$ADDRESSING_MODE;
-              make -j 4 || ERR_CODE=$?;
-          else
-              ./configure --enable-sdl-video --enable-sdl-audio --disable-vosf --disable-jit-compiler --with-x --with-gtk --with-mon --with-sdl2 --enable-addressing=$ADDRESSING_MODE;
-              make -j 4 || ERR_CODE=$?;
-          fi
-        else
-              ./configure --disable-jit-compiler --with-x --with-gtk --with-mon --enable-addressing=$ADDRESSING_MODE;
-              make -j 4 || ERR_CODE=$?;
-        fi
-    else
-        if [[ $WITH_SDL == *"1"* ]]; then
-          ./configure --enable-sdl-video --enable-sdl-audio --disable-vosf --disable-jit-compiler --with-gtk=no --with-mon --with-sdl2 --enable-addressing=banks;
-          make -j 4 || ERR_CODE=$?;
-        else
-          ./configure --disable-vosf --disable-jit-compiler --with-gtk=no --with-mon --enable-addressing=banks;
-          make -j 4 || ERR_CODE=$?;
-        fi
-    fi
-  - (exit $ERR_CODE)
+      env: BADGE=amd64-linux-sheepshaver
+      addons:
+        apt:
+          packages:
+            - libgtk2.0-dev
+            - libsdl2-dev
+      script:
+        - cd SheepShaver
+        - make links
+        - cd src/Unix
+        - NO_CONFIGURE=1 ./autogen.sh
+        - ./configure --with-mon
+        - make

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/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
 #