Skip to content

Commit

Permalink
Remove MacOS from CI; update COMPILING.md
Browse files Browse the repository at this point in the history
  • Loading branch information
dashodanger committed Nov 22, 2024
1 parent 4f44802 commit 136d1b2
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 33 deletions.
29 changes: 1 addition & 28 deletions .github/workflows/cmake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -103,31 +103,4 @@ jobs:
theme
tools
obsidian
retention-days: ${{env.RETENTION_DAYS}}
build-macos:
runs-on: macos-latest
steps:
- uses: actions/checkout@v4
- name: Install HomeBrew FLTK
run: brew install fltk
- name: Configure CMake MacOS
run: mkdir build && cd build && cmake .. -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
- name: Build MacOS
run: cmake --build build --config ${{env.BUILD_TYPE}}
- uses: actions/upload-artifact@v4
with:
name: obsidian-macos
path: |
addons
data
engines
games
language
modules
ports
presets
scripts
theme
tools
obsidian
retention-days: ${{env.RETENTION_DAYS}}
retention-days: ${{env.RETENTION_DAYS}}
8 changes: 3 additions & 5 deletions COMPILING.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,8 @@
2. Xorg:
* package: `xorg` (`xorg-libraries` on its own doesn't seem sufficient)

3. Wayland:
* Wayland support for FLTK 1.4 is in a state of flux; instructions and
dependencies can be found in the source_files/fltk/README.Wayland.txt file
3. FLTK:
* package: `fltk`

The C++ compiler/toolchain should already be present on a typical BSD install

Expand All @@ -31,8 +30,7 @@ The C++ compiler/toolchain should already be present on a typical BSD install
* package: `libfontconfig1-dev`
* recommended if using X11 for better fonts: `libxft-dev`
* if using X11 and not pulled in by one of the above packages: `libx11-dev`
* Wayland support for FLTK 1.4 is in a state of flux; instructions and
dependencies can be found in the source_files/fltk/README.Wayland.txt file
* package: `libfltk1.3-dev` (minimum required version, later versions also acceptable)

## Linux/BSD Compilation

Expand Down

0 comments on commit 136d1b2

Please sign in to comment.