Skip to content

Commit

Permalink
Update macOS to 13.5 and xcode 14.3.1. (#33722)
Browse files Browse the repository at this point in the history
  • Loading branch information
BillyONeal authored Sep 14, 2023
1 parent 130a670 commit d99b693
Show file tree
Hide file tree
Showing 18 changed files with 140 additions and 683 deletions.
24 changes: 22 additions & 2 deletions ports/urho3d/macosx.patch
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/Source/ThirdParty/Assimp/contrib/zlib/gzguts.h b/Source/ThirdParty/Assimp/contrib/zlib/gzguts.h
index 6378d468a..c8563db52 100644
index 6378d46..c8563db 100644
--- a/Source/ThirdParty/Assimp/contrib/zlib/gzguts.h
+++ b/Source/ThirdParty/Assimp/contrib/zlib/gzguts.h
@@ -38,6 +38,9 @@
Expand All @@ -13,7 +13,7 @@ index 6378d468a..c8563db52 100644
#if defined(_WIN32)
# define WIDECHAR
diff --git a/Source/ThirdParty/Civetweb/src/civetweb.c b/Source/ThirdParty/Civetweb/src/civetweb.c
index 4d26e0a83..2bd577e81 100644
index 4d26e0a..2bd577e 100644
--- a/Source/ThirdParty/Civetweb/src/civetweb.c
+++ b/Source/ThirdParty/Civetweb/src/civetweb.c
@@ -167,6 +167,8 @@ mg_static_assert(sizeof(void *) >= sizeof(int), "data type size check");
Expand All @@ -25,3 +25,23 @@ index 4d26e0a83..2bd577e81 100644
#if !defined(DEBUG_TRACE)
#if defined(DEBUG)

diff --git a/Source/ThirdParty/SDL/CMakeLists.txt b/Source/ThirdParty/SDL/CMakeLists.txt
index 5c4ef27..fd4c4dd 100644
--- a/Source/ThirdParty/SDL/CMakeLists.txt
+++ b/Source/ThirdParty/SDL/CMakeLists.txt
@@ -428,15 +428,6 @@ if(USE_GCC OR USE_CLANG)
list(APPEND EXTRA_CFLAGS "-fno-strict-aliasing")
endif()

- check_c_compiler_flag(-Wdeclaration-after-statement HAVE_GCC_WDECLARATION_AFTER_STATEMENT)
- if(HAVE_GCC_WDECLARATION_AFTER_STATEMENT)
- check_c_compiler_flag(-Werror=declaration-after-statement HAVE_GCC_WERROR_DECLARATION_AFTER_STATEMENT)
- # Urho3D - bug fix - SDL does not build cleanly for Android platform with this flag on, make a tweak here rather than changing on their code
- if(HAVE_GCC_WERROR_DECLARATION_AFTER_STATEMENT AND NOT ANDROID)
- list(APPEND EXTRA_CFLAGS "-Werror=declaration-after-statement")
- endif()
- list(APPEND EXTRA_CFLAGS "-Wdeclaration-after-statement")
- endif()

if(DEPENDENCY_TRACKING)
check_c_source_compiles("
2 changes: 1 addition & 1 deletion ports/urho3d/vcpkg.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"$note": "Due to the upstream modification of the dependent source code, the internal port of vcpkg cannot be used.",
"name": "urho3d",
"version-date": "2021-03-01",
"port-version": 4,
"port-version": 5,
"description": "Urho3D is a free lightweight, cross-platform 2D and 3D game engine implemented in C++ and released under the MIT license. Greatly inspired by OGRE and Horde3D.",
"homepage": "https://github.com/urho3d/Urho3D",
"supports": "!(arm | uwp)",
Expand Down
2 changes: 1 addition & 1 deletion scripts/azure-pipelines/azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ variables:
android-pool: 'PrAnd-1ES-Pool'
linux-pool: 'PrLin-1ES-Pool'
windows-pool: 'PrWin-2023-08-09'
osx-pool: 'PrOsx-2022-02-04'
osx-pool: 'PrOsx-2023-09-11'
linux-docker-image: 'andcontainerregistry.azurecr.io/vcpkg-android:2023-04-20'

parameters:
Expand Down
128 changes: 0 additions & 128 deletions scripts/azure-pipelines/osx/Install-Prerequisites.ps1

This file was deleted.

Loading

0 comments on commit d99b693

Please sign in to comment.