Remove SDL 1.2

Author: electricbrass

.github/workflows/linux.yml

@@ -37,22 +37,6 @@ jobs:
       with:
         name: Odamex-Linux-x86_64
         path: 'build/artifact/*'
-  build-sdl12:
-    name: Build (SDL 1.2)
-    needs: pre_job
-    if: ${{ needs.pre_job.outputs.should_skip != 'true' }}
-    runs-on: ubuntu-latest
-    env:
-      USE_SDL12: 1
-    steps:
-    - name: Checkout source
-      uses: actions/checkout@v4
-    - name: Checkout submodules
-      run: git submodule update --init --recursive
-    - name: Prepare build
-      run: bash ci/ubuntu-buildgen.sh
-    - name: Run build
-      run: cmake --build ./build/
   build-clang:
     name: Build (Clang)
     needs: pre_job

ci/ubuntu-buildgen.sh

@@ -9,24 +9,12 @@ set -x
 
 # Install packages
 sudo apt update
-if [[ -z ${USE_SDL12:-} ]]; then
-    sudo apt install ninja-build libsdl2-dev libsdl2-mixer-dev \
-        libcurl4-openssl-dev libpng-dev libwxgtk3.2-dev deutex
-else
-    sudo apt install ninja-build libsdl1.2-dev libsdl-mixer1.2-dev \
-        libcurl4-openssl-dev libpng-dev libwxgtk3.2-dev deutex
-fi
+sudo apt install ninja-build libsdl2-dev libsdl2-mixer-dev \
+    libcurl4-openssl-dev libpng-dev libwxgtk3.2-dev deutex
 
 # Generate build
 mkdir -p build && cd build
-if [[ -z ${USE_SDL12:-} ]]; then
-    cmake .. -GNinja \
-        -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-        -DBUILD_OR_FAIL=1 -DBUILD_CLIENT=1 -DBUILD_SERVER=1 \
-        -DBUILD_MASTER=1 -DBUILD_LAUNCHER=1
-else
-    cmake .. -GNinja \
-        -DCMAKE_BUILD_TYPE=RelWithDebInfo -DUSE_SDL12=1 \
-        -DBUILD_OR_FAIL=1 -DBUILD_CLIENT=1 -DBUILD_SERVER=1 \
-        -DBUILD_MASTER=1 -DBUILD_LAUNCHER=1
-fi
+cmake .. -GNinja \
+    -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+    -DBUILD_OR_FAIL=1 -DBUILD_CLIENT=1 -DBUILD_SERVER=1 \
+    -DBUILD_MASTER=1 -DBUILD_LAUNCHER=1

client/sdl/i_input.cpp

@@ -48,9 +48,7 @@
 	#include "nx_io.h"
 #endif
 
-#if defined(SDL12)
-#include "i_input_sdl12.h"
-#elif defined(SDL20)
+#if defined(SDL20)
 #include "i_input_sdl20.h"
 #endif
 
@@ -434,7 +432,7 @@ static void I_UpdateGrab()
 	// force I_ResumeMouse or I_PauseMouse if toggling between fullscreen/windowed
 	bool fullscreen = I_GetWindow()->isFullScreen();
 	static bool prev_fullscreen = fullscreen;
-	if (fullscreen != prev_fullscreen) 
+	if (fullscreen != prev_fullscreen)
 		I_ForceUpdateGrab();
 	prev_fullscreen = fullscreen;
 
@@ -478,7 +476,7 @@ CVAR_FUNC_IMPL(joy_active)
 		}
 	}
 
-#ifdef GCONSOLE	
+#ifdef GCONSOLE
 	// Don't let console users choose an invalid joystick because
 	// they won't have any way to reenable through the menu.
 	if (!devices.empty())
@@ -517,7 +515,7 @@ std::string I_GetJoystickNameFromIndex(int index)
 bool I_OpenJoystick()
 {
 	I_CloseJoystick();		// just in case it was left open...
-	
+
 	if (use_joystick != 0)
 	{
 		// Verify that the joystick ID indicated by the joy_active CVAR
@@ -596,9 +594,7 @@ bool I_InitInput()
 
 	atterm(I_ShutdownInput);
 
-	#if defined(SDL12)
-	input_subsystem = new ISDL12InputSubsystem();
-	#elif defined(SDL20)
+	#if defined(SDL20)
 	input_subsystem = new ISDL20InputSubsystem();
 	#endif
 
@@ -794,7 +790,7 @@ void IInputSubsystem::disableTextEntry()
 // Joystick hat events also repeat but each directional trigger repeats
 // concurrently as long as they are held down. Thus a unique value is returned
 // for each of them.
-// 
+//
 static int I_GetEventRepeaterKey(const event_t* ev)
 {
 	if (ev->type != ev_keydown && ev->type != ev_keyup)