Merge branch 'master' into sdl3.

Author: AliceLR

.github/workflows/main.yml

@@ -105,35 +105,6 @@ jobs:
       - name: Distclean (OpenMPT)
         run: $MZX_MAKE distclean
 
-  # Ubuntu static SDL2 expects other junk, so build a -static SDL. Either way, it crashes on startup.
-  # Ubuntu's libvorbis.a relies on libm functions that no longer exist. Just build everything manually...
-  unix-static:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: 🙄
-        run: sudo sed -i '/deb-src/s/^# //' /etc/apt/sources.list
-#      - name: Install dependencies
-#        run: sudo apt update && sudo apt install -y --no-install-recommends $MZXDEPS_DEBIAN_SDL2
-      - name: Fetch dependency sources
-#        run: mkdir DEPS && sudo apt update && apt source libsdl2
-        run: mkdir DEPS && sudo apt update && apt source zlib libpng1.6 libogg libvorbis libsdl2
-      - name: Build zlib
-        run: (cd zlib-*/; ./configure --prefix "$(pwd)/../DEPS" --static && $MZX_MAKE && make install)
-      - name: Build libpng
-        run: (cd libpng1.6-*/; ./configure --prefix "$(pwd)/../DEPS" --disable-shared --enable-static && make -j8 && make install)
-      - name: Build libogg
-        run: (cd libogg-*/; ./configure --prefix "$(pwd)/../DEPS" --disable-shared --enable-static && make -j8 && make install)
-      - name: Build libvorbis
-        run: (cd libvorbis-*/; ./configure --prefix "$(pwd)/../DEPS" --disable-shared --enable-static && make -j8 && make install)
-      - name: Build SDL2
-        run: (cd libsdl2-*/; ./configure --prefix="$(pwd)/../DEPS" --disable-shared --enable-static && make -j8 && make install)
-      - name: Configure
-        run: ./config.sh --platform unix-devel --prefix DEPS --enable-release --disable-modular
-      - name: Build
-        run: LDFLAGS="-static" $MZX_MAKE
-        # TODO: tests
-
   darwin-arm64:
     runs-on: macos-latest
     steps:
@@ -333,42 +304,34 @@ jobs:
         run: sudo apt update && sudo apt install -y --no-install-recommends $MZXDEPS_DEBIAN_SDL2
       - uses: actions/checkout@v4
       - name: Configure
-        run: ./config.sh --platform unix-devel --enable-asan
+        run: ./config.sh --platform unix-devel --enable-asan --enable-extram
       - name: Build
         run: $MZX_MAKE
       - name: Run tests
         run: $MZX_MAKE test
 
   # Note: requires all non-system/libc calls to be from instrumented libraries.
   # For the regression tests, MZX can get away with just zlib.
-  #
-  # - actions/checkout will delete the work directory(!?), do it first.
-  # - The MSan zlib needs to be built static to prevent linking the system zlib.
-  # - ZLIB_LDFLAGS needs to be overridden to prevent linking the system zlib.
-  MemorySanitizer:
-    runs-on: ubuntu-latest
-    env:
-      CC: clang
-      CXX: clang++
-      ZLIB_LDFLAGS: DEPS/lib/libz.a
-    steps:
-      - uses: actions/checkout@v4
-      - name: 🙄
-        run: sudo sed -i '/deb-src/s/^# //' /etc/apt/sources.list
-      - name: Fetch dependency sources
-        run: mkdir DEPS && sudo apt update && apt source zlib
-      - name: Build zlib
-        run: |
-          (cd zlib-*;
-          CC=clang CXX=clang++ CFLAGS="-O3 -fsanitize=memory -g -fPIC -Wno-pointer-sign" LDFLAGS="-fsanitize=memory" \
-            ./configure --prefix "$(pwd)/../DEPS" --static;
-          $MZX_MAKE && make install)
-      - name: Configure
-        run: ./config.sh --platform unix-devel --prefix DEPS --enable-msan --disable-sdl --disable-libpng --disable-vorbis --disable-x11
-      - name: Build
-        run: $MZX_MAKE V=1
-      - name: Run tests
-        run: $MZX_MAKE V=1 test
+  # SDL calls into uninstrumented functions and is not built at all.
+  # libpng is temporarily disabled. libogg/libvorbis work with no issue.
+#  MemorySanitizer:
+#    runs-on: ubuntu-latest
+#    env:
+#      CC: clang
+#      CXX: clang++
+#    steps:
+#      - uses: actions/checkout@v4
+#      - name: Fetch dependencies
+#        run: |
+#          (cd scripts/deps;
+#          wget https://github.com/AliceLR/megazeux-dependencies/releases/download/v2.93c/megazeux-dependencies-2.93c-r0-linux-msan.tar.xz;
+#          tar -xJf megazeux-dependencies-*-linux-msan.tar.xz)
+#      - name: Configure
+#        run: ./config.sh --platform unix-devel --prefix scripts/deps/linux-msan/x86_64 --enable-msan --disable-sdl --disable-libpng --disable-x11 --enable-extram
+#      - name: Build
+#        run: $MZX_MAKE V=1
+#      - name: Run tests
+#        run: $MZX_MAKE V=1 test
 
   UndefinedBehaviorSanitizer:
     runs-on: ubuntu-latest
