diff --git a/.github/workflows/build_linux.yml b/.github/workflows/build_linux.yml
index bc1f4167c..836744181 100644
--- a/.github/workflows/build_linux.yml
+++ b/.github/workflows/build_linux.yml
@@ -25,7 +25,7 @@ jobs:
         run: |
           sudo dpkg --add-architecture i386
           sudo apt-get -y update
-          sudo apt-get -y install gcc-multilib libx11-dev:i386 libxi-dev:i386 libgl1-mesa-dev:i386
+          sudo apt-get -y install gcc-multilib libx11-dev:i386 libxi-dev:i386 libgl1-mesa-dev:i386 libsdl2-dev:i386
       - name: Compile 32 bit Linux builds
         shell: bash
         id: compile
@@ -33,11 +33,12 @@ jobs:
           COMMON_FLAGS: "-O1 -s -fno-stack-protector -fno-math-errno -Qn"
           NIX32_FLAGS:  "-no-pie -fno-pie -m32 -fvisibility=hidden -fcf-protection=none -rdynamic -DCC_BUILD_ICON"
         run: |
-          LATEST_FLAG=-DCC_COMMIT_SHA=\"$(git rev-parse --short "$GITHUB_SHA")\"  
+          LATEST_FLAG=-DCC_COMMIT_SHA=\"$(git rev-parse --short "$GITHUB_SHA")\"
           
           cd src
           gcc *.c ${{ env.COMMON_FLAGS }} ${{ env.NIX32_FLAGS }} $LATEST_FLAG -o cc-nix32-gl1 -lX11 -lXi -lpthread -lGL -lm -ldl
           gcc *.c ${{ env.COMMON_FLAGS }} ${{ env.NIX32_FLAGS }} $LATEST_FLAG -DCC_BUILD_GLMODERN -o cc-nix32-gl2 -lX11 -lXi -lpthread -lGL -lm -ldl
+          gcc *.c ${{ env.COMMON_FLAGS }} ${{ env.NIX32_FLAGS }} $LATEST_FLAG -DCC_BUILD_GLMODERN -DCC_WIN_BACKEND=CC_WIN_BACKEND_SDL2 -o cc-sdl32-gl2 -lSDL2 -lpthread -lGL -lm -ldl
 
 
       - uses: ./.github/actions/notify_failure
@@ -59,6 +60,12 @@ jobs:
           SOURCE_FILE: 'src/cc-nix32-gl2'
           DEST_NAME: 'ClassiCube-Linux32-ModernGL'
           
+      - uses: ./.github/actions/upload_build
+        if: ${{ always() && steps.compile.outcome == 'success' }}
+        with:
+          SOURCE_FILE: 'src/cc-sdl32-gl2'
+          DEST_NAME: 'ClassiCube-Linux32-SDL2'
+          
           
       - uses: ./.github/actions/notify_success
         if: ${{ always() && steps.compile.outcome == 'success' }}
@@ -80,12 +87,13 @@ jobs:
           COMMON_FLAGS: "-O1 -s -fno-stack-protector -fno-math-errno -Qn"
           NIX64_FLAGS:  "-no-pie -fno-pie -m64 -fvisibility=hidden -fcf-protection=none -rdynamic -DCC_BUILD_ICON"
         run: |
-          sudo apt-get -y install libx11-dev libxi-dev libgl1-mesa-dev
+          sudo apt-get -y install libx11-dev libxi-dev libgl1-mesa-dev libsdl2-dev
           LATEST_FLAG=-DCC_COMMIT_SHA=\"$(git rev-parse --short "$GITHUB_SHA")\"  
           
           cd src
           gcc *.c ${{ env.COMMON_FLAGS }} ${{ env.NIX64_FLAGS }} $LATEST_FLAG -o cc-nix64-gl1 -lX11 -lXi -lpthread -lGL -lm -ldl
           gcc *.c ${{ env.COMMON_FLAGS }} ${{ env.NIX64_FLAGS }} $LATEST_FLAG -DCC_BUILD_GLMODERN -o cc-nix64-gl2 -lX11 -lXi -lpthread -lGL -lm -ldl
+          gcc *.c ${{ env.COMMON_FLAGS }} ${{ env.NIX64_FLAGS }} $LATEST_FLAG -DCC_BUILD_GLMODERN -DCC_WIN_BACKEND=CC_WIN_BACKEND_SDL2 -o cc-sdl64-gl2 -lSDL2 -lpthread -lGL -lm -ldl
 
 
       - uses: ./.github/actions/notify_failure
@@ -107,6 +115,12 @@ jobs:
           SOURCE_FILE: 'src/cc-nix64-gl2'
           DEST_NAME: 'ClassiCube-Linux64-ModernGL'
           
+      - uses: ./.github/actions/upload_build
+        if: ${{ always() && steps.compile.outcome == 'success' }}
+        with:
+          SOURCE_FILE: 'src/cc-sdl64-gl2'
+          DEST_NAME: 'ClassiCube-Linux64-SDL2'
+          
           
       - uses: ./.github/actions/notify_success
         if: ${{ always() && steps.compile.outcome == 'success' }}
diff --git a/src/Core.h b/src/Core.h
index 56d7c005a..33367429f 100644
--- a/src/Core.h
+++ b/src/Core.h
@@ -417,6 +417,9 @@ typedef cc_uint8  cc_bool;
 #if defined DEFAULT_WIN_BACKEND && !defined CC_WIN_BACKEND
 	#define CC_WIN_BACKEND DEFAULT_WIN_BACKEND
 #endif
+#if defined DEFAULT_GFX_BACKEND && !defined CC_GFX_BACKEND
+	#define CC_GFX_BACKEND DEFAULT_GFX_BACKEND
+#endif
 
 #ifdef CC_BUILD_CONSOLE
 #undef CC_BUILD_FREETYPE