From 136d1b211c8190402da20fce7a800cbd428410fb Mon Sep 17 00:00:00 2001 From: dashodanger Date: Thu, 21 Nov 2024 22:34:49 -0700 Subject: [PATCH] Remove MacOS from CI; update COMPILING.md --- .github/workflows/cmake.yml | 29 +---------------------------- COMPILING.md | 8 +++----- 2 files changed, 4 insertions(+), 33 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 756700177..edb274104 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -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}} \ No newline at end of file diff --git a/COMPILING.md b/COMPILING.md index a0cb4be9c..d0e6a0d92 100644 --- a/COMPILING.md +++ b/COMPILING.md @@ -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 @@ -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