Skip to content

Commit

Permalink
Merge branch 'MUME:master' into jahara-memory-leak
Browse files Browse the repository at this point in the history
  • Loading branch information
nschimme authored Oct 22, 2023
2 parents 9a0b0dd + f798b50 commit 237cbf1
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 deletions.
12 changes: 7 additions & 5 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ environment:
image:
# AppVeyor builds are ordered by the image list:
- Visual Studio 2019
- macos-bigsur
- macos-monterey
- Ubuntu1804
- Ubuntu2004
- Previous Ubuntu2004
Expand Down Expand Up @@ -63,11 +63,11 @@ matrix:
COMPILER: MinGW
- image: Previous Ubuntu2004
COMPILER: MSVC
- image: macos-bigsur
- image: macos-monterey
COMPILER: GCC
- image: macos-bigsur
- image: macos-monterey
COMPILER: MinGW
- image: macos-bigsur
- image: macos-monterey
COMPILER: MSVC
# Following builds are disabled to prevent build timeouts
- image: Ubuntu1804
Expand All @@ -78,6 +78,8 @@ matrix:
COMPILER: Clang
- image: Ubuntu2004
ARCH: arm64
- image: Previous Ubuntu2004
ARCH: arm64
- image: Visual Studio 2022
COMPILER: MSVC
# x64 .deb is either Ubuntu or Debian stable
Expand Down Expand Up @@ -335,7 +337,7 @@ for:
-
matrix:
only:
- image: macos-bigsur
- image: macos-monterey

clone_folder: ~/mmapper

Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ endif()

if(APPLE)
set(CMAKE_MACOSX_RPATH TRUE)
set(CMAKE_OSX_DEPLOYMENT_TARGET "11.0" CACHE STRING "Minimum OS X deployment version" FORCE)
set(CMAKE_OSX_DEPLOYMENT_TARGET "12.0" CACHE STRING "Minimum OS X deployment version" FORCE)
endif()

if(WIN32)
Expand Down

0 comments on commit 237cbf1

Please sign in to comment.