Reapply "ToolBar buttons to add and remove objects. (#18 )"

This reverts commit 0c16b7d879.
Fix linting CI.
2026-02-14 17:31:17 -05:00 · 2026-02-14 17:29:42 -05:00 · 2026-02-14 16:33:18 -05:00 · 2026-02-14 16:33:10 -05:00 · 2026-02-14 14:30:56 -05:00 · 2026-02-14 14:08:35 -05:00
2 changed files with 2 additions and 2 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -31,7 +31,7 @@ jobs:
            cmake: -DCMAKE_PREFIX_PATH=D:/a/qtk/qtk/Qt/$QT_VERSION/mingw81_64/ $CONFIG
            flags: ''
          - os: macos-latest
-            cmake: -DCMAKE_PREFIX_PATH=/home/runner/work/qtk/Qt/$QT_VERSION/gcc_64/ $CONFIG
+            cmake: -DCMAKE_PREFIX_PATH=/home/runner/work/qtk/Qt/$QT_VERSION/gcc_64/ -Dfdopen=fdopen $CONFIG
            flags: -j $(nproc)

    runs-on: ${{ matrix.os }}
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -163,9 +163,9 @@ if(QTK_SUBMODULES)
    add_compile_definitions(-Dfdopen=fdopen)
  endif()
  if(NOT WIN32)
-    # Required to statically link.
    add_compile_options(-fPIC)
  endif()
+  # Required to statically link.
  set(BUILD_SHARED_LIBS OFF CACHE STRING "Build static assimp libs" FORCE)
  set(ASSIMP_BUILD_ZLIB ON CACHE STRING "Build Zlib with assimp." FORCE)
  set(
Author	SHA1	Message	Date
Shaun Reed	9a87c1df10	Reapply "ToolBar buttons to add and remove objects. (#18 )" This reverts commit `0c16b7d879`.	2026-02-14 17:31:17 -05:00
Shaun Reed	9397e3117b	Fix linting CI.	2026-02-14 17:29:42 -05:00
Shaun Reed	a2f849ec72	Install NSIS for windows pt2.	2026-02-14 16:33:18 -05:00
Shaun Reed	67fcf4619b	Update assimp to fix Mac CI. Zlib no longer uses fdopen. Zlib previously had redefined fdopen, causing conflicts in apple things. Zlib has since updated to remove these defines, fixing the issue.	2026-02-14 16:33:10 -05:00
Shaun Reed	6d9689720d	Remove deprecated GLSL.	2026-02-14 14:30:56 -05:00
Shaun Reed	4f76d37ea0	Install NSIS on windows.	2026-02-14 14:08:35 -05:00
Shaun Reed	0770b0ea65	Update clang-format action.	2026-02-14 13:54:30 -05:00
Shaun Reed	0c16b7d879	Revert "ToolBar buttons to add and remove objects. (#18 )" This reverts commit `ed604eb655`.	2026-02-14 13:41:18 -05:00