mirror of
https://github.com/Lorenzooone/cc3dsfs.git
synced 2026-07-18 16:43:28 -05:00
Build universal binary for macos
This commit is contained in:
parent
52c8291f79
commit
fcef91d886
15
.github/workflows/cd_main.yml
vendored
15
.github/workflows/cd_main.yml
vendored
|
|
@ -18,7 +18,6 @@ jobs:
|
|||
platform:
|
||||
- { name: Windows VS2022, os: windows-2022 }
|
||||
- { name: Linux GCC, os: ubuntu-latest }
|
||||
- { name: macOS x64, os: macos-13 }
|
||||
- { name: macOS Apple Silicon, os: macos-14 }
|
||||
config:
|
||||
- { name: Static, flags: -DBUILD_SHARED_LIBS=FALSE }
|
||||
|
|
@ -49,15 +48,10 @@ jobs:
|
|||
shell: bash
|
||||
run: cd build && cpack -G ZIP
|
||||
|
||||
- name: Unpack Codesign Repack x64
|
||||
if: (runner.os == 'macOS') && (runner.arch == 'x64')
|
||||
- name: Unpack Codesign Repack
|
||||
if: runner.os == 'macOS'
|
||||
shell: bash
|
||||
run: setup_scripts/macos_bundle_signature.sh cc3dsfs_macos_x86_64
|
||||
|
||||
- name: Unpack Codesign Repack Arm64
|
||||
if: (runner.os == 'macOS') && (runner.arch == 'ARM64')
|
||||
shell: bash
|
||||
run: setup_scripts/macos_bundle_signature.sh cc3dsfs_macos_arm64
|
||||
run: setup_scripts/macos_bundle_signature.sh cc3dsfs_macos
|
||||
|
||||
- name: Archive resulting artifact
|
||||
uses: actions/upload-artifact@v3
|
||||
|
|
@ -85,7 +79,6 @@ jobs:
|
|||
tag: "nightly-latest"
|
||||
replace: true
|
||||
files: >
|
||||
cc3dsfs_macos_x86_64.zip
|
||||
cc3dsfs_windows_x86_64.zip
|
||||
cc3dsfs_linux_x86_64.zip
|
||||
cc3dsfs_macos_arm64.zip
|
||||
cc3dsfs_macos.zip
|
||||
|
|
|
|||
|
|
@ -1,4 +1,6 @@
|
|||
cmake_minimum_required(VERSION 3.16)
|
||||
set(CMAKE_OSX_ARCHITECTURES "x86_64;arm64" CACHE STRING "Build archs for Mac OS X" FORCE)
|
||||
set(CMAKE_OSX_DEPLOYMENT_TARGET "11" CACHE STRING "Minimum OS X deployment version")
|
||||
project(cc3dsfs VERSION 1.0.0 LANGUAGES CXX)
|
||||
include(ExternalProject)
|
||||
|
||||
|
|
@ -327,7 +329,7 @@ set(CPACK_PACKAGE_INSTALL_DIRECTORY ${CPACK_PACKAGE_NAME})
|
|||
set(CPACK_VERBATIM_VARIABLES TRUE)
|
||||
|
||||
if(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
|
||||
set(CPACK_PACKAGE_FILE_NAME ${CPACK_PACKAGE_NAME}_macos_${CMAKE_SYSTEM_PROCESSOR})
|
||||
set(CPACK_PACKAGE_FILE_NAME ${CPACK_PACKAGE_NAME}_macos)
|
||||
elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
|
||||
if(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "AMD64")
|
||||
set(CPACK_PACKAGE_FILE_NAME ${CPACK_PACKAGE_NAME}_windows_x86_64)
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
#include "frontend.hpp"
|
||||
|
||||
#define GL_SILENCE_DEPRECATION
|
||||
#include <SFML/OpenGL.hpp>
|
||||
#include <cstring>
|
||||
#include "font_ttf.h"
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user