.circleci/config.yml

-version: 2
-jobs:
-  build:
-    working_directory: /home/circleci/SRB2
-    docker:
-      - image: cimg/base:current
-        environment:
-          CC: ccache gcc
-          CCACHE_COMPRESS: true
-          CFLAGS: -Wno-error=unused-result
-      #- image: ubuntu:trusty
-      #  environment:
-      #    CC: ccache gcc -m32
-      #    PKG_CONFIG_LIBDIR: /usr/lib/i386-linux-gnu/pkgconfig
-      #    LIBGME_CFLAGS: -I/usr/include
-      #    LIBGME_LDFLAGS: -lgme
-      #    CCACHE_COMPRESS: true
-      #    WFLAGS: -Wno-unsuffixed-float-constants
-      #    GCC48: true
-    resource_class: large
-    steps:
-      - run:
-          name: Add STJr PPA
-          command: |
-            sudo apt-get -qq update
-            sudo apt-get -qq install apt-utils
-      - run:
-          name: Make APT cache folder
-          command: mkdir -p /home/circleci/.cache/apt/archives/partial
-      - run:
-          name: Make APT cache usage by _apt
-          command: sudo chown -Rv _apt:root /home/circleci/.cache/apt/archives/partial
-      - run:
-          name: Update APT listing
-          command: sudo apt-get -qq update
-      - run:
-          name: Support S3 upload
-          command: sudo apt-get -qq -y install ca-certificates
-      - restore_cache:
-          keys:
-            - v1-SRB2-APT
-      - run:
-          name: Install SDK
-          command: sudo apt-get -o Dir::Cache="/home/circleci/.cache/apt" -qq -y --no-install-recommends install git build-essential libpng-dev libsdl2-mixer-dev libgme-dev libcurl4-openssl-dev libopenmpt-dev libminiupnpc-dev gettext ccache wget gcc-multilib upx openssh-client
-      - run:
-          name: make md5sum
-          command: sudo find /home/circleci/.cache/apt/archives -type f -print0 | sort -z | sudo xargs -r0 md5sum > /home/circleci/.cache/apt_archives.md5
-      - save_cache:
-          key: v1-SRB2-APT-{{ checksum "/home/circleci/.cache/apt_archives.md5" }}
-          paths:
-            - /home/circleci/.cache/apt
-      - checkout
-      - run:
-         name: Create deps folder as needed
-         command: mkdir -p make/linux/64/SDL/deps/
-      - run:
-          name: make master depend file
-          command: find make/linux/64/SDL/deps/ -type f -print0 | sort -z | xargs -r0 cat > make/linux/64/SDL.deps
-      - restore_cache:
-          keys:
-            - v1-SRB2-{{ .Branch }}-{{ checksum "make/linux/64/SDL.deps" }}
-      - run:
-          name: Compile
-          command: make -C src LINUX64=1 ERRORMODE=1 -k -j4
-      - store_artifacts:
-          path: /home/circleci/SRB2/bin/
-          destination: bin
-      - save_cache:
-          key: v1-SRB2-{{ .Branch }}-{{ checksum "make/linux/64/SDL.deps" }}
-          paths:
-            - /home/circleci/.ccache

.gitlab/ci/jobs/windows-x64-makefile.yml

@@ -3,9 +3,7 @@ Windows x64 Makefile:
 
   stage: build
 
-  when: manual
-
-  allow_failure: true
+  when: on_success
 
   artifacts:
     paths:

.gitlab/ci/jobs/windows-x64.yml

@@ -3,10 +3,6 @@ Windows x64:
 
   stage: build
 
-  when: manual
-
-  allow_failure: true
-
   cache:
     - key: ccache-$CI_JOB_NAME_SLUG-$CI_COMMIT_REF_SLUG
       fallback_keys:

.gitlab/ci/jobs/windows-x86-makefile.yml

@@ -3,7 +3,9 @@ Windows x86 Makefile:
 
   stage: build
 
-  when: on_success
+  when: manual
+
+  allow_failure: true
 
   artifacts:
     paths:

.gitlab/ci/jobs/windows-x86.yml

