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.

Sign up for GitHub

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

Jump to bottom

[macOS] Default to nativewindowing #23438

Merged
merged 1 commit into from Jun 25, 2023
Merged

[macOS] Default to nativewindowing #23438

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 5 additions & 5 deletions docs/README.macOS.md
View file
Open in desktop
Expand Up @@ -114,9 +114,9 @@ make -j$(getconf _NPROCESSORS_ONLN)
./configure --host=x86_64-apple-darwin --with-platform=macos --with-sdk=10.14
```

Developers can also select native windowing/input handling with the following
Developers can also select the legacy SDL windowing/input handling with the following
```
./configure --host=x86_64-apple-darwin --with-platform=macos --with-windowsystem=native
./configure --host=x86_64-apple-darwin --with-platform=macos --with-windowsystem=sdl
```

### 4.1. Advanced Configure Options
Expand Down Expand Up @@ -189,7 +189,7 @@ Developers can also select native windowing/input handling with the following
```
--with-windowsystem=<native:sdl>
```
Windowing system to use (default is sdl when not provided). arm64 MacOS requires native
Windowing system to use (default is native windowing when not provided). arm64 MacOS does not support SDL windowing.

```
--with-sdk=<sdknumber>
Expand Down Expand Up @@ -241,9 +241,9 @@ Generate Xcode project as per configure command in **[Configure and build tools
make -C tools/depends/target/cmakebuildsys BUILD_DIR=$HOME/kodi-build GEN=Xcode
```

To explicitly select the windowing/input system to use do the following (default is to use SDL if not provided)
To explicitly select the windowing/input system to use do the following (default is to use native if not provided)
```
make -C tools/depends/target/cmakebuildsys BUILD_DIR=$HOME/kodi-build GEN=Xcode APP_WINDOW_SYSTEM=native
make -C tools/depends/target/cmakebuildsys BUILD_DIR=$HOME/kodi-build GEN=Xcode APP_WINDOW_SYSTEM=sdl
```

**TIP:** BUILD_DIR can be omitted, and project will be created in $HOME/kodi/build
Expand Down
4 changes: 2 additions & 2 deletions tools/depends/configure.ac
View file
Open in desktop
Expand Up @@ -464,13 +464,13 @@ case $host in
target_minver="10.14"

# check provided window system is valid_sdk
# if no window system supplied, default to SDL for now.
# if no window system supplied, default to native.
if test -n "$app_winsystem"; then
if test "$app_winsystem" != "native" && test "$app_winsystem" != "sdl"; then
AC_MSG_ERROR(Window system must be native or sdl)
fi
else
app_winsystem=sdl
app_winsystem=native
fi
;;
aarch64-apple-darwin*)
Expand Down
6 changes: 3 additions & 3 deletions tools/depends/target/cmakebuildsys/Makefile
View file
Open in desktop
Expand Up @@ -29,10 +29,10 @@ else
endif

ifeq ($(OS),osx)
ifeq ($(APP_WINDOW_SYSTEM),native)
WINDOWSYSTEM=-DAPP_WINDOW_SYSTEM=native
else
ifeq ($(APP_WINDOW_SYSTEM),sdl)
WINDOWSYSTEM=-DAPP_WINDOW_SYSTEM=sdl
else
WINDOWSYSTEM=-DAPP_WINDOW_SYSTEM=native
endif
endif

Expand Down