CI: Revert previous commit and fix underlying issue

This commit is contained in:
Connor McLaughlin 2021-06-04 16:49:27 +10:00
parent 1269a1e091
commit 950b81861b
2 changed files with 43 additions and 5 deletions

View File

@ -243,6 +243,42 @@ jobs:
path: "duckstation-android.apk"
macos-build:
runs-on: macos-10.15
if: github.ref != 'refs/heads/play-store'
steps:
- uses: actions/checkout@v2.3.1
with:
fetch-depth: 0
- name: Install packages
shell: bash
run: |
brew install qt5 sdl2 curl
- name: Clone mac externals
shell: bash
run: |
git clone https://github.com/stenzek/duckstation-ext-mac.git dep/mac
- name: Compile and zip .app
shell: bash
run: |
mkdir build
cd build
export MACOSX_DEPLOYMENT_TARGET=10.14
cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_NOGUI_FRONTEND=OFF -DBUILD_QT_FRONTEND=ON -DUSE_SDL2=ON -DQt5_DIR=/usr/local/opt/qt@5/lib/cmake/Qt5 ..
cmake --build . --parallel 2
cd bin
zip -r duckstation-mac-release.zip DuckStation.app/
- name: Upload macOS .app
uses: actions/upload-artifact@v1
with:
name: "macos-x64"
path: "build/bin/duckstation-mac-release.zip"
create-release:
needs: [windows-build, windows-arm64-build, linux-build, android-build]
runs-on: "ubuntu-20.04"

View File

@ -224,12 +224,14 @@ endif()
# Default symbol visibility to hidden, that way we don't go through the PLT for intra-library calls.
if(ANDROID OR BUILD_LIBRETRO_CORE)
set(CMAKE_C_VISIBILITY_PRESET hidden)
set(CMAKE_CXX_VISIBILITY_PRESET hidden)
if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fno-semantic-interposition")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-semantic-interposition")
endif()
endif()
# Detect C++ version support.