Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sdl3 test build ng #935

Open
wants to merge 21 commits into
base: ng
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,9 @@ on:
jobs:
linux:
uses: minecraft-linux/appimage-builder/.github/workflows/main.yml@main
with:
mcpelauncher-ref: ${{ github.sha }}
macOS:
uses: minecraft-linux/macos-builder/.github/workflows/main.yml@main
uses: minecraft-linux/macos-builder/.github/workflows/main.yml@main
with:
mcpelauncher-ref: ${{ github.sha }}
1 change: 1 addition & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ if (BUILD_CLIENT)
endif()

include(game-window/BuildSettings.cmake)
set(GAMEWINDOW_SYSTEM "SDL3" CACHE STRING "" FORCE)
if (USE_SDL3_AUDIO OR GAMEWINDOW_SYSTEM STREQUAL "SDL3")
if(NOT GAMEWINDOW_SYSTEM STREQUAL "SDL3")
set(SDL_WAYLAND OFF CACHE BOOL "" FORCE)
Expand Down
36 changes: 18 additions & 18 deletions ext/sdl3.cmake
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
# Create an option to switch between a system sdl library and a vendored SDL library
option(SDL3_VENDORED "Use vendored sdl3 libraries" ON)
if(SDL3_VENDORED)
set(SDL3_VENDORED ON CACHE BOOL "" FORCE)
set(SDL_SHARED OFF CACHE BOOL "" FORCE)
set(SDL_STATIC ON CACHE BOOL "" FORCE)
set(SDL_CAMERA OFF CACHE BOOL "" FORCE)
set(SDL_RENDER OFF CACHE BOOL "" FORCE)
set(SDL_DIALOG OFF CACHE BOOL "" FORCE)
set(SDL_SENSOR OFF CACHE BOOL "" FORCE)
set(SDL_VIDEO_DRIVER_X11_SUPPORTS_GENERIC_EVENTS 1 CACHE STRING "" FORCE)
add_subdirectory(sdl3 EXCLUDE_FROM_ALL)
else()
# 1. Look for a SDL3 package,
# 2. look for the SDL3-shared component, and
# 3. fail if the shared component cannot be found.
find_package(SDL3 REQUIRED CONFIG REQUIRED COMPONENTS SDL3-shared)
# Create an option to switch between a system sdl library and a vendored SDL library
option(SDL3_VENDORED "Use vendored sdl3 libraries" ON)

if(SDL3_VENDORED)
set(SDL3_VENDORED ON CACHE BOOL "" FORCE)
set(SDL_SHARED OFF CACHE BOOL "" FORCE)
set(SDL_STATIC ON CACHE BOOL "" FORCE)
set(SDL_CAMERA OFF CACHE BOOL "" FORCE)
set(SDL_RENDER OFF CACHE BOOL "" FORCE)
set(SDL_DIALOG OFF CACHE BOOL "" FORCE)
set(SDL_SENSOR OFF CACHE BOOL "" FORCE)
set(SDL_VIDEO_DRIVER_X11_SUPPORTS_GENERIC_EVENTS 1 CACHE STRING "" FORCE)
add_subdirectory(sdl3 EXCLUDE_FROM_ALL)
else()
# 1. Look for a SDL3 package,
# 2. look for the SDL3-shared component, and
# 3. fail if the shared component cannot be found.
find_package(SDL3 REQUIRED CONFIG REQUIRED COMPONENTS SDL3-shared)
endif()
Loading