Merge branch 'master' of https://github.com/sirjuddington/SLADE

SteelT1 · Dec 25, 2023 · a283ade · a283ade
2 parents c51eb0b + 29f8e23
commit a283ade
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/continuous_integration.yml b/.github/workflows/continuous_integration.yml
@@ -12,8 +12,8 @@ jobs:
         config:
         - {
             name: "macOS",
-            os: macos-11,
-	    extra_options: "-DBUILD_PK3=ON",
+            os: macos-12,
+            extra_options: "-DBUILD_PK3=ON",
             deps_cmdline: "brew install fluidsynth freeimage ftgl lua mpg123 sfml wxwidgets"
           }
         - {

diff --git a/cmake/unix.cmake b/cmake/unix.cmake
@@ -186,7 +186,7 @@ target_link_libraries(slade
 	${MPG123_LIBRARIES}
 )
 
-if(LINUX)
+if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND CMAKE_CXX_COMPILER_VERSION LESS 9)
 	target_link_libraries(slade -lstdc++fs)
 endif()