Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: SuperTux/supertux
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: tuxecure/supertux
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Able to merge. These branches can be automatically merged.
3 contributors

Commits on Sep 12, 2024

  1. support for armhf

    @jhay06
    jhay06 committed Sep 12, 2024
    Copy the full SHA
    17c4d56 View commit details

  2. make SDL_ttf a static module dependency

    @jhay06
    jhay06 committed Sep 12, 2024
    Copy the full SHA
    b0a49cc View commit details

  3. add modified SDL_ttf for MIR

    @jhay06
    jhay06 committed Sep 12, 2024
    Copy the full SHA
    7c6dcb4 View commit details

  4. Merge pull request #3 from tuxecure/sdl2mir-armhf-arm64-amd64 

    Sdl2mir armhf arm64 amd64
    @jhayar0719
    jhayar0719 authored Sep 12, 2024
    Copy the full SHA
    614353d View commit details

  5. add MIR_BUILD macros , it requires to load QGuiApp on focal to show t… 

    …he window
    @jhay06
    jhay06 committed Sep 12, 2024
    Copy the full SHA
    d44da84 View commit details

  6. Merge pull request #4 from tuxecure/sdl2mir-armhf-arm64-amd64 

    add MIR_BUILD macros , it requires to load QGuiApp on focal to show t…
    @jhayar0719
    jhayar0719 authored Sep 12, 2024
    Copy the full SHA
    8583709 View commit details

  7. edit clickable.yaml , changed local IP :port to ubportslibpatches url

    @jhay06
    jhay06 committed Sep 12, 2024
    Copy the full SHA
    49a2040 View commit details

  8. Merge pull request #5 from tuxecure/sdl2mir-armhf-arm64-amd64 

    edit clickable.yaml , changed local IP :port to ubportslibpatches url
    @jhayar0719
    jhayar0719 authored Sep 12, 2024
    Copy the full SHA
    8a1b0cb View commit details

  9. removed the double https://

    @jhay06
    jhay06 committed Sep 12, 2024
    Copy the full SHA
    aa2002e View commit details

  10. Merge pull request #6 from tuxecure/sdl2mir-armhf-arm64-amd64 

    removed the double https://
    @jhayar0719
    jhayar0719 authored Sep 12, 2024
    Copy the full SHA
    f1da81c View commit details

Commits on Sep 16, 2024

  1. reduce it to just sdl builds for ubuntu touch

    @Fuseteam
    Fuseteam authored Sep 16, 2024
    Copy the full SHA
    4acfd26 View commit details

  2. reduce the matrix to sdl only

    @Fuseteam
    Fuseteam authored Sep 16, 2024
    Copy the full SHA
    bf0eed8 View commit details

  3. fix error

    @Fuseteam
    Fuseteam authored Sep 16, 2024
    Copy the full SHA
    6df7ef3 View commit details

Commits on Sep 17, 2024

  1. added libhybris , setting SDL_VIDEODRIVER as null and setting QT_QPA_… 

    …PLATFORm to ubuntumirclient
    @jhay06
    jhay06 committed Sep 17, 2024
    Copy the full SHA
    616acdd View commit details

  2. Merge pull request #7 from tuxecure/libhybris_additional 

    added libhybris , setting SDL_VIDEODRIVER as null and setting QT_QPA_…
    @jhayar0719
    jhayar0719 authored Sep 17, 2024
    Copy the full SHA
    6543092 View commit details

  3. include debug builds for arm64

    @Fuseteam
    Fuseteam authored Sep 17, 2024
    Copy the full SHA
    4d2091a View commit details

