mirror of
https://github.com/WerWolv/ImHex.git
synced 2026-03-28 07:47:03 -05:00
Compare commits
20 Commits
python_scr
...
m1_cross_c
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a6cc4ca210 | ||
|
|
b4f6c8d773 | ||
|
|
effe93ddd8 | ||
|
|
84b4c14d35 | ||
|
|
911164b513 | ||
|
|
411214797b | ||
|
|
5206a712fe | ||
|
|
641949ecda | ||
|
|
eadf9c1c2e | ||
|
|
ed37d56625 | ||
|
|
64185a0d2f | ||
|
|
aa72cd4d24 | ||
|
|
7dbf84f73a | ||
|
|
f077515a46 | ||
|
|
bb43af3fc9 | ||
|
|
94c0b663f6 | ||
|
|
cac656710e | ||
|
|
df807896ea | ||
|
|
31b63a11ce | ||
|
|
211f775b9f |
24
.github/workflows/build.yml
vendored
24
.github/workflows/build.yml
vendored
@@ -124,15 +124,24 @@ jobs:
|
||||
|
||||
# MacOS build
|
||||
macos:
|
||||
runs-on: macos-11
|
||||
runs-on: macos-12
|
||||
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
include:
|
||||
- suffix: "-NoGPU"
|
||||
custom_glfw: true
|
||||
toolchain_file: ""
|
||||
needs_update: true
|
||||
- suffix: ""
|
||||
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}}
|
||||
|
||||
@@ -160,6 +169,11 @@ jobs:
|
||||
build/CMakeCache.txt
|
||||
key: ${{ runner.os }}-${{ matrix.suffix }}-cmakecache-${{ hashFiles('**/CMakeLists.txt') }}
|
||||
|
||||
- name: ⬇️ Update brew packages
|
||||
if: ${{matrix.needs_update}}
|
||||
run: |
|
||||
brew update
|
||||
|
||||
- name: ⬇️ Install dependencies
|
||||
run: |
|
||||
brew bundle --no-lock --file dist/Brewfile
|
||||
@@ -207,19 +221,22 @@ jobs:
|
||||
run: |
|
||||
mkdir -p build
|
||||
cd build
|
||||
CC=$(brew --prefix gcc@12)/bin/gcc-12 \
|
||||
CXX=$(brew --prefix gcc@12)/bin/g++-12 \
|
||||
CC=$(brew --prefix llvm)/bin/clang \
|
||||
CXX=$(brew --prefix llvm)/bin/clang++ \
|
||||
OBJC=$(brew --prefix llvm)/bin/clang \
|
||||
OBJCXX=$(brew --prefix llvm)/bin/clang++ \
|
||||
PKG_CONFIG_PATH="$(brew --prefix openssl)/lib/pkgconfig":"$(brew --prefix)/lib/pkgconfig" \
|
||||
cmake -G "Ninja" \
|
||||
-DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} \
|
||||
-DCMAKE_TOOLCHAIN_FILE="${{matrix.toolchain_file}}" \
|
||||
-DCREATE_BUNDLE=ON \
|
||||
-DCREATE_PACKAGE=ON \
|
||||
-DCMAKE_C_COMPILER_LAUNCHER=ccache \
|
||||
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
|
||||
-DCMAKE_OBJC_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_COMMIT_HASH_SHORT="${GITHUB_SHA::7}" \
|
||||
-DIMHEX_COMMIT_HASH_LONG="${GITHUB_SHA}" \
|
||||
@@ -472,6 +489,7 @@ jobs:
|
||||
# RPM distro builds
|
||||
rpm-build:
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
include:
|
||||
- name: Fedora
|
||||
|
||||
@@ -297,6 +297,10 @@ macro(configureCMake)
|
||||
# Enable C and C++ languages
|
||||
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
|
||||
if (IMHEX_USE_DEFAULT_BUILD_SETTINGS)
|
||||
message(STATUS "Configuring CMake to use recommended build tools...")
|
||||
|
||||
4
dist/macOS/macos_arm_toolchain.cmake
vendored
Normal file
4
dist/macOS/macos_arm_toolchain.cmake
vendored
Normal 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)
|
||||
Reference in New Issue
Block a user