Merge remote-tracking branch 'origin/master' into gcc12-update

.gitignore

@@ -8,3 +8,4 @@ InterfacesAndLibraries
 /result
 /result-*
 /build
+.direnv

Samples/SystemExtension/CMakeLists.txt

@@ -46,10 +46,14 @@ set_target_properties(SystemExtension PROPERTIES
         # of code in a data file
     LINK_FLAGS -Wl,--mac-flat)
 
+if (REZ_INCLUDE_PATH)
+    set(REZ_INCLUDE_FLAG -I${REZ_INCLUDE_PATH})
+endif()
+
     # Use Rez to put it together
 add_custom_command(
     OUTPUT SystemExtension.bin SystemExtension.dsk
-    COMMAND ${REZ} -I ${REZ_INCLUDE_PATH}
+    COMMAND ${REZ} ${REZ_INCLUDE_FLAG}
                     ${CMAKE_CURRENT_SOURCE_DIR}/SystemExtension.r
                     --copy ${CMAKE_CURRENT_SOURCE_DIR}/Icons.rsrc.bin
                     -o SystemExtension.bin

Samples/WDEF/CMakeLists.txt

@@ -67,10 +67,14 @@ elseif(CMAKE_SYSTEM_NAME MATCHES RetroPPC)
     set(WDEF_RESOURCE WDEF.pef)
 endif()
 
+if (REZ_INCLUDE_PATH)
+    set(REZ_INCLUDE_FLAG -I${REZ_INCLUDE_PATH})
+endif()
+
     # wrap the compiled WDEF into a resource
 add_custom_command(
     OUTPUT WDEF.rsrc.bin
-    COMMAND ${REZ} -I ${REZ_INCLUDE_PATH}
+    COMMAND ${REZ} ${REZ_INCLUDE_FLAG}
                     ${CMAKE_CURRENT_SOURCE_DIR}/${WDEF_R}
                     -o WDEF.rsrc.bin
                     

azure-pipelines.yml

@@ -55,7 +55,7 @@ jobs:
 
 - job: macOS
   pool:
-    vmImage: 'macOS-11'
+    vmImage: 'macOS-13'
   timeoutInMinutes: 90
   steps:
   - checkout: self