From 174297b6fc8da318dc27dcc1d0a285ad279ac8db Mon Sep 17 00:00:00 2001 From: adam-bloom Date: Sun, 28 Feb 2021 10:10:11 -0700 Subject: [PATCH] OpenRCT2/Dependencies v28 --- CMakeLists.txt | 9 +++------ OpenRCT2.xcodeproj/project.pbxproj | 2 +- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index beef8d4024..90c0c5e8c9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -103,13 +103,10 @@ endif () if (APPLE AND MACOS_USE_DEPENDENCIES) # if we're building on macOS, then we need the dependencies # update dylibs - set(MACOS_DYLIBS_VERSION "27") + set(MACOS_DYLIBS_VERSION "28") set(MACOS_DYLIBS_ZIPFILE "openrct2-libs-v${MACOS_DYLIBS_VERSION}-x64-macos-dylibs.zip") set(MACOS_DYLIBS_DIR "${ROOT_DIR}/lib/macos") - - # change back before releasing! - #set(MACOS_DYLIBS_URL "https://github.com/OpenRCT2/Dependencies/releases/download/v${MACOS_DYLIBS_VERSION}/${MACOS_DYLIBS_ZIPFILE}") - set(MACOS_DYLIBS_URL "https://github.com/adam-bloom/Dependencies/releases/download/v${MACOS_DYLIBS_VERSION}/${MACOS_DYLIBS_ZIPFILE}") + set(MACOS_DYLIBS_URL "https://github.com/OpenRCT2/Dependencies/releases/download/v${MACOS_DYLIBS_VERSION}/${MACOS_DYLIBS_ZIPFILE}") if (NOT EXISTS ${MACOS_DYLIBS_DIR}) set(DOWNLOAD_DYLIBS 1) @@ -466,4 +463,4 @@ if (APPLE AND MACOS_USE_DEPENDENCIES) # (via homebrew). A local CMAKE_INSTALL_PREFIX is recommended to avoid issues file(GLOB DYLIB_FILES "${MACOS_DYLIBS_DIR}/lib/*.dylib") install(FILES ${DYLIB_FILES} DESTINATION "${CMAKE_INSTALL_LIBDIR}") -endif() \ No newline at end of file +endif() diff --git a/OpenRCT2.xcodeproj/project.pbxproj b/OpenRCT2.xcodeproj/project.pbxproj index 120010e215..592441cae8 100644 --- a/OpenRCT2.xcodeproj/project.pbxproj +++ b/OpenRCT2.xcodeproj/project.pbxproj @@ -4411,7 +4411,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "version=\"27\"\nzipname=\"openrct2-libs-v27-x64-macos-dylibs.zip\"\n# change back before releasing!\n#liburl=\"https://github.com/OpenRCT2/Dependencies/releases/download/v$version/$zipname\"\n\nliburl=\"https://github.com/adam-bloom/Dependencies/releases/download/v$version/$zipname\"\n\n[[ ! -d \"${SRCROOT}/libxc\" || ! -e \"${SRCROOT}/libversion\" || $(head -n 1 \"${SRCROOT}/libversion\") != $version ]]\noutdated=$?\n\nif [[ $outdated -eq 0 ]]; then\nif [[ -d \"${SRCROOT}/libxc\" ]]; then rm -r \"${SRCROOT}/libxc\"; fi\nmkdir \"${SRCROOT}/libxc\"\n\ncurl -L -o \"${SRCROOT}/libxc/$zipname\" \"$liburl\"\nunzip -uaq -d \"${SRCROOT}/libxc\" \"${SRCROOT}/libxc/$zipname\"\nrm \"${SRCROOT}/libxc/$zipname\"\n\necho $version > \"${SRCROOT}/libversion\"\nfi\n"; + shellScript = "version=\"28\"\nzipname=\"openrct2-libs-v28-x64-macos-dylibs.zip\"\nliburl=\"https://github.com/OpenRCT2/Dependencies/releases/download/v$version/$zipname\"\n\n[[ ! -d \"${SRCROOT}/libxc\" || ! -e \"${SRCROOT}/libversion\" || $(head -n 1 \"${SRCROOT}/libversion\") != $version ]]\noutdated=$?\n\nif [[ $outdated -eq 0 ]]; then\nif [[ -d \"${SRCROOT}/libxc\" ]]; then rm -r \"${SRCROOT}/libxc\"; fi\nmkdir \"${SRCROOT}/libxc\"\n\ncurl -L -o \"${SRCROOT}/libxc/$zipname\" \"$liburl\"\nunzip -uaq -d \"${SRCROOT}/libxc\" \"${SRCROOT}/libxc/$zipname\"\nrm \"${SRCROOT}/libxc/$zipname\"\n\necho $version > \"${SRCROOT}/libversion\"\nfi\n"; }; D42C09D21C254F4E00309751 /* Build g2.dat */ = { isa = PBXShellScriptBuildPhase;