Commits on Sep 27, 2024

  1. SDL_WAYLAND_EGL init

    @jhayar0719
    jhayar0719 committed Sep 27, 2024
    Copy the full SHA
    92eca69 View commit details

  2. Added Droidian support egl

    @jhayar0719
    jhayar0719 committed Sep 27, 2024
    Copy the full SHA
    8a4c580 View commit details

  3. set tinygettext to hash cbd7e8b8067cc8abe3207233cd035ca8742a3d98, thi… 

    …s is the only working hash for Ubuntu touch
    @jhayar0719
    jhayar0719 committed Sep 27, 2024
    Copy the full SHA
    1852cc4 View commit details

  4. reverting to original SDL_ttf provided with Supertux

    @jhayar0719
    jhayar0719 committed Sep 27, 2024
    Copy the full SHA
    40aa84e View commit details

  5. bringback the original SDL_ttf from main upstream

    @jhayar0719
    jhayar0719 committed Sep 27, 2024
    Copy the full SHA
    86ee1fc View commit details
24 changes: 1 addition & 23 deletions .github/workflows/ubuntu-touch.yml
View file
Original file line number Diff line number Diff line change
@@ -33,11 +33,7 @@ jobs:
build_type: [Debug, Release]
arch: [amd64, arm64, armhf]
# glbinding is missing as it isn't available on Ubuntu 16.04
opengl: [glew, sdl]
exclude:
# FIXME: Debug builds don't work for arm64
- arch: arm64
build_type: Debug
opengl: [ sdl ]

runs-on: ubuntu-20.04
steps:
@@ -61,24 +57,6 @@ jobs:
sudo systemctl unmask docker.service
sudo systemctl start docker.service
- name: Build (OpenGL with GLEW)
if: ${{ matrix.opengl == 'glew' }}
env:
BUILD_TYPE: ${{ (matrix.build_type == 'Debug') && '--debug' || '' }}
ARCH: ${{ matrix.arch }}
run: |
~/.local/bin/clickable build --verbose ${BUILD_TYPE} --arch ${ARCH} \
--config mk/clickable/clickable-glew.yaml
- name: Build (OpenGL with GLbinding)
if: ${{ matrix.opengl == 'glbinding' }}
env:
BUILD_TYPE: ${{ (matrix.build_type == 'Debug') && '--debug' || '' }}
ARCH: ${{ matrix.arch }}
run: |
~/.local/bin/clickable build --verbose ${BUILD_TYPE} --arch ${ARCH} \
--config mk/clickable/clickable-glbinding.yaml
- name: Build (no OpenGL)
if: ${{ matrix.opengl == 'sdl' }}
env:
6 changes: 3 additions & 3 deletions .gitmodules
View file
Original file line number Diff line number Diff line change
@@ -7,9 +7,6 @@
[submodule "external/physfs"]
path = external/physfs
url = https://github.com/icculus/physfs.git
[submodule "external/SDL_ttf"]
path = external/SDL_ttf
url = https://github.com/SuperTux/SDL_ttf
[submodule "discord-sdk"]
path = external/discord-sdk
url = https://github.com/SuperTux/discord-rpc
@@ -22,3 +19,6 @@
[submodule "external/simplesquirrel"]
path = external/simplesquirrel
url = https://github.com/SuperTux/simplesquirrel
[submodule "external/SDL_ttf"]
path = external/SDL_ttf
url = https://github.com/SuperTux/SDL_ttf
8 changes: 8 additions & 0 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -275,6 +275,14 @@ target_link_libraries(supertux2_lib PUBLIC LibFmt)
target_link_libraries(supertux2_lib PUBLIC LibPhysfs)

if(NOT EMSCRIPTEN)

IF(UBUNTU_TOUCH)
find_package(Qt5Gui REQUIRED) #LOMIRI doesnt start without starting QGui
find_package(Qt5Core REQUIRED)
target_compile_definitions(supertux2_lib PUBLIC USE_OPENGLES2=ON)
target_link_libraries(supertux2_lib PUBLIC Qt5::Gui Qt5::Core)
endif()

target_link_libraries(supertux2_lib PUBLIC LibSDL2_ttf)
target_link_libraries(supertux2_lib PUBLIC LibSDL2 LibSDL2_image)
target_link_libraries(supertux2_lib PUBLIC LibOggVorbis)
Loading