@@ -381,7 +344,7 @@ jobs:
         run: sudo apt update && sudo apt install -y --no-install-recommends $MZXDEPS_DEBIAN_SDL2
       - uses: actions/checkout@v4
       - name: Configure
-        run: ./config.sh --platform unix-devel --enable-ubsan
+        run: ./config.sh --platform unix-devel --enable-ubsan --enable-extram
       - name: Build
         run: $MZX_MAKE
       - name: Run tests

.gitignore

@@ -164,6 +164,7 @@ stdout.txt
 stderr.txt
 Thumbs.db
 unit/.build/
+unit/audio/.build/
 unit/editor/.build/
 unit/io/.build/
 unit/network/.build/

README.md

@@ -3,7 +3,7 @@
 
 MegaZeux is a game creation system (GCS) created by game developer Alexis Janson in 1994.
 Originally a DOS program, in 2005 a multi-platform port was released by Exophase. The most
-recent version of MegaZeux is 2.93, which was released on December 31st, 2023.
+recent version of MegaZeux is 2.93b, which was released on September 10th, 2024.
 
 MegaZeux is officially supported on Windows, Linux/BSD, MacOS, as well as the NDS, 3DS, Wii,
 and PSP consoles. Historical support has also existed for GP2X, Pandora, and AmigaOS 4.
