Compare commits

...

20 Commits

Author SHA1 Message Date
WerWolv
a6cc4ca210 Set native compiler to gcc 2023-11-04 15:02:39 +01:00
WerWolv
b4f6c8d773 Try to get libromfs to build again 2023-11-04 14:57:26 +01:00
WerWolv
effe93ddd8 Try fix sysroot settings 2023-11-04 14:27:40 +01:00
WerWolv
84b4c14d35 Don't cancel workflows if one fails in matrix 2023-11-04 13:55:23 +01:00
WerWolv
911164b513 Try force setting OSX Arch 2023-11-04 13:50:05 +01:00
WerWolv
411214797b Add cross compiling message 2023-11-03 16:16:45 +01:00
WerWolv
5206a712fe Use toolchain file to cross compile 2023-11-03 16:15:16 +01:00
WerWolv
641949ecda Set native compiler 2023-11-03 16:01:54 +01:00
WerWolv
eadf9c1c2e Don't use -target anymore 2023-11-03 15:41:26 +01:00
WerWolv
ed37d56625 Remove minor version number from build target 2023-11-03 14:18:28 +01:00
WerWolv
64185a0d2f Fixed target again 2023-11-03 14:06:08 +01:00
WerWolv
aa72cd4d24 Only update brew packages on ARM 2023-11-03 14:00:01 +01:00
WerWolv
7dbf84f73a Fixed build target tripple 2023-11-03 13:23:43 +01:00
WerWolv
f077515a46 Upgrade to macOS 12 builds 2023-11-03 13:16:33 +01:00
WerWolv
bb43af3fc9 Back to standard llvm 2023-11-03 12:55:40 +01:00
WerWolv
94c0b663f6 Try to use pre-built version 2023-11-03 12:47:00 +01:00
WerWolv
cac656710e Try using llvm17 directly 2023-11-03 08:10:32 +01:00
WerWolv
df807896ea Try install latest llvm
.
2023-11-02 22:25:24 +01:00
WerWolv
31b63a11ce Try fixing build 2023-11-02 21:33:29 +01:00
WerWolv
211f775b9f git: Try cross-compiling 2023-11-02 20:49:11 +01:00
3 changed files with 29 additions and 3 deletions

View File

@@ -124,15 +124,24 @@ jobs:
# MacOS build # MacOS build
macos: macos:
runs-on: macos-11 runs-on: macos-12
strategy: strategy:
fail-fast: false
matrix: matrix:
include: include:
- suffix: "-NoGPU" - suffix: "-NoGPU"
custom_glfw: true custom_glfw: true
toolchain_file: ""
needs_update: true
- suffix: "" - suffix: ""
custom_glfw: false custom_glfw: false
toolchain_file: ""
needs_update: true
- suffix: "-ARM"
custom_glfw: false
toolchain_file: "dist/macOS/macos_arm_toolchain.cmake"
needs_update: true
name: 🍎 macOS 11.0${{matrix.suffix}} name: 🍎 macOS 11.0${{matrix.suffix}}
@@ -160,6 +169,11 @@ jobs:
build/CMakeCache.txt build/CMakeCache.txt
key: ${{ runner.os }}-${{ matrix.suffix }}-cmakecache-${{ hashFiles('**/CMakeLists.txt') }} key: ${{ runner.os }}-${{ matrix.suffix }}-cmakecache-${{ hashFiles('**/CMakeLists.txt') }}
- name: ⬇️ Update brew packages
if: ${{matrix.needs_update}}
run: |
brew update
- name: ⬇️ Install dependencies - name: ⬇️ Install dependencies
run: | run: |
brew bundle --no-lock --file dist/Brewfile brew bundle --no-lock --file dist/Brewfile
@@ -207,19 +221,22 @@ jobs:
run: | run: |
mkdir -p build mkdir -p build
cd build cd build
CC=$(brew --prefix gcc@12)/bin/gcc-12 \ CC=$(brew --prefix llvm)/bin/clang \
CXX=$(brew --prefix gcc@12)/bin/g++-12 \ CXX=$(brew --prefix llvm)/bin/clang++ \
OBJC=$(brew --prefix llvm)/bin/clang \ OBJC=$(brew --prefix llvm)/bin/clang \
OBJCXX=$(brew --prefix llvm)/bin/clang++ \ OBJCXX=$(brew --prefix llvm)/bin/clang++ \
PKG_CONFIG_PATH="$(brew --prefix openssl)/lib/pkgconfig":"$(brew --prefix)/lib/pkgconfig" \ PKG_CONFIG_PATH="$(brew --prefix openssl)/lib/pkgconfig":"$(brew --prefix)/lib/pkgconfig" \
cmake -G "Ninja" \ cmake -G "Ninja" \
-DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} \ -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} \
-DCMAKE_TOOLCHAIN_FILE="${{matrix.toolchain_file}}" \
-DCREATE_BUNDLE=ON \ -DCREATE_BUNDLE=ON \
-DCREATE_PACKAGE=ON \ -DCREATE_PACKAGE=ON \
-DCMAKE_C_COMPILER_LAUNCHER=ccache \ -DCMAKE_C_COMPILER_LAUNCHER=ccache \
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \ -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
-DCMAKE_OBJC_COMPILER_LAUNCHER=ccache \ -DCMAKE_OBJC_COMPILER_LAUNCHER=ccache \
-DCMAKE_OBJCXX_COMPILER_LAUNCHER=ccache \ -DCMAKE_OBJCXX_COMPILER_LAUNCHER=ccache \
-DNATIVE_CMAKE_C_COMPILER="$(brew --prefix gcc@12)/bin/gcc-12" \
-DNATIVE_CMAKE_CXX_COMPILER="$(brew --prefix gcc@12)/bin/g++-12" \
-DIMHEX_PATTERNS_PULL_MASTER=ON \ -DIMHEX_PATTERNS_PULL_MASTER=ON \
-DIMHEX_COMMIT_HASH_SHORT="${GITHUB_SHA::7}" \ -DIMHEX_COMMIT_HASH_SHORT="${GITHUB_SHA::7}" \
-DIMHEX_COMMIT_HASH_LONG="${GITHUB_SHA}" \ -DIMHEX_COMMIT_HASH_LONG="${GITHUB_SHA}" \
@@ -472,6 +489,7 @@ jobs:
# RPM distro builds # RPM distro builds
rpm-build: rpm-build:
strategy: strategy:
fail-fast: false
matrix: matrix:
include: include:
- name: Fedora - name: Fedora

View File

@@ -297,6 +297,10 @@ macro(configureCMake)
# Enable C and C++ languages # Enable C and C++ languages
enable_language(C CXX) enable_language(C CXX)
if (CMAKE_CROSSCOMPILING)
message(STATUS "ImHex is being Cross-Compiled for ${CMAKE_SYSTEM_NAME}!")
endif ()
# Configure use of recommended build tools # Configure use of recommended build tools
if (IMHEX_USE_DEFAULT_BUILD_SETTINGS) if (IMHEX_USE_DEFAULT_BUILD_SETTINGS)
message(STATUS "Configuring CMake to use recommended build tools...") message(STATUS "Configuring CMake to use recommended build tools...")

4
dist/macOS/macos_arm_toolchain.cmake vendored Normal file
View File

@@ -0,0 +1,4 @@
set(CMAKE_SYSTEM_NAME Darwin)
set(CMAKE_SYSTEM_PROCESSOR arm64)
set(CMAKE_OSX_ARCHITECTURES arm64 CACHE INTERNAL "" FORCE)
SET(CMAKE_OSX_SYSROOT macosx CACHE INTERNAL "" FORCE)