Merge pull request #43 from BenjamenMeyer/enhancement_sdl2_support

Enhancement: SDL2 support
vegastrike · Sep 30, 2023 · 2b974c1 · 2b974c1
2 parents 4326cc7 + b96820b
commit 2b974c1
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 35 deletions.
diff --git a/.github/workflows/Anchore-Container-Scan.yml b/.github/workflows/Anchore-Container-Scan.yml
@@ -22,7 +22,6 @@ jobs:
       matrix:
         FROM:
           - 'ubuntu:lunar'
-          - 'ubuntu:kinetic'
           - 'ubuntu:jammy'
           - 'ubuntu:focal'
           - 'ubuntu:bionic'

diff --git a/.github/workflows/gh-actions-pr.yml b/.github/workflows/gh-actions-pr.yml
@@ -12,7 +12,6 @@ jobs:
       matrix:
         FROM:
           - 'ubuntu:lunar'
-          - 'ubuntu:kinetic'
           - 'ubuntu:jammy'
           - 'ubuntu:focal'
           - 'ubuntu:bionic'

diff --git a/.github/workflows/gh-actions-release.yml b/.github/workflows/gh-actions-release.yml
@@ -19,7 +19,6 @@ jobs:
       matrix:
         FROM:
           - 'ubuntu:lunar'
-          - 'ubuntu:kinetic'
           - 'ubuntu:jammy'
           - 'ubuntu:focal'
           - 'ubuntu:bionic'

diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
 .editorconfig
+*.sw?
diff --git a/script/bootstrap b/script/bootstrap
@@ -81,6 +81,7 @@ function bootstrapOnDebian()
                       libglvnd-dev \
                       libgl1-mesa-dev \
                       libsdl1.2-dev \
+                      libsdl2-dev \
                       libpostproc-dev \
                       freeglut3-dev \
                       libboost-python-dev \
@@ -111,6 +112,7 @@ function bootstrapOnDebian()
                       libglvnd-dev \
                       libgl1-mesa-dev \
                       libsdl1.2-dev \
+                      libsdl2-dev \
                       libpostproc-dev \
                       freeglut3-dev \
                       libboost-python-dev \
@@ -139,6 +141,7 @@ function bootstrapOnDebian()
                       libglvnd-dev \
                       libgl1-mesa-dev \
                       libsdl1.2-dev \
+                      libsdl2-dev \
                       libpostproc-dev \
                       freeglut3-dev \
                       libboost-python-dev \
@@ -195,38 +198,7 @@ function bootstrapOnUbuntu()
                       libglvnd-dev \
                       libgl1-mesa-dev \
                       libsdl1.2-dev \
-                      libopengl0 \
-                      libpostproc-dev \
-                      freeglut3-dev \
-                      libboost-python-dev \
-                      libboost-log-dev \
-                      libboost-regex-dev \
-                      libboost-program-options-dev \
-                      libxmu-dev \
-                      clang \
-                      lsb-release
-      ;;
-    "kinetic")
-      apt-get -qy install \
-                      git \
-                      cmake \
-                      python3-dev \
-                      build-essential \
-                      automake \
-                      autoconf \
-                      libpng16-16 \
-                      libpng-dev \
-                      libpng-tools \
-                      libjpeg-turbo8-dev \
-                      libexpat1-dev \
-                      libgdk-pixbuf-2.0-dev \
-                      libgtk-3-dev \
-                      libopenal-dev \
-                      libogg-dev \
-                      libvorbis-dev \
-                      libglvnd-dev \
-                      libgl1-mesa-dev \
-                      libsdl1.2-dev \
+                      libsdl2-dev \
                       libopengl0 \
                       libpostproc-dev \
                       freeglut3-dev \
@@ -259,6 +231,7 @@ function bootstrapOnUbuntu()
                       libglvnd-dev \
                       libgl1-mesa-dev \
                       libsdl1.2-dev \
+                      libsdl2-dev \
                       libopengl0 \
                       libpostproc-dev \
                       freeglut3-dev \
@@ -290,6 +263,7 @@ function bootstrapOnUbuntu()
                       libglvnd-dev \
                       libgl1-mesa-dev \
                       libsdl1.2-dev \
+                      libsdl2-dev \
                       libopengl0 \
                       libpostproc-dev \
                       freeglut3-dev \
@@ -320,6 +294,7 @@ function bootstrapOnUbuntu()
                       libglvnd-dev \
                       libgl1-mesa-dev \
                       libsdl1.2-dev \
+                      libsdl2-dev \
                       libopengl0 \
                       libpostproc-dev \
                       freeglut3-dev \
@@ -340,6 +315,7 @@ function bootstrapOnUbuntu()
                       freeglut3-dev \
                       libopenal-dev \
                       libsdl-gfx1.2-dev \
+                      libsdl2-dev \
                       libvorbis-dev \
                       libjpeg-dev \
                       libpng-dev \
@@ -405,6 +381,7 @@ function bootstrapOnPopOS ()
                       libglvnd-dev \
                       libgl1-mesa-dev \
                       libsdl1.2-dev \
+                      libsdl2-dev \
                       libopengl0 \
                       libpostproc-dev \
                       freeglut3-dev \
@@ -454,6 +431,7 @@ function bootstrapOnLinuxMint ()
                       libglvnd-dev \
                       libgl1-mesa-dev \
                       libsdl1.2-compat-dev \
+                      libsdl2-dev \
                       libopengl0 \
                       libpostproc-dev \
                       freeglut3-dev \
@@ -486,6 +464,7 @@ function bootstrapOnLinuxMint ()
                       libglvnd-dev \
                       libgl1-mesa-dev \
                       libsdl1.2-dev \
+                      libsdl2-dev \
                       libopengl0 \
                       libpostproc-dev \
                       freeglut3-dev \
@@ -516,6 +495,7 @@ function bootstrapOnLinuxMint ()
                       libglvnd-dev \
                       libgl1-mesa-dev \
                       libsdl1.2-dev \
+                      libsdl2-dev \
                       libopengl0 \
                       libpostproc-dev \
                       freeglut3-dev \

diff --git a/script/local-test-ci.sh b/script/local-test-ci.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+export FROM="debian:bullseye"
+export MY_OS_NAME="linux"
+export IS_RELEASE=0
+
+#./script/cibuild
+export DOCKER_IMG_NAME="vegastrike/vega-strike-build-env:$(echo "$FROM" | sed 's/:/_/' | sed 's/\//_/')"
+docker build --build-arg from="$FROM" -t "$DOCKER_IMG_NAME" .