@@ -17,6 +17,7 @@ Older versions are available at [DigitalMZX](https://www.digitalmzx.com/).
 [megazeux-w64]: https://www.digitalmzx.com/download.php?latest=windows64
 [megazeux-w32]: https://www.digitalmzx.com/download.php?latest=windows32
 [megazeux-dos]: https://www.digitalmzx.com/download.php?latest=dos
+[megazeux-dos32]: https://www.digitalmzx.com/download.php?latest=dosdjgpp
 [megazeux-osx]: https://www.digitalmzx.com/download.php?latest=osx
 [megazeux-ppc]: https://www.digitalmzx.com/download.php?latest=osxppc
 [megazeux-u64]: https://www.digitalmzx.com/download.php?latest=ubuntu64
@@ -25,37 +26,47 @@ Older versions are available at [DigitalMZX](https://www.digitalmzx.com/).
 [megazeux-d32]: https://www.digitalmzx.com/download.php?latest=debian32
 [megazeux-f64]: https://www.digitalmzx.com/download.php?latest=fedora64
 [megazeux-rpi]: https://www.digitalmzx.com/download.php?latest=raspbian
+[megazeux-flat]: https://www.digitalmzx.com/download.php?latest=flatpak
 [megazeux-and]: https://www.digitalmzx.com/download.php?latest=android
 [megazeux-html]: https://www.digitalmzx.com/download.php?latest=html5
 [megazeux-nds]: https://www.digitalmzx.com/download.php?latest=nds
 [megazeux-3ds]: https://www.digitalmzx.com/download.php?latest=3ds
 [megazeux-wii]: https://www.digitalmzx.com/download.php?latest=wii
+[megazeux-wiiu]: https://www.digitalmzx.com/download.php?latest=wiiu
 [megazeux-swi]: https://www.digitalmzx.com/download.php?latest=switch
 [megazeux-psp]: https://www.digitalmzx.com/download.php?latest=psp
+[megazeux-vita]: https://www.digitalmzx.com/download.php?latest=psvita
+[megazeux-dc]: https://www.digitalmzx.com/download.php?latest=dreamcast
 [megazeux-src]: https://www.digitalmzx.com/download.php?latest=src
 
 <!-- Images for download links. -->
 [arch-w64]: contrib/archicons/windows64.png "Windows x64"
 [arch-w32]: contrib/archicons/windows32.png "Windows x86"
 [arch-dos]: contrib/archicons/dos.png       "MS DOS (MZX 2.70)"
-[arch-osx]: contrib/archicons/osx.png       "MacOS"
-[arch-ppc]: contrib/archicons/osxppc.png    "Mac OS X (PowerPC)"
+[arch-dos32]:contrib/archicons/dosdjgpp.png "MS DOS (32-bit)"
+[arch-osx]: contrib/archicons/osx.png       "macOS"
+[arch-ppc]: contrib/archicons/maccompat.png "macOS (Compatible)"
 [arch-u64]: contrib/archicons/ubuntu64.png  "Ubuntu AMD64"
 [arch-u32]: contrib/archicons/ubuntu32.png  "Ubuntu i386"
 [arch-d64]: contrib/archicons/debian64.png  "Debian AMD64"
 [arch-d32]: contrib/archicons/debian32.png  "Debian i386"
 [arch-f64]: contrib/archicons/fedora64.png  "Fedora x86_64"
 [arch-rpi]: contrib/archicons/raspbian.png  "Raspbian"
+[arch-flat]:contrib/archicons/flatpak.png   "Flatpak"
 [arch-and]: contrib/archicons/android.png   "Android"
 [arch-html]:contrib/archicons/html5.png     "HTML5 (Emscripten)"
 [arch-aur]: contrib/archicons/archlinux.png "Arch Linux (via AUR)"
 [arch-void]:contrib/archicons/voidlinux.png "Void Linux"
 [arch-gen]: contrib/archicons/gentoo.png    "Gentoo"
+[arch-alp]: contrib/archicons/alpine.png    "Alpine Linux"
 [arch-nds]: contrib/archicons/nds.png       "Nintendo DS"
 [arch-3ds]: contrib/archicons/3ds.png       "Nintendo 3DS"
 [arch-wii]: contrib/archicons/wii.png       "Nintendo Wii"
+[arch-wiiu]:contrib/archicons/wiiu.png      "Nintendo Wii U"
 [arch-swi]: contrib/archicons/switch.png    "Nintendo Switch"
 [arch-psp]: contrib/archicons/psp.png       "PlayStation Portable"
+[arch-vita]:contrib/archicons/psvita.png    "PlayStation Vita"
+[arch-dc]:  contrib/archicons/dreamcast.png "Sega Dreamcast"
 [arch-ami]: contrib/archicons/amiga.png     "Amiga OS 4"
 [arch-gp2x]:contrib/archicons/gp2x.png      "GP2X"
 [arch-pand]:contrib/archicons/pandora.png   "Pandora"
@@ -65,27 +76,33 @@ Older versions are available at [DigitalMZX](https://www.digitalmzx.com/).
 &nbsp; [![Windows x64         ][arch-w64]][megazeux-w64]
 &nbsp; [![Windows x86         ][arch-w32]][megazeux-w32]
 &nbsp; [![Mac OS X            ][arch-osx]][megazeux-osx]
-&nbsp; [![Mac OS X (PowerPC)  ][arch-ppc]][megazeux-ppc]
+&nbsp; [![macOS (Compatible)) ][arch-ppc]][megazeux-ppc]
 &nbsp; [![Ubuntu AMD64        ][arch-u64]][megazeux-u64]
 &nbsp; [![Ubuntu i386         ][arch-u32]][megazeux-u32]
 &nbsp; [![Debian AMD64        ][arch-d64]][megazeux-d64]
 &nbsp; [![Debian i386         ][arch-d32]][megazeux-d32]
 &nbsp; [![Fedora x86_64       ][arch-f64]][megazeux-f64]
 &nbsp; [![Raspbian            ][arch-rpi]][megazeux-rpi]
+&nbsp; [![Flatpak             ][arch-flat]][megazeux-flat]
 &nbsp; [![Android             ][arch-and]][megazeux-and]
 &nbsp; [![HTML5 (Emscripten)  ][arch-html]][megazeux-html]
 &nbsp; [![Nintendo DS         ][arch-nds]][megazeux-nds]
 &nbsp; [![Nintendo 3DS        ][arch-3ds]][megazeux-3ds]
 &nbsp; [![Nintendo Wii        ][arch-wii]][megazeux-wii]
+&nbsp; [![Nintendo Wii U      ][arch-wiiu]][megazeux-wiiu]
 &nbsp; [![Nintendo Switch     ][arch-swi]][megazeux-swi]
 &nbsp; [![PlayStation Portable][arch-psp]][megazeux-psp]
+&nbsp; [![PlayStation Vita    ][arch-vita]][megazeux-vita]
+&nbsp; [![Sega Dreamcast      ][arch-dc]][megazeux-dc]
+&nbsp; [![DOS (32-bit)        ][arch-dos32]][megazeux-dos32]
 &nbsp; [![Source code         ][arch-src]][megazeux-src]
 
 The following platforms have MegaZeux releases available via repository:
 
 &nbsp; [![Arch Linux (via AUR)][arch-aur]](https://aur.archlinux.org/packages/megazeux/)
 &nbsp; [![Void Linux][arch-void]](https://github.com/void-linux/void-packages/tree/master/srcpkgs/megazeux)
 &nbsp; [![Gentoo][arch-gen]](https://github.com/Spectere/megazeux-overlay)
+&nbsp; [![Alpine Linux][arch-alp]](https://pkgs.alpinelinux.org/packages?name=megazeux)
 &nbsp; [![Amiga OS 4 (outdated)][arch-ami]](http://aminet.net/package/game/misc/pfp-mgzx)
 &nbsp; [![GP2X (outdated)][arch-gp2x]](https://dl.openhandhelds.org/cgi-bin/gp2x.cgi?0,0,0,0,26,2920)
 &nbsp; [![Pandora (outdated)][arch-pand]](https://repo.openpandora.org/?page=detail&app=megazeux_ptitseb)

arch/3ds/CONFIG.3DS

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-./config.sh --platform 3ds --enable-release --enable-meter --disable-utils \
-            --disable-sdl --enable-tremor --disable-screenshots \
+./config.sh --platform 3ds --enable-release --enable-lto --enable-meter \
+            --disable-sdl --enable-tremor --disable-screenshots --disable-utils \
             --enable-stdio-redirect "$@"
 

arch/3ds/render.cpp

@@ -496,8 +496,7 @@ static boolean ctr_init_video(struct graphics_data *graphics,
   graphics->window_height = 350;
 
   ctr_keyboard_init(&render_data);
-
-  return set_video_mode();
+  return true;
 }
 
 static void ctr_free_video(struct graphics_data *graphics)
@@ -520,8 +519,8 @@ static void ctr_free_video(struct graphics_data *graphics)
   C3D_Fini();
 }
 
-static boolean ctr_set_video_mode(struct graphics_data *graphics, int width,
- int height, int depth, boolean fullscreen, boolean resize)
+static boolean ctr_create_window(struct graphics_data *graphics,
+ struct video_window *window)
 {
   return true;
 }
@@ -1136,7 +1135,8 @@ static inline void ctr_draw_playfield(struct ctr_render_data *render_data,
   }
 }
 
-static void ctr_sync_screen(struct graphics_data *graphics)
+static void ctr_sync_screen(struct graphics_data *graphics,
+ struct video_window *window)
 {
   struct ctr_render_data *render_data = (struct ctr_render_data *) graphics->render_data;
 
@@ -1200,14 +1200,12 @@ void render_ctr_register(struct renderer *renderer)
   memset(renderer, 0, sizeof(struct renderer));
   renderer->init_video = ctr_init_video;
   renderer->free_video = ctr_free_video;
-  renderer->set_video_mode = ctr_set_video_mode;
+  renderer->create_window = ctr_create_window;
+  renderer->set_viewport = set_window_viewport_centered;
   renderer->update_colors = ctr_update_colors;
-  renderer->resize_screen = resize_screen_standard;
   renderer->remap_char_range = ctr_remap_char_range;
   renderer->remap_char = ctr_remap_char;
   renderer->remap_charbyte = ctr_remap_charbyte;
-  renderer->get_screen_coords = get_screen_coords_centered;
-  renderer->set_screen_coords = set_screen_coords_centered;
   renderer->render_layer = ctr_render_layer;
   renderer->render_cursor = ctr_render_cursor;
   renderer->render_mouse = ctr_render_mouse;

arch/android/CONFIG.ANDROID

@@ -4,5 +4,5 @@
 
 [ -z "$NDK_PATH" ] && { echo "Must define NDK_PATH!"; exit 1; }
 
-./config.sh --platform android --enable-release --disable-utils \
-  --disable-libpng --disable-gl-fixed "$@"
+./config.sh --platform android --enable-release --enable-lto \
+            --disable-utils --disable-libpng --disable-gl-fixed "$@"

arch/darwin/Makefile.arch

@@ -40,35 +40,34 @@ endif
 ifeq (${ARCH},arm64)
 CC      := $(or ${ARM64_CC},${CC}) ${ARM64_CFLAGS}
 CXX     := $(or ${ARM64_CXX},${CXX}) ${ARM64_CFLAGS}
-STDLIB  ?= libc++
 MINVER  ?= 11.0
 endif
 
 ifeq (${ARCH},arm64e)
 CC      := $(or ${ARM64E_CC},${CC}) ${ARM64E_CFLAGS}
 CXX     := $(or ${ARM64E_CXX},${CXX}) ${ARM64E_CFLAGS}
-STDLIB  ?= libc++
 MINVER  ?= 11.0
 endif
 
 ifeq (${ARCH},i686)
 CC      := $(or ${X86_CC},${CC}) ${X86_CFLAGS}
 CXX     := $(or ${X86_CXX},${CXX}) ${X86_CFLAGS}
+SYSROOT ?= /Developer/SDKs/MacOSX10.13.sdk
 STDLIB  ?= libstdc++
 MINVER  ?= 10.6
 endif
 
 ifeq (${ARCH},x86_64)
 CC      := $(or ${X86_64_CC},${CC}) ${X86_64_CFLAGS}
 CXX     := $(or ${X86_64_CXX},${CXX}) ${X86_64_CFLAGS}
+SYSROOT ?= /Developer/SDKs/MacOSX10.13.sdk
 STDLIB  ?= libstdc++
 MINVER  ?= 10.6
 endif
 
 ifeq (${ARCH},x86_64h)
 CC      := $(or ${X86_64H_CC},${CC}) ${X86_64H_CFLAGS}
 CXX     := $(or ${X86_64H_CXX},${CXX}) ${X86_64H_CFLAGS}
-STDLIB  ?= libc++
 MINVER  ?= 10.9
 endif
 

arch/darwin/Makefile.in

@@ -11,6 +11,10 @@ DSOSONAME  = -install_name ${LIBDIR}/
 DYLIBBUNDLER ?= @arch/darwin/bundle.sh
 LIPO         ?= @arch/darwin/lipo.sh
 
+CODESIGN_ID  ?= -
+CODESIGN     ?= codesign --force --deep --preserve-metadata=entitlements,requirements,flags,runtime --sign ${CODESIGN_ID}
+CODESIGN_CHK ?= codesign --verify --deep --strict -vvvv
+
 #
 # darwin specific recipes.
 # Enable 'make install' and 'make uninstall' for darwin builds.
@@ -98,6 +102,7 @@ CFLAGS   += -DSUBPLATFORM='"${REAL_ARCH}"'
 CXXFLAGS += -DSUBPLATFORM='"${REAL_ARCH}"'
 UTILS_ZLIB_LDFLAGS ?= ${PREFIX}/lib/libz.a
 UTILS_LIBPNG_LDFLAGS ?= ${PREFIX}/lib/libpng.a
+SDL_PREFIX := ${PREFIX}
 
 package: all
 	if [ -d "bundles/libs-${REAL_ARCH}" ]; then rm -rf "bundles/libs-${REAL_ARCH}"; fi
@@ -216,6 +221,13 @@ build:
 	${MV} ${build}/docs               ${mzx_app}/../Documentation
 ifeq (${BUILD_UTILS},1)
 	${MV} ${build}/utils/             ${mzx_app}/../Utilities
+	${CODESIGN}                       ${mzx_app}/../Utilities/ccv
+	${CODESIGN}                       ${mzx_app}/../Utilities/checkres
+	${CODESIGN}                       ${mzx_app}/../Utilities/downver
+	${CODESIGN}                       ${mzx_app}/../Utilities/png2smzx
+	${CODESIGN}                       ${mzx_app}/../Utilities/y4m2smzx
+	${CODESIGN}                       ${mzx_app}/../Utilities/hlp2txt
+	${CODESIGN}                       ${mzx_app}/../Utilities/txt2hlp
 endif
 	${MV} ${build}/${mzx}             ${mzx_app}/Contents/MacOS/MegaZeux
 ifneq (${BUILD_MZXRUN},)
@@ -225,7 +237,8 @@ ifneq (${BUILD_MODULAR},)
 	${MV} ${build}/${core_target}     ${mzx_app}/Contents/MacOS/
 	${MV} ${build}/${editor_target}   ${mzx_app}/Contents/MacOS/
 endif
-	${CP} -r ./bundles/libs-*         ${mzx_app}/Contents/
+	${MKDIR}                          ${mzx_app}/Contents/Frameworks
+	${CP} -r ./bundles/libs-*         ${mzx_app}/Contents/Frameworks
 ifneq (${BUILD_MZXRUN},)
 	${CP} -r ${mzx_app} ${mzxrun_app}
 	${RM} ${mzx_app}/Contents/MacOS/MZXRun
@@ -234,11 +247,17 @@ ifneq (${BUILD_MODULAR},)
 	${RM} ${mzxrun_app}/Contents/MacOS/${editor_target}
 endif
 	${CP} arch/darwin/MZXRun.plist    ${mzxrun_app}/Contents/Info.plist
+	${CODESIGN}                       ${mzxrun_app}/Contents/MacOS/MZXRun
+	${CODESIGN_CHK}                   ${mzxrun_app}
 endif
 	${CP} arch/darwin/MegaZeux.plist  ${mzx_app}/Contents/Info.plist
+	${CODESIGN}                       ${mzx_app}/Contents/MacOS/MegaZeux
+	${CODESIGN_CHK}                   ${mzx_app}
 
 archive: build
 	@arch/darwin/dmg.sh ${TARGET}
+	${CODESIGN} build/dist/darwin/${TARGET}.dmg
+	${CODESIGN_CHK} build/dist/darwin/${TARGET}.dmg
 
 clean: package_clean
 

arch/darwin/MegaZeux.plist

@@ -7,7 +7,7 @@
 	<key>CFBundleIconFile</key>
 	<string>MegaZeux</string>
 	<key>CFBundleIdentifier</key>
-	<string>MegaZeux</string>
+	<string>com.digitalmzx.MegaZeux</string>
 	<key>CFBundleName</key>
 	<string>MegaZeux</string>
 </dict>