gbdev/rgbds
1
0
Fork 0
mirror of https://github.com/gbdev/rgbds.git synced 2025-11-20 10:12:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Get rid of macOS hack to try having the filesystem cake and eat it too

Browse Source
This commit is contained in:
ISSOtm
2023-12-30 20:33:16 +01:00
committed by Rangi
parent 6b559e99b2
commit 528a4c0b70
3 changed files with 2 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/create-release-artifacts.yml vendored
View File

@@ -83,7 +83,7 @@ jobs:
- name: Build binaries - name: Build binaries
run: | run: |
export PATH="/usr/local/opt/bison/bin:$PATH" export PATH="/usr/local/opt/bison/bin:$PATH"
make -j CXXFLAGS="-O3 -flto -DNDEBUG -mmacosx-version-min=10.9 -I include/hacks" PKG_CONFIG="pkg-config --static" PNGLDLIBS="$(pkg-config --static --libs-only-L libpng | cut -c 3-)/libpng.a $(pkg-config --static --libs-only-l libpng | sed s/-lpng[0-9]*//g)" Q= make -j CXXFLAGS="-O3 -flto -DNDEBUG -mmacosx-version-min=10.9" PKG_CONFIG="pkg-config --static" PNGLDLIBS="$(pkg-config --static --libs-only-L libpng | cut -c 3-)/libpng.a $(pkg-config --static --libs-only-l libpng | sed s/-lpng[0-9]*//g)" Q=
- name: Package binaries - name: Package binaries
run: | run: |
zip --junk-paths rgbds-${{ env.version }}-macos-x86_64.zip rgb{asm,link,fix,gfx} man/* .github/scripts/install.sh zip --junk-paths rgbds-${{ env.version }}-macos-x86_64.zip rgb{asm,link,fix,gfx} man/* .github/scripts/install.sh

2
.github/workflows/testing.yml vendored
View File

@@ -98,7 +98,7 @@ jobs:
- name: Build & install - name: Build & install
run: | run: |
export PATH="/usr/local/opt/bison/bin:$PATH" export PATH="/usr/local/opt/bison/bin:$PATH"
make -j CXXFLAGS="-O3 -flto -DNDEBUG -mmacosx-version-min=10.9 -I include/hacks" PKG_CONFIG="pkg-config --static" PNGLDLIBS="$(pkg-config --static --libs-only-L libpng | cut -c 3-)/libpng.a $(pkg-config --static --libs-only-l libpng | sed s/-lpng[0-9]*//g)" Q= make -j CXXFLAGS="-O3 -flto -DNDEBUG -mmacosx-version-min=10.9" PKG_CONFIG="pkg-config --static" PNGLDLIBS="$(pkg-config --static --libs-only-L libpng | cut -c 3-)/libpng.a $(pkg-config --static --libs-only-l libpng | sed s/-lpng[0-9]*//g)" Q=
- name: Package binaries - name: Package binaries
run: | run: |
mkdir bins mkdir bins

32
include/hacks/__availability
View File

@@ -1,32 +0,0 @@
/* SPDX-License-Identifier: MIT */
#ifdef __APPLE__
#include_next <__availability>
/**
* This is a hack to make RGBDS build on macOS 10.14 and below. Without it, we get errors like:
* error: 'path' is unavailable: introduced in macOS 10.15
* The hack weakens the `std::filesystem::path` availability error into a warning, by removing
* `strict` from the availability macros (for information on the `availability` attribute, see
* https://releases.llvm.org/17.0.1/tools/clang/docs/AttributeReference.html#availability). This is
* acceptable because what we need of `std::filesystem::path` was already supported in macOS 10.14
* (the last version to support 32-bit, hence in demand despite being superseded by 10.15 in 2019).
*/
#ifndef _LIBCPP_HAS_NO_VENDOR_AVAILABILITY_ANNOTATIONS
# undef _LIBCPP_AVAILABILITY_FILESYSTEM_PUSH
# define _LIBCPP_AVAILABILITY_FILESYSTEM_PUSH \
_Pragma("clang attribute push(__attribute__((availability(macosx,introduced=10.15))), apply_to=any(function,record))") \
_Pragma("clang attribute push(__attribute__((availability(ios,introduced=13.0))), apply_to=any(function,record))") \
_Pragma("clang attribute push(__attribute__((availability(tvos,introduced=13.0))), apply_to=any(function,record))") \
_Pragma("clang attribute push(__attribute__((availability(watchos,introduced=6.0))), apply_to=any(function,record))")
# define _LIBCPP_AVAILABILITY_FILESYSTEM \
__attribute__((availability(macosx,introduced=10.15))) \
__attribute__((availability(ios,introduced=13.0))) \
__attribute__((availability(tvos,introduced=13.0))) \
__attribute__((availability(watchos,introduced=6.0)))
#endif
#endif // __APPLE__