@@ -3,6 +3,10 @@ Windows x86:
 
   stage: build
 
+  when: manual
+
+  allow_failure: true
+
   cache:
     - key: ccache-$CI_JOB_NAME_SLUG-$CI_COMMIT_REF_SLUG
       fallback_keys:

CMakeLists.txt

@@ -67,6 +67,7 @@ option(
 option(SRB2_CONFIG_HWRENDER "Enable hardware render (OpenGL) support" ON)
 option(SRB2_CONFIG_USE_GME "Enable GME playback support" OFF)
 option(SRB2_CONFIG_STATIC_OPENGL "Enable static linking GL (do not do this)" OFF)
+option(SRB2_CONFIG_USE_AVX "Compile using AVX intrinsics" OFF)
 option(SRB2_CONFIG_ERRORMODE "Compile C code with warnings treated as errors." OFF)
 option(SRB2_CONFIG_DEBUGMODE "Compile with PARANOIA, ZDEBUG, RANGECHECK and PACKETDROP defined." OFF)
 option(SRB2_CONFIG_MOBJCONSISTANCY "Compile with MOBJCONSISTANCY defined." OFF)

README.md

-# Sonic Robo Blast 2
-[![latest release](https://badgen.net/github/release/STJr/SRB2/stable)](https://github.com/STJr/SRB2/releases/latest)
+# Sonic Robo Blast 2 Classic
 
-[![Build status](https://ci.appveyor.com/api/projects/status/399d4hcw9yy7hg2y?svg=true)](https://ci.appveyor.com/project/STJr/srb2)
-[![Build status](https://travis-ci.org/STJr/SRB2.svg?branch=master)](https://travis-ci.org/STJr/SRB2)
-[![CircleCI](https://circleci.com/gh/STJr/SRB2/tree/master.svg?style=svg)](https://circleci.com/gh/STJr/SRB2/tree/master)
+[Sonic Robo Blast 2 Classic](https://srb2classic.net/) is a fork of Sonic Robo Blast 2 version 2.2, continuing it's development.
 
-[Sonic Robo Blast 2](https://srb2.org/) is a 3D Sonic the Hedgehog fangame based on a modified version of [Doom Legacy](http://doomlegacy.sourceforge.net/).
-
-## Dependencies
-- SDL2 (Linux/OS X only)
-- SDL2-Mixer (Linux/OS X only)
-- libupnp (Linux/OS X only)
-- libgme (Linux/OS X only)
-- libopenmpt (Linux/OS X only)
+If you're interested in helping out, join us on [Matrix](https://matrix.to/#/#srb2classic:tchncs.de)!
 
 ## Compiling
 
 See [SRB2 Wiki/Source code compiling](http://wiki.srb2.org/wiki/Source_code_compiling)
 
 ## Disclaimer
-Sonic Team Junior is in no way affiliated with SEGA or Sonic Team. We do not claim ownership of any of SEGA's intellectual property used in SRB2.
+Neither this project nor Sonic Team Junior is in no way affiliated with SEGA or Sonic Team. We do not claim ownership of any of SEGA's intellectual property used in SRB2 Classic.

appveyor.yml

-version: 2.2.14.{branch}-{build}
+version: 2.2.16.{branch}-{build}
 os: MinGW
 
 environment:

assets/debian-template/README.Debian

-srb2 for Debian
----------------
-
-SRB2 Debian package!
-Hi there, to rebuild this package just use the SRB2 Makefile system, or, optionally, run
-dpkg-buildpackage in the in /assets directory. You can build these with or without a key
-if you want, but if you want to put these on a repo, generate your own GnuPG key as per the
-https://help.ubuntu.com/community/GnuPrivacyGuardHowto instructions and pass the -k<keyid>
-command to debuild. Make sure you export the key footprint and give them to your users to install
-with apt-key add. Thanks!
-
- -- Callum Dickinson <gcfreak_ag20@hotmail.com>  Fri, 26 Nov 2010 18:25:31 +1300
-
-
----------------
-
-
-Templating
-
-Note that you MUST run [repo-root]/debian_template.sh before running debuild
-on these scripts! debian_template.sh fills these template files with working values.
-
-You should also set PACKAGE_NAME_EMAIL="John Doe <jdoe@example.com>" to match
-the identity of the key you will use to sign the package.
-
-
-Building for Launchpad PPA
-
-Run this step first:
-
-    1. source [repo-root]/debian_template.sh
-       * Initializes defaults for the package variables and fills in templates.
-
-Use these steps to prepare building a source package for Launchpad:
-
-    1. cd [repo-root]/assets/
-    2. debuild -T clean-all (optional; if you already have asset files, this clears them)
-
-Build the source package:
-
-    1. debuild -T build (this downloads the asset files from srb2.org if necessary)
-    2. debuild -S (builds the source package for Launchpad, including the asset files)
-
-
-Signing for Launchpad PPA
-
-First, follow Callum's instructions to generate a GnuPG key with your identity. You will need
-to publish the fingerprint of that key to Ubuntu's key server.
-
-    https://help.ubuntu.com/community/GnuPrivacyGuardHowto#Uploading_the_key_to_Ubuntu_keyserver
-
-Next, you will have to add that key fingerprint to your Launchpad account. Go to your Launchpad
-profile and click the yellow Edit button next to "OpenPGP keys". Once you add the key, you can
-upload signed source packages and publish them onto your PPA.
-
-IF YOU UPLOAD A PACKAGE and Launchpad does NOT send you a confirmation or rejection email, that
-means your key is not set up correctly with your Launchpad account.
-
-Finally, if your packages have not already been signed, follow these steps:
-
-    1. cd ..
-       * Packages are located in the parent folder of where debuild was called
-    2. debsign "srb2-data_[version]_source.changes"
-       * You may need to specify -k [key-fingerprint]
-
-
-Uploading for Launchpad PPA
-
-Follow the instructions at <https://help.launchpad.net/Packaging/PPA/Uploading> to upload
-to your PPA and have Launchpad build your binary deb packages.
-
-
- -- Marco Zafra <marco.a.zafra@gmail.com>  Mon, 26 Nov 2018 21:13:00 -0500

assets/debian-template/README.source

-srb2-data for Debian
----------------
-
-Look in main SRB2 README.source for more information.

assets/debian-template/changelog

-${PACKAGE_NAME}-data (${PACKAGE_VERSION}${PACKAGE_SUBVERSION}${PACKAGE_REVISION}) ${PACKAGE_DISTRO}; urgency=${PACKAGE_URGENCY}
-
-  * ${PROGRAM_NAME} v${PROGRAM_VERSION} asset data
-
- -- ${PACKAGE_NAME_EMAIL}  ${__PACKAGE_DATETIME}

assets/debian-template/compat

-7

assets/debian-template/control

-# SRB2-data Debian package control file.
-
-Source: ${PACKAGE_NAME}-data
-Section: games
-Priority: extra
-Maintainer: ${PACKAGE_GROUP_NAME_EMAIL}
-Build-Depends: debhelper (>= 7.0.50~),
- wget
-Standards-Version: 3.8.4
-Homepage: ${PACKAGE_WEBSITE}
-
-Package: ${PACKAGE_NAME}-data
-Architecture: all
-Description: A cross-platform 3D Sonic fangame
- Sonic Robo Blast 2 is a 3D open-source Sonic the Hedgehog
- fangame built using a modified version of the Doom Legacy
- port of Doom. SRB2 is closely inspired by the original
- Sonic games from the Sega Genesis, and attempts to recreate
- the design in 3D. It features tons of levels, enemies, speed,
- and quite a lot of the fun that the original Sonic games provided.
- This is the data package that provides the data files that
- SRB2 requires to run; it will not work without it.

assets/debian-template/copyright

-This work was packaged for Debian by:
-
-    ${PACKAGE_NAME_EMAIL}  ${__PACKAGE_DATETIME}
-
-It was downloaded from:
-
-    ${PACKAGE_WEBSITE}
-
-Upstream Author(s):
-
-    ${PACKAGE_GROUP_NAME_EMAIL}
-
-Copyright:
-
-    Copyright (C) 1998-2025 by Sonic Team Junior
-
-License:
-
-    GNU General Public License, version 2
-
-The Debian packaging is:
-
-    Copyright (C) 2010 Callum Dickinson <gcfreak_ag20@hotmail.com>
-    Copyright (C) 2010-2025 by Sonic Team Junior <stjr@srb2.org>
-
-and is licensed under the GPL version 2,
-see "/usr/share/common-licenses/GPL-2".

assets/debian-template/rules

-#!/usr/bin/make -f
-# -*- makefile -*-
-
-#############################################################################
-#
-#     GNU Make Debian package makefile for SRB2-data
-#
-# Copyright (C) 1998-2011 by Callum Dickinson
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	See the
-# GNU General Public License for more details.
-#
-# This file most likely will not need to be modified to make
-# branches of SRB2 capable of making their own Debian packages,
-# instead look at the /debian/control file for configuration.
-#
-#############################################################################
-
-#############################################################################
-#
-# !!!!!!!!!! DEPLOYER NOTE !!!!!!!!!!
-#
-# Variables to be templated are curly-braced ${PACKAGE_INSTALL_PATH}
-# Variables used by the rules script are parenthese'd $(DATADIR)
-# See [repo-root]/debian_template.sh
-#
-#############################################################################
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-# user/group of to-be-installed files
-ROOT_USER  := 0
-ROOT_GROUP := 0
-
-MKDIR	:= mkdir -p
-INSTALL := install -o $(ROOT_USER) -g $(ROOT_GROUP) -m 644
-MV	:= mv
-RM	:= rm -rf
-DIR	:= $(shell pwd)
-
-PACKAGE := $(shell cat $(DIR)/debian/control | grep 'Package:' | sed -e 's/Package: //g')
-ARCHIVEPATH := ${ASSET_ARCHIVE_PATH}
-ARCHIVEOPTIONALPATH := ${ASSET_ARCHIVE_OPTIONAL_PATH}
-GETOPTIONALFILES := ${ASSET_FILES_OPTIONAL_GET}
-
-DATADIR	:= $(shell echo "${PACKAGE_INSTALL_PATH}" | sed -e 's/^\///')
-RESOURCEDIR := .
-STAGINGDIR := $(RESOURCEDIR)/installer
-WGET	:= wget -P $(RESOURCEDIR) -c -nc
-
-build:
-	$(MKDIR) $(DIR)/debian/tmp/$(DATADIR)
-	> $(DIR)/debian/source/include-binaries
-	# Copy data files to their install locations, and add data files to include-binaries
-	if [ ! -d $(STAGINGDIR) ]; then \
-		mkdir -p "$(STAGINGDIR)"; \
-		$(WGET) $(ARCHIVEPATH); \
-		7z x "$(RESOURCEDIR)/$(shell basename $(ARCHIVEPATH))" -aos; \
-		if [ "$(GETOPTIONALFILES)" = "1" ]; then \
-			$(WGET) $(ARCHIVEOPTIONALPATH); \
-			7z x "$(RESOURCEDIR)/$(shell basename $(ARCHIVEOPTIONALPATH))" -aos; \
-		fi; \
-	fi
-	# Install asset directory and add asset file to include-binaries
-	cp -vr "$(STAGINGDIR)/." "$(DIR)/debian/tmp/$(DATADIR)"
-	find "$(STAGINGDIR)" >> $(DIR)/debian/source/include-binaries
-
-
-binary-indep:
-	# Generate install folder file
-	echo $(DATADIR) > $(DIR)/debian/$(PACKAGE).install
-
-binary-arch:
-	# only here to kill Lintian warning
-	echo "no need to do any arch-specific stuff"
-
-binary: binary-indep
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs
-	# dh_installdocs
-	# dh_installexamples
-	dh_install --sourcedir=$(DIR)/debian/tmp
-	# dh_installmenu
-	# dh_installdebconf
-	# dh_installlogrotate
-	# dh_installemacsen
-	# dh_installpam
-	# dh_installmime
-	# dh_python
-	# dh_installinit
-	# dh_installcron
-	# dh_installinfo
-	# dh_installman
-	# dh_link
-	dh_compress
-	dh_fixperms
-	# dh_perl
-	# dh_makeshlibs
-	dh_installdeb
-	# -dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-clean:
-	$(RM) $(DIR)/debian/tmp/*; \
-	$(RM) $(DIR)/debian/$(PACKAGE).install; \
-	$(RM) $(DIR)/debian/files; \
-
-clean-all: clean
-	$(RM) $(RESOURCEDIR)/*.wad; \
-	$(RM) $(RESOURCEDIR)/*.dta; \
-	$(RM) $(RESOURCEDIR)/*.plr; \
-	$(RM) $(RESOURCEDIR)/*.wpn; \
-	$(RM) $(RESOURCEDIR)/*.srb; \
-	$(RM) $(RESOURCEDIR)/*.dll; \
-	$(RM) $(RESOURCEDIR)/*.txt; \
-	$(RM) $(DIR)/debian/source/include-binaries; \
-
-.PHONY: all clean binary binary-arch binary-indep build

assets/debian-template/source/format

-3.0 (native)

assets/debian-template/source/options

-tar-ignore = "tmp/*"

debian-template/README.Debian

-srb2 for Debian
----------------
-
-SRB2 Debian package!
-Hi there, to rebuild these packages just use debuild in the root source directory (not /src!).
-You can build these with or without a key if you want, but if you want to put these on a repo,
-generate your own GnuPG key as per the https://help.ubuntu.com/community/GnuPrivacyGuardHowto
-instructions and pass the -k<keyid> command to debuild. Make sure you export the key footprint
-and give them to your users to install with apt-key add. Thanks!
-
- -- Callum Dickinson <gcfreak_ag20@hotmail.com>  Fri, 26 Nov 2010 18:25:31 +1300
-
----------------
-
-
-Templating
-
-Note that you MUST run [repo-root]/debian_template.sh before running debuild
-on these scripts! debian_template.sh fills these template files with working values.
-
-You should also set PACKAGE_NAME_EMAIL="John Doe <jdoe@example.com>" to match
-the identity of the key you will use to sign the package.
-
-
-Building for Launchpad PPA
-
-Use these steps to prepare building a source package for Launchpad:
-
-    1. cd [repo-root]
-    2. git reset --hard; git clean -fd; git clean -fx;
-       * Resets your repo folder to a committed state and removes untracked files
-       * If you built srb2-data in the assets/ folder, MAKE SURE THAT FOLDER DOES NOT HAVE ASSETS,
-         OR THEY MAY BE INCLUDED IN THE MAIN SOURCE PACKAGE!
-
-Build the source package:
-
-    1. source [repo-root]/debian_template.sh
-       * Initializes defaults for the package variables and fills in templates.
-    2. debuild -S (builds the source package for Launchpad)
-
-
-Signing for Launchpad PPA
-
-First, follow Callum's instructions to generate a GnuPG key with your identity. You will need
-to publish the fingerprint of that key to Ubuntu's key server.
-
-    https://help.ubuntu.com/community/GnuPrivacyGuardHowto#Uploading_the_key_to_Ubuntu_keyserver
-
-Next, you will have to add that key fingerprint to your Launchpad account. Go to your Launchpad
-profile and click the yellow Edit button next to "OpenPGP keys". Once you add the key, you can
-upload signed source packages and publish them onto your PPA.
-
-IF YOU UPLOAD A PACKAGE and Launchpad does NOT send you a confirmation or rejection email, that
-means your key is not set up correctly with your Launchpad account.
-
-Finally, if your packages have not already been signed, follow these steps:
-
-    1. cd ..
-       * Packages are located in the parent folder of where debuild was called
-    2. debsign "srb2_[version]_source.changes"
-       * You may need to specify -k [key-fingerprint]
-
-
-Uploading for Launchpad PPA
-
-Follow the instructions at <https://help.launchpad.net/Packaging/PPA/Uploading> to upload
-to your PPA and have Launchpad build your binary deb packages.
-
-
- -- Marco Zafra <marco.a.zafra@gmail.com>  Mon, 26 Nov 2018 21:13:00 -0500