Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
[submodule "3rdparty/minhook"]
path = 3rdparty/minhook
url = https://github.com/mumble-voip/minhook.git
[submodule "3rdparty/mach-override-src"]
path = 3rdparty/mach-override-src
url = https://github.com/mumble-voip/mach_override.git
[submodule "3rdparty/speexdsp"]
path = 3rdparty/speexdsp
url = https://github.com/xiph/speexdsp.git
Expand Down
48 changes: 0 additions & 48 deletions 3rdparty/mach-override-build/CMakeLists.txt

This file was deleted.

1 change: 0 additions & 1 deletion 3rdparty/mach-override-src
Submodule mach-override-src deleted from 919148
15 changes: 2 additions & 13 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ if(NOT DEFINED CMAKE_CXX_STANDARD OR CMAKE_CXX_STANDARD LESS 20)
set(CMAKE_CXX_STANDARD 20)
endif()
set(CMAKE_CXX_EXTENSIONS OFF)
set(CMAKE_OSX_DEPLOYMENT_TARGET 10.15)
set(CMAKE_OSX_DEPLOYMENT_TARGET 14)


include(pkg-utils)
Expand Down Expand Up @@ -95,7 +95,7 @@ include(os)
target_architecture(MUMBLE_TARGET_ARCH)
string(TOLOWER "${MUMBLE_TARGET_ARCH}" MUMBLE_TARGET_ARCH)

if(NOT ${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD")
if(NOT ${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD" AND NOT APPLE)
option(overlay "Build overlay." ${client})
if(64_BIT AND NOT MUMBLE_TARGET_ARCH STREQUAL "arm64")
option(overlay-xcompile "Build 32 bit overlay library, necessary for the overlay to work with 32 bit processes." ${client})
Expand Down Expand Up @@ -177,24 +177,13 @@ if(g15 AND WIN32)
add_subdirectory("helpers/g15helper")
endif()

if(APPLE AND MUMBLE_TARGET_ARCH MATCHES "arm.*")
# mach_override doesn't support ARM
# https://github.com/rentzsch/mach_override/issues/6
set(overlay OFF CACHE BOOL "" FORCE)
message(STATUS "Disabling the overlay on ARM macOS")
endif()

if(overlay)
if(WIN32)
add_subdirectory(overlay)
else()
if(NOT CMAKE_SYSTEM_PROCESSOR MATCHES "arm|aarch64")
add_subdirectory(overlay_gl)
endif()

if(APPLE)
add_subdirectory(macx/osax)
endif()
endif()
endif()

Expand Down
153 changes: 0 additions & 153 deletions helpers/g15helper/g15helper_macx.c

This file was deleted.

35 changes: 0 additions & 35 deletions macx/osax/CMakeLists.txt

This file was deleted.

8 changes: 0 additions & 8 deletions macx/osax/MumbleOverlay.sdef

This file was deleted.

28 changes: 0 additions & 28 deletions macx/osax/osax.m

This file was deleted.

45 changes: 0 additions & 45 deletions macx/osax/osax.plist.in

This file was deleted.

Loading
Loading