mirror of
https://github.com/geode-sdk/geode.git
synced 2024-11-27 09:55:34 -05:00
Merge branch 'main' of https://github.com/geode-sdk/geode
This commit is contained in:
commit
d6d9161017
3 changed files with 19 additions and 18 deletions
26
.github/workflows/build.yml
vendored
26
.github/workflows/build.yml
vendored
|
@ -33,19 +33,19 @@ jobs:
|
||||||
package_cmd: 'makensis -WX -V3 ./installer/windows/installer.nsi'
|
package_cmd: 'makensis -WX -V3 ./installer/windows/installer.nsi'
|
||||||
installer_path: './installer/windows/geode-installer-win.exe'
|
installer_path: './installer/windows/geode-installer-win.exe'
|
||||||
|
|
||||||
- name: macOS
|
# - name: macOS
|
||||||
os: macos-latest
|
# os: macos-latest
|
||||||
id: mac
|
# id: mac
|
||||||
cli_id: mac
|
# cli_id: mac
|
||||||
extra_flags: >
|
# extra_flags: >
|
||||||
-DCMAKE_C_COMPILER=clang
|
# -DCMAKE_C_COMPILER=clang
|
||||||
-DCMAKE_CXX_COMPILER=clang++
|
# -DCMAKE_CXX_COMPILER=clang++
|
||||||
-DCMAKE_C_COMPILER_LAUNCHER=ccache
|
# -DCMAKE_C_COMPILER_LAUNCHER=ccache
|
||||||
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache
|
# -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
|
||||||
-DCMAKE_BUILD_TYPE=RelWithDebInfo -DGEODE_DEBUG=On -DCMAKE_OSX_DEPLOYMENT_TARGET=10.13
|
# -DCMAKE_BUILD_TYPE=RelWithDebInfo -DGEODE_DEBUG=On -DCMAKE_OSX_DEPLOYMENT_TARGET=10.13
|
||||||
cli_cmd: 'chmod +x $GITHUB_WORKSPACE/cli/geode'
|
# cli_cmd: 'chmod +x $GITHUB_WORKSPACE/cli/geode'
|
||||||
package_cmd: './installer/mac/package.sh ./bin/nightly ./installer/mac/geode-installer-mac.pkg'
|
# package_cmd: './installer/mac/package.sh ./bin/nightly ./installer/mac/geode-installer-mac.pkg'
|
||||||
installer_path: './installer/mac/geode-installer-mac.pkg'
|
# installer_path: './installer/mac/geode-installer-mac.pkg'
|
||||||
|
|
||||||
- name: Android
|
- name: Android
|
||||||
os: ubuntu-latest
|
os: ubuntu-latest
|
||||||
|
|
10
.github/workflows/test-offsets.yml
vendored
10
.github/workflows/test-offsets.yml
vendored
|
@ -23,11 +23,11 @@ jobs:
|
||||||
prefixes: ''
|
prefixes: ''
|
||||||
extra_flags: -A win32 -DGEODE_DEBUG=On
|
extra_flags: -A win32 -DGEODE_DEBUG=On
|
||||||
|
|
||||||
- name: macOS
|
# - name: macOS
|
||||||
os_identifier: mac
|
# os_identifier: mac
|
||||||
os: macos-latest
|
# os: macos-latest
|
||||||
prefixes: PATH="/usr/local/opt/ccache/libexec:$PATH"
|
# prefixes: PATH="/usr/local/opt/ccache/libexec:$PATH"
|
||||||
extra_flags: -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_BUILD_TYPE=Debug -DGEODE_DEBUG=On
|
# extra_flags: -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_BUILD_TYPE=Debug -DGEODE_DEBUG=On
|
||||||
|
|
||||||
name: Test Offsets ${{ matrix.config.name }}
|
name: Test Offsets ${{ matrix.config.name }}
|
||||||
runs-on: ${{ matrix.config.os }}
|
runs-on: ${{ matrix.config.os }}
|
||||||
|
|
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -45,6 +45,7 @@ build
|
||||||
build2
|
build2
|
||||||
build-docs/
|
build-docs/
|
||||||
bin
|
bin
|
||||||
|
/build-*
|
||||||
|
|
||||||
# Ignore docs folders
|
# Ignore docs folders
|
||||||
docs/**
|
docs/**
|
||||||
|
|
Loading…
Reference in